From e8a9dc249a098eb95965ff9992b57c3f30a95f43 Mon Sep 17 00:00:00 2001
From: "Dr. Peter Droste" <info@qtjambi.io>
Date: Sun, 19 Mar 2023 00:18:37 +0100
Subject: [PATCH] Release version 6.4.4 #135 Decreasing UI performance of
 QListView #129 UIC to Kotlin errors and exceptions #139 Does qtJambi work
 also for STM32MP1? #130 How to use QtJambi Generator to create Java bindings
 to Qt C++ dependency library

---
 README.md                                     |    6 +-
 antcontrib.properties                         |   22 -
 antfiles/autotests.xml                        |   39 +-
 antfiles/generator.xml                        |    3 +
 antfiles/native.xml                           |    6 +-
 antfiles/setenv.xml                           |  120 -
 build.properties                              |    4 +
 build.xml                                     |   78 +-
 releases.properties                           |    6 +-
 src/cpp/QtJambi/configure.pri                 |   10 +-
 src/cpp/QtJambi/convert.cpp                   |  307 +-
 src/cpp/QtJambi/coreapi.cpp                   |   20 +-
 src/cpp/QtJambi/coreapi.h                     |    2 -
 src/cpp/QtJambi/events.cpp                    |   12 +-
 src/cpp/QtJambi/fileengine.cpp                |   15 +-
 src/cpp/QtJambi/functionpointer.cpp           |   24 +-
 src/cpp/QtJambi/functionpointer.h             |   18 +-
 src/cpp/QtJambi/future.cpp                    |   79 +-
 src/cpp/QtJambi/java.cpp                      |   86 +-
 src/cpp/QtJambi/javaapi.h                     |   37 +
 src/cpp/QtJambi/javainvalidate.cpp            |   80 +-
 src/cpp/QtJambi/javainvalidate.h              |    5 +-
 src/cpp/QtJambi/jna.cpp                       |  100 +-
 src/cpp/QtJambi/jni_nativepointer.cpp         |   24 +-
 src/cpp/QtJambi/jni_utilities.cpp             |  119 +-
 src/cpp/QtJambi/jobjectwrapper.cpp            |   14 +-
 src/cpp/QtJambi/jobjectwrapper.h              |   26 +-
 .../qtjambi_cast_impl_container_associative.h |    6 +-
 .../qtjambi_cast_impl_container_sequential.h  |    3 +-
 src/cpp/QtJambi/qtjambi_cast_impl_jnitype.h   |   73 +-
 src/cpp/QtJambi/qtjambi_cast_impl_template1.h |  183 +-
 src/cpp/QtJambi/qtjambi_cast_impl_template2.h |    8 +-
 src/cpp/QtJambi/qtjambi_cast_impl_template3.h |    4 +-
 src/cpp/QtJambi/qtjambi_cast_impl_template4.h |   18 +-
 src/cpp/QtJambi/qtjambi_cast_impl_template5.h |   16 +-
 src/cpp/QtJambi/qtjambi_cast_impl_util.h      |   24 +
 src/cpp/QtJambi/qtjambiapi.cpp                |   32 +-
 src/cpp/QtJambi/qtjambiapi.h                  |   44 +-
 src/cpp/QtJambi/qtjambilink.cpp               | 1158 +-
 src/cpp/QtJambi/qtjambilink_p.h               |  230 +-
 src/cpp/QtJambi/qtjambimetaobject.cpp         |   12 +-
 src/cpp/QtJambi/qtjambishell.cpp              |   10 +-
 src/cpp/QtJambi/registry.cpp                  |  137 +-
 src/cpp/QtJambi/registryapi.h                 |  126 +-
 src/cpp/QtJambi/scope.cpp                     |   14 +
 src/cpp/QtJambi/scope.h                       |    1 +
 src/cpp/QtJambi/typeentry.cpp                 | 1783 +++-
 src/cpp/QtJambi/typeentry_p.h                 |  456 +-
 src/cpp/QtJambi/typemanager.cpp               |   61 +-
 src/cpp/QtJambi/utils_p.h                     |    7 +
 src/cpp/QtJambi3DAnimation/hashes.h           |   37 +-
 src/cpp/QtJambi3DRender/hashes.h              |   52 +-
 src/cpp/QtJambiBluetooth/hashes.h             |  253 +-
 src/cpp/QtJambiCore/hashes.h                  |  587 +-
 src/cpp/QtJambiCore/impl.cpp                  |   63 +-
 src/cpp/QtJambiDataVisualization/hashes.h     |   59 +-
 src/cpp/QtJambiDesigner/QtJambiDesigner.pro   |    2 +
 src/cpp/QtJambiDesigner/impl.cpp              |    8 +
 src/cpp/QtJambiDesigner/utils_p.h             |   44 +
 .../QtJambiGenerator/abstractgenerator.cpp    |  193 +-
 src/cpp/QtJambiGenerator/abstractgenerator.h  |    4 +
 src/cpp/QtJambiGenerator/asttoxml.cpp         |   21 +-
 src/cpp/QtJambiGenerator/cppgenerator.cpp     |  182 +-
 src/cpp/QtJambiGenerator/cppgenerator.h       |   73 +-
 .../QtJambiGenerator/cppheadergenerator.cpp   |   56 +-
 src/cpp/QtJambiGenerator/cppheadergenerator.h |   22 +-
 src/cpp/QtJambiGenerator/cppimplgenerator.cpp | 1729 ++-
 src/cpp/QtJambiGenerator/cppimplgenerator.h   |   22 +-
 .../QtJambiGenerator/docindex/docfunction.cpp |    7 +
 .../QtJambiGenerator/docindex/docfunction.h   |    2 +
 src/cpp/QtJambiGenerator/generator.cpp        |  620 +-
 src/cpp/QtJambiGenerator/generator.h          |    8 +
 src/cpp/QtJambiGenerator/javagenerator.cpp    | 2044 ++--
 src/cpp/QtJambiGenerator/javagenerator.h      |  291 +-
 src/cpp/QtJambiGenerator/library.pro          |    6 +-
 src/cpp/QtJambiGenerator/metabuilder.cpp      | 5167 +++++----
 src/cpp/QtJambiGenerator/metabuilder.h        |   96 +-
 .../QtJambiGenerator/metainfogenerator.cpp    |  112 +-
 src/cpp/QtJambiGenerator/metainfogenerator.h  |   11 +-
 src/cpp/QtJambiGenerator/metalang.cpp         |  693 +-
 src/cpp/QtJambiGenerator/metalang.h           |  745 +-
 src/cpp/QtJambiGenerator/parser/ast.h         |    7 +-
 src/cpp/QtJambiGenerator/parser/binder.cpp    |  521 +-
 src/cpp/QtJambiGenerator/parser/binder.h      |   22 +-
 .../parser/class_compiler.cpp                 |   70 +
 .../QtJambiGenerator/parser/class_compiler.h  |   84 +-
 src/cpp/QtJambiGenerator/parser/codemodel.cpp |  345 +-
 src/cpp/QtJambiGenerator/parser/codemodel.h   |  227 +-
 .../parser/codemodel_finder.cpp               |    2 +-
 .../parser/codemodel_finder.h                 |    6 +-
 .../QtJambiGenerator/parser/codemodel_fwd.h   |    1 +
 .../parser/compiler_utils.cpp                 |   14 +-
 .../parser/declarator_compiler.cpp            |    6 +-
 .../parser/declarator_compiler.h              |    4 +
 src/cpp/QtJambiGenerator/parser/lexer.cpp     |   47 +-
 src/cpp/QtJambiGenerator/parser/lexer.h       |   11 +-
 .../QtJambiGenerator/parser/name_compiler.cpp |  238 +-
 .../QtJambiGenerator/parser/name_compiler.h   |   12 +-
 src/cpp/QtJambiGenerator/parser/parser.cpp    |  248 +-
 src/cpp/QtJambiGenerator/parser/parser.h      |    3 +-
 .../parser/rpp/pp-engine-bits.cpp             |    1 +
 .../parser/rpp/pp-engine-bits.h               |   31 +-
 .../parser/rpp/pp-environment.cpp             |    8 +
 .../parser/rpp/pp-environment.h               |    4 +
 .../parser/rpp/pp-macro-expander.h            |   48 +-
 .../QtJambiGenerator/parser/rpp/pp-scanner.h  |    9 +-
 .../parser/rpp/preprocessor.cpp               |    2 +-
 src/cpp/QtJambiGenerator/parser/tokens.cpp    |   13 +-
 src/cpp/QtJambiGenerator/parser/tokens.h      |   11 +-
 .../QtJambiGenerator/parser/type_compiler.cpp |    1 +
 .../QtJambiGenerator/parser/type_compiler.h   |    2 +
 .../QtJambiGenerator/preprocesshandler.cpp    |    2 +-
 src/cpp/QtJambiGenerator/targets/all.h        |  101 +-
 src/cpp/QtJambiGenerator/typeparser.cpp       |  179 +-
 src/cpp/QtJambiGenerator/typeparser.h         |   12 +-
 .../QtJambiGenerator/typesystem/codesnip.h    |    1 +
 .../typesystem/java/QtJambi3DCore.java        |   14 +-
 .../typesystem/java/QtJambiCharts.java        |    8 +-
 .../typesystem/java/QtJambiConcurrent.java    | 3078 +++---
 .../typesystem/java/QtJambiCore.java          | 3417 +++---
 .../typesystem/java/QtJambiGui.java           |  168 +-
 .../typesystem/java/QtJambiHttpServer.java    |  362 +-
 .../typesystem/java/QtJambiLocation.java      |   12 +-
 .../typesystem/java/QtJambiMultimedia.java    |   78 +-
 .../typesystem/java/QtJambiNetwork.java       |   16 +-
 .../typesystem/java/QtJambiQml.java           |  141 +-
 .../typesystem/java/QtJambiQuick.java         |    6 +-
 .../typesystem/java/QtJambiQuickTest.java     |   18 +-
 .../typesystem/java/QtJambiRemoteObjects.java |   26 +-
 .../typesystem/java/QtJambiScxml.java         |    4 +-
 .../typesystem/java/QtJambiTest.java          |  318 +-
 .../typesystem/java/QtJambiWidgets.java       |  521 +-
 .../typesystem/java/QtJambiXml.java           |   25 +-
 .../typesystem/modification.h                 |   21 +-
 .../typesystem/qml/Qt3DAnimation.qml          |  238 +-
 .../typesystem/qml/Qt3DCore.qml               |  454 +-
 .../typesystem/qml/Qt3DExtras.qml             |   63 +-
 .../typesystem/qml/Qt3DInput.qml              |  114 +-
 .../typesystem/qml/Qt3DLogic.qml              |   12 +-
 .../typesystem/qml/Qt3DQuick.qml              |   23 +-
 .../typesystem/qml/Qt3DQuickExtras.qml        |   17 +-
 .../typesystem/qml/Qt3DQuickRender.qml        |   27 +-
 .../typesystem/qml/Qt3DQuickScene2D.qml       |   16 +-
 .../typesystem/qml/Qt3DRender.qml             | 1271 +--
 .../typesystem/qml/QtActiveX.qml              |  171 +-
 .../typesystem/qml/QtBluetooth.qml            |  536 +-
 .../typesystem/qml/QtBodymovin.qml            |    2 +-
 .../typesystem/qml/QtCharts.qml               |  158 +-
 .../typesystem/qml/QtConcurrent.qml           | 1465 ++-
 .../typesystem/qml/QtCore.qml                 | 9319 ++++++-----------
 .../typesystem/qml/QtDBus.qml                 |  900 +-
 .../typesystem/qml/QtDataVisualization.qml    |  407 +-
 .../typesystem/qml/QtDesigner.qml             |  572 +-
 .../typesystem/qml/QtGamepad.qml              |   16 +-
 .../QtJambiGenerator/typesystem/qml/QtGui.qml | 4066 +++----
 .../typesystem/qml/QtHelp.qml                 |   98 +-
 .../typesystem/qml/QtHttpServer.qml           |  234 +-
 .../typesystem/qml/QtLocation.qml             |  140 +-
 .../typesystem/qml/QtMacExtras.qml            |    4 +-
 .../typesystem/qml/QtMultimedia.qml           |  593 +-
 .../typesystem/qml/QtMultimediaWidgets.qml    |    6 +-
 .../typesystem/qml/QtNetwork.qml              |  398 +-
 .../typesystem/qml/QtNetworkAuth.qml          |   57 +-
 .../QtJambiGenerator/typesystem/qml/QtNfc.qml |  168 +-
 .../typesystem/qml/QtOpenGL.qml               |  930 +-
 .../typesystem/qml/QtOpenGLWidgets.qml        |    2 +-
 .../QtJambiGenerator/typesystem/qml/QtPdf.qml |  126 +-
 .../typesystem/qml/QtPdfWidgets.qml           |    2 +-
 .../typesystem/qml/QtPositioning.qml          |   83 +-
 .../typesystem/qml/QtPrintSupport.qml         |  197 +-
 .../typesystem/qml/QtPurchasing.qml           |    2 +-
 .../QtJambiGenerator/typesystem/qml/QtQml.qml |  885 +-
 .../typesystem/qml/QtQuick.qml                | 1430 +--
 .../typesystem/qml/QtQuick3D.qml              |   85 +-
 .../typesystem/qml/QtQuickControls2.qml       |    4 +-
 .../typesystem/qml/QtQuickTest.qml            |   30 +-
 .../typesystem/qml/QtQuickWidgets.qml         |    2 +-
 .../typesystem/qml/QtRemoteObjects.qml        |   59 +-
 .../typesystem/qml/QtScript.qml               |   57 +-
 .../typesystem/qml/QtScriptTools.qml          |    2 +-
 .../typesystem/qml/QtScxml.qml                |  275 +-
 .../typesystem/qml/QtSensors.qml              |  139 +-
 .../typesystem/qml/QtSerialBus.qml            |  429 +-
 .../typesystem/qml/QtSerialPort.qml           |    8 +-
 .../typesystem/qml/QtSpatialAudio.qml         |    2 +-
 .../QtJambiGenerator/typesystem/qml/QtSql.qml |   95 +-
 .../typesystem/qml/QtStateMachine.qml         |   23 +-
 .../QtJambiGenerator/typesystem/qml/QtSvg.qml |    2 +-
 .../typesystem/qml/QtSvgWidgets.qml           |    2 +-
 .../typesystem/qml/QtTest.qml                 | 1048 +-
 .../typesystem/qml/QtTextToSpeech.qml         |    6 +-
 .../typesystem/qml/QtUiTools.qml              |    2 +-
 .../typesystem/qml/QtVirtualKeyboard.qml      |   12 +-
 .../typesystem/qml/QtWebChannel.qml           |    4 +-
 .../typesystem/qml/QtWebEngine.qml            |    7 +-
 .../typesystem/qml/QtWebEngineCore.qml        |  478 +-
 .../typesystem/qml/QtWebEngineQuick.qml       |    7 +-
 .../typesystem/qml/QtWebEngineWidgets.qml     |  218 +-
 .../typesystem/qml/QtWebSockets.qml           |   98 +-
 .../typesystem/qml/QtWebView.qml              |    2 +-
 .../typesystem/qml/QtWidgets.qml              | 2532 ++---
 .../typesystem/qml/QtWinExtras.qml            |   26 +-
 .../typesystem/qml/QtX11Extras.qml            |   19 +-
 .../QtJambiGenerator/typesystem/qml/QtXml.qml |  215 +-
 .../typesystem/qml/QtXmlPatterns.qml          |  217 +-
 .../QtJambiGenerator/typesystem/qml/ui4.qml   |  619 +-
 .../typesystem/qml_abstractobject.h           |    4 +-
 .../typesystem/qml_modify.cpp                 |   78 +
 .../QtJambiGenerator/typesystem/qml_modify.h  |   53 +
 .../typesystem/qmltypesystemreader.cpp        |  422 +-
 .../typesystem/typedatabase.cpp               |   59 +-
 .../typesystem/typedatabase.h                 |   33 +-
 .../QtJambiGenerator/typesystem/typeentry.cpp |   74 +-
 .../QtJambiGenerator/typesystem/typeentry.h   |  368 +-
 src/cpp/QtJambiGenerator/typesystem/utils.cpp |   13 +-
 src/cpp/QtJambiGenerator/typesystem/utils.h   |    6 +-
 .../typesystem/xmltypesystemreader.cpp        |    8 +-
 src/cpp/QtJambiGui/hashes.h                   |  859 +-
 src/cpp/QtJambiGui/impl.cpp                   |   34 +-
 src/cpp/QtJambiHelp/hashes.h                  |    9 +-
 src/cpp/QtJambiLocation/hashes.h              |  267 +-
 src/cpp/QtJambiMultimedia/hashes.h            |  370 +-
 src/cpp/QtJambiMultimedia/impl.cpp            |    2 +-
 src/cpp/QtJambiNetwork/hashes.h               |  307 +-
 src/cpp/QtJambiNfc/hashes.h                   |   18 +-
 src/cpp/QtJambiPlugin/QtJambiPlugin.pro       |    3 +-
 src/cpp/QtJambiPositioning/hashes.h           |  164 +-
 src/cpp/QtJambiQml/hashes.h                   |   50 +-
 src/cpp/QtJambiQml/impl.cpp                   |  389 +-
 src/cpp/QtJambiQml/utils_p.h                  |   14 +
 src/cpp/QtJambiQuick/hashes.h                 |  163 +-
 src/cpp/QtJambiRemoteObjects/hashes.h         |    9 +-
 src/cpp/QtJambiScript/hashes.h                |   38 +-
 src/cpp/QtJambiSensors/QtJambiSensors.pro     |    7 +
 src/cpp/QtJambiSensors/impl.cpp               |   48 +
 src/cpp/QtJambiSensors/utils_p.h              |    7 +
 src/cpp/QtJambiSerialBus/hashes.h             |  185 +-
 src/cpp/QtJambiSerialBus/impl.cpp             |    4 +
 src/cpp/QtJambiSerialBus/utils_p.h            |    3 +
 src/cpp/QtJambiSql/hashes.h                   |   58 +-
 src/cpp/QtJambiTextToSpeech/hashes.h          |   11 +-
 src/cpp/QtJambiWebEngineCore/hashes.h         |  106 +-
 src/cpp/QtJambiWebEngineQuick/impl.cpp        |    4 +-
 src/cpp/QtJambiWebEngineWidgets/hashes.h      |  119 +-
 src/cpp/QtJambiWidgets/hashes.h               |   21 +-
 src/cpp/QtJambiXml/hashes.h                   |  105 +-
 .../QtJambiXmlPatterns/QtJambiXmlPatterns.pro |    3 +
 src/cpp/QtJambiXmlPatterns/hashes.h           |   91 +
 src/cpp/autotests/autotests.qml               |  202 +-
 src/cpp/autotests/global.cpp                  |   18 +-
 src/cpp/autotests/nativepointertester.h       |    6 -
 src/cpp/functionpointers/functionpointers.pri |    1 +
 src/cpp/jarimport/jarimport.pro               |    1 +
 src/cpp/modules.pro                           |    2 +-
 src/java/ant/io/qt/tools/ant/Constants.java   |    2 +
 .../tools/ant/CreateNativeDeploymentTask.java |  130 +-
 .../io/qt/tools/ant/ForeachVersionTask.java   |    2 +-
 .../ant/io/qt/tools/ant/GeneratorTask.java    |   29 +
 src/java/ant/io/qt/tools/ant/IfTask.java      |   94 +
 .../io/qt/tools/ant/InitializeBuildTask.java  |   40 +-
 src/java/ant/io/qt/tools/ant/IsLessThan.java  |   75 +
 src/java/ant/io/qt/tools/ant/MakeTask.java    |    4 +-
 src/java/ant/io/qt/tools/ant/OSInfo.java      |   18 +
 src/java/ant/io/qt/tools/ant/QMakeTask.java   |    3 +
 .../ant/io/qt/tools/ant/TryCatchTask.java     |  106 +
 src/java/ant/io/qt/tools/ant/ant-qtjambi.xml  |   32 +-
 .../qt/autotests/ApplicationInitializer.java  |   51 +-
 .../qt/autotests/TestBluetoothDiscovery.java  |   12 +-
 .../qt/autotests/TestClassFunctionality.java  |    9 +-
 .../io/qt/autotests/TestConnections.java      |    6 +-
 .../io/qt/autotests/TestExceptions.java       |    1 -
 .../io/qt/autotests/TestFileEngine.java       |    8 +-
 .../autotests/io/qt/autotests/TestFuture.java |   23 +-
 .../io/qt/autotests/TestInjectedCode.java     |   15 +-
 .../io/qt/autotests/TestNativePointer.java    |    8 -
 .../autotests/io/qt/autotests/TestPlugin.java |    4 +-
 .../io/qt/autotests/TestQThread.java          |   95 +-
 .../io/qt/autotests/TestQmlPlugin.java        |    2 +-
 .../io/qt/autotests/TestSignals.java          |    5 +-
 .../io/qt/autotests/TestThreadAffinity.java   |   10 +-
 src/java/modules/modules.xml                  |   81 +-
 .../qt/qtjambi/deployer/BundleGenerator.java  |  102 +-
 .../deployer/ContainerAccessGenerator.java    |    2 +-
 .../qt/qtjambi/deployer/containeraccess.pro   |    1 +
 .../io/qt/qtjambi/deployer/plugin.pro         |    1 +
 .../io/qt/uic/java/WriteInitialization.java   |   22 +-
 .../io/qt/uic/kotlin/WriteClass.java          |    8 +-
 .../io/qt/uic/kotlin/WriteInitialization.java |  293 +-
 .../qtjambi/Qt6/io/qt/core/QPermission.java   |   15 +
 src/java/modules/qtjambi/build.xml            |   53 +-
 .../modules/qtjambi/jsr305/io/qt/NonNull.java |   45 +
 .../qtjambi/jsr305/io/qt/Nullable.java        |   45 +
 .../qtjambi/jsr305/io/qt/StrictNonNull.java   |   47 +
 .../qtjambi/main/io/qt/QNativePointer.java    |   22 +-
 .../qtjambi/main/io/qt/QtUtilities.java       |   16 +
 .../AbstractAssociativeContainer.java         |    4 -
 .../main/io/qt/internal/AbstractHash.java     |    4 -
 .../main/io/qt/internal/AbstractList.java     |    4 -
 .../main/io/qt/internal/AbstractMap.java      |    4 -
 .../AbstractMultiAssociativeContainer.java    |    4 -
 .../io/qt/internal/AbstractMultiHash.java     |    4 -
 .../main/io/qt/internal/AbstractMultiMap.java |    4 -
 .../internal/AbstractSequentialContainer.java |    4 -
 .../main/io/qt/internal/LibraryUtility.java   |   12 +-
 .../main/io/qt/internal/MetaTypeUtility.java  |   16 +-
 .../main/io/qt/internal/SignalUtility.java    |    2 -
 .../qtjambi/non-jsr305/io/qt/NonNull.java     |   43 +
 .../qtjambi/non-jsr305/io/qt/Nullable.java    |   43 +
 .../non-jsr305/io/qt/StrictNonNull.java       |   43 +
 src/java/plugins/plugins.xml                  |    2 +-
 src/java/qml/qml.xml                          |    2 +-
 311 files changed, 32567 insertions(+), 35310 deletions(-)
 delete mode 100644 antcontrib.properties
 delete mode 100644 antfiles/setenv.xml
 create mode 100644 src/cpp/QtJambiDesigner/utils_p.h
 create mode 100644 src/cpp/QtJambiXmlPatterns/hashes.h
 create mode 100644 src/java/ant/io/qt/tools/ant/IfTask.java
 create mode 100644 src/java/ant/io/qt/tools/ant/IsLessThan.java
 create mode 100644 src/java/ant/io/qt/tools/ant/TryCatchTask.java
 create mode 100644 src/java/modules/qtjambi/Qt6/io/qt/core/QPermission.java
 create mode 100644 src/java/modules/qtjambi/jsr305/io/qt/NonNull.java
 create mode 100644 src/java/modules/qtjambi/jsr305/io/qt/Nullable.java
 create mode 100644 src/java/modules/qtjambi/jsr305/io/qt/StrictNonNull.java
 create mode 100644 src/java/modules/qtjambi/non-jsr305/io/qt/NonNull.java
 create mode 100644 src/java/modules/qtjambi/non-jsr305/io/qt/Nullable.java
 create mode 100644 src/java/modules/qtjambi/non-jsr305/io/qt/StrictNonNull.java

diff --git a/README.md b/README.md
index 72c5ae10..f49be09b 100644
--- a/README.md
+++ b/README.md
@@ -37,13 +37,13 @@ Make yourself familiar with [developing applications with QtJambi](www/How-to-de
 * [Apache Ant](https://ant.apache.org/) (min. 1.10.x)
 * Java Development Kit (e.g. [OpenJDK](https://adoptopenjdk.net/), tested with Java 1.8 and 18)
 * Qt 5.15 or 6.x (using the Qt Online Installer)
-* C++ compiler (Gcc, Clang, MSVC2019)
-* chrpath (Linux only)
+* Minimum required Qt modules: QtCore, QtQml, QtNetwork, QtConcurrent and QtXml
+* C++ compiler and make (Gcc, Clang, MSVC2019)
 * XCode command line tools (macOS only)
 
 ### Building QtJambi
 If you do'nt need the entire set of Qt modules available in Java edit property `qtjambi.skipped.modules` in `build.properties` and exclude Qt modules you don't need.
-This saves compilation time.
+This saves compilation time. Although QtJambi build process requires the availability of QtQml, QtNetwork, QtConcurrent and QtXml, you can skip them from being generated as QtJambi module.
 
 #### Pre-Build Steps On Windows
 * Open the Visual Studio command prompt for x64 architecture.
diff --git a/antcontrib.properties b/antcontrib.properties
deleted file mode 100644
index 7e9cee0d..00000000
--- a/antcontrib.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# This file contains the necessary properties to download ant-contrib and have
-# it known throughout the build system.
-#
-# You have two options:
-# * either you fill in the antcontrib.system.location property below, which
-#   should point to the place where you have the JAR for ant-contrib (there's no
-#   need to put it in the CLASSPATH);
-# * either you don't have ant-contrib on your system, in which case the two
-#   other properties tell where to download the binary distribution and where,
-#   in the binary distribution, the ant-contrib jar itself is located.
-#
-# Ideally, you want the first solution, of course.
-#
-# Example: where to find ant-contrib.jar on a Gentoo Linux system (if
-# installed):
-#antcontrib.system.location = /usr/share/ant-contrib/lib/ant-contrib.jar
-
-#
-# Where to download it from:
-#
-antcontrib.download.url=https://repo1.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar
diff --git a/antfiles/autotests.xml b/antfiles/autotests.xml
index f9b1eed3..f03fe9f9 100644
--- a/antfiles/autotests.xml
+++ b/antfiles/autotests.xml
@@ -178,6 +178,7 @@
                 importdirectories="generator/${psep}${basedir}/src/cpp/autotests"
                 outputDirectory="${outputDir}/tests"
                 generatorDirectory="${generator.builddir}/../bin"
+				nullness="${qtjambi.generate.nullness}"
                 qtlibdirectory="${generator.builddir}/../lib${psep}${tools.qt.libdir}"
                 qtbindirectory="${generator.builddir}/../bin${psep}${tools.qt.bindir}"
 				qtjambiVersion="${qtjambi.patchversion}"
@@ -606,12 +607,12 @@
 							<os family="windows"/>
 							<then>
 								<property name="qtPath"           location="${qtjambi.qt.bindir}" />
-								<property name="qtJambiPath"      location="${outputDir}/${qtjambi.osname}/qtjambi/bin" />
+								<property name="qtJambiPath"      location="${deploymentdir}/native/${qtjambi.osname}/${kind}/bin" />
 								<property name="testLibPath"      location="${outputDir}/${qtjambi.osname}/tests/bin" />
 							</then>
 							<else>
 								<property name="qtPath"           location="${qtjambi.qt.libdir}" />
-								<property name="qtJambiPath"      location="${outputDir}/${qtjambi.osname}/qtjambi/lib" />
+								<property name="qtJambiPath"      location="${deploymentdir}/native/${qtjambi.osname}/${kind}/lib" />
 								<property name="testLibPath"      location="${outputDir}/${qtjambi.osname}/tests/lib" />
 							</else>
 						</if>
@@ -675,21 +676,6 @@
 						<condition property="Ddeploymentdir" value="-Dio.qt.deploymentdir=${io.qt.deploymentdir}" else="-Dx">
 							<isset property="io.qt.deploymentdir"/>
 						</condition>
-						<if>
-							<not>
-								<os family="windows"/>
-							</not>
-							<then>
-								<symlink link="${outputDir}/${qtjambi.osname}/tests/${kind}/lib" resource="${deploymentdir}/native/${qtjambi.osname}/${kind}/lib"/>
-							</then>
-						</if>
-						<if>
-							<os family="mac"/>
-							<then>
-								<symlink link="${testLibPath}/libQtJambi${dbgsuffix}.${qt.version.major}.jnilib" resource="${qtJambiPath}/libQtJambi${dbgsuffix}.${qt.version.major}.jnilib"/>
-								<symlink link="${testLibPath}/QtJambi${dbgsuffix}.framework" resource="${qtJambiPath}/QtJambi${dbgsuffix}.framework"/>
-							</then>
-						</if>
 						<trycatch>
 							<try>
 								<mkdir dir="${outputDir}/${qtjambi.osname}/tests/junitxml-${kind}${jdk-exec-version}"/>
@@ -730,21 +716,6 @@
 								<modify-test-results dir="${outputDir}/${qtjambi.osname}/tests/junitxml-${kind}${jdk-exec-version}" version="${qtjambi.jar.version}" mode="${kind}" jdk="${jdk-exec-version}"/>
 							</try>
 							<finally>
-								<if>
-									<not>
-										<os family="windows"/>
-									</not>
-									<then>
-										<symlink action="delete" link="${outputDir}/${qtjambi.osname}/tests/${kind}/lib"/>
-									</then>
-								</if>
-								<if>
-									<os family="mac"/>
-									<then>
-										<symlink action="delete" link="${testLibPath}/libQtJambi${dbgsuffix}.${qt.version.major}.jnilib"/>
-										<symlink action="delete" link="${testLibPath}/QtJambi${dbgsuffix}.framework"/>
-									</then>
-								</if>
 							</finally>
 						</trycatch>
 					</then>
@@ -903,7 +874,7 @@
     </target>
     
     <target name="tests.report"
-            depends="log, setenv, init.taskdef" description="Generates all test reports">
+            depends="log, init.taskdef" description="Generates all test reports">
         <antcall target="tests.report.impl"/>
     </target>
     
@@ -1065,7 +1036,7 @@
         </trycatch>
     </target>
     
-    <target name="tests.debug.run.all-impl" depends="init.build, setenv">
+    <target name="tests.debug.run.all-impl" depends="init.build">
         <trycatch>
             <try>
                 <antcall target="debug.run"/>
diff --git a/antfiles/generator.xml b/antfiles/generator.xml
index 7de5a7fd..8d4261c9 100644
--- a/antfiles/generator.xml
+++ b/antfiles/generator.xml
@@ -5,10 +5,13 @@
 
     <target name="tools.generator.run" unless="${skip-generate}">
         <mkdir dir="${generator.outputdir}"/>
+		<!--options="- - debug-level=full"-->
         <generator dir="${generator.builddir}/../bin"
                 importdirectories="${basedir}/src/cpp/QtJambiGenerator"
                 outputDirectory="${generator.outputdir}"
                 generatorDirectory="${generator.builddir}/../bin"
+                nullness="${qtjambi.generate.nullness}"
+                kotlinpropertydelegates="${qtjambi.generate.kotlin.delegates}"
                 qtdocdirectory="${qtjambi.qt.docdir}"
                 qtlibdirectory="${generator.builddir}/../lib${psep}${tools.qt.libdir}"
                 qtbindirectory="${generator.builddir}/../bin${psep}${tools.qt.bindir}"
diff --git a/antfiles/native.xml b/antfiles/native.xml
index 07f252dc..6d015a5d 100644
--- a/antfiles/native.xml
+++ b/antfiles/native.xml
@@ -292,7 +292,7 @@
     <if>
         <available file="${plugins.builddir}/${platformjar.configuration}/plugins/containeraccess" type="dir"/>
         <then>
-			<create-native-deployment outputDirectory="${deploymentdir}/native/${qtjambi.osname}/${platformjar.configuration}" debug="${platformjar.debug}" module="containeraccess" plugin="true"/>
+			<create-native-deployment outputDirectory="${deploymentdir}/native/${qtjambi.osname}/${platformjar.configuration}" debug="${platformjar.debug}" module="containeraccess" plugin="true" forcedebuginfo="${qtjambi.force.debug.info}"/>
 			<jar destfile="${deploymentdir}/qtjambi-plugin-containeraccess-native-${qtjambi.osname}${platformjar.debug.suffix}-${qtjambi.jar.version}.jar">
 				<manifest>
 					<attribute name="Built-By" value="${qtjambi.user.name} &lt;${qtjambi.user.email}> - ${TODAY}"/>
@@ -338,6 +338,9 @@
 								<pathelement location="${tools.qt.libdir}"/>
 							</path>
 						</pathconvert>
+						<condition property="force" value="--force-debug-info" else="--">
+							<istrue value="${qtjambi.force.debug.info}"/>
+						</condition>
 						<java fork="true" classname="io.qt.qtjambi.deployer.Main" failonerror="true">
 							<jvmarg value="-Djava.library.path=${librarypath}"/>
 							<jvmarg value="-Dio.qt.deploymentdir=${outputDir}/tmp"/>
@@ -357,6 +360,7 @@
 							<arg value="--resources=${qtjambi.qt.resourcesdir}" />
 							<arg value="--translations=${qtjambi.qt.translationsdir}" />
 							<arg value="--qml=${qtjambi.qt.qmlmodulesdir}" />
+							<arg value="${force}" />
 							<env key="DYLD_LIBRARY_PATH" value="${librarypath}" />
 							<classpath>
 								<fileset dir="${deploymentdir}" includes="qtjambi-${qtjambi.jar.version}.jar,qtjambi-deployer-${qtjambi.jar.version}.jar,qtjambi-deployer-native-*-${qtjambi.jar.version}.jar"/>
diff --git a/antfiles/setenv.xml b/antfiles/setenv.xml
deleted file mode 100644
index 6aca9720..00000000
--- a/antfiles/setenv.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<!--
-    This file has two purposes:
-
-    * download ant-contrib and use it (or pick up the jar from the system itself)
-    * set various properties necessary for the build process.
--->
-
-<project name="qtjambi.setenv" default="setenv">
-
-    <property file="${basedir}/antcontrib.properties"/>
-    <property name="timestamp.dir" location="${basedir}/buildlogs"/>
-
-    <!--
-        We want the environment variables and we want a timestamp for jars.
-    -->
-
-    <property environment="env"/>
-    <tstamp/>
-
-    <!--
-        Macro for creating a timestamp
-    -->
-
-    <macrodef name="dostamp">
-        <attribute name="stampfile"/>
-        <sequential>
-            <mkdir dir="${timestamp.dir}"/>
-            <touch file="${timestamp.dir}/@{stampfile}"/>
-        </sequential>
-    </macrodef>
-
-    <!--
-        Preliminary: we download and enable ant-contrib tasks, unless a
-        timestamp file exists that tells us this is already done.
-
-        As an alternative, we get ant-contrib from the system itself if the
-        antcontrib.system.location is set in antcontrib.properties.
-
-        As we don't have ant-contrib yet at this stage (obviously), we must
-        rely on a proxy task to tell whether the timestamp file exists.
-    -->
-
-    <target name="check.antcontrib">
-        <available file="${timestamp.dir}/antcontrib" type="file"
-                   property="antcontrib.done"/>
-    </target>
-
-    <target name="antcontrib.systemcopy" if="antcontrib.system.location">
-        <mkdir dir="extjars"/>
-        <copy failonerror="true" overwrite="true"
-              file="${antcontrib.system.location}"
-              tofile="extjars/ant-contrib.jar"/>
-        <property name="antcontrib.done" value="yes"/>
-    </target>
-
-    <target name="get.antcontrib"
-            depends="check.antcontrib, antcontrib.systemcopy"
-            unless="antcontrib.done">
-        <!--
-            Yes, pathnames are hardcoded here. Since this is the only use we
-            have for them, there's no need to make properties out of them.
-        -->
-        <mkdir dir="extjars"/>
-        <!--
-            NOTE about the use of <get> below: there is a usetimestamp property
-            that can avoid regetting the file if it is considered up to date wrt
-            the remote side. Unfortunately, it will not do its job quite
-            correctly since it doesn't check for the size... So we don't use it
-            here (it is set to "false" by default). Later, we should add some
-            kind of timestamp to tell that yes, the file is there, and not
-            download it again.
-        -->
-        <get src="${antcontrib.download.url}" dest="extjars/ant-contrib.jar" verbose="true"/>
-        <!--
-            ... And remove the temporary directory, which we don't need anymore.
-        -->
-        <dostamp stampfile="antcontrib"/>
-    </target>
-
-    <target name="source.antcontrib" depends="get.antcontrib">
-        <!--
-            OK, we have extracted the zip file, copied the ant-contrib.jar where
-            we expect it to be, we can now import all tasks...
-        -->
-        <taskdef resource="net/sf/antcontrib/antlib.xml"
-                 classpath="extjars/ant-contrib.jar"/>
-    </target>
-    <target name="source.ivy">
-        <!--taskdef uri="antlib:openpgp" resource="org/apache/commons/openpgp/ant/antlib.xml">
-            <classpath>
-                <pathelement location="${basedir}/extjars/commons-openpgp-1.0-SNAPSHOT.jar"/>
-                <pathelement location="${basedir}/extjars/bcpg-jdk15on-1.68.jar"/>
-                <pathelement location="${basedir}/extjars/bcprov-jdk15on-1.68.jar"/>
-            </classpath>
-        </taskdef>
-        <taskdef uri="antlib:org.apache.ivy" resource="org/apache/ivy/ant/antlib.xml">
-            <classpath>
-                <pathelement location="${basedir}/extjars/apache-ivy-2.5.0/ivy-2.5.0.jar"/>
-                <fileset dir="${basedir}/extjars/apache-ivy-2.5.0/lib/">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-        </taskdef-->
-    </target>
-
-    <!--
-        Handle environment variables.
-        If QTDIR isn't set, look LIBDIR and INCLUDEDIR, which points to
-        to qt's libraries's dir and include dir.
-    -->
-
-    <target name="setup-properties">
-        <!-- these are used by examples/generator/hello_world_generator/** not by QtJambi to build itself -->
-        <property name="qtjambi.jambi.libdir"       value="${basedir}${file.separator}build${file.separator}qmake-qtjambi${file.separator}lib"/>
-        <property name="qtjambi.jambi.pluginsdir"   value="${basedir}${file.separator}build${file.separator}qmake-qtjambi${file.separator}plugins"/>
-    </target>
-
-    <target name="setenv" depends="source.antcontrib, setup-properties"/>
-
-</project>
diff --git a/build.properties b/build.properties
index 0e0c604e..0d39d9e6 100644
--- a/build.properties
+++ b/build.properties
@@ -17,5 +17,9 @@ qt.docs=https://doc.qt.io/qt-${qtjambi.soname.version.major}/
 io.qt.debug.level=255
 minimum.java.version=11
 qtjambi.macos.frameworks=true
+org.eclipse.jdt.annotation.url=https://repo1.maven.org/maven2/org/eclipse/jdt/org.eclipse.jdt.annotation/2.2.700/org.eclipse.jdt.annotation-2.2.700.jar
+antcontrib.download.url=https://repo1.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar
+jsr305.url=https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
+kotlin-annotations-jvm.url=https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-annotations-jvm/1.8.10/kotlin-annotations-jvm-1.8.10.jar
 #qtjambi.skipped.modules=xmlpatterns,macextras,winextras,x11extras,serialport,script,scripttools,networkauth,help,multimedia,dbus,test,webengine,webview,remoteobjects,gamepad,scxml,nfc,texttospeech,serialbus,sensors,location,positioning,bluetooth,3d,3dlogic,3dquickextras,3dquickrender,3dquick,3dinput,3drender,3danimation,3dextras,websockets,webchannel,purchasing,quickcontrols2,statemachine,charts,datavisualization,virtualkeyboard,quick3d,opengl,
 #quick,quickwidgets,svg,printsupport,xml,network,sql,widgets,gui,qml,concurrent
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 1c73a9d9..206db83d 100644
--- a/build.xml
+++ b/build.xml
@@ -22,7 +22,6 @@
         Import files containing tasks for the compilation.
     -->
 
-    <import file="antfiles/setenv.xml"/>
     <import file="antfiles/generator.xml"/>
     <import file="antfiles/native.xml"/>
     <import file="antfiles/java.xml"/>
@@ -33,6 +32,7 @@
          but no one is expected to change them.
          -->
     <property name="antjardir"                   location="antjar"/>
+    <property name="extjardir"                   location="extjars"/>
     <property name="java.srcdir"                   location="src/java"/>
     <!--
         Initialization tasks. Note that the init.taskdef task depends on a jar
@@ -183,15 +183,15 @@ Further options:
         <antcall inheritAll="false" target="${proxy.target}"/>
    </target>
 
-    <target name="javadocs" depends="log, setenv, init.taskdef" description="Generates the Java Doc pages for QtJambi">
+    <target name="javadocs" depends="log, init.taskdef" description="Generates the Java Doc pages for QtJambi">
         <foreach-version targets="javadocs-impl"/>
     </target>
     
-    <target name="single.javadocs" depends="log, setenv, init.taskdef" description="Generates the Java Doc pages for QtJambi">
+    <target name="single.javadocs" depends="log, init.taskdef" description="Generates the Java Doc pages for QtJambi">
         <foreach-version targets="single.javadocs-impl"/>
     </target>
     
-    <target name="generator.make" depends="log, setenv, init.taskdef"
+    <target name="generator.make" depends="log, init.taskdef"
         description="Compiles the generator.">
         <foreach-version targets="generator.make-impl"/>
     </target>
@@ -199,13 +199,13 @@ Further options:
         <antcall target="finished"/>
     </target>
 
-    <target name="generate" depends="log, setenv, init.taskdef"
+    <target name="generate" depends="log, init.taskdef"
         description="Compiles and runs the Qt Jambi Generator.">
         <foreach-version targets="generate-impl"/>
     </target>
     <target name="generate-impl" depends="tools.generator.make, tools.generator.run"/>
 
-    <target name="generator.run" depends="log, setenv, init.taskdef"
+    <target name="generator.run" depends="log, init.taskdef"
         description="Runs the Qt Jambi generator on the Qt headers">
         <foreach-version targets="generator.run-impl"/>
     </target>
@@ -213,165 +213,165 @@ Further options:
         <antcall target="finished"/>
     </target>
 
-    <target name="library.native" depends="log, setenv, init.taskdef"
+    <target name="library.native" depends="log, init.taskdef"
         description="Compiles and bundles the Qt Jambi native libraries.">
         <foreach-version targets="library.native-impl"/>
     </target>
     <target name="library.native-impl" depends="library.native.qmake-impl, library.native.make-impl, library.native.bundle-impl"/>
     
-    <target name="library.native.qmake" depends="log, setenv, init.taskdef" description="Runs qmake on the Qt Jambi native library">
+    <target name="library.native.qmake" depends="log, init.taskdef" description="Runs qmake on the Qt Jambi native library">
         <foreach-version targets="library.native.qmake-impl"/>
     </target>
     
-    <target name="library.native.make" depends="log, setenv, init.taskdef" description="Runs make on the Qt Jambi native library">
+    <target name="library.native.make" depends="log, init.taskdef" description="Runs make on the Qt Jambi native library">
         <foreach-version targets="library.native.make-impl"/>
     </target>
     
-    <target name="library.native.compile" depends="log, setenv, init.taskdef">
+    <target name="library.native.compile" depends="log, init.taskdef">
         <foreach-version targets="library.native.compile-impl"/>
     </target>
 	
-    <target name="library.native.makebundle" depends="log, setenv, init.taskdef">
+    <target name="library.native.makebundle" depends="log, init.taskdef">
         <foreach-version targets="library.native.makebundle-impl"/>
     </target>
     
-    <target name="library.native.bundle" depends="log, setenv, init.taskdef">
+    <target name="library.native.bundle" depends="log, init.taskdef">
         <foreach-version targets="library.native.bundle-impl"/>
     </target>
 
-    <target name="library.native.bundle.plugins" depends="log, setenv, init.taskdef">
+    <target name="library.native.bundle.plugins" depends="log, init.taskdef">
         <foreach-version targets="library.native.bundle.plugins-impl"/>
     </target>
 	
-    <target name="bundle.qtlib" depends="log, setenv, init.taskdef">
+    <target name="bundle.qtlib" depends="log, init.taskdef">
         <foreach-version targets="bundle.qtlib-impl"/>
     </target>
 
-    <target name="library.java" depends="log, setenv, init.taskdef"
+    <target name="library.java" depends="log, init.taskdef"
         description="Compiles and bundles the Qt Jambi java libraries.">
         <foreach-version targets="library.java-impl"/>
     </target>
     <target name="library.java-impl" depends="init.build, javac.excludes, java.build.qtjambi"/>
 
-    <target name="plugins.java" depends="log, setenv, init.taskdef"
+    <target name="plugins.java" depends="log, init.taskdef"
         description="Compiles the Qt Jambi plugins.">
         <foreach-version targets="plugins.java-impl"/>
     </target>
     <target name="plugins.java-impl" depends="init.build, javac.excludes, java.build.qtjambiplugins"/>
     
-    <target name="plugins" depends="log, setenv, init.taskdef"
+    <target name="plugins" depends="log, init.taskdef"
         description="Compiles and bundles the Qt Jambi plugins.">
         <foreach-version targets="plugins-impl"/>
     </target>
     <target name="plugins-impl" depends="init.build, javac.excludes, java.build.qtjambiplugins, library.native.bundle.plugins-impl"/>
 
-    <target name="library" depends="log, setenv, init.taskdef"
+    <target name="library" depends="log, init.taskdef"
         description="Compiles and bundles the Qt Jambi libraries.">
         <foreach-version targets="library-impl"/>
     </target>
     <target name="library-impl" depends="library.native.qmake-impl, library.native.make-impl, library.java-impl, library.native.bundle-impl"/>
 
-    <target name="all" depends="log, setenv, init.taskdef"
+    <target name="all" depends="log, init.taskdef"
         description="Generates, builds and bundles the Qt Jambi libraries.">
         <foreach-version targets="all-impl"/>
     </target>
     <target name="all-impl" depends="generate-impl, library-impl"/>
     
-    <target name="clean" depends="log, setenv, init.taskdef"
+    <target name="clean" depends="log, init.taskdef"
         description="Cleans everything">
         <foreach-version targets="clean-impl"/>
     </target>
     
-    <target name="tests.clean" depends="log, setenv, init.taskdef"
+    <target name="tests.clean" depends="log, init.taskdef"
         description="Cleans built test files">
         <foreach-version targets="tests.clean-impl"/>
     </target>
 
-    <target name="tests.generate" depends="log, setenv, init.taskdef"
+    <target name="tests.generate" depends="log, init.taskdef"
          description="Generates and builds all tests">
         <foreach-version targets="tests.generate-impl"/>
     </target>
 
-    <target name="tests.compile" depends="log, setenv, init.taskdef"
+    <target name="tests.compile" depends="log, init.taskdef"
           description="Builds all tests without recalling generator">
         <foreach-version targets="tests.compile-impl"/>
     </target>
 
-    <target name="tests.compile.native" depends="log, setenv, init.taskdef"
+    <target name="tests.compile.native" depends="log, init.taskdef"
           description="Builds native test components">
         <foreach-version targets="tests.compile.native-impl"/>
     </target>
 
-    <target name="tests.compile.java" depends="log, setenv, init.taskdef"
+    <target name="tests.compile.java" depends="log, init.taskdef"
           description="Builds java test components">
         <foreach-version targets="tests.compile.java-impl"/>
     </target>
 
-    <target name="tests.compile.plugins" depends="log, setenv, init.taskdef"
+    <target name="tests.compile.plugins" depends="log, init.taskdef"
           description="Builds plugins test components">
         <foreach-version targets="tests.compile.plugins-impl"/>
     </target>
 
-    <target name="tests.run" depends="log, setenv, init.taskdef"
+    <target name="tests.run" depends="log, init.taskdef"
            description="Runs tests and generates report in TestReport subdir">
         <foreach-version targets="tests.run-impl"/>
     </target>
 	
-    <target name="tests.run.all" depends="log, setenv, init.taskdef"
+    <target name="tests.run.all" depends="log, init.taskdef"
             description="Runs tests and generates report in TestReport subdir">
         <foreach-version targets="tests.run.all-impl"/>
     </target>
 
-    <target name="tests.release.run" depends="log, setenv, init.taskdef"
+    <target name="tests.release.run" depends="log, init.taskdef"
             description="Runs tests and generates report in TestReport subdir">
         <foreach-version targets="tests.release.run-impl"/>
     </target>
 
-    <target name="tests.debug.run" depends="log, setenv, init.taskdef"
+    <target name="tests.debug.run" depends="log, init.taskdef"
             description="Runs tests and generates report in TestReport subdir">
         <foreach-version targets="tests.debug.run-impl"/>
     </target>
 
-    <target name="tests.release.run8" depends="log, setenv, init.taskdef"
+    <target name="tests.release.run8" depends="log, init.taskdef"
             description="Runs tests and generates report in TestReport subdir">
         <foreach-version targets="tests.release.run8-impl"/>
     </target>
 
-    <target name="tests.debug.run8" depends="log, setenv, init.taskdef"
+    <target name="tests.debug.run8" depends="log, init.taskdef"
             description="Runs tests and generates report in TestReport subdir">
         <foreach-version targets="tests.debug.run8-impl"/>
     </target>
     
-    <target name="tests.release.run.all" depends="log, setenv, init.taskdef"
+    <target name="tests.release.run.all" depends="log, init.taskdef"
             description="Runs tests and generates report in TestReport subdir">
         <foreach-version targets="tests.release.run.all-impl"/>
     </target>
     
-    <target name="tests.debug.run.all" depends="log, setenv, init.taskdef"
+    <target name="tests.debug.run.all" depends="log, init.taskdef"
             description="Runs tests and generates report in TestReport subdir">
         <foreach-version targets="tests.debug.run.all-impl"/>
     </target>
 
-    <target name="deploy.snapshot" depends="log, setenv, init.taskdef"
+    <target name="deploy.snapshot" depends="log, init.taskdef"
         description="Publishes QtJambi as Maven artifact snapshot.">
         <foreach-version targets="init.build,deploy-snapshot"/>
     </target>
         
-    <target name="deploy.release" depends="log, setenv, init.taskdef"
+    <target name="deploy.release" depends="log, init.taskdef"
         description="Publishes QtJambi as Maven artifact.">
         <foreach-version targets="init.build,deploy-release"/>
     </target>
         
-    <target name="deploy.bundle" depends="log, setenv, init.taskdef"
+    <target name="deploy.bundle" depends="log, init.taskdef"
         description="Publishes QtJambi as Maven artifact.">
         <foreach-version targets="init.build,deploy-bundle"/>
     </target>
     
-    <target name="deploy.bundle.release" depends="log, setenv, init.taskdef"
+    <target name="deploy.bundle.release" depends="log, init.taskdef"
         description="Publishes QtJambi as Maven artifact.">
         <foreach-version targets="init.build,deploy-release,deploy-bundle"/>
     </target>
-    <target name="test" depends="log, setenv, init.taskdef"
+    <target name="test" depends="log, init.taskdef"
         description="Publishes QtJambi as Maven artifact.">
         <foreach-version targets="init.build,finished"/>
     </target>
diff --git a/releases.properties b/releases.properties
index ef1a8895..8d845f1e 100644
--- a/releases.properties
+++ b/releases.properties
@@ -1,7 +1,7 @@
-5.15=13
+5.15=14
 6.0=1
 6.1=1
-6.2=11
+6.2=12
 6.3=6
-6.4=3
+6.4=4
 6.5=0
\ No newline at end of file
diff --git a/src/cpp/QtJambi/configure.pri b/src/cpp/QtJambi/configure.pri
index cd9a95b0..3e9c98ac 100644
--- a/src/cpp/QtJambi/configure.pri
+++ b/src/cpp/QtJambi/configure.pri
@@ -148,6 +148,10 @@ linux-g++* : lessThan(QT_MAJOR_VERSION, 6):{
     QMAKE_CXXFLAGS += -fno-sized-deallocation
 }
 
+win32-msvc* {
+    CONFIG += embed_manifest_dll force_embed_manifest
+}
+
 GENERATOR_PRI = $$clean_path($$PWD/../../../$$VERSION/build/generator/cpp/$$QTJAMBI_PROJECT/generated.pri)
 exists($$GENERATOR_PRI): include($$GENERATOR_PRI)
 
@@ -166,6 +170,7 @@ exists($$GENERATOR_PRI): include($$GENERATOR_PRI)
                     QTJAMBI_LIB_NAME = QtJambi_debug
             }else{
                     QTJAMBI_LIB_NAME = QtJambi
+                    CONFIG += optimize_full
             }
     }
 
@@ -209,11 +214,6 @@ exists($$GENERATOR_PRI): include($$GENERATOR_PRI)
             LIBS += -l$$QTJAMBI_LIB_NAME
         }
     }
-
-    # These option changes are recommended since at least: win32-msvc2005
-    win32-msvc* {
-        CONFIG += embed_manifest_dll force_embed_manifest
-    }
 }
 
 ios: DEFINES += LIBRARY_NAME=$$member(TARGET, 0)
diff --git a/src/cpp/QtJambi/convert.cpp b/src/cpp/QtJambi/convert.cpp
index 35b0898f..ce529d0c 100644
--- a/src/cpp/QtJambi/convert.cpp
+++ b/src/cpp/QtJambi/convert.cpp
@@ -205,15 +205,13 @@ jobject QtJambiAPI::convertQCharToJavaObject(JNIEnv *env, const QChar &strg)
 {
     jobject returned = Java::QtCore::QChar::newInstance(env, nullptr);
     QChar* sptr = new QChar(strg);
-    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
                 env,
                 returned,
                 sptr,
                 LINK_NAME_ARG("QChar")
                 false,
-                false, [](void * ptr,bool){delete reinterpret_cast<QChar*>(ptr);})) {
-        // If the type is copied in, we own the pointer
-        link->setJavaOwnership(env);
+                false, [](void * ptr,bool){delete reinterpret_cast<QChar*>(ptr);}, QtJambiLink::Ownership::Java)) {
     } else {
         delete sptr;
         returned = nullptr;
@@ -224,13 +222,13 @@ jobject QtJambiAPI::convertQCharToJavaObject(JNIEnv *env, const QChar &strg)
 jobject QtJambiAPI::convertQCharToJavaObject(JNIEnv *env, QChar *strg)
 {
     jobject returned = Java::QtCore::QChar::newInstance(env, nullptr);
-    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
                 env,
                 returned,
                 strg,
                 LINK_NAME_ARG("QChar")
                 false,
-                false, [](void * ptr,bool){delete reinterpret_cast<QChar*>(ptr);})) {
+                false, [](void * ptr,bool){delete reinterpret_cast<QChar*>(ptr);}, QtJambiLink::Ownership::None)) {
     } else {
         returned = nullptr;
     }
@@ -241,15 +239,13 @@ jobject QtJambiAPI::convertQVariantToJavaVariant(JNIEnv *env, const QVariant &va
 {
     jobject returned = Java::QtCore::QVariant::newInstance(env, nullptr);
     QVariant* vptr = new QVariant(variant);
-    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
                 env,
                 returned,
                 vptr,
                 LINK_NAME_ARG("QVariant")
                 false,
-                false, [](void * ptr,bool){delete reinterpret_cast<QVariant*>(ptr);})) {
-        // If the type is copied in, we own the pointer
-        link->setJavaOwnership(env);
+                false, [](void * ptr,bool){delete reinterpret_cast<QVariant*>(ptr);}, QtJambiLink::Ownership::Java)) {
     } else {
         delete vptr;
         returned = nullptr;
@@ -260,15 +256,13 @@ jobject QtJambiAPI::convertQVariantToJavaVariant(JNIEnv *env, const QVariant &va
 jobject QtJambiAPI::convertQVariantToJavaVariant(JNIEnv *env, QVariant *variant)
 {
     jobject returned = Java::QtCore::QVariant::newInstance(env, nullptr);
-    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
                 env,
                 returned,
                 variant,
                 LINK_NAME_ARG("QVariant")
                 false,
-                false, [](void * ptr,bool){delete reinterpret_cast<QVariant*>(ptr);})) {
-        // If the type is copied in, we own the pointer
-        link->setJavaOwnership(env);
+                false, [](void * ptr,bool){delete reinterpret_cast<QVariant*>(ptr);}, QtJambiLink::Ownership::None)) {
     } else {
         returned = nullptr;
     }
@@ -279,15 +273,13 @@ jobject QtJambiAPI::convertQStringToJavaObject(JNIEnv *env, const QString &strg)
 {
     jobject returned = Java::QtCore::QString::newInstance(env, nullptr);
     QString* sptr = new QString(strg);
-    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
                 env,
                 returned,
                 sptr,
                 LINK_NAME_ARG("QString")
                 false,
-                false, [](void * ptr,bool){delete reinterpret_cast<QString*>(ptr);})) {
-        // If the type is copied in, we own the pointer
-        link->setJavaOwnership(env);
+                false, [](void * ptr,bool){delete reinterpret_cast<QString*>(ptr);}, QtJambiLink::Ownership::Java)) {
     } else {
         delete sptr;
         returned = nullptr;
@@ -298,13 +290,13 @@ jobject QtJambiAPI::convertQStringToJavaObject(JNIEnv *env, const QString &strg)
 jobject QtJambiAPI::convertQStringToJavaObject(JNIEnv *env, QString *strg)
 {
     jobject returned = Java::QtCore::QString::newInstance(env, nullptr);
-    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+    if (const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
                 env,
                 returned,
                 strg,
                 LINK_NAME_ARG("QString")
                 false,
-                false, [](void * ptr,bool){delete reinterpret_cast<QString*>(ptr);})) {
+                false, [](void * ptr,bool){delete reinterpret_cast<QString*>(ptr);}, QtJambiLink::Ownership::None)) {
     } else {
         returned = nullptr;
     }
@@ -1766,7 +1758,7 @@ QVariant QtJambiAPI::convertJavaObjectToQVariant(JNIEnv *env, jobject java_objec
 
 bool QtJambiAPI::convertJavaToNative(JNIEnv *env, const std::type_info& typeId, jobject java_object, void * output, QtJambiScope* scope)
 {
-    if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId)){
+    if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId)){
         jvalue java_value;
         java_value.l = java_object;
         return typeEntry->convertToNative(env, java_value, jValueType::l, output, scope);
@@ -1775,7 +1767,7 @@ bool QtJambiAPI::convertJavaToNative(JNIEnv *env, const std::type_info& typeId,
 
 bool QtJambiAPI::convertJavaToNative(JNIEnv *env, const std::type_info& typeId, const char* qtName, const char* javaName, jobject java_object, void * output, QtJambiScope* scope)
 {
-    const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId, qtName);
+    QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId, qtName);
     if(!qtName && javaName && typeEntry->isFunctional()){
         if(const std::type_info* typeId = getTypeByJavaName(javaName))
             qtName = getQtName(*typeId);
@@ -1789,28 +1781,9 @@ bool QtJambiAPI::convertJavaToNative(JNIEnv *env, const std::type_info& typeId,
     }else return false;
 }
 
-bool QtJambiAPI::convertNativeToJava(JNIEnv *env, const std::type_info& typeId, const char* qtName, const char* javaName, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jobject& output)
-{
-    const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId, qtName);
-    if(!qtName && javaName && typeEntry->isFunctional()){
-        if(const std::type_info* typeId = getTypeByJavaName(javaName))
-            qtName = getQtName(*typeId);
-        if(qtName)
-            typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId, qtName);
-    }
-    if(typeEntry){
-        jvalue jv;
-        jv.l = nullptr;
-        bool result = typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, &jv, jValueType::l);
-        if(result)
-            output = jv.l;
-        return result;
-    }else return false;
-}
-
 bool QtJambiAPI::convertJavaToNative(JNIEnv *env, const std::type_info& typeId, const char* typeName, jobject java_object, void * output, QtJambiScope* scope)
 {
-    const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId, typeName);
+    QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId, typeName);
     if(!typeEntry){
         if(typeName){
             if(const std::type_info* typeId = getTypeByJavaName(typeName)){
@@ -1829,28 +1802,6 @@ bool QtJambiAPI::convertJavaToNative(JNIEnv *env, const std::type_info& typeId,
     }
 }
 
-bool QtJambiAPI::convertNativeToJava(JNIEnv *env, const std::type_info& typeId, const char* typeName, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jobject& output)
-{
-    const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId, typeName);
-    if(!typeEntry){
-        if(typeName){
-            if(const std::type_info* typeId = getTypeByJavaName(typeName)){
-                typeName = getQtName(*typeId);
-            }
-            if(typeName)
-                typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId, typeName);
-        }
-    }
-    if(typeEntry){
-        jvalue jv;
-        jv.l = nullptr;
-        bool result = typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, &jv, jValueType::l);
-        if(result)
-            output = jv.l;
-        return result;
-    }else return false;
-}
-
 void *QtJambiAPI::convertJavaObjectToNative(JNIEnv *env, jobject java_object)
 {
     if(const QSharedPointer<QtJambiLink>& link = QtJambiLink::findLinkForJavaObject(env, java_object))
@@ -1983,16 +1934,19 @@ void *QtJambiAPI::convertJavaInterfaceToNative(JNIEnv *env, jobject object, cons
     return internal_convertJavaInterfaceToNative(env, object, typeId);
 }
 
-jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, const std::type_info& typeId, bool makeCopyOfValueTypes, bool cppOwnership, bool *ok = nullptr)
+jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, const std::type_info& typeId, const char *qtName, NativeToJavaConversionMode mode, bool *ok)
 {
     if(ok) *ok = true;
     if (!qt_object)
         return nullptr;
-    if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId)){
-        jvalue result;
-        result.l = nullptr;
-        if(typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, &result, jValueType::l)){
-            return result.l;
+    if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId, qtName)){
+        jvalue jv;
+        jv.l = nullptr;
+        QtJambiTypeEntry::NativeToJavaResult result = typeEntry->convertToJava(env, qt_object, mode==NativeToJavaConversionMode::MakeCopyOfValues, &jv, jValueType::l);
+        if(result){
+            if(mode==NativeToJavaConversionMode::TransferOwnership && result.link())
+                result.link()->setJavaOwnership(env);
+            return jv.l;
         }else{
             return nullptr;
         }
@@ -2001,8 +1955,10 @@ jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, c
     return nullptr;
 }
 
-jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, QByteArray className, jclass clazz, bool makeCopyOfValueTypes, bool cppOwnership)
+jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, QByteArray className, jclass clazz, NativeToJavaConversionMode mode, bool *ok)
 {
+    if(ok)
+        *ok = true;
     if (!qt_object || !clazz)
         return nullptr;
     int metaType = QMetaType::UnknownType;
@@ -2015,7 +1971,7 @@ jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, Q
 
     // If it's not a value type, we just link to the pointer directly.
     void *copy = nullptr;
-    if (!makeCopyOfValueTypes || metaType == QMetaType::UnknownType) {
+    if (mode!=NativeToJavaConversionMode::MakeCopyOfValues || metaType == QMetaType::UnknownType) {
         // If the object is constructed in Java, then we can look it up
         for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
             if(link){
@@ -2038,8 +1994,11 @@ jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, Q
         copy = const_cast<void *>(qt_object);
     } else {
         copy = QMetaType::create(metaType, qt_object);
-        if (!copy)
+        if (!copy){
+            if(ok)
+                *ok = false;
             return nullptr;
+        }
     }
 
     jobject returned = nullptr;
@@ -2052,6 +2011,8 @@ jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, Q
                 }else{
                     if (metaType != QMetaType::UnknownType && copy)
                         QMetaType::destroy(metaType, copy);
+                    if(ok)
+                        *ok = false;
                     return nullptr;
                 }
             }
@@ -2062,90 +2023,157 @@ jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, Q
         }
     }
 
-    if (!returned)
+    if (!returned){
+        if(ok)
+            *ok = false;
         return nullptr;
-
-    if (const QSharedPointer<QtJambiLink>& link =
-               metaType == QMetaType::UnknownType ? QtJambiLink::createLinkForObject(
-                                                    env,
-                                                    returned,
-                                                    copy,
-                                                    LINK_NAME_ARG(nullptr)
-                                                    false,
-                                                    false)
-                                                : QtJambiLink::createLinkForObject(
-                                                    env,
-                                                    returned,
-                                                    copy,
-                                                    QMetaType(metaType),
-                                                    false,
-                                                    false) ) {
-        // If the type is copied in, we own the pointer
-        if(cppOwnership){
-            link->setCppOwnership(env);
-        }
-        else if (metaType != QMetaType::UnknownType && makeCopyOfValueTypes){
-            link->setJavaOwnership(env);
+    }
+    QtJambiLink::Ownership ownership = QtJambiLink::Ownership::None;
+    // If the type is copied in, we own the pointer
+    if ((metaType != QMetaType::UnknownType && mode==NativeToJavaConversionMode::MakeCopyOfValues) || mode==NativeToJavaConversionMode::TransferOwnership){
+        ownership = QtJambiLink::Ownership::Java;
+    }
+    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, clazz);
+    QSharedPointer<QtJambiLink> link;
+    if(metaType == QMetaType::UnknownType){
+        if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
+            link = QtJambiLink::createLinkForNativeObject(
+                        env,
+                        returned,
+                        copy,
+                        LINK_NAME_ARG(nullptr)
+                        false,
+                        false,
+                        ownership,
+                        interfaceOffsets->offsets,
+                        interfaceOffsets->interfaces,
+                        interfaceOffsets->inheritedInterfaces);
+        }else{
+            link = QtJambiLink::createLinkForNativeObject(
+                        env,
+                        returned,
+                        copy,
+                        LINK_NAME_ARG(nullptr)
+                        false,
+                        false,
+                        ownership);
+        }
+        if(!link){
+            if(ok)
+                *ok = false;
+            returned = nullptr;
+        }
+    }else{
+        if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
+            link = QtJambiLink::createLinkForNativeObject(
+                        env,
+                        returned,
+                        copy,
+                        QMetaType(metaType),
+                        false,
+                        false,
+                        ownership,
+                        interfaceOffsets->offsets,
+                        interfaceOffsets->interfaces,
+                        interfaceOffsets->inheritedInterfaces);
+        }else{
+            link = QtJambiLink::createLinkForNativeObject(
+                        env,
+                        returned,
+                        copy,
+                        QMetaType(metaType),
+                        false,
+                        false,
+                        ownership);
+        }
+        if(!link){
+            if (mode==NativeToJavaConversionMode::MakeCopyOfValues && copy)
+                QMetaType::destroy(metaType, copy);
+            returned = nullptr;
+            if(ok)
+                *ok = false;
         }
-    } else {
-        if (metaType != QMetaType::UnknownType && copy)
-            QMetaType::destroy(metaType, copy);
-        returned = nullptr;
     }
-
     return returned;
 }
 
-jobject QtJambiAPI::convertNativeToJavaObject(JNIEnv *env, const void *qt_object, const char *className, bool makeCopyOfValueTypes, bool cppOwnership){
-    const std::type_info* typeId = getTypeByJavaName(className);
-    if(typeId){
-        bool ok;
-        jobject result = internal_convertNativeToJavaObject(env, qt_object, *typeId, makeCopyOfValueTypes, cppOwnership, &ok);
-        if(ok)
-            return result;
+jobject internal_convertNativeToJavaObject(NativeToJavaConversionMode mode, JNIEnv *env, const void *qt_object, const std::type_info& typeId, const char *qtName){
+    bool ok{false};
+    jobject result = internal_convertNativeToJavaObject(env, qt_object, typeId, qtName, mode, &ok);
+    if(!ok){
+        QByteArray className = getJavaName(typeId);
+        if(!className.isEmpty()
+                && (!className.startsWith("io/qt/core/Q")
+                    || (   className!="io/qt/core/QList"
+                        && className!="io/qt/core/QVector"
+                        && className!="io/qt/core/QLinkedList"
+                        && className!="io/qt/core/QMultiMap"
+                        && className!="io/qt/core/QMultiHash"
+                        && className!="io/qt/core/QMap"
+                        && className!="io/qt/core/QHash"
+                        && className!="io/qt/core/QSet"
+                        && className!="io/qt/core/QStack"
+                        && className!="io/qt/core/QQueue"
+                        && className!="io/qt/core/QSequentialIterator"
+                        && className!="io/qt/core/QAssociativeIterator"
+                        && className!="io/qt/core/QSequentialConstIterator"
+                        && className!="io/qt/core/QAssociativeConstIterator"
+                        && className!="io/qt/core/QPair"))){
+            return internal_convertNativeToJavaObject(env, qt_object, className, JavaAPI::resolveClass(env, className), mode, &ok);
+        }
     }
-    return internal_convertNativeToJavaObject(env, qt_object, className, JavaAPI::resolveClass(env, className), makeCopyOfValueTypes, cppOwnership);
-}
-
-jobject QtJambiAPI::convertNativeToJavaObject(JNIEnv *env, const void *qt_object, const char *className,
-                            const std::type_info& typeId, bool makeCopyOfValueTypes, bool cppOwnership){
-    bool ok;
-    jobject result = internal_convertNativeToJavaObject(env, qt_object, typeId, makeCopyOfValueTypes, cppOwnership, &ok);
     if(ok)
         return result;
-    return internal_convertNativeToJavaObject(env, qt_object, className, JavaAPI::resolveClass(env, className), makeCopyOfValueTypes, cppOwnership);
+    JavaException::raiseIllegalArgumentException(env, QStringLiteral("Cannot cast %1 to java object").arg(QLatin1String(QtJambiAPI::typeName(typeId))) QTJAMBI_STACKTRACEINFO );
+    return nullptr;
 }
 
-jobject QtJambiAPI::convertNativeToJavaObject(JNIEnv *env, const void *qt_object, jclass clazz, bool makeCopyOfValueTypes, bool cppOwnership){
-    QString java_name = QtJambiAPI::getClassName(env, clazz).replace(QLatin1Char('.'), QLatin1Char('/'));
-    const std::type_info* typeId = getTypeByJavaName(java_name);
-    if(typeId){
-        bool ok;
-        jobject result = internal_convertNativeToJavaObject(env, qt_object, *typeId, makeCopyOfValueTypes, cppOwnership, &ok);
-        if(ok)
-            return result;
-    }
-    return internal_convertNativeToJavaObject(env, qt_object, qPrintable(java_name), clazz, makeCopyOfValueTypes, cppOwnership);
+jobject QtJambiAPI::convertNativeToJavaObjectAsCopy(JNIEnv *env, const void *qt_object, const std::type_info& typeId, const char *qtName){
+    return internal_convertNativeToJavaObject(NativeToJavaConversionMode::MakeCopyOfValues, env, qt_object, typeId, qtName);
 }
 
-jobject QtJambiAPI::convertNativeToJavaObject(JNIEnv *env, const void *qt_object, const std::type_info& typeId, bool makeCopyOfValueTypes, bool cppOwnership){
-    bool ok;
-    jobject result = internal_convertNativeToJavaObject(env, qt_object, typeId, makeCopyOfValueTypes, cppOwnership, &ok);
+jobject QtJambiAPI::convertNativeToJavaObjectAsWrapper(JNIEnv *env, const void *qt_object, const std::type_info& typeId, const char *qtName){
+    return internal_convertNativeToJavaObject(NativeToJavaConversionMode::None, env, qt_object, typeId, qtName);
+}
+
+jobject QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(JNIEnv *env, const void *qt_object, const std::type_info& typeId, const char *qtName){
+    return internal_convertNativeToJavaObject(NativeToJavaConversionMode::TransferOwnership, env, qt_object, typeId, qtName);
+}
+
+jobject internal_convertNativeToJavaObject(NativeToJavaConversionMode mode, JNIEnv *env, const void *qt_object, jclass clazz){
+    QString java_name = QtJambiAPI::getClassName(env, clazz).replace(QLatin1Char('.'), QLatin1Char('/'));
+    const std::type_info* typeId = getTypeByJavaName(java_name);
+    bool ok{false};
+    jobject result{nullptr};
+    if(typeId)
+        result = internal_convertNativeToJavaObject(env, qt_object, *typeId, getQtName(*typeId), mode, &ok);
+    if(!ok)
+        result = internal_convertNativeToJavaObject(env, qt_object, qPrintable(java_name), clazz, mode, &ok);
     if(ok)
         return result;
-    QByteArray className = getJavaName(typeId);
-    if(!className.isEmpty())
-        return internal_convertNativeToJavaObject(env, qt_object, className, JavaAPI::resolveClass(env, className), makeCopyOfValueTypes, cppOwnership);
+    JavaException::raiseIllegalArgumentException(env, QStringLiteral("Cannot cast %1 to java object").arg(QtJambiAPI::getClassName(env, clazz).replace(QLatin1Char('$'), QLatin1Char('.'))) QTJAMBI_STACKTRACEINFO );
     return nullptr;
 }
 
+jobject QtJambiAPI::convertNativeToJavaObjectAsCopy(JNIEnv *env, const void *qt_object, jclass clazz){
+    return internal_convertNativeToJavaObject(NativeToJavaConversionMode::MakeCopyOfValues, env, qt_object, clazz);
+}
+
+jobject QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(JNIEnv *env, const void *qt_object, jclass clazz){
+    return internal_convertNativeToJavaObject(NativeToJavaConversionMode::TransferOwnership, env, qt_object, clazz);
+}
+
+jobject QtJambiAPI::convertNativeToJavaObjectAsWrapper(JNIEnv *env, const void *qt_object, jclass clazz){
+    return internal_convertNativeToJavaObject(NativeToJavaConversionMode::None, env, qt_object, clazz);
+}
+
 jobject internal_convertSmartPointerToJavaObject_impl(JNIEnv *env,
                             const std::type_info& typeId, void* ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, bool* ok)
 {
     if(ok) *ok = true;
     if (!ptr_shared_pointer || !sharedPointerDeleter || !sharedPointerGetter || !sharedPointerGetter(ptr_shared_pointer))
         return nullptr;
-    if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId)){
+    if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId)){
         jvalue result;
         if(typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, sharedPointerDeleter, sharedPointerGetter, &result, jValueType::l)){
             return result.l;
@@ -2418,16 +2446,17 @@ jobject internal_convertQObjectToJavaObject_type(JNIEnv *env, const QObject *qt_
     if(ok) *ok = true;
     if (!qt_object)
         return nullptr;
-    const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeid(*qt_object));
+    QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeid(*qt_object));
     if(!typeEntry)
         typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId);
     if(!typeEntry)
         typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeid(QObject));
     if(typeEntry){
-        jvalue result;
-        result.l = nullptr;
-        if(typeEntry->convertToJava(env, qt_object, false, true, &result, jValueType::l)){
-            return result.l;
+        jvalue jv;
+        jv.l = nullptr;
+        QtJambiTypeEntry::NativeToJavaResult result = typeEntry->convertToJava(env, qt_object, false, &jv, jValueType::l);
+        if(result){
+            return jv.l;
         }else{
             return nullptr;
         }
@@ -2576,7 +2605,7 @@ jobject internal_convertQObjectSmartPointerToJavaObject_impl(JNIEnv *env, const
     if (!ptr_shared_pointer || !shared_pointer_deleter || !pointerGetter || !pointerGetter(ptr_shared_pointer))
         return nullptr;
 
-    if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId)){
+    if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId)){
         jvalue result;
         if(typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, shared_pointer_deleter, pointerGetter, &result, jValueType::l)){
             return result.l;
diff --git a/src/cpp/QtJambi/coreapi.cpp b/src/cpp/QtJambi/coreapi.cpp
index a3edb0b2..9dcb287c 100644
--- a/src/cpp/QtJambi/coreapi.cpp
+++ b/src/cpp/QtJambi/coreapi.cpp
@@ -531,14 +531,6 @@ void CoreAPI::registerDependentInterface(JNIEnv *env, jobject dependentObject, j
     }
 }
 
-void CoreAPI::registerDependency(JNIEnv *env, jobject dependentObject, QtJambiNativeID nativeId){
-    QSharedPointer<QtJambiLink> _dependentLink = QtJambiLink::findLinkForJavaInterface(env, dependentObject);
-    QSharedPointer<QtJambiLink> _ownerLink = QtJambiLink::fromNativeId(nativeId);
-    if(_dependentLink && _ownerLink){
-        _ownerLink->registerDependentObject(_dependentLink);
-    }
-}
-
 void CoreAPI::registerDependentObject(JNIEnv *env, jobject dependentObject, jobject owner){
     QSharedPointer<QtJambiLink> _dependentLink = QtJambiLink::findLinkForJavaObject(env, dependentObject);
     QSharedPointer<QtJambiLink> _ownerLink = QtJambiLink::findLinkForJavaInterface(env, owner);
@@ -658,12 +650,12 @@ jobject CoreAPI::newInstanceForMetaObject(JNIEnv *env, QtJambiNativeID construct
                 }else{
                     if(const QtJambiMetaObject* dynamicMetaObject = QtJambiMetaObject::cast(constructor.enclosingMetaObject())){
                         if(Java::QtJambi::QtObjectInterface::isAssignableFrom(env, dynamicMetaObject->javaClass())){
-                            return QtJambiAPI::convertNativeToJavaObject(env, obj, dynamicMetaObject->javaClass(), false, false);
+                            return QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, obj, dynamicMetaObject->javaClass());
                         }else{
                             return reinterpret_cast<jobject>(obj);
                         }
                     }else if(const std::type_info* typeId = getTypeByQtName(constructor.enclosingMetaObject()->className())){
-                        return QtJambiAPI::convertNativeToJavaObject(env, obj, *typeId, false, false);
+                        return QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, obj, *typeId);
                     }
                 }
             }
@@ -686,7 +678,7 @@ jobject CoreAPI::metaObjectCast(JNIEnv *env, jobject object, jclass targetType){
                     }
                     if(!targetTypePointer){
                         for(const PolymorphicIdHandler* handler : getPolymorphicIdHandlers(typeid(QObject))){
-                            if(handler->m_targetTypeId==*targetTypeId){
+                            if(unique_id(handler->m_targetTypeId)==unique_id(*targetTypeId)){
                                 qintptr offset(0);
                                 if(handler->m_polymorphyHandler(sourceTypePointer, offset) && offset!=qintptr(sourceTypePointer)){
                                     targetTypePointer = reinterpret_cast<void*>(qintptr(sourceTypePointer) - offset);
@@ -714,7 +706,7 @@ jobject CoreAPI::metaObjectCast(JNIEnv *env, jobject object, jclass targetType){
                                 if(isInterface(*sourceTypeId)){
                                     const std::type_info& qobjectId = typeid(QObject);
                                     for(const PolymorphicIdHandler* handler : getPolymorphicIdHandlers(*sourceTypeId)){
-                                        if(handler->m_targetTypeId==qobjectId){
+                                        if(unique_id(handler->m_targetTypeId)==unique_id(qobjectId)){
                                             qintptr offset(0);
                                             if(handler->m_polymorphyHandler(sourceTypePointer, offset) && offset!=qintptr(sourceTypePointer)){
                                                 targetTypePointer = reinterpret_cast<void*>(qintptr(sourceTypePointer) - offset);
@@ -760,7 +752,7 @@ jobject CoreAPI::metaObjectCast(JNIEnv *env, jobject object, jclass targetType){
                         }else return obj;
                     }
                 }
-                result = QtJambiAPI::convertNativeToJavaObject(env, targetTypePointer, *targetTypeId, false, false);
+                result = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, targetTypePointer, *targetTypeId);
                 if(QSharedPointer<QtJambiLink> newlink = QtJambiLink::findLinkForJavaObject(env, result)){
                     objectLink->registerDependentObject(newlink);
                     if(!newlink->isQObject()){
@@ -792,7 +784,7 @@ jobject CoreAPI::metaObjectCast(JNIEnv *env, jobject object, jclass targetType){
                             }else return obj;
                         }
                     }
-                    result = QtJambiAPI::convertNativeToJavaObject(env, interfacePointer, targetType, false, false);
+                    result = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, interfacePointer, targetType);
                     if(QSharedPointer<QtJambiLink> newlink = QtJambiLink::findLinkForJavaObject(env, result)){
                         objectLink->registerDependentObject(newlink);
                         if(!newlink->isQObject()){
diff --git a/src/cpp/QtJambi/coreapi.h b/src/cpp/QtJambi/coreapi.h
index dae0472a..895a7682 100644
--- a/src/cpp/QtJambi/coreapi.h
+++ b/src/cpp/QtJambi/coreapi.h
@@ -205,8 +205,6 @@ QTJAMBI_EXPORT void unregisterDependentInterface(JNIEnv *env, jobject dependentO
 
 QTJAMBI_EXPORT void unregisterDependentObject(JNIEnv *env, jobject dependentObject, jobject owner);
 
-QTJAMBI_EXPORT void registerDependency(JNIEnv *env, jobject dependentObject, QtJambiNativeID _this_nativeId);
-
 QTJAMBI_EXPORT void initializeQList(JNIEnv *env, jobject object, jclass elementType, QtJambiNativeID elementMetaType, jobject other);
 
 QTJAMBI_EXPORT void initializeQSet(JNIEnv *env, jobject object, jclass elementType, QtJambiNativeID elementMetaType, jobject other);
diff --git a/src/cpp/QtJambi/events.cpp b/src/cpp/QtJambi/events.cpp
index a43ca5f4..306fadeb 100644
--- a/src/cpp/QtJambi/events.cpp
+++ b/src/cpp/QtJambi/events.cpp
@@ -350,9 +350,15 @@ void UIInitialCheck::enabledUIThreadCheck(JNIEnv *env, const std::type_info& typ
     QThread* objectThread = QCoreApplicationPrivate::theMainThread.loadRelaxed();
     QThread* currentThread = QThread::currentThread();
     if(currentThread!=objectThread){
-        JavaException::raiseQThreadAffinityException(env, QStringLiteral("%1 used from outside main thread").arg(getQtName(typeId)) QTJAMBI_STACKTRACEINFO ,
-                                                     nullptr,
-                                                     objectThread, currentThread);
+        if(unique_id(typeId)==unique_id(typeid(void))){
+            JavaException::raiseQThreadAffinityException(env, QStringLiteral("%1 used from outside main thread").arg(getQtName(typeId)) QTJAMBI_STACKTRACEINFO ,
+                                                         nullptr,
+                                                         objectThread, currentThread);
+        }else{
+            JavaException::raiseQThreadAffinityException(env, "Thread affinity breach" QTJAMBI_STACKTRACEINFO ,
+                                                         nullptr,
+                                                         objectThread, currentThread);
+        }
     }
 }
 
diff --git a/src/cpp/QtJambi/fileengine.cpp b/src/cpp/QtJambi/fileengine.cpp
index 86337b5d..0c8647ad 100644
--- a/src/cpp/QtJambi/fileengine.cpp
+++ b/src/cpp/QtJambi/fileengine.cpp
@@ -939,7 +939,10 @@ void QClassPathEngine::setFileName(const QString &fileName)
 {
     if (fileName==QClassPathEngine::fileName())
         return;
-    m_engines.clear();
+    {
+        QMutexLocker locker(&m_mutex);
+        m_engines.clear();
+    }
     if(JniEnvironment env{600}){
         QLatin1String fileNamePrefix1("classpath:");
         QLatin1String fileNamePrefix2("/:classpath:");
@@ -1100,12 +1103,11 @@ QString QClassPathEngine::fileName(FileName file) const {
         engines = m_engines;
     }
     if(QAbstractFileEngine* afe = engines.value(0)){
-        if (QFSFileEngine* fsf = dynamic_cast<QFSFileEngine*>(afe)){
-            return fsf->fileName(file);
-        }
         QString classPathEntry;
         if (engines.size() == 1) {
-            if (QClassPathEntry* cpe = dynamic_cast<QClassPathEntry*>(afe))
+            /*if (QFSFileEngine* fsf = dynamic_cast<QFSFileEngine*>(afe)){
+                return fsf->fileName(file);
+            }else*/ if (QClassPathEntry* cpe = dynamic_cast<QClassPathEntry*>(afe))
                 classPathEntry = cpe->classPathEntryName();
             else{
                 if(JniEnvironment env{200}){
@@ -1350,8 +1352,9 @@ bool QClassPathEngine::addFromPath(JNIEnv* env, jobject url, const QString& file
                 ) {
             file = QFileInfo(file.absolutePath() + "/" + fileName);
             if(file.exists()){
+                QFSEntryEngine* engine = new QFSEntryEngine(file.absoluteFilePath(), urlPath);
                 QMutexLocker locker(&m_mutex);
-                m_engines << new QFSEntryEngine(file.absoluteFilePath(), urlPath);
+                m_engines << engine;
                 return true;
 #ifdef Q_OS_ANDROID
             }else if(urlPath=="file:/"){
diff --git a/src/cpp/QtJambi/functionpointer.cpp b/src/cpp/QtJambi/functionpointer.cpp
index 341ad8bf..e24c9e9e 100644
--- a/src/cpp/QtJambi/functionpointer.cpp
+++ b/src/cpp/QtJambi/functionpointer.cpp
@@ -100,14 +100,16 @@ struct LibraryFunction{
 void register_file_by_function(struct LibraryFile* libFile, QFunctionPointer fn);
 void unregister_file_by_function(QFunctionPointer fn);
 
+typedef std::vector<QFunctionPointer>::size_type index_type;
+
 struct LibraryFile : public QSharedData{
     LibraryFile(const QString& _name,
-                QVector<LibraryFunction>&& _libFunctions,
-                QSet<size_type>&& _freeIndexes,
+                std::vector<LibraryFunction>&& _libFunctions,
+                QSet<index_type>&& _freeIndexes,
                 std::unique_ptr<QLibrary>& _library):
         name(_name),
-        libFunctions(_libFunctions),
-        freeIndexes(_freeIndexes),
+        libFunctions(std::move(_libFunctions)),
+        freeIndexes(std::move(_freeIndexes)),
         usedIndexes(),
         library(_library.release()){
     }
@@ -121,7 +123,7 @@ struct LibraryFile : public QSharedData{
                                   QFunctionPointer caller){
         if(freeIndexes.isEmpty())
             return nullptr;
-        size_type freeIndex = *freeIndexes.cbegin();
+        index_type freeIndex = *freeIndexes.cbegin();
         freeIndexes.erase(freeIndexes.cbegin());
         LibraryFunction& lf = libFunctions[freeIndex];
         lf.enable(disposer, caller);
@@ -131,7 +133,7 @@ struct LibraryFile : public QSharedData{
     }
     bool disposeFunction(QFunctionPointer fn){
         if(usedIndexes.contains(quintptr(fn))){
-            size_type usedIndex = usedIndexes.take(quintptr(fn));
+            index_type usedIndex = usedIndexes.take(quintptr(fn));
             LibraryFunction& lf = libFunctions[usedIndex];
             lf.disable();
             freeIndexes << usedIndex;
@@ -141,8 +143,8 @@ struct LibraryFile : public QSharedData{
     }
     const QString name;
 private:
-    QVector<LibraryFunction> libFunctions;
-    QSet<size_type> freeIndexes;
+    std::vector<LibraryFunction> libFunctions;
+    QSet<index_type> freeIndexes;
     QHash<quintptr,size_type> usedIndexes;
     QLibrary* library;
     Q_DISABLE_COPY_MOVE(LibraryFile);
@@ -255,10 +257,10 @@ QFunctionPointer extractFunction(
                 std::vector<QFunctionPointer> functions;
                 QFunctionPointer* callers = initialize(on_null_ptr, functions);
                 Q_ASSERT(callers);
-                QSet<size_type> freeIndexes;
-                QVector<LibraryFunction> libFunctions;
+                QSet<index_type> freeIndexes;
+                std::vector<LibraryFunction> libFunctions;
                 libFunctions.resize(functions.size());
-                for(std::vector<QFunctionPointer>::size_type i=0; i<functions.size(); ++i){
+                for(index_type i=0; i<functions.size(); ++i){
                     freeIndexes << i;
                     LibraryFunction& lf = libFunctions[i];
                     lf.initialize(callers + i, functions[i]);
diff --git a/src/cpp/QtJambi/functionpointer.h b/src/cpp/QtJambi/functionpointer.h
index 27c1e99f..6ee9533a 100644
--- a/src/cpp/QtJambi/functionpointer.h
+++ b/src/cpp/QtJambi/functionpointer.h
@@ -31,6 +31,7 @@
 #define QTJAMBI_FUNCTIONPOINTER_H
 
 #include "global.h"
+#include "qtjambiapi.h"
 #include <QtCore/QVector>
 #include <QtCore/QQueue>
 #include <QtCore/QHash>
@@ -120,17 +121,12 @@ union storage
     typename std::decay<Callable>::type callable;
 };
 
-template<typename Ret, typename... Args>
-struct fn{
-    typedef Ret(*type)(Args...);
-};
-
 template<ushort count, typename Callable, typename Ret, typename... Args>
-void setInitialFunction(QQueue<typename fn<Ret, Args...>::type>& freeFunctions);
+void setInitialFunction(QQueue<typename QtJambiAPI::FunctionType<Ret, Args...>::type>& freeFunctions);
 
 template<ushort count, typename Callable, typename Ret, typename... Args>
 class CallableHash{
-    typedef typename fn<Ret,Args...>::type Fn;
+    typedef typename QtJambiAPI::FunctionType<Ret,Args...>::type Fn;
 
     CallableHash();
 public:
@@ -190,7 +186,7 @@ class CallableHash{
 
 template<ushort n, ushort count, typename Callable, typename Ret, typename... Args>
 struct CallableHashInitializer{
-    typedef typename fn<Ret,Args...>::type Fn;
+    typedef typename QtJambiAPI::FunctionType<Ret,Args...>::type Fn;
 
     static Ret call(Args...args){
 #if Q_CC_MSVC && !defined(QT_DEBUG)
@@ -208,7 +204,7 @@ struct CallableHashInitializer{
 
 template<ushort count, typename Callable, typename Ret, typename... Args>
 struct CallableHashInitializer<count, count, Callable, Ret, Args...>{
-    typedef typename fn<Ret,Args...>::type Fn;
+    typedef typename QtJambiAPI::FunctionType<Ret,Args...>::type Fn;
     static void initialize(QQueue<Fn>&){}
 };
 
@@ -235,9 +231,9 @@ CallableHash<count,Callable,Ret,Args...>& CallableHash<count,Callable,Ret,Args..
 
 
 template<ushort count, typename Callable, typename Ret, typename... Args>
-typename fn<Ret,Args...>::type functionPointer(Callable&& c, hash_type hash, std::function<void()>* deleterFunction, std::function<const Callable*(Ret(*)(Args...))>* reverseFunctionGetter)
+typename QtJambiAPI::FunctionType<Ret,Args...>::type functionPointer(Callable&& c, hash_type hash, std::function<void()>* deleterFunction, std::function<const Callable*(Ret(*)(Args...))>* reverseFunctionGetter)
 {
-    typedef typename fn<Ret,Args...>::type Fn;
+    typedef typename QtJambiAPI::FunctionType<Ret,Args...>::type Fn;
     CallableHash<count,Callable,Ret,Args...>& callables = CallableHash<count,Callable,Ret,Args...>::instance();
     QMutexLocker locker(functionPointerLock());
     Fn fn = callables.functionOf(hash);
diff --git a/src/cpp/QtJambi/future.cpp b/src/cpp/QtJambi/future.cpp
index 9e27aad9..44b6c4de 100644
--- a/src/cpp/QtJambi/future.cpp
+++ b/src/cpp/QtJambi/future.cpp
@@ -368,9 +368,22 @@ QFutureInterfaceBase& QtJambiAPI::getQFutureInterfaceFromQFuture(const QFuture<v
 }
 #endif
 
+bool isVariantFuture(QSharedPointer<QFutureInterfaceBase>& sourceFuture){
+    if(dynamic_cast<QFutureInterface<QVariant>*>(sourceFuture.get()))
+        return true;
+#if defined(Q_OS_ANDROID)
+    QFutureInterfaceBase* sourceObject = sourceFuture.get();
+    QByteArray sourceFutureTypeName = QtJambiAPI::typeName(typeid(*sourceObject));
+    if(sourceFutureTypeName=="QFutureInterface<QVariant>"
+            || sourceFutureTypeName=="QFutureInterface_shell<QVariant>")
+        return true;
+#endif
+    return false;
+}
+
 QFutureInterfaceBase* QtJambiAPI::translateQFutureInterface(QSharedPointer<QFutureInterfaceBase>&& sourceFuture, QSharedPointer<QFutureInterfaceBase>&& targetFuture, const char* translatedType, ResultTranslator resultTranslator, ResultTranslator resultRetranslator){
     if(sourceFuture->d){
-        if(dynamic_cast<QFutureInterface<QVariant>*>(sourceFuture.get())){
+        if(isVariantFuture(sourceFuture)){
             QMutexLocker lock(&sourceFuture->d->m_mutex);
             if(!sourceFuture->d->outputConnections.isEmpty()){
                 for(int i=0; i<sourceFuture->d->outputConnections.size(); ++i){
@@ -379,25 +392,25 @@ QFutureInterfaceBase* QtJambiAPI::translateQFutureInterface(QSharedPointer<QFutu
                         QFutureInterfaceBase* targetObject = targetFuture.get();
                         const std::type_info& sourceType = typeid(*sourceObject);
                         const std::type_info& targetType = typeid(*targetObject);
-                        if(targetType==sourceType){
+                        if(unique_id(targetType)==unique_id(sourceType)){
                             return sourceObject;
                         }else{
                             if(JniEnvironment env{200}){
-                                QString baseType = QLatin1String(QtJambiAPI::typeName(sourceType));
-                                QString requiredType = QLatin1String(QtJambiAPI::typeName(targetType));
+                                QByteArray baseType = QtJambiAPI::typeName(sourceType);
+                                QByteArray requiredType = QtJambiAPI::typeName(targetType);
                                 auto idx = requiredType.indexOf('<');
                                 if(idx>0){
-                                    requiredType = QLatin1String(translatedType) + requiredType.mid(idx);
+                                    requiredType = translatedType + requiredType.mid(idx);
                                 }else{
-                                    requiredType = QLatin1String(translatedType);
+                                    requiredType = translatedType;
                                 }
-                                if(baseType==QLatin1String("QFutureInterfaceBase")
-                                        || baseType==QLatin1String("QFutureInterfaceBase_shell")){
-                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1<void> to %2.").arg(QLatin1String(translatedType)).arg(requiredType) QTJAMBI_STACKTRACEINFO );
-                                }else if(baseType.startsWith(QLatin1String("QFutureInterface<"))){
-                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1%2 to %3.").arg(QLatin1String(translatedType)).arg(baseType.mid(16)).arg(requiredType) QTJAMBI_STACKTRACEINFO );
-                                }else if(baseType.startsWith(QLatin1String("QFutureInterface_shell<"))){
-                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1%2 to %3.").arg(QLatin1String(translatedType)).arg(baseType.mid(22)).arg(requiredType) QTJAMBI_STACKTRACEINFO );
+                                if(baseType=="QFutureInterfaceBase"
+                                        || baseType=="QFutureInterfaceBase_shell"){
+                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1<void> to %2.").arg(translatedType, requiredType) QTJAMBI_STACKTRACEINFO );
+                                }else if(baseType.startsWith("QFutureInterface<")){
+                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1%2 to %3.").arg(translatedType, baseType.mid(16), requiredType) QTJAMBI_STACKTRACEINFO );
+                                }else if(baseType.startsWith("QFutureInterface_shell<")){
+                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1%2 to %3.").arg(translatedType, baseType.mid(22), requiredType) QTJAMBI_STACKTRACEINFO );
                                 }
                             }
                         }
@@ -406,25 +419,25 @@ QFutureInterfaceBase* QtJambiAPI::translateQFutureInterface(QSharedPointer<QFutu
                         QFutureInterfaceBase* targetObject = targetFuture.get();
                         const std::type_info& sourceType = typeid(*sourceObject);
                         const std::type_info& targetType = typeid(*targetObject);
-                        if(targetType==sourceType){
+                        if(unique_id(targetType)==unique_id(sourceType)){
                             return sourceObject;
                         }else{
                             if(JniEnvironment env{200}){
-                                QString baseType = QLatin1String(QtJambiAPI::typeName(sourceType));
-                                QString requiredType = QLatin1String(QtJambiAPI::typeName(targetType));
+                                QByteArray baseType = QtJambiAPI::typeName(sourceType);
+                                QByteArray requiredType = QtJambiAPI::typeName(targetType);
                                 auto idx = requiredType.indexOf('<');
                                 if(idx>0){
-                                    requiredType = QLatin1String(translatedType) + requiredType.mid(idx);
+                                    requiredType = translatedType + requiredType.mid(idx);
                                 }else{
-                                    requiredType = QLatin1String(translatedType);
+                                    requiredType = translatedType;
                                 }
-                                if(baseType==QLatin1String("QFutureInterfaceBase")
-                                        || baseType==QLatin1String("QFutureInterfaceBase_shell")){
-                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1<void> to %2.").arg(QLatin1String(translatedType)).arg(requiredType) QTJAMBI_STACKTRACEINFO );
-                                }else if(baseType.startsWith(QLatin1String("QFutureInterface<"))){
-                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1%2 to %3.").arg(QLatin1String(translatedType)).arg(baseType.mid(16)).arg(requiredType) QTJAMBI_STACKTRACEINFO );
-                                }else if(baseType.startsWith(QLatin1String("QFutureInterface_shell<"))){
-                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1%2 to %3.").arg(QLatin1String(translatedType)).arg(baseType.mid(22)).arg(requiredType) QTJAMBI_STACKTRACEINFO );
+                                if(baseType=="QFutureInterfaceBase"
+                                        || baseType=="QFutureInterfaceBase_shell"){
+                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1<void> to %2.").arg(translatedType, requiredType) QTJAMBI_STACKTRACEINFO );
+                                }else if(baseType.startsWith("QFutureInterface<")){
+                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1%2 to %3.").arg(translatedType, baseType.mid(16), requiredType) QTJAMBI_STACKTRACEINFO );
+                                }else if(baseType.startsWith("QFutureInterface_shell<")){
+                                    Java::Runtime::IllegalArgumentException::throwNew(env, QStringLiteral("Cannot cast %1%2 to %3.").arg(translatedType, baseType.mid(22), requiredType) QTJAMBI_STACKTRACEINFO );
                                 }
                             }
                         }
@@ -472,21 +485,21 @@ void CoreAPI::invokeAndCatch(JNIEnv *__jni_env, void* ptr, void(*expression)(voi
         if(unique_id(typeid(exn))==unique_id(typeid(QException))){
             Java::QtCore::QException::throwNew(__jni_env, "An exception has been thrown in native code." QTJAMBI_STACKTRACEINFO );
         }else{
-            QString exceptionName(QLatin1String(QtJambiAPI::typeName(typeid(exn))));
+            QByteArray exceptionName(QtJambiAPI::typeName(typeid(exn)));
             const char* what = exn.what();
             const char* original_what = exn.std::exception::what();
-            if(what && QLatin1String(what)!=QLatin1String(original_what) && exceptionName!=QLatin1String(what)){
-                Java::QtCore::QException::throwNew(__jni_env, QString("An exception (%1) has been thrown in native code: %2").arg(exceptionName).arg(QLatin1String(what)) QTJAMBI_STACKTRACEINFO );
+            if(what && QLatin1String(what)!=QLatin1String(original_what) && exceptionName!=what){
+                Java::QtCore::QException::throwNew(__jni_env, QStringLiteral("An exception (%1) has been thrown in native code: %2").arg(QLatin1String(exceptionName), QLatin1String(what)) QTJAMBI_STACKTRACEINFO );
             }else{
-                Java::QtCore::QException::throwNew(__jni_env, QString("An exception (%1) has been thrown in native code.").arg(exceptionName) QTJAMBI_STACKTRACEINFO );
+                Java::QtCore::QException::throwNew(__jni_env, QStringLiteral("An exception (%1) has been thrown in native code.").arg(QLatin1String(exceptionName)) QTJAMBI_STACKTRACEINFO );
             }
         }
     }catch(const std::exception& exn){
-        QString exceptionName(QLatin1String(QtJambiAPI::typeName(typeid(exn))));
-        if(exn.what() && exceptionName!=QLatin1String(exn.what())){
-            Java::QtCore::QUnhandledException::throwNew(__jni_env, QString("An exception (%1) has been thrown in native code: %2").arg(exceptionName).arg(QLatin1String(exn.what())) QTJAMBI_STACKTRACEINFO );
+        QByteArray exceptionName(QtJambiAPI::typeName(typeid(exn)));
+        if(exn.what() && exceptionName!=exn.what()){
+            Java::QtCore::QUnhandledException::throwNew(__jni_env, QStringLiteral("An exception (%1) has been thrown in native code: %2").arg(QLatin1String(exceptionName), QLatin1String(exn.what())) QTJAMBI_STACKTRACEINFO );
         }else{
-            Java::QtCore::QUnhandledException::throwNew(__jni_env, QString("An exception (%1) has been thrown in native code.").arg(exceptionName) QTJAMBI_STACKTRACEINFO );
+            Java::QtCore::QUnhandledException::throwNew(__jni_env, QStringLiteral("An exception (%1) has been thrown in native code.").arg(QLatin1String(exceptionName)) QTJAMBI_STACKTRACEINFO );
         }
     }catch(...){
         Java::QtCore::QUnhandledException::throwNew(__jni_env, "An exception has been thrown in native code." QTJAMBI_STACKTRACEINFO );
diff --git a/src/cpp/QtJambi/java.cpp b/src/cpp/QtJambi/java.cpp
index 59103738..adda3415 100644
--- a/src/cpp/QtJambi/java.cpp
+++ b/src/cpp/QtJambi/java.cpp
@@ -241,6 +241,78 @@ QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QCoreApplication,
     QTJAMBI_REPOSITORY_DEFINE_STATIC_FIELD(__qt_isInitializing,Z)
 )
 
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method9,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method8,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method7,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method6,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method5,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method4,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method3,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method2,
+QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method1,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;)Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method0,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,()Ljava/lang/Object;)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot9,
+    QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot8,
+    QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot7,
+    QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot6,
+    QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot5,
+    QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot4,
+    QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot3,
+    QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V)
+)
+
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot2,
+  QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;)V)
+)
+
 QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot1,
     QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;)V)
 )
@@ -572,13 +644,16 @@ QTJAMBI_REPOSITORY_DEFINE_CLASS(java/util/function,LongBinaryOperator,
 }
 
 namespace QtGui{
-
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/gui/gl,GLsync,)
 QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/gui,QValidator$QValidationData,
     QTJAMBI_REPOSITORY_DEFINE_CONSTRUCTOR(Ljava/lang/String;I)
     QTJAMBI_REPOSITORY_DEFINE_FIELD(string,Ljava/lang/String;)
     QTJAMBI_REPOSITORY_DEFINE_FIELD(position,I)
 )
-
+QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/gui,QPainter,
+    QTJAMBI_REPOSITORY_DEFINE_STATIC_METHOD(beginPaint,(Lio/qt/gui/QPaintDevice;)V)
+    QTJAMBI_REPOSITORY_DEFINE_STATIC_METHOD(endPaint,(Lio/qt/gui/QPaintDevice;)V)
+)
 }
 
 namespace QtCore{
@@ -1067,13 +1142,6 @@ QTJAMBI_REPOSITORY_DEFINE_CLASS(java/util,MissingResourceException,
 
 }
 
-namespace QtGui{
-QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/gui,QPainter,
-    QTJAMBI_REPOSITORY_DEFINE_STATIC_METHOD(beginPaint,(Lio/qt/gui/QPaintDevice;)V)
-    QTJAMBI_REPOSITORY_DEFINE_STATIC_METHOD(endPaint,(Lio/qt/gui/QPaintDevice;)V)
-)
-}
-
 namespace QtJambi{
 
 QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/internal,NativeUtility$NativeLink,
diff --git a/src/cpp/QtJambi/javaapi.h b/src/cpp/QtJambi/javaapi.h
index 0042c4a1..2b59ae3f 100644
--- a/src/cpp/QtJambi/javaapi.h
+++ b/src/cpp/QtJambi/javaapi.h
@@ -498,6 +498,42 @@ namespace QtCore{
     QTJAMBI_REPOSITORY_DECLARE_CLASS(QThread,
         QTJAMBI_REPOSITORY_DECLARE_OBJECT_FIELD(javaThread))
 
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method9,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method8,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method7,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method6,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method5,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method4,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method3,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method2,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method1,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method0,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot9,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot8,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot7,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot6,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot5,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot4,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot3,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
+    QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot2,
+                  QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
     QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot1,
                   QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
     QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot0,
@@ -724,6 +760,7 @@ namespace QtCore{
 }
 
 namespace QtGui{
+QTJAMBI_REPOSITORY_DECLARE_CLASS(GLsync,)
 QTJAMBI_REPOSITORY_DECLARE_CLASS(QValidator$QValidationData,
               QTJAMBI_REPOSITORY_DECLARE_CONSTRUCTOR()
               QTJAMBI_REPOSITORY_DECLARE_STRING_FIELD(string)
diff --git a/src/cpp/QtJambi/javainvalidate.cpp b/src/cpp/QtJambi/javainvalidate.cpp
index 5909203c..b9758b5e 100644
--- a/src/cpp/QtJambi/javainvalidate.cpp
+++ b/src/cpp/QtJambi/javainvalidate.cpp
@@ -74,27 +74,75 @@ void invalidateCollection(JNIEnv *env, jobject java_collection, bool checkJavaOw
     }
 }
 
+struct InvalidateAfterUsePrivate{
+    virtual ~InvalidateAfterUsePrivate();
+};
+
+InvalidateAfterUsePrivate::~InvalidateAfterUsePrivate() = default;
+
+struct InvalidateObjectAfterUsePrivate : InvalidateAfterUsePrivate{
+    InvalidateObjectAfterUsePrivate(JNIEnv *env, jobject object, bool checkJavaOwnership)
+        : m_env(env),
+          m_object(m_env->NewGlobalRef(object)),
+          m_checkJavaOwnership(checkJavaOwnership)
+    {}
+    ~InvalidateObjectAfterUsePrivate(){
+        QtJambiExceptionInhibitor __exnHandler;
+        try{
+            invalidateJavaObject(m_env, m_object, m_checkJavaOwnership);
+        }catch(const JavaException& exn){
+            m_env->DeleteGlobalRef(m_object);
+            m_object = nullptr;
+            __exnHandler.handle(m_env, exn, nullptr);
+        } catch (const std::exception& e) {
+            qWarning("%s", e.what());
+        } catch (...) {
+        }
+        if(m_object)
+            m_env->DeleteGlobalRef(m_object);
+    }
+
+    JNIEnv *m_env;
+    jobject m_object;
+    bool m_checkJavaOwnership;
+};
+
+struct InvalidateNativeIDAfterUsePrivate : InvalidateAfterUsePrivate{
+    InvalidateNativeIDAfterUsePrivate(JNIEnv *env, const QSharedPointer<QtJambiLink>& link)
+        : m_env(env),
+          m_link(link)
+    {}
+    ~InvalidateNativeIDAfterUsePrivate(){
+        QtJambiExceptionInhibitor __exnHandler;
+        try{
+            if(QSharedPointer<QtJambiLink> link = m_link.toStrongRef()){
+                if(link->isShell() && !link->isQObject()){
+                    link->invalidate(m_env);
+                }
+            }
+        }catch(const JavaException& exn){
+            __exnHandler.handle(m_env, exn, nullptr);
+        } catch (const std::exception& e) {
+            qWarning("%s", e.what());
+        } catch (...) {
+        }
+    }
+
+    JNIEnv *m_env;
+    QWeakPointer<QtJambiLink> m_link;
+};
+
 InvalidateAfterUse::InvalidateAfterUse(JNIEnv *env, jobject object, bool checkJavaOwnership)
-    : m_env(env),
-      m_object(m_env->NewGlobalRef(object)),
-      m_checkJavaOwnership(checkJavaOwnership)
+    : p(new InvalidateObjectAfterUsePrivate(env, object, checkJavaOwnership))
+{}
+
+InvalidateAfterUse::InvalidateAfterUse(JNIEnv *env, QtJambiNativeID nativeId)
+    : p(new InvalidateNativeIDAfterUsePrivate(env, QtJambiLink::fromNativeId(nativeId)))
 {}
 
 InvalidateAfterUse::~InvalidateAfterUse()
 {
-    QtJambiExceptionInhibitor __exnHandler;
-    try{
-        invalidateJavaObject(m_env, m_object, m_checkJavaOwnership);
-    }catch(const JavaException& exn){
-        m_env->DeleteGlobalRef(m_object);
-        m_object = nullptr;
-        __exnHandler.handle(m_env, exn, nullptr);
-    } catch (const std::exception& e) {
-        qWarning("%s", e.what());
-    } catch (...) {
-    }
-    if(m_object)
-        m_env->DeleteGlobalRef(m_object);
+    delete p;
 }
 
 void InvalidateAfterUse::invalidate(JNIEnv *env, jobject java_object, bool checkJavaOwnership){
diff --git a/src/cpp/QtJambi/javainvalidate.h b/src/cpp/QtJambi/javainvalidate.h
index 97a51706..870a99b8 100644
--- a/src/cpp/QtJambi/javainvalidate.h
+++ b/src/cpp/QtJambi/javainvalidate.h
@@ -37,13 +37,12 @@ enum class QtJambiNativeID : jlong;
 class QTJAMBI_EXPORT InvalidateAfterUse{
 public:
     InvalidateAfterUse(JNIEnv *env, jobject object, bool checkJavaOwnership = true);
+    InvalidateAfterUse(JNIEnv *env, QtJambiNativeID nativeId);
     ~InvalidateAfterUse();
     static void invalidate(JNIEnv *env, jobject java_object, bool checkJavaOwnership = true);
     static void invalidate(JNIEnv *env, QtJambiNativeID nativeId);
 private:
-    JNIEnv *m_env;
-    jobject m_object;
-    bool m_checkJavaOwnership;
+    struct InvalidateAfterUsePrivate* p;
     Q_DISABLE_COPY_MOVE(InvalidateAfterUse)
 };
 
diff --git a/src/cpp/QtJambi/jna.cpp b/src/cpp/QtJambi/jna.cpp
index bc397557..1bf51b23 100644
--- a/src/cpp/QtJambi/jna.cpp
+++ b/src/cpp/QtJambi/jna.cpp
@@ -188,15 +188,16 @@ void convertArgumentList(QVector<QSharedDataPointer<Cleanup>>& cleaners, QVector
                                                                   0,
                                                                   __jni_env->NewStringUTF("UTF-8"));
                     ptr = *reinterpret_cast<QFunctionPointer*>(peer);
-                    QtJambiLink::createLinkForObject(
+                    QtJambiLink::createLinkForNativeObject(
                             __jni_env,
                             val,
                             new QFunctionPointer(ptr),
                             LINK_NAME_ARG(nullptr)
                             false,
                             false,
-                            &delete_callback_pointer
-                        )->setJavaOwnership(__jni_env);
+                            &delete_callback_pointer,
+                            QtJambiLink::Ownership::Java
+                        );
                     {
                         QWriteLocker locker(gPointerLock());
                         (*gObjectsByFunctionPointer())[quintptr(ptr)] << JObjectWrapper(__jni_env, val);
@@ -412,7 +413,7 @@ void convertArgumentList(QVector<QSharedDataPointer<Cleanup>>& cleaners, QVector
                                     successActions.append([array, control, length, val, typeId](JNIEnv * env){
                                         for(jsize i = 0; i<length; ++i){
                                             if(control[i] != array[i]){
-                                                env->SetObjectArrayElement(jobjectArray(val), i, QtJambiAPI::convertNativeToJavaObject(env, array[i], nullptr, *typeId, false, false));
+                                                env->SetObjectArrayElement(jobjectArray(val), i, internal_convertNativeToJavaObject(env, array[i], *typeId, nullptr, NativeToJavaConversionMode::None));
                                             }
                                         }
                                     });
@@ -444,7 +445,7 @@ void convertArgumentList(QVector<QSharedDataPointer<Cleanup>>& cleaners, QVector
                                 successActions.append([array, control, length, val, typeId](JNIEnv * env){
                                     for(jsize i = 0; i<length; ++i){
                                         if(control[i] != array[i]){
-                                            env->SetObjectArrayElement(jobjectArray(val), i, QtJambiAPI::convertNativeToJavaObject(env, array[i], nullptr, *typeId, false, false));
+                                            env->SetObjectArrayElement(jobjectArray(val), i, internal_convertNativeToJavaObject(env, array[i], *typeId, nullptr, NativeToJavaConversionMode::None));
                                         }
                                     }
                                 });
@@ -515,7 +516,7 @@ void convertArgumentList(QVector<QSharedDataPointer<Cleanup>>& cleaners, QVector
                                             continue;
                                         }
                                     }
-                                    jobject newObj = QtJambiAPI::convertNativeToJavaObject(env, array+size_t(i)*size, nullptr, *typeId, true, false);
+                                    jobject newObj = internal_convertNativeToJavaObject(env, array+size_t(i)*size, *typeId, nullptr, NativeToJavaConversionMode::MakeCopyOfValues);
                                     if(!Java::Runtime::Objects::equals(env, obj, newObj)){
                                         env->SetObjectArrayElement(jobjectArray(val), i, newObj);
                                     }
@@ -555,7 +556,7 @@ void convertArgumentList(QVector<QSharedDataPointer<Cleanup>>& cleaners, QVector
                                     successActions.append([array, control, length, val, typeId](JNIEnv * env){
                                         for(jsize i = 0; i<length; ++i){
                                             if(control[i] != array[i]){
-                                                env->SetObjectArrayElement(jobjectArray(val), i, QtJambiAPI::convertNativeToJavaObject(env, array[i], nullptr, *typeId, false, false));
+                                                env->SetObjectArrayElement(jobjectArray(val), i, internal_convertNativeToJavaObject(env, array[i], *typeId, nullptr, NativeToJavaConversionMode::None));
                                             }
                                         }
                                     });
@@ -563,7 +564,7 @@ void convertArgumentList(QVector<QSharedDataPointer<Cleanup>>& cleaners, QVector
                                     successActions.append([array, control, length, val, argClassType](JNIEnv * env){
                                         for(jsize i = 0; i<length; ++i){
                                             if(control[i] != array[i]){
-                                                env->SetObjectArrayElement(jobjectArray(val), i, QtJambiAPI::convertNativeToJavaObject(env, array[i], argClassType, false, false));
+                                                env->SetObjectArrayElement(jobjectArray(val), i, QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, array[i], argClassType));
                                             }
                                         }
                                     });
@@ -627,7 +628,7 @@ void convertArgumentList(QVector<QSharedDataPointer<Cleanup>>& cleaners, QVector
                                                     continue;
                                                 }
                                             }
-                                            jobject newObj = QtJambiAPI::convertNativeToJavaObject(env, array+size_t(i)*size, nullptr, *typeId, true, false);
+                                            jobject newObj = internal_convertNativeToJavaObject(env, array+size_t(i)*size, *typeId, nullptr, NativeToJavaConversionMode::MakeCopyOfValues);
                                             if(!Java::Runtime::Objects::equals(env, obj, newObj)){
                                                 env->SetObjectArrayElement(jobjectArray(val), i, newObj);
                                             }
@@ -645,7 +646,7 @@ void convertArgumentList(QVector<QSharedDataPointer<Cleanup>>& cleaners, QVector
                                                     continue;
                                                 }
                                             }
-                                            jobject newObj = QtJambiAPI::convertNativeToJavaObject(env, array+size_t(i)*size, argClassType, true, false);
+                                            jobject newObj = QtJambiAPI::convertNativeToJavaObjectAsCopy(env, array+size_t(i)*size, argClassType);
                                             if(!Java::Runtime::Objects::equals(env, obj, newObj)){
                                                 env->SetObjectArrayElement(jobjectArray(val), i, newObj);
                                             }
@@ -1569,24 +1570,24 @@ jobject CoreAPI::invokeFunctionPointer(JNIEnv * __jni_env, QFunctionPointer __qt
              || AbstractContainerAccess::isPointerType(QMetaType(registerMetaType(__jni_env, returnClassType, false, false)))){
         switch(length){
         case 0:
-            return QtJambiAPI::convertNativeToJavaObject(__jni_env, reinterpret_cast<void*(*)()>(*__qt_this)(), returnClassType, false);
+            return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, reinterpret_cast<void*(*)()>(*__qt_this)(), returnClassType);
         case 1:
             {
                 jobject arg = __jni_env->GetObjectArrayElement(arguments, 0);
                 if(Java::Runtime::Byte::isInstanceOf(__jni_env, arg)){
-                    return QtJambiAPI::convertNativeToJavaObject(__jni_env, reinterpret_cast<void*(*)(jbyte)>(*__qt_this)(qtjambi_cast<jbyte>(__jni_env, arg)), returnClassType, false);
+                    return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, reinterpret_cast<void*(*)(jbyte)>(*__qt_this)(qtjambi_cast<jbyte>(__jni_env, arg)), returnClassType);
                 }else if(Java::Runtime::Short::isInstanceOf(__jni_env, arg)){
-                    return QtJambiAPI::convertNativeToJavaObject(__jni_env, reinterpret_cast<void*(*)(jshort)>(*__qt_this)(qtjambi_cast<jshort>(__jni_env, arg)), returnClassType, false);
+                    return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, reinterpret_cast<void*(*)(jshort)>(*__qt_this)(qtjambi_cast<jshort>(__jni_env, arg)), returnClassType);
                 }else if(Java::Runtime::Integer::isInstanceOf(__jni_env, arg)){
-                    return QtJambiAPI::convertNativeToJavaObject(__jni_env, reinterpret_cast<void*(*)(jint)>(*__qt_this)(qtjambi_cast<jint>(__jni_env, arg)), returnClassType, false);
+                    return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, reinterpret_cast<void*(*)(jint)>(*__qt_this)(qtjambi_cast<jint>(__jni_env, arg)), returnClassType);
                 }else if(Java::Runtime::Long::isInstanceOf(__jni_env, arg)){
-                    return QtJambiAPI::convertNativeToJavaObject(__jni_env, reinterpret_cast<void*(*)(jlong)>(*__qt_this)(qtjambi_cast<jlong>(__jni_env, arg)), returnClassType, false);
+                    return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, reinterpret_cast<void*(*)(jlong)>(*__qt_this)(qtjambi_cast<jlong>(__jni_env, arg)), returnClassType);
                 }else if(Java::Runtime::Double::isInstanceOf(__jni_env, arg)){
-                    return QtJambiAPI::convertNativeToJavaObject(__jni_env, reinterpret_cast<void*(*)(double)>(*__qt_this)(qtjambi_cast<double>(__jni_env, arg)), returnClassType, false);
+                    return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, reinterpret_cast<void*(*)(double)>(*__qt_this)(qtjambi_cast<double>(__jni_env, arg)), returnClassType);
                 }else if(Java::Runtime::Float::isInstanceOf(__jni_env, arg)){
-                    return QtJambiAPI::convertNativeToJavaObject(__jni_env, reinterpret_cast<void*(*)(float)>(*__qt_this)(qtjambi_cast<float>(__jni_env, arg)), returnClassType, false);
+                    return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, reinterpret_cast<void*(*)(float)>(*__qt_this)(qtjambi_cast<float>(__jni_env, arg)), returnClassType);
                 }else if(Java::Runtime::Boolean::isInstanceOf(__jni_env, arg)){
-                    return QtJambiAPI::convertNativeToJavaObject(__jni_env, reinterpret_cast<void*(*)(bool)>(*__qt_this)(qtjambi_cast<bool>(__jni_env, arg)), returnClassType, false);
+                    return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, reinterpret_cast<void*(*)(bool)>(*__qt_this)(qtjambi_cast<bool>(__jni_env, arg)), returnClassType);
                 }else{
                     const QMetaType* metaType = qtjambi_cast<const QMetaType*>(__jni_env, Java::QtCore::QGenericArgument::metaType(__jni_env, arg));
                     if(Java::QtCore::QGenericArgument::isInstanceOf(__jni_env, arg))
@@ -1601,7 +1602,7 @@ jobject CoreAPI::invokeFunctionPointer(JNIEnv * __jni_env, QFunctionPointer __qt
 #endif
                                                                 )){
                             void*const* ptr = reinterpret_cast<void*const*>(variant.data());
-                            return QtJambiAPI::convertNativeToJavaObject(__jni_env, reinterpret_cast<void*(*)(const void*)>(*__qt_this)(*ptr), returnClassType, false);
+                            return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, reinterpret_cast<void*(*)(const void*)>(*__qt_this)(*ptr), returnClassType);
                         }
                     }
                 }
@@ -1785,9 +1786,13 @@ jobject CoreAPI::invokeFunctionPointer(JNIEnv * __jni_env, QFunctionPointer __qt
         }
 #endif
         if(returnTypeId){
-            result = QtJambiAPI::convertNativeToJavaObject(__jni_env, ptr, nullptr, *returnTypeId, !isAllocated, false);
+            result = internal_convertNativeToJavaObject(__jni_env, ptr, *returnTypeId, nullptr, !isAllocated ? NativeToJavaConversionMode::MakeCopyOfValues : NativeToJavaConversionMode::None);
         }else {
-            result = QtJambiAPI::convertNativeToJavaObject(__jni_env, ptr, returnClassType, !isAllocated, false);
+            if(!isAllocated){
+                result = QtJambiAPI::convertNativeToJavaObjectAsCopy(__jni_env, ptr, returnClassType);
+            }else{
+                result = QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, ptr, returnClassType);
+            }
         }
         if(result && returnClassType && __jni_env->IsInstanceOf(result, returnClassType)){
             if(QSharedPointer<QtJambiLink> link = QtJambiLink::findLinkForJavaInterface(__jni_env, result)){
@@ -1832,15 +1837,16 @@ jobject CoreAPI::invokeFunctionPointer(JNIEnv * __jni_env, QFunctionPointer __qt
                     }
                     if(!resolved){
                         result = Java::QtCore::QFunctionPointerUtil::createProxy(__jni_env, returnClassType);
-                        QtJambiLink::createLinkForObject(
+                        QtJambiLink::createLinkForNativeObject(
                                 __jni_env,
                                 result,
                                 new QFunctionPointer(fp),
                                 LINK_NAME_ARG(nullptr)
                                 false,
                                 false,
-                                &delete_callback_pointer
-                            )->setJavaOwnership(__jni_env);
+                                &delete_callback_pointer,
+                                QtJambiLink::Ownership::Java
+                            );
                         QWriteLocker locker(gPointerLock());
                         (*gObjectsByFunctionPointer())[quintptr(fp)] << JObjectWrapper(__jni_env, result);
                     }
@@ -1850,9 +1856,13 @@ jobject CoreAPI::invokeFunctionPointer(JNIEnv * __jni_env, QFunctionPointer __qt
                         _ptr = &ptr;
                     }
                     if(returnTypeId){
-                        result = QtJambiAPI::convertNativeToJavaObject(__jni_env, _ptr, nullptr, *returnTypeId, isFunctionPointer || (!isReferenceMetaType && (returnPointerOrReference==0 || returnPointerOrReference==-2)), false);
+                        result = internal_convertNativeToJavaObject(__jni_env, _ptr, *returnTypeId, nullptr, isFunctionPointer || (!isReferenceMetaType && (returnPointerOrReference==0 || returnPointerOrReference==-2)) ? NativeToJavaConversionMode::MakeCopyOfValues : NativeToJavaConversionMode::None);
                     }else {
-                        result = QtJambiAPI::convertNativeToJavaObject(__jni_env, _ptr, returnClassType, isFunctionPointer || (!isReferenceMetaType && (returnPointerOrReference==0 || returnPointerOrReference==-2)), false);
+                        if(isFunctionPointer || (!isReferenceMetaType && (returnPointerOrReference==0 || returnPointerOrReference==-2))){
+                            result = QtJambiAPI::convertNativeToJavaObjectAsCopy(__jni_env, _ptr, returnClassType);
+                        }else{
+                            result = QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, _ptr, returnClassType);
+                        }
                     }
                 }
             }
@@ -2131,15 +2141,16 @@ jobject CoreAPI::convertFunctionPointerReturn(JNIEnv * __jni_env, jobject return
                                                               __jni_env->NewStringUTF("UTF-8"));
                 ptr = *reinterpret_cast<QFunctionPointer*>(peer);
                 QFunctionPointer fp = reinterpret_cast<QFunctionPointer>(ptr);
-                QtJambiLink::createLinkForObject(
+                QtJambiLink::createLinkForNativeObject(
                         __jni_env,
                         result,
                         new QFunctionPointer(ptr),
                         LINK_NAME_ARG(nullptr)
                         false,
                         false,
-                        &delete_callback_pointer
-                    )->setJavaOwnership(__jni_env);
+                        &delete_callback_pointer,
+                        QtJambiLink::Ownership::Java
+                    );
                 {
                     QWriteLocker locker(gPointerLock());
                     (*gObjectsByFunctionPointer())[quintptr(fp)] << JObjectWrapper(__jni_env, result);
@@ -2956,15 +2967,16 @@ void CoreAPI::convertFunctionPointerParameters(JNIEnv * __jni_env, jobjectArray
                         }
                         if(!resolved){
                             convertedValue = Java::QtCore::QFunctionPointerUtil::createProxy(__jni_env, argClassType);
-                            QtJambiLink::createLinkForObject(
+                            QtJambiLink::createLinkForNativeObject(
                                     __jni_env,
                                     convertedValue,
                                     new QFunctionPointer(fp),
                                     LINK_NAME_ARG(nullptr)
                                     false,
                                     false,
-                                    &delete_callback_pointer
-                                )->setJavaOwnership(__jni_env);
+                                    &delete_callback_pointer,
+                                    QtJambiLink::Ownership::Java
+                                );
                             QWriteLocker locker(gPointerLock());
                             (*gObjectsByFunctionPointer())[quintptr(fp)] << JObjectWrapper(__jni_env, convertedValue);
                         }
@@ -2974,9 +2986,13 @@ void CoreAPI::convertFunctionPointerParameters(JNIEnv * __jni_env, jobjectArray
                             _ptr = &ptr;
                         }
                         if(typeId){
-                            convertedValue = QtJambiAPI::convertNativeToJavaObject(__jni_env, _ptr, nullptr, *typeId, isFunctionPointer || (!isReferenceMetaType && (argPointerOrReference==0 || argPointerOrReference==-2)), false);
+                            convertedValue = internal_convertNativeToJavaObject(__jni_env, _ptr, *typeId, nullptr, isFunctionPointer || (!isReferenceMetaType && (argPointerOrReference==0 || argPointerOrReference==-2)) ? NativeToJavaConversionMode::MakeCopyOfValues : NativeToJavaConversionMode::None);
                         }else {
-                            convertedValue = QtJambiAPI::convertNativeToJavaObject(__jni_env, _ptr, argClassType, isFunctionPointer || (!isReferenceMetaType && (argPointerOrReference==0 || argPointerOrReference==-2)), false);
+                            if(isFunctionPointer || (!isReferenceMetaType && (argPointerOrReference==0 || argPointerOrReference==-2))){
+                                convertedValue = QtJambiAPI::convertNativeToJavaObjectAsCopy(__jni_env, _ptr, argClassType);
+                            }else{
+                                convertedValue = QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, _ptr, argClassType);
+                            }
                         }
                     }
                 }else if(Java::QtJambi::QtEnumerator::isAssignableFrom(__jni_env, argClassType)){
@@ -3162,7 +3178,7 @@ jobject CoreAPI::castFunctionPointer(JNIEnv * env, jobject function, jclass func
                                                     }
                                                 }
                                             }
-                                            jobject result = QtJambiAPI::convertNativeToJavaObject(env, &ptr, nullptr, *targetTypeId, true, false);
+                                            jobject result = QtJambiAPI::convertNativeToJavaObjectAsCopy(env, &ptr, *targetTypeId);
                                             QWriteLocker locker(gPointerLock());
                                             (*gObjectsByFunctionPointer())[quintptr(ptr)] << JObjectWrapper(env, result);
                                             return result;
@@ -3213,15 +3229,16 @@ jobject CoreAPI::castFunctionPointer(JNIEnv * env, jobject function, jclass func
                                         exn2.raise();
                                     }
                                     jobject result = Java::QtCore::QFunctionPointerUtil::createProxy(env, functionalInterface);
-                                    QtJambiLink::createLinkForObject(
+                                    QtJambiLink::createLinkForNativeObject(
                                             env,
                                             result,
                                             new QFunctionPointer(ptr),
                                             LINK_NAME_ARG(nullptr)
                                             false,
                                             false,
-                                            &delete_callback_pointer
-                                        )->setJavaOwnership(env);
+                                            &delete_callback_pointer,
+                                            QtJambiLink::Ownership::Java
+                                        );
                                     QWriteLocker locker(gPointerLock());
                                     (*gObjectsByFunctionPointer())[quintptr(ptr)] << JObjectWrapper(env, result);
                                     return result;
@@ -3266,15 +3283,16 @@ jobject CoreAPI::castFunctionPointer(JNIEnv * env, jobject function, jclass func
                                 exn2.raise();
                             }
                             jobject result = Java::QtCore::QFunctionPointerUtil::createProxy(env, functionalInterface);
-                            QtJambiLink::createLinkForObject(
+                            QtJambiLink::createLinkForNativeObject(
                                     env,
                                     result,
                                     new QFunctionPointer(*ptr),
                                     LINK_NAME_ARG(nullptr)
                                     false,
                                     false,
-                                    &delete_callback_pointer
-                                )->setJavaOwnership(env);
+                                    &delete_callback_pointer,
+                                    QtJambiLink::Ownership::Java
+                                );
                             QWriteLocker locker(gPointerLock());
                             (*gObjectsByFunctionPointer())[quintptr(*ptr)] << JObjectWrapper(env, result);
                             return result;
diff --git a/src/cpp/QtJambi/jni_nativepointer.cpp b/src/cpp/QtJambi/jni_nativepointer.cpp
index 691178c6..1db5d0eb 100644
--- a/src/cpp/QtJambi/jni_nativepointer.cpp
+++ b/src/cpp/QtJambi/jni_nativepointer.cpp
@@ -156,15 +156,27 @@ bool isValueType(JNIEnv * __jni_env, jclass valueType, int* metaTypeId = nullptr
 
 extern "C" Q_DECL_EXPORT jobject JNICALL
 QTJAMBI_FUNCTION_PREFIX(Java_io_qt_QNativePointer_readObject)
-  (JNIEnv * __jni_env, jclass, jlong ptr, jclass valueType, jlong pos, jboolean readOnly)
+  (JNIEnv * __jni_env, jclass, jlong ptr, jclass valueType, jlong pos, jboolean readOnly, jint type, jlong size)
 {
     try{
-        int metaTypeId;
-        bool isValue = isValueType(__jni_env, valueType, &metaTypeId);
-        if(readOnly && !isValue){
-            JavaException::raiseIllegalArgumentException(__jni_env, "Cannot read non-value typed object from read-only buffer." QTJAMBI_STACKTRACEINFO);
+        if(QNativePointer::Type(type)==QNativePointer::Type::Pointer && size==-1){
+            if (QSharedPointer<QtJambiLink> link = QtJambiLink::findLinksForPointer(&reinterpret_cast<void **>(ptr)[pos]).value(0)){
+                return link->getJavaObjectLocalRef(__jni_env);
+            }
+            return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, &reinterpret_cast<void **>(ptr)[pos], valueType);
+        }else if(size>0){
+            void* _ptr = reinterpret_cast<char*>(ptr) + size_t(pos) * size;
+            int metaTypeId;
+            bool isValue = isValueType(__jni_env, valueType, &metaTypeId);
+            if(readOnly && !isValue){
+                JavaException::raiseIllegalArgumentException(__jni_env, "Cannot read non-value typed object from read-only buffer." QTJAMBI_STACKTRACEINFO);
+            }
+            if(isValue){
+                return QtJambiAPI::convertNativeToJavaObjectAsCopy(__jni_env, &_ptr, valueType);
+            }else{
+                return QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, &_ptr, valueType);
+            }
         }
-        return QtJambiAPI::convertNativeToJavaObject(__jni_env, &reinterpret_cast<void **>(ptr)[pos], valueType, isValue, false);
     }catch(const JavaException& exn){
         exn.raiseInJava(__jni_env);
     }
diff --git a/src/cpp/QtJambi/jni_utilities.cpp b/src/cpp/QtJambi/jni_utilities.cpp
index e3cf584b..f92caeec 100644
--- a/src/cpp/QtJambi/jni_utilities.cpp
+++ b/src/cpp/QtJambi/jni_utilities.cpp
@@ -37,6 +37,7 @@
 #include <stdio.h>
 #include <map>
 #include <initializer_list>
+#include "threadapi.h"
 #endif
 #include "java_p.h"
 #include "utils_p.h"
@@ -194,6 +195,26 @@ QTJAMBI_FUNCTION_PREFIX(Java_io_qt_QtUtilities_reinstallEventNotifyCallback)(JNI
     return false;
 }
 
+extern "C" Q_DECL_EXPORT void JNICALL
+QTJAMBI_FUNCTION_PREFIX(Java_io_qt_QtUtilities_uiThreadCheck)(JNIEnv *env, jclass)
+{
+    try{
+        QtJambiAPI::checkThreadUI(env, typeid(void));
+    }catch(const JavaException& exn){
+        exn.raiseInJava(env);
+    }
+}
+
+extern "C" Q_DECL_EXPORT void JNICALL
+QTJAMBI_FUNCTION_PREFIX(Java_io_qt_QtUtilities_threadCheck)(JNIEnv *env, jclass, QtJambiNativeID objectId)
+{
+    try{
+        QtJambiAPI::checkThread(env, QtJambiAPI::objectFromNativeId<QObject>(objectId));
+    }catch(const JavaException& exn){
+        exn.raiseInJava(env);
+    }
+}
+
 #if (defined(Q_OS_LINUX) || defined(Q_OS_MACOS)) && !defined(Q_OS_ANDROID)
 #if defined(signals)
 #undef signals
@@ -204,67 +225,83 @@ struct SignalCache : public QtJambiObjectData{
     ~SignalCache() override = default;
     QTJAMBI_OBJECTUSERDATA_ID_IMPL(static,)
     Q_DISABLE_COPY_MOVE(SignalCache)
-    static std::initializer_list<int> signals(){
-        static std::initializer_list<int> signals{SIGSEGV,SIGBUS,SIGFPE,SIGPIPE,SIGILL,SIGQUIT,SIGUSR2,SIGFPE};
-        return signals;
+    static std::vector<int> signals(){
+        return std::vector<int>{SIGSEGV,SIGBUS,SIGFPE,SIGPIPE,SIGILL,SIGQUIT,SIGUSR2,SIGFPE};
     }
     std::map<int,std::pair<int,void(*)(int)>> handlers;
 };
 #endif
 
 extern "C" Q_DECL_EXPORT bool JNICALL
-QTJAMBI_FUNCTION_PREFIX(Java_io_qt_QtUtilities_saveUnixSignalHandlers)(JNIEnv *)
+QTJAMBI_FUNCTION_PREFIX(Java_io_qt_QtUtilities_saveUnixSignalHandlers)(JNIEnv *env, jclass)
 {
 #if (defined(Q_OS_LINUX) || defined(Q_OS_MACOS)) && !defined(Q_OS_ANDROID)
-    if(QThread* mainThread = QCoreApplicationPrivate::theMainThread.loadRelaxed()){
-        std::unique_ptr<SignalCache> cache{new SignalCache()};
-        for(int s : SignalCache::signals()){
-            struct sigaction sa;
-            memset(&sa, 0, sizeof(sa));
-            if(sigaction(s, nullptr, &sa)==0){
-                qDebug("Signalhandler for %d saved.", s);
-                cache->handlers[s] = {sa.sa_flags, sa.sa_handler};
-            }else
-                qDebug("Unable to save signalhandler for %d.", s);
+    try{
+        QThread* mainThread = QCoreApplicationPrivate::theMainThread.loadRelaxed();
+        if(!mainThread){
+            ThreadAPI::initializeMainThread(env);
+            mainThread = QCoreApplicationPrivate::theMainThread.loadRelaxed();
+        }
+        if(mainThread){
+            std::unique_ptr<SignalCache> cache{new SignalCache()};
+            for(int s : SignalCache::signals()){
+                struct sigaction sa;
+                memset(&sa, 0, sizeof(sa));
+                if(sigaction(s, nullptr, &sa)==0){
+                    qDebug("Signalhandler for %d saved.", s);
+                    cache->handlers[s] = {sa.sa_flags, sa.sa_handler};
+                }else
+                    qDebug("Unable to save signalhandler for %d.", s);
+            }
+            QWriteLocker locker(QtJambiLinkUserData::lock());
+            QTJAMBI_SET_OBJECTUSERDATA(SignalCache, mainThread, cache.release());
+            return true;
         }
-        QWriteLocker locker(QtJambiLinkUserData::lock());
-        QTJAMBI_SET_OBJECTUSERDATA(SignalCache, mainThread, cache.release());
-        return true;
+    }catch(const JavaException& exn){
+        exn.raiseInJava(env);
     }
+#else
+    Q_UNUSED(env)
 #endif
     return false;
 }
 
 extern "C" Q_DECL_EXPORT bool JNICALL
-QTJAMBI_FUNCTION_PREFIX(Java_io_qt_QtUtilities_restoreUnixSignalHandlers)(JNIEnv *)
+QTJAMBI_FUNCTION_PREFIX(Java_io_qt_QtUtilities_restoreUnixSignalHandlers)(JNIEnv *env, jclass)
 {
 #if (defined(Q_OS_LINUX) || defined(Q_OS_MACOS)) && !defined(Q_OS_ANDROID)
-    if(QThread* mainThread = QCoreApplicationPrivate::theMainThread.loadRelaxed()){
-        std::unique_ptr<SignalCache> cache{nullptr};
-        {
-            QWriteLocker locker(QtJambiLinkUserData::lock());
-            cache.reset(QTJAMBI_GET_OBJECTUSERDATA(SignalCache, mainThread));
-            QTJAMBI_SET_OBJECTUSERDATA(SignalCache, mainThread, nullptr);
-        }
-        if(cache){
-            for(int s : SignalCache::signals()){
-                struct sigaction sa;
-                struct sigaction sa2;
-                memset(&sa, 0, sizeof(sa));
-                memset(&sa2, 0, sizeof(sa2));
-                sa.sa_flags = cache->handlers[s].first;
-                sa.sa_handler = cache->handlers[s].second;
-                if(sigaction(s, &sa, &sa2)==0){
-                    if(sa.sa_handler!=sa2.sa_handler)
-                        qDebug("Signalhandler for %d restored.", s);
-                    else
-                        qDebug("Signalhandler for %d unchanged.", s);
-                }else
-                    qDebug("Unable to restore signalhandler for %d.", s);
+    try{
+        if(QThread* mainThread = QCoreApplicationPrivate::theMainThread.loadRelaxed()){
+            std::unique_ptr<SignalCache> cache{nullptr};
+            {
+                QWriteLocker locker(QtJambiLinkUserData::lock());
+                cache.reset(QTJAMBI_GET_OBJECTUSERDATA(SignalCache, mainThread));
+                QTJAMBI_SET_OBJECTUSERDATA(SignalCache, mainThread, nullptr);
+            }
+            if(cache){
+                for(int s : SignalCache::signals()){
+                    struct sigaction sa;
+                    struct sigaction sa2;
+                    memset(&sa, 0, sizeof(sa));
+                    memset(&sa2, 0, sizeof(sa2));
+                    sa.sa_flags = cache->handlers[s].first;
+                    sa.sa_handler = cache->handlers[s].second;
+                    if(sigaction(s, &sa, &sa2)==0){
+                        if(sa.sa_handler!=sa2.sa_handler)
+                            qDebug("Signalhandler for %d restored.", s);
+                        else
+                            qDebug("Signalhandler for %d unchanged.", s);
+                    }else
+                        qDebug("Unable to restore signalhandler for %d.", s);
+                }
+                return true;
             }
-            return true;
         }
+    }catch(const JavaException& exn){
+        exn.raiseInJava(env);
     }
+#else
+    Q_UNUSED(env)
 #endif
     return false;
 }
diff --git a/src/cpp/QtJambi/jobjectwrapper.cpp b/src/cpp/QtJambi/jobjectwrapper.cpp
index bdb53e95..3d1f50ec 100644
--- a/src/cpp/QtJambi/jobjectwrapper.cpp
+++ b/src/cpp/QtJambi/jobjectwrapper.cpp
@@ -1280,7 +1280,7 @@ QDataStream &operator<<(QDataStream &out, const JObjectWrapper &myObj){
     if(JniEnvironment env{200}){
         QtJambiExceptionHandler __exnhandler;
         try{
-            jobject jstream = QtJambiAPI::convertNativeToJavaObject(env, &out, typeid(QDataStream), false);
+            jobject jstream = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, &out, typeid(QDataStream));
             QTJAMBI_INVALIDATE_AFTER_USE(env, jstream);
             Java::QtJambi::MetaTypeUtility::writeSerializableJavaObject(env, jstream, myObj.object());
         }catch(const JavaException& exn){
@@ -1294,7 +1294,7 @@ QDataStream &operator>>(QDataStream &in, JObjectWrapper &myObj){
     if(JniEnvironment env{200}){
         QtJambiExceptionHandler __exnhandler;
         try{
-            jobject jstream = QtJambiAPI::convertNativeToJavaObject(env, &in, typeid(QDataStream), false);
+            jobject jstream = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, &in, typeid(QDataStream));
             QTJAMBI_INVALIDATE_AFTER_USE(env, jstream);
             jobject res = Java::QtJambi::MetaTypeUtility::readSerializableJavaObject(env, jstream);
             if(!res){
@@ -1349,7 +1349,7 @@ QDebug operator<<(QDebug out, const JObjectWrapper &myObj){
     if(JniEnvironment env{200}){
         QtJambiExceptionHandler __exnhandler;
         try{
-            jobject dstream = QtJambiAPI::convertNativeToJavaObject(env, &out, typeid(QDebug), false);
+            jobject dstream = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, &out, typeid(QDebug));
             QTJAMBI_INVALIDATE_AFTER_USE(env, dstream);
             Java::QtJambi::MetaTypeUtility::debugObject(env, dstream, myObj.object());
         }catch(const JavaException& exn){
@@ -1359,12 +1359,14 @@ QDebug operator<<(QDebug out, const JObjectWrapper &myObj){
     return out;
 }
 
-hash_type qHash(const JObjectWrapper &value)
+hash_type qHash(const JObjectWrapper &value, hash_type seed)
 {
     if(JniEnvironment env{200}){
         if(value.object()){
-            return hash_type(Java::Runtime::Object::hashCode(env, value.object()));
+            if(seed)
+                return qHash(Java::Runtime::Object::hashCode(env, value.object()), seed);
+            else return hash_type(Java::Runtime::Object::hashCode(env, value.object()));
         }
     }
-    return 0;
+    return seed;
 }
diff --git a/src/cpp/QtJambi/jobjectwrapper.h b/src/cpp/QtJambi/jobjectwrapper.h
index 936504af..1984bd06 100644
--- a/src/cpp/QtJambi/jobjectwrapper.h
+++ b/src/cpp/QtJambi/jobjectwrapper.h
@@ -689,31 +689,31 @@ Q_DECLARE_METATYPE(JFloatArrayWrapper)
 typedef JArrayWrapper<jdouble> JDoubleArrayWrapper;
 Q_DECLARE_METATYPE(JDoubleArrayWrapper)
 
-QTJAMBI_EXPORT hash_type qHash(const JObjectWrapper &value);
+QTJAMBI_EXPORT hash_type qHash(const JObjectWrapper &value, hash_type seed = 0);
 
-inline hash_type qHash(const JObjectArrayWrapper &value){
-    return qHash(static_cast<const JObjectWrapper &>(value));
+inline hash_type qHash(const JObjectArrayWrapper &value, hash_type seed = 0){
+    return qHash(static_cast<const JObjectWrapper &>(value), seed);
 }
 
-inline hash_type qHash(const JIteratorWrapper &value){
-    return qHash(static_cast<const JObjectWrapper &>(value));
+inline hash_type qHash(const JIteratorWrapper &value, hash_type seed = 0){
+    return qHash(static_cast<const JObjectWrapper &>(value), seed);
 }
 
-inline hash_type qHash(const JMapWrapper &value){
-    return qHash(static_cast<const JObjectWrapper &>(value));
+inline hash_type qHash(const JMapWrapper &value, hash_type seed = 0){
+    return qHash(static_cast<const JObjectWrapper &>(value), seed);
 }
 
-inline hash_type qHash(const JCollectionWrapper &value){
-    return qHash(static_cast<const JObjectWrapper &>(value));
+inline hash_type qHash(const JCollectionWrapper &value, hash_type seed = 0){
+    return qHash(static_cast<const JObjectWrapper &>(value), seed);
 }
 
-inline hash_type qHash(const JEnumWrapper &value){
-    return qHash(static_cast<const JObjectWrapper &>(value));
+inline hash_type qHash(const JEnumWrapper &value, hash_type seed = 0){
+    return qHash(static_cast<const JObjectWrapper &>(value), seed);
 }
 
 template<typename JType>
-inline hash_type qHash(const JArrayWrapper<JType> &value){
-    return qHash(static_cast<const JObjectWrapper &>(value));
+inline hash_type qHash(const JArrayWrapper<JType> &value, hash_type seed = 0){
+    return qHash(static_cast<const JObjectWrapper &>(value), seed);
 }
 
 QTJAMBI_EXPORT QDataStream &operator<<(QDataStream &out, const JObjectWrapper &myObj);
diff --git a/src/cpp/QtJambi/qtjambi_cast_impl_container_associative.h b/src/cpp/QtJambi/qtjambi_cast_impl_container_associative.h
index 51597914..6653cfc3 100644
--- a/src/cpp/QtJambi/qtjambi_cast_impl_container_associative.h
+++ b/src/cpp/QtJambi/qtjambi_cast_impl_container_associative.h
@@ -90,11 +90,13 @@ class QAssociativeConstIteratorAccess : public AbstractConstIteratorAccess<Itera
 
     jobject value(JNIEnv * env, const void* ptr) override {
         const Iterator* iterator = static_cast<const Iterator*>(ptr);
-        return qtjambi_scoped_cast<false,jobject,typename std::add_const<decltype(iterator->value())>::type>::cast(env, iterator->value(), nullptr, nullptr);
+        const auto& value = iterator->value();
+        return qtjambi_scoped_cast<false,jobject,decltype(value)>::cast(env, value, nullptr, nullptr);
     }
     jobject key(JNIEnv * env, const void* ptr) override {
         const Iterator* iterator = static_cast<const Iterator*>(ptr);
-        return qtjambi_scoped_cast<false,jobject,typename std::add_const<decltype(iterator->key())>::type>::cast(env, iterator->key(), nullptr, nullptr);
+        const auto& key = iterator->key();
+        return qtjambi_scoped_cast<false,jobject,decltype(key)>::cast(env, key, nullptr, nullptr);
     }
 };
 
diff --git a/src/cpp/QtJambi/qtjambi_cast_impl_container_sequential.h b/src/cpp/QtJambi/qtjambi_cast_impl_container_sequential.h
index c59f1c7b..a5f99d56 100644
--- a/src/cpp/QtJambi/qtjambi_cast_impl_container_sequential.h
+++ b/src/cpp/QtJambi/qtjambi_cast_impl_container_sequential.h
@@ -88,7 +88,8 @@ class QSequentialConstIteratorAccess : public AbstractConstIteratorAccess<Iterat
 
     jobject value(JNIEnv * env, const void* ptr) override {
         const Iterator* iterator = static_cast<const Iterator*>(ptr);
-        return qtjambi_scoped_cast<false,jobject,typename std::add_const<decltype(*(*iterator))>::type>::cast(env, *(*iterator), nullptr, nullptr);
+        const auto& value = *(*iterator);
+        return qtjambi_scoped_cast<false,jobject,decltype(value)>::cast(env, value, nullptr, nullptr);
     }
 };
 
diff --git a/src/cpp/QtJambi/qtjambi_cast_impl_jnitype.h b/src/cpp/QtJambi/qtjambi_cast_impl_jnitype.h
index 3825d319..54a8b76f 100644
--- a/src/cpp/QtJambi/qtjambi_cast_impl_jnitype.h
+++ b/src/cpp/QtJambi/qtjambi_cast_impl_jnitype.h
@@ -126,11 +126,7 @@ struct qtjambi_jnitype_caster<true, has_scope,
     typedef typename std::add_pointer<NativeType_c>::type NativeType_in;
     typedef typename std::add_pointer<NativeType_c>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char* nativeTypeName, QtJambiScope*){
-        jobject result = nullptr;
-        if(!QtJambiAPI::convertNativeToJava(env, typeid(NativeType_ptr), nativeTypeName, reinterpret_cast<const void*>(in), true, false, result)){
-           JavaException::raiseIllegalArgumentException(env, QStringLiteral("Cannot cast to type %1").arg(QLatin1String(nativeTypeName ? nativeTypeName : QtJambiAPI::typeName(typeid(NativeType)).data())) QTJAMBI_STACKTRACEINFO );
-        }
-        return result;
+        return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, reinterpret_cast<const void*>(in), typeid(NativeType_ptr), nativeTypeName);
     }
 };
 
@@ -249,7 +245,7 @@ struct qtjambi_jnitype_qobject_decider_cast<true, has_scope, NativeType, true, i
     typedef typename std::add_pointer<NativeType_c>::type NativeType_out;
     typedef typename std::add_pointer<NativeType>::type NativeType_ptr;
     static jobject cast(JNIEnv * env, NativeType_in in, const char*, QtJambiScope* scope){
-        jobject o = QtJambiAPI::convertNativeToJavaObject(env, in, typeid(NativeType), false, false);
+        jobject o = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, in, typeid(NativeType));
         if(scope)
             scope->addObjectInvalidation(env, o, true, false);
         return o;
@@ -266,7 +262,7 @@ struct qtjambi_jnitype_qobject_decider_cast<true, has_scope, NativeType, true, i
     static jobject cast(JNIEnv * env, NativeType_in in, const char*, QtJambiScope* scope){
         jobject o = QtJambiShellInterface::getJavaObjectLocalRef(env, dynamic_cast<const QtJambiShellInterface*>(in));
         if(!o){
-            o = QtJambiAPI::convertNativeToJavaObject(env, in, typeid(NativeType), false, false);
+            o = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, in, typeid(NativeType));
             if(scope)
                 scope->addObjectInvalidation(env, o, true, false);
         }
@@ -301,16 +297,7 @@ struct qtjambi_jnitype_copy_assignable_decider_cast{
 template<bool has_scope,
          typename NativeType, bool is_const, bool is_reference, bool is_polymorphic>
 struct qtjambi_jnitype_qobject_decider_cast<true, has_scope, NativeType, false, is_const, is_reference, false, is_polymorphic>
-{
-    typedef typename std::conditional<is_const, typename std::add_const<NativeType>::type, NativeType>::type NativeType_c;
-    typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
-    typedef typename std::add_lvalue_reference<typename std::add_const<NativeType>::type>::type NativeType_in;
-    typedef typename std::add_lvalue_reference<NativeType_c>::type NativeType_out;
-    typedef typename std::add_pointer<NativeType>::type NativeType_ptr;
-    constexpr static jobject cast(JNIEnv * env, NativeType_in in, const char*, QtJambiScope*){
-        return QtJambiAPI::convertNativeToJavaObject(env, &in, typeid(NativeType), true, false);
-    }
-};
+        : qtjambi_move_or_copy_decider<NativeType, is_const>{};
 
 template<bool has_scope,
          bool is_const, bool is_reference>
@@ -361,32 +348,60 @@ struct qtjambi_jnitype_copy_assignable_decider_cast<has_scope, NativeType, is_co
     }
 };
 
-template<bool has_scope, bool is_const, bool is_reference>
-struct qtjambi_jnitype_use_pointer_decider_cast<has_scope, QVariant, is_const, is_reference, true /*dont_use_pointer*/>{
+// QVariant& and QString& are not light-weight
+template<bool has_scope, bool is_const>
+struct qtjambi_jnitype_use_pointer_decider_cast<has_scope, QVariant, is_const, true, true /*dont_use_pointer*/>
+        : qtjambi_jnitype_use_pointer_decider_cast<has_scope, QVariant, is_const, true, false>{};
+
+template<bool has_scope, bool is_const>
+struct qtjambi_jnitype_use_pointer_decider_cast<has_scope, QString, is_const, true, true /*dont_use_pointer*/>
+        : qtjambi_jnitype_use_pointer_decider_cast<has_scope, QString, is_const, true, false>{};
+
+template<bool has_scope, bool is_const>
+struct qtjambi_jnitype_use_pointer_decider_cast<has_scope, QVariant, is_const, false, true /*dont_use_pointer*/>{
     typedef typename std::conditional<is_const, typename std::add_const<QVariant>::type, QVariant>::type NativeType_c;
-    typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
-    Q_STATIC_ASSERT_X(!is_reference, "Cannot cast to QVariant reference");
 
-    static NativeType_cr cast(JNIEnv *env, jobject in, const char*, QtJambiScope*){
+    static NativeType_c cast(JNIEnv *env, jobject in, const char*, QtJambiScope*){
         return QtJambiAPI::convertJavaObjectToQVariant(env, in);
     }
 };
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #ifdef QABSTRACTITEMMODEL_H
-template<bool is_const, bool is_reference>
-struct qtjambi_jnitype_use_pointer_decider_cast<true, QModelRoleDataSpan, is_const, is_reference, true /*dont_use_pointer*/>{
-    typedef typename std::conditional<is_const, typename std::add_const<QModelRoleDataSpan>::type, QVariant>::type NativeType_c;
-    typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
-    Q_STATIC_ASSERT_X(!is_reference, "Cannot cast to QVariant reference");
+template<bool has_scope, bool is_const>
+struct qtjambi_jnitype_use_pointer_decider_cast<has_scope, QModelRoleDataSpan, is_const, false, true /*dont_use_pointer*/>{
+    typedef typename std::conditional<is_const, typename std::add_const<QModelRoleDataSpan>::type, QModelRoleDataSpan>::type NativeType_c;
+    typedef typename std::conditional<false, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
 
-    static QModelRoleDataSpan cast(JNIEnv *env, jobject in, const char*, QtJambiScope* scope){
+    Q_STATIC_ASSERT_X(has_scope, "Cannot cast to QModelRoleDataSpan reference without scope");
+    static NativeType_cr cast(JNIEnv *env, jobject in, const char*, QtJambiScope* scope){
+        if(!scope)
+            JavaException::raiseError(env, "Cannot cast to QModelRoleDataSpan reference without scope." QTJAMBI_STACKTRACEINFO );
         void *data(nullptr);
         qsizetype length(0);
         QtJambiAPI::convertJavaObjectToQModelRoleData(env, *scope, in, data, length);
         return QModelRoleDataSpan(reinterpret_cast<QModelRoleData*>(data), length);
     }
 };
+
+template<bool has_scope, bool is_const>
+struct qtjambi_jnitype_use_pointer_decider_cast<has_scope, QModelRoleDataSpan, is_const, true, true /*dont_use_pointer*/>{
+    typedef typename std::conditional<is_const, typename std::add_const<QModelRoleDataSpan>::type, QModelRoleDataSpan>::type NativeType_c;
+    typedef typename std::conditional<true, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
+
+    Q_STATIC_ASSERT_X(has_scope, "Cannot cast to QModelRoleDataSpan reference without scope");
+
+    static NativeType_cr cast(JNIEnv *env, jobject in, const char*, QtJambiScope* scope){
+        if(!scope)
+            JavaException::raiseError(env, "Cannot cast to QModelRoleDataSpan reference without scope." QTJAMBI_STACKTRACEINFO );
+        void *data(nullptr);
+        qsizetype length(0);
+        QtJambiAPI::convertJavaObjectToQModelRoleData(env, *scope, in, data, length);
+        QModelRoleDataSpan* buffer = new QModelRoleDataSpan(reinterpret_cast<QModelRoleData*>(data), length);
+        scope->addDeletion(buffer);
+        return *buffer;
+    }
+};
 #endif
 #endif
 
@@ -1320,7 +1335,7 @@ struct qtjambi_jnitype_caster<true, has_scope,
     typedef typename std::add_lvalue_reference<NativeType_c>::type NativeType_in;
     typedef NativeType_cr NativeType_out;
     constexpr static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
-        return QtJambiAPI::convertNativeToJavaObject(env, &in, typeid(NativeType), false, false);
+        return QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, &in, typeid(NativeType));
     }
 };
 
diff --git a/src/cpp/QtJambi/qtjambi_cast_impl_template1.h b/src/cpp/QtJambi/qtjambi_cast_impl_template1.h
index ce3297a0..03b8182e 100644
--- a/src/cpp/QtJambi/qtjambi_cast_impl_template1.h
+++ b/src/cpp/QtJambi/qtjambi_cast_impl_template1.h
@@ -113,29 +113,29 @@ struct qtjambi_jnitype_template1_cast<forward, has_scope,
 //template from any QFlags to jobject
 template<bool has_scope,
          bool is_pointer, bool is_const, bool is_reference,
-         typename T>
+         typename E>
 struct qtjambi_jnitype_template1_cast<true, has_scope,
                                  jobject,
                                  QFlags, is_pointer, is_const, is_reference,
-                                 T>{
-    typedef QFlags<T> NativeType;
+                                 E>{
+    typedef QFlags<E> NativeType;
     typedef typename std::conditional<is_const, typename std::add_const<NativeType>::type, NativeType>::type NativeType_c;
     typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     constexpr static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
-        return QtJambiAPI::convertQFlagsToJavaObject(env, deref_ptr<is_pointer,NativeType_c>::deref(in));
+        return QtJambiAPI::convertQFlagsToJavaObject<E>(env, deref_ptr<is_pointer,NativeType_c>::deref(in));
     }
 };
 
 template<bool has_scope,
          bool is_pointer, bool is_const, bool is_reference,
-         typename T>
+         typename E>
 struct qtjambi_jnitype_template1_cast<false, has_scope,
                                  jobject,
                                  QFlags, is_pointer, is_const, is_reference,
-                                 T>{
-    typedef QFlags<T> NativeType;
+                                 E>{
+    typedef QFlags<E> NativeType;
     typedef typename std::conditional<is_const, typename std::add_const<NativeType>::type, NativeType>::type NativeType_c;
     typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
@@ -143,7 +143,7 @@ struct qtjambi_jnitype_template1_cast<false, has_scope,
     static NativeType_out cast(JNIEnv *env, jobject in, const char*, QtJambiScope*){
         Q_STATIC_ASSERT_X(!is_reference, "Cannot cast to QFlags<T> &");
         Q_STATIC_ASSERT_X(!is_pointer, "Cannot cast to QFlags<T> *");
-        return QFlags<T>(QtJambiAPI::enumValue<int>(env, in));
+        return QFlags<E>(QtJambiAPI::enumValue<int>(env, in));
     }
 };
 
@@ -970,9 +970,7 @@ struct qtjambi_jnitype_template1_cast<true, has_scope,
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
          NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
-         jobject result = QtJambiAPI::convertNativeToJavaObject<QDBusReply<QVariant>>(env, QDBusReplyUtility<T>::createFrom(_in), false, false);
-         QtJambiAPI::setJavaOwnership(env, result);
-         return result;
+         return QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(env, QDBusReplyUtility<T>::createFrom(_in));
     }
 };
 
@@ -1012,9 +1010,7 @@ struct qtjambi_jnitype_template1_cast<true, has_scope,
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
          NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
-         jobject result = QtJambiAPI::convertNativeToJavaObject<QDBusReply<QVariant>>(env, QDBusReplyUtility<QVariant>::createFrom(_in), false, false);
-         QtJambiAPI::setJavaOwnership(env, result);
-         return result;
+         return QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(env, QDBusReplyUtility<QVariant>::createFrom(_in));
     }
 };
 
@@ -1041,7 +1037,7 @@ template<class T, bool = std::is_base_of<QObject,T>::value>
 struct QmlListPropertyUtility{
     static jobject toJavaObject(JNIEnv *env, const QQmlListProperty<T>& d)
     {
-        return QtJambiAPI::convertNativeToJavaObject(env, &d, typeid(QQmlListProperty<void>), true, false);
+        return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, &d, typeid(QQmlListProperty<void>));
     }
 };
 
@@ -1049,7 +1045,7 @@ template<class T>
 struct QmlListPropertyUtility<T,false>{
     static jobject toJavaObject(JNIEnv *env, const QQmlListProperty<T>& d)
     {
-        jobject result = QtJambiAPI::convertNativeToJavaObject(env, &d, typeid(QQmlListProperty<void>), true, false);
+        jobject result = QtJambiAPI::convertNativeToJavaObjectAsCopy(env, &d, typeid(QQmlListProperty<void>));
         jobject mt = qtjambi_cast<jobject>(env, QMetaType::fromType<T*>());
         QtJambiAPI::setQQmlListPropertyElementType(env, result, mt);
         return result;
@@ -1109,7 +1105,7 @@ struct qtjambi_jnitype_template1_cast<true, has_scope,
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
          NativeType_c* _in = ref_ptr<is_pointer, NativeType_c>::ref(in);
-         return QtJambiAPI::convertNativeToJavaObject(env, _in, qtjambi_type<NativeType>::id(), true);
+         return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, _in, qtjambi_type<NativeType>::id());
     }
 };
 
@@ -1145,7 +1141,7 @@ struct qtjambi_jnitype_template1_cast<true, has_scope,
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
          NativeType_c* _in = ref_ptr<is_pointer, NativeType_c>::ref(in);
-         return QtJambiAPI::convertNativeToJavaObject(env, _in, qtjambi_type<NativeType>::id(), true);
+         return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, _in, qtjambi_type<NativeType>::id());
     }
 };
 
@@ -1180,7 +1176,7 @@ struct qtjambi_jnitype_template1_cast<true, has_scope,
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
          NativeType_c* _in = ref_ptr<is_pointer, NativeType_c>::ref(in);
-         return QtJambiAPI::convertNativeToJavaObject(env, _in, qtjambi_type<NativeType>::id(), true);
+         return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, _in, qtjambi_type<NativeType>::id());
     }
 };
 
@@ -1215,7 +1211,7 @@ struct qtjambi_jnitype_template1_cast<true, has_scope,
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
          NativeType_c* _in = ref_ptr<is_pointer, NativeType_c>::ref(in);
-         return QtJambiAPI::convertNativeToJavaObject(env, _in, qtjambi_type<NativeType>::id(), true);
+         return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, _in, qtjambi_type<NativeType>::id());
     }
 };
 
@@ -1241,19 +1237,34 @@ static NativeType_out cast(JNIEnv *env, jobject in, const char*, QtJambiScope*){
 #ifdef QFUTUREINTERFACE_H
 
 template<bool has_scope,
-         bool is_pointer, bool is_const, bool is_reference>
+         bool is_const, bool is_reference>
 struct qtjambi_jnitype_template1_cast<true, has_scope,
                                  jobject,
-                                 QFutureInterface, is_pointer, is_const, is_reference,
+                                 QFutureInterface, true, is_const, is_reference,
                                  void>{
     typedef QFutureInterface<void> NativeType;
     typedef typename std::conditional<is_const, typename std::add_const<NativeType>::type, NativeType>::type NativeType_c;
     typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
-    typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
-    typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
+    typedef typename std::conditional<true, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
+    typedef typename std::conditional<true, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
-         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
-         return QtJambiAPI::convertNativeToJavaObject(env, &_in, true, false);
+         return QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, in);
+    }
+};
+
+template<bool has_scope,
+         bool is_const, bool is_reference>
+struct qtjambi_jnitype_template1_cast<true, has_scope,
+                                 jobject,
+                                 QFutureInterface, false, is_const, is_reference,
+                                 void>{
+    typedef QFutureInterface<void> NativeType;
+    typedef typename std::conditional<is_const, typename std::add_const<NativeType>::type, NativeType>::type NativeType_c;
+    typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
+    typedef typename std::conditional<false, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
+    typedef typename std::conditional<false, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
+    static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
+         return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, &in);
     }
 };
 
@@ -1275,19 +1286,34 @@ struct qtjambi_jnitype_template1_cast<false, has_scope,
 };
 
 template<bool has_scope,
-         bool is_pointer, bool is_const, bool is_reference>
+         bool is_const, bool is_reference>
 struct qtjambi_jnitype_template1_cast<true, has_scope,
                                  jobject,
-                                 QFutureInterface, is_pointer, is_const, is_reference,
+                                 QFutureInterface, true, is_const, is_reference,
                                  QVariant>{
     typedef QFutureInterface<QVariant> NativeType;
     typedef typename std::conditional<is_const, typename std::add_const<NativeType>::type, NativeType>::type NativeType_c;
     typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
-    typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
-    typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
+    typedef typename std::conditional<true, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
+    typedef typename std::conditional<true, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
-         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
-         return QtJambiAPI::convertNativeToJavaObject(env, &_in, true, false);
+         return QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, in);
+    }
+};
+
+template<bool has_scope,
+         bool is_const, bool is_reference>
+struct qtjambi_jnitype_template1_cast<true, has_scope,
+                                 jobject,
+                                 QFutureInterface, false, is_const, is_reference,
+                                 QVariant>{
+    typedef QFutureInterface<QVariant> NativeType;
+    typedef typename std::conditional<is_const, typename std::add_const<NativeType>::type, NativeType>::type NativeType_c;
+    typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
+    typedef typename std::conditional<false, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
+    typedef typename std::conditional<false, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
+    static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
+         return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, &in);
     }
 };
 
@@ -1357,8 +1383,8 @@ struct qtjambi_jnitype_template1_cast<true, has_scope,
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
          NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
-         QFutureInterface<QVariant> jpromise = convert_T_future_interface<T>(_in);
-         return QtJambiAPI::convertNativeToJavaObject(env, &jpromise, true, false);
+         QFutureInterface<QVariant>* jpromise = new QFutureInterface<QVariant>(convert_T_future_interface<T>(_in));
+         return QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(env, jpromise);
     }
 };
 
@@ -1544,6 +1570,23 @@ struct qtjambi_jnitype_template1_cast<false, has_scope,
                         JavaException::raiseIllegalArgumentException(env, QStringLiteral("Cannot cast QFutureWatcher<void> to %1.").arg(QLatin1String(QtJambiAPI::typeName(typeid(NativeType)))) QTJAMBI_STACKTRACEINFO );
                     }else{
                         QString baseType = QLatin1String(QtJambiAPI::typeName(typeid(*base)));
+#if defined(Q_OS_ANDROID)
+                        if(baseType==QLatin1String("QFutureInterface<QVariant>")
+                                || baseType==QLatin1String("QFutureInterface_shell<QVariant>")){
+                            QFutureInterface<QVariant>* futureInterface = reinterpret_cast<QFutureInterface<QVariant>*>(base);
+                            QFutureInterface<T> _futureInterface = convert_future_interface<T>(futureInterface, "QFutureWatcher");
+                            NativeType* _watcher = new NativeType(watcher);
+                            _watcher->setFuture(_futureInterface.future());
+                            return _watcher;
+                        }else if(baseType!=QString("QFutureInterface<void>")
+                                 && baseType!=QString("QFutureInterface_shell<void>")
+                                 && baseType==QString("QFutureInterface<%1>").arg(QLatin1String(QtJambiAPI::typeName(typeid(T))))){
+                            QFutureInterface<T>* futureInterface = reinterpret_cast<QFutureInterface<T>*>(base);
+                            NativeType* _watcher = new NativeType(watcher);
+                            _watcher->setFuture(QFuture<T>(futureInterface));
+                            return _watcher;
+                        }else
+#endif
                         if(baseType==QLatin1String("QFutureInterfaceBase")
                                 || baseType==QLatin1String("QFutureInterfaceBase_shell")){
                             JavaException::raiseIllegalArgumentException(env, QStringLiteral("Cannot cast QFutureWatcher<void> to %1.").arg(QLatin1String(QtJambiAPI::typeName(typeid(NativeType)))) QTJAMBI_STACKTRACEINFO );
@@ -1632,6 +1675,21 @@ struct qtjambi_jnitype_template1_cast<false, has_scope,
                 return *promise;
             }else if(base){
                 QString baseType = QLatin1String(QtJambiAPI::typeName(typeid(*base)));
+#if defined(Q_OS_ANDROID)
+                if(baseType==QLatin1String("QFutureInterface<QVariant>")
+                        || baseType==QLatin1String("QFutureInterface_shell<QVariant>")){
+                    QFutureInterface<QVariant>* futureInterface = reinterpret_cast<QFutureInterface<QVariant>*>(base);
+                    if(scope==nullptr)
+                        JavaException::raiseError(env, "Cannot cast QPromise without scope." QTJAMBI_STACKTRACEINFO );
+                    QFutureInterface<T> _futureInterface = convert_future_interface<T>(futureInterface, "QPromise");
+                    QPromise<T>* promise = new QPromise<T>(_futureInterface);
+                    QFutureInterface<T>* promiseContent = reinterpret_cast<QFutureInterface<T>*>(promise);
+                    scope->addDeletion(promiseContent);
+                    return *promise;
+                }else if(baseType==QString("QFutureInterface<%1>").arg(QLatin1String(QtJambiAPI::typeName(typeid(T))))){
+                    return *reinterpret_cast<QPromise<T>*>(promisePtr);
+                }else
+#endif
                 if(baseType==QLatin1String("QFutureInterfaceBase")
                         || baseType==QLatin1String("QFutureInterfaceBase_shell")){
                     JavaException::raiseIllegalArgumentException(env, QStringLiteral("Cannot cast QPromise<void> to %1.").arg(QLatin1String(QtJambiAPI::typeName(typeid(QPromise<T>)))) QTJAMBI_STACKTRACEINFO );
@@ -1669,6 +1727,25 @@ struct qtjambi_jnitype_template1_cast<false, has_scope,
                         return *promise;
                     }else{
                         QString baseType = QLatin1String(QtJambiAPI::typeName(typeid(*base)));
+#if defined(Q_OS_ANDROID)
+                        if(baseType==QLatin1String("QFutureInterface<QVariant>")
+                                || baseType==QLatin1String("QFutureInterface_shell<QVariant>")){
+                            QFutureInterface<QVariant>* futureInterface = reinterpret_cast<QFutureInterface<QVariant>*>(base);
+                            QFutureInterface<T> _futureInterface = convert_future_interface<T>(futureInterface, "QPromise");
+                            QPromise<T>* promise = new QPromise<T>(_futureInterface);
+                            QFutureInterface<T>* promiseContent = reinterpret_cast<QFutureInterface<T>*>(promise);
+                            scope->addDeletion(promiseContent);
+                            return *promise;
+                        }else if(baseType==QString("QFutureInterface<%1>").arg(QLatin1String(QtJambiAPI::typeName(typeid(T))))){
+                            QFutureInterface<T>* futureInterface = reinterpret_cast<QFutureInterface<T>*>(base);
+                            if(scope==nullptr)
+                                JavaException::raiseError(env, "Cannot cast QPromise without scope." QTJAMBI_STACKTRACEINFO );
+                            QPromise<T>* promise = new QPromise<T>(*futureInterface);
+                            QFutureInterface<T>* promiseContent = reinterpret_cast<QFutureInterface<T>*>(promise);
+                            scope->addDeletion(promiseContent);
+                            return *promise;
+                        }else
+#endif
                         if(baseType==QLatin1String("QFutureInterfaceBase")
                                 || baseType==QLatin1String("QFutureInterfaceBase_shell")){
                             JavaException::raiseIllegalArgumentException(env, QStringLiteral("Cannot cast QPromise<void> to %1.").arg(QLatin1String(QtJambiAPI::typeName(typeid(QPromise<T>)))) QTJAMBI_STACKTRACEINFO );
@@ -1836,6 +1913,15 @@ struct qtjambi_jnitype_template1_cast<false, has_scope,
         jobject futureInterface = QtJambiAPI::getQFutureInterfaceFromQFuture(env, in);
         QFutureInterfaceBase* base = qtjambi_scoped_cast<has_scope,QFutureInterfaceBase*,jobject>::cast(env, futureInterface, nullptr, scope);
         QFutureInterface<QVariant>* future = dynamic_cast<QFutureInterface<QVariant>*>(base);
+#if defined(Q_OS_ANDROID)
+        if(!future){
+            QString baseType = QLatin1String(QtJambiAPI::typeName(typeid(*base)));
+            if(baseType==QLatin1String("QFutureInterface<QVariant>")
+                    || baseType==QLatin1String("QFutureInterface_shell<QVariant>")){
+                future = reinterpret_cast<QFutureInterface<QVariant>*>(base);
+            }
+        }
+#endif
         QFutureInterface<T> tpromise = convert_future_interface<T>(future, "QFuture");
         QFuture<T> ft = tpromise.future();
         return create_container_pointer<is_pointer, is_const, is_reference, has_scope, NativeType>::create(env, scope, &ft);
@@ -2208,8 +2294,8 @@ struct qtjambi_jnitype_template1_cast<true, has_scope,
     static JniType cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         return QtJambiAPI::toJObjectArray(env, qtjambi_type<T>::id(), ref_ptr<is_pointer, NativeType_c>::ref(in), jsize(in.size()),
                        [scope](JNIEnv * env,const void* in, jsize index)->jobject{
-                            return qtjambi_scoped_cast<has_scope,jobject,T_const>::cast(env,
-                                        reinterpret_cast<typename std::add_const<NativeType>::type*>(in)->begin()[index], nullptr, scope);
+                            const auto& element = reinterpret_cast<const std::initializer_list<T>*>(in)->begin()[index];
+                            return qtjambi_scoped_cast<has_scope,jobject,decltype(element)>::cast(env, element, nullptr, scope);
                        }
                    );
     }
@@ -3047,26 +3133,31 @@ struct qtjambi_jnitype_template1_cast<false, has_scope,
 //template from any std::function to jobject
 
 template<bool has_scope,
-         bool is_pointer, bool is_const, bool is_reference,
+         bool is_const, bool is_reference,
          typename T>
 struct qtjambi_jnitype_template1_cast<true, has_scope,
                                  jobject,
-                                 std::function, is_pointer, is_const, is_reference,
+                                 std::function, true, is_const, is_reference,
                                  T>{
     typedef std::function<T> NativeType;
     typedef typename std::conditional<is_const, typename std::add_const<NativeType>::type, NativeType>::type NativeType_c;
     typedef typename std::conditional<is_reference, typename std::add_lvalue_reference<NativeType_c>::type, NativeType_c>::type NativeType_cr;
-    typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
-    typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
-    static jobject cast(JNIEnv *env, NativeType_in in, const char* nativeTypeName, QtJambiScope*){
-        jobject result = nullptr;
-        if(!QtJambiAPI::convertNativeToJava(env, typeid(NativeType), nativeTypeName, &deref_ptr<is_pointer,NativeType_c>::deref(in), true, false, result)){
-           JavaException::raiseIllegalArgumentException(env, QStringLiteral("Cannot cast native type %1 to Java object.").arg(QLatin1String(QtJambiAPI::typeName(typeid(NativeType)))) QTJAMBI_STACKTRACEINFO );
-        }
-        return result;
+    typedef typename std::conditional<true, typename std::add_pointer<NativeType_c>::type, typename std::add_lvalue_reference<NativeType_c>::type>::type NativeType_in;
+    typedef typename std::conditional<true, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
+    static jobject cast(JNIEnv *env, NativeType_in in, const char* nativeTypeName, QtJambiScope* scope){
+        return in ? qtjambi_move_or_copy_decider<NativeType, is_const>::cast(env, *in, nativeTypeName, scope) : nullptr;
     }
 };
 
+template<bool has_scope,
+         bool is_const, bool is_reference,
+         typename T>
+struct qtjambi_jnitype_template1_cast<true, has_scope,
+                                 jobject,
+                                 std::function, false, is_const, is_reference,
+                                 T>
+        : qtjambi_move_or_copy_decider<std::function<T>, is_const>{};
+
 template<bool has_scope,
          bool is_pointer, bool is_const, bool is_reference,
          typename T>
diff --git a/src/cpp/QtJambi/qtjambi_cast_impl_template2.h b/src/cpp/QtJambi/qtjambi_cast_impl_template2.h
index ae1383cd..ccb6b9d9 100644
--- a/src/cpp/QtJambi/qtjambi_cast_impl_template2.h
+++ b/src/cpp/QtJambi/qtjambi_cast_impl_template2.h
@@ -62,7 +62,7 @@ struct qtjambi_jnitype_template2_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaArrayList(env, jint(_in.size()));
-        for(decltype(*(_in.begin())) entry : _in){
+        for(const auto& entry : _in){
             jobject _entry = qtjambi_scoped_cast<has_scope,jobject,decltype(entry)>::cast(env, entry, nullptr, scope);
             QtJambiAPI::addToJavaCollection(env, list, _entry);
         }
@@ -112,7 +112,7 @@ struct qtjambi_jnitype_template2_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaArrayList(env, jint(_in.size()));
-        for(decltype(*(_in.begin())) entry : _in){
+        for(const auto& entry : _in){
             jobject _entry = qtjambi_scoped_cast<has_scope,jobject,decltype(entry)>::cast(env, entry, nullptr, scope);
             QtJambiAPI::addToJavaCollection(env, list, _entry);
         }
@@ -163,7 +163,7 @@ struct qtjambi_jnitype_template2_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaArrayList(env, jint(_in.size()));
-        for(decltype(*(_in.begin())) entry : _in){
+        for(const auto& entry : _in){
             jobject _entry = qtjambi_scoped_cast<has_scope,jobject,decltype(entry)>::cast(env, entry, nullptr, scope);
             QtJambiAPI::addToJavaCollection(env, list, _entry);
         }
@@ -358,7 +358,7 @@ struct qtjambi_jnitype_template2_cast<true, has_scope,
     typedef typename std::conditional<is_pointer, typename std::add_pointer<NativeType_c>::type, NativeType_cr>::type NativeType_out;
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope*){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
-        return QtJambiAPI::convertNativeToJavaObject(env, &_in, typeid(QUrl::FormattingOptions), true, false);
+        return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, &_in, typeid(QUrl::FormattingOptions));
     }
 };
 
diff --git a/src/cpp/QtJambi/qtjambi_cast_impl_template3.h b/src/cpp/QtJambi/qtjambi_cast_impl_template3.h
index 2fe0abe7..4f2ddd35 100644
--- a/src/cpp/QtJambi/qtjambi_cast_impl_template3.h
+++ b/src/cpp/QtJambi/qtjambi_cast_impl_template3.h
@@ -59,7 +59,7 @@ struct qtjambi_jnitype_template3_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaHashSet(env);
-        for(decltype(*(_in.begin())) entry : _in){
+        for(const auto& entry : _in){
             jobject _entry = qtjambi_scoped_cast<has_scope,jobject,decltype(entry)>::cast(env, entry, nullptr, scope);
             QtJambiAPI::addToJavaCollection(env, list, _entry);
         }
@@ -108,7 +108,7 @@ struct qtjambi_jnitype_template3_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaHashSet(env);
-        for(decltype(*(_in.begin())) entry : _in){
+        for(const auto& entry : _in){
             jobject _entry = qtjambi_scoped_cast<has_scope,jobject,decltype(entry)>::cast(env, entry, nullptr, scope);
             QtJambiAPI::addToJavaCollection(env, list, _entry);
         }
diff --git a/src/cpp/QtJambi/qtjambi_cast_impl_template4.h b/src/cpp/QtJambi/qtjambi_cast_impl_template4.h
index a929099c..f6e35917 100644
--- a/src/cpp/QtJambi/qtjambi_cast_impl_template4.h
+++ b/src/cpp/QtJambi/qtjambi_cast_impl_template4.h
@@ -58,9 +58,11 @@ struct qtjambi_jnitype_template4_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaHashMap(env, jint(_in.size()));
-        for (auto it = _in.begin(); it != _in.end(); ++it) {
-            jobject first = qtjambi_scoped_cast<has_scope,jobject,decltype(it->first)>::cast(env, it->first, nullptr, scope);
-            jobject second = qtjambi_scoped_cast<has_scope,jobject,decltype(it->second)>::cast(env, it->second, nullptr, scope);
+        for (auto it = _in.cbegin(); it != _in.cend(); ++it) {
+            const auto& _first = it->first;
+            const auto& _second = it->second;
+            jobject first = qtjambi_scoped_cast<has_scope,jobject,decltype(_first)>::cast(env, _first, nullptr, scope);
+            jobject second = qtjambi_scoped_cast<has_scope,jobject,decltype(_second)>::cast(env, _second, nullptr, scope);
             QtJambiAPI::putJavaMap(env, list, first, second);
         }
         return list;
@@ -110,9 +112,11 @@ struct qtjambi_jnitype_template4_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaHashMap(env, jint(_in.size()));
-        for (auto it = _in.begin(); it != _in.end(); ++it) {
-            jobject first = qtjambi_scoped_cast<has_scope,jobject,decltype(it->first)>::cast(env, it->first, nullptr, scope);
-            jobject second = qtjambi_scoped_cast<has_scope,jobject,decltype(it->second)>::cast(env, it->second, nullptr, scope);
+        for (auto it = _in.cbegin(); it != _in.cend(); ++it) {
+            const auto& _first = it->first;
+            const auto& _second = it->second;
+            jobject first = qtjambi_scoped_cast<has_scope,jobject,decltype(_first)>::cast(env, _first, nullptr, scope);
+            jobject second = qtjambi_scoped_cast<has_scope,jobject,decltype(_second)>::cast(env, _second, nullptr, scope);
             QtJambiAPI::putJavaMap(env, list, first, second);
         }
         return list;
@@ -163,7 +167,7 @@ struct qtjambi_jnitype_template4_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaHashSet(env);
-        for(decltype(*(_in.begin())) entry : _in){
+        for(const auto& entry : _in){
             jobject _entry = qtjambi_scoped_cast<has_scope,jobject,decltype(entry)>::cast(env, entry, nullptr, scope);
             QtJambiAPI::addToJavaCollection(env, list, _entry);
         }
diff --git a/src/cpp/QtJambi/qtjambi_cast_impl_template5.h b/src/cpp/QtJambi/qtjambi_cast_impl_template5.h
index bdd950c0..76483b40 100644
--- a/src/cpp/QtJambi/qtjambi_cast_impl_template5.h
+++ b/src/cpp/QtJambi/qtjambi_cast_impl_template5.h
@@ -30,9 +30,11 @@ struct qtjambi_jnitype_template5_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaHashMap(env, jint(_in.size()));
-        for (auto it = _in.begin(); it != _in.end(); ++it) {
-            jobject first = qtjambi_scoped_cast<has_scope,jobject,decltype(it->first)>::cast(env, it->first, nullptr, scope);
-            jobject second = qtjambi_scoped_cast<has_scope,jobject,decltype(it->second)>::cast(env, it->second, nullptr, scope);
+        for (auto it = _in.cbegin(); it != _in.cend(); ++it) {
+            const auto& _first = it->first;
+            const auto& _second = it->second;
+            jobject first = qtjambi_scoped_cast<has_scope,jobject,decltype(_first)>::cast(env, _first, nullptr, scope);
+            jobject second = qtjambi_scoped_cast<has_scope,jobject,decltype(_second)>::cast(env, _second, nullptr, scope);
             QtJambiAPI::putJavaMap(env, list, first, second);
         }
         return list;
@@ -82,9 +84,11 @@ struct qtjambi_jnitype_template5_cast<true, has_scope,
     static jobject cast(JNIEnv *env, NativeType_in in, const char*, QtJambiScope* scope){
         NativeType_c& _in = deref_ptr<is_pointer, NativeType_c>::deref(in);
         jobject list = QtJambiAPI::newJavaHashMap(env, jint(_in.size()));
-        for (auto it = _in.begin(); it != _in.end(); ++it) {
-            jobject first = qtjambi_scoped_cast<has_scope,jobject,decltype(it->first)>::cast(env, it->first, nullptr, scope);
-            jobject second = qtjambi_scoped_cast<has_scope,jobject,decltype(it->second)>::cast(env, it->second, nullptr, scope);
+        for (auto it = _in.cbegin(); it != _in.cend(); ++it) {
+            const auto& _first = it->first;
+            const auto& _second = it->second;
+            jobject first = qtjambi_scoped_cast<has_scope,jobject,decltype(_first)>::cast(env, _first, nullptr, scope);
+            jobject second = qtjambi_scoped_cast<has_scope,jobject,decltype(_second)>::cast(env, _second, nullptr, scope);
             QtJambiAPI::putJavaMap(env, list, first, second);
         }
         return list;
diff --git a/src/cpp/QtJambi/qtjambi_cast_impl_util.h b/src/cpp/QtJambi/qtjambi_cast_impl_util.h
index 2dec640e..6c64f1c6 100644
--- a/src/cpp/QtJambi/qtjambi_cast_impl_util.h
+++ b/src/cpp/QtJambi/qtjambi_cast_impl_util.h
@@ -610,6 +610,30 @@ struct create_container_pointer<false, false, true, false, Container, has_defaul
     }
 };
 
+template<typename NativeType, bool is_const, bool is_movable = std::is_move_constructible<NativeType>::value>
+struct qtjambi_move_or_copy_decider{
+    constexpr static jobject cast(JNIEnv * env, const NativeType& in, const char* nativeTypeName, QtJambiScope*){
+        return QtJambiAPI::convertNativeToJavaObjectAsCopy(env, &in, typeid(NativeType), nativeTypeName);
+    }
+};
+
+template<typename NativeType>
+struct qtjambi_move_or_copy_decider<NativeType,false,true>{
+    static jobject cast(JNIEnv * env, NativeType& in, const char* nativeTypeName, QtJambiScope*){
+        NativeType* ptr = new NativeType(std::move(in));
+        try{
+            jobject out = QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(env, ptr, typeid(NativeType), nativeTypeName);
+            if(!out)
+                delete ptr;
+            return out;
+        }catch(const JavaException& exn){
+            delete ptr;
+            exn.raise();
+            return nullptr;
+        }
+    }
+};
+
 } // namespace QtJambiPrivate
 
 #endif // QTJAMBI_CAST_IMPL_UTIL_H
diff --git a/src/cpp/QtJambi/qtjambiapi.cpp b/src/cpp/QtJambi/qtjambiapi.cpp
index 2ab4ed8b..8189325b 100644
--- a/src/cpp/QtJambi/qtjambiapi.cpp
+++ b/src/cpp/QtJambi/qtjambiapi.cpp
@@ -328,6 +328,14 @@ QByteArray QtJambiAPI::typeName(const std::type_info& typeId){
     return typeName;
 }
 
+void QtJambiAPI::registerDependency(JNIEnv *env, jobject dependentObject, QtJambiNativeID nativeId){
+    QSharedPointer<QtJambiLink> _dependentLink = QtJambiLink::findLinkForJavaInterface(env, dependentObject);
+    QSharedPointer<QtJambiLink> _ownerLink = QtJambiLink::fromNativeId(nativeId);
+    if(_dependentLink && _ownerLink){
+        _ownerLink->registerDependentObject(_dependentLink);
+    }
+}
+
 void QtJambiAPI::setJavaOwnershipForTopLevelObject(JNIEnv *env, QObject* qobject)
 {
     if(qobject && !qobject->parent()){
@@ -478,7 +486,27 @@ void QtJambiAPI::checkPointer(JNIEnv *env, const void* ptr, const std::type_info
 jobjectArray QtJambiAPI::createObjectArray(JNIEnv *env, const std::type_info& componentType, jsize size){
     jclass arrayElementType = JavaAPI::resolveClass(env, getJavaInterfaceName(componentType));
     JavaException::check(env QTJAMBI_STACKTRACEINFO );
-    Q_ASSERT(arrayElementType);
+    Q_ASSERT(arrayElementType && !Java::Runtime::Class::isPrimitive(env, arrayElementType));
+    if(Java::Runtime::Class::isPrimitive(env, arrayElementType)){
+        if(Java::Runtime::Integer::isPrimitiveType(env, arrayElementType))
+            arrayElementType = Java::Runtime::Integer::getClass(env);
+        else if(Java::Runtime::Short::isPrimitiveType(env, arrayElementType))
+            arrayElementType = Java::Runtime::Short::getClass(env);
+        else if(Java::Runtime::Byte::isPrimitiveType(env, arrayElementType))
+            arrayElementType = Java::Runtime::Byte::getClass(env);
+        else if(Java::Runtime::Long::isPrimitiveType(env, arrayElementType))
+            arrayElementType = Java::Runtime::Long::getClass(env);
+        else if(Java::Runtime::Float::isPrimitiveType(env, arrayElementType))
+            arrayElementType = Java::Runtime::Float::getClass(env);
+        else if(Java::Runtime::Double::isPrimitiveType(env, arrayElementType))
+            arrayElementType = Java::Runtime::Double::getClass(env);
+        else if(Java::Runtime::Character::isPrimitiveType(env, arrayElementType))
+            arrayElementType = Java::Runtime::Character::getClass(env);
+        else if(Java::Runtime::Boolean::isPrimitiveType(env, arrayElementType))
+            arrayElementType = Java::Runtime::Boolean::getClass(env);
+        else if(Java::Runtime::Void::isPrimitiveType(env, arrayElementType))
+            arrayElementType = Java::Runtime::Void::getClass(env);
+    }
     jobjectArray array = env->NewObjectArray(jsize(size), arrayElementType, nullptr);
     JavaException::check(env QTJAMBI_STACKTRACEINFO );
     return array;
@@ -962,7 +990,7 @@ jobject QtJambiAPI::createQPromise(JNIEnv* env, jobject futureInterface, const v
         }
     }
     jobject result = Java::QtCore::QPromise::newInstance(env, futureInterface, true);
-    jobject ni = QtJambiAPI::convertNativeToJavaObject(env, promise, Java::QtCore::QPromise$NativeInstance::getClass(env), false, false);
+    jobject ni = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, promise, Java::QtCore::QPromise$NativeInstance::getClass(env));
     if(scope){
         JObjectWrapper _result(env, result);
         scope->addFinalAction([env, _result](){
diff --git a/src/cpp/QtJambi/qtjambiapi.h b/src/cpp/QtJambi/qtjambiapi.h
index 5b6e2079..8f0e6ff1 100644
--- a/src/cpp/QtJambi/qtjambiapi.h
+++ b/src/cpp/QtJambi/qtjambiapi.h
@@ -110,10 +110,6 @@ QTJAMBI_EXPORT bool convertJavaToNative(JNIEnv *env, const std::type_info& typeI
 
 QTJAMBI_EXPORT bool convertJavaToNative(JNIEnv *env, const std::type_info& typeId, const char* typeName, jobject java_object, void * output, QtJambiScope* scope = nullptr);
 
-QTJAMBI_EXPORT bool convertNativeToJava(JNIEnv *env, const std::type_info& typeId, const char* qtName, const char* javaName, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jobject& output);
-
-QTJAMBI_EXPORT bool convertNativeToJava(JNIEnv *env, const std::type_info& typeId, const char* typeName, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jobject& output);
-
 QTJAMBI_EXPORT bool isShell(QtJambiNativeID nativeId);
 
 QTJAMBI_EXPORT bool javaObjectHasShell(JNIEnv *env, jobject object);
@@ -306,26 +302,42 @@ QTJAMBI_EXPORT bool isQByteArrayViewObject(JNIEnv *env, jobject obj);
 
 QTJAMBI_EXPORT bool isJavaString(JNIEnv *env, jobject obj);
 
-QTJAMBI_EXPORT jobject convertNativeToJavaObject(JNIEnv *env, const void *qt_object, const std::type_info& typeId, bool makeCopyOfValueTypes, bool cppOwnership = false);
+QTJAMBI_EXPORT jobject convertNativeToJavaOwnedObjectAsWrapper(JNIEnv *env, const void *qt_object, const std::type_info& typeId, const char *nativeTypeName = nullptr);
+
+QTJAMBI_EXPORT jobject convertNativeToJavaOwnedObjectAsWrapper(JNIEnv *env, const void *qt_object, jclass clazz);
 
-QTJAMBI_EXPORT jobject convertNativeToJavaObject(JNIEnv *env, const void *qt_object, const char *className, const std::type_info& typeId, bool makeCopyOfValueTypes, bool cppOwnership = false);
+QTJAMBI_EXPORT jobject convertNativeToJavaObjectAsWrapper(JNIEnv *env, const void *qt_object, const std::type_info& typeId, const char *nativeTypeName = nullptr);
 
-QTJAMBI_EXPORT jobject convertNativeToJavaObject(JNIEnv *env, const void *qt_object, const char *className, bool makeCopyOfValueTypes, bool cppOwnership = false);
+QTJAMBI_EXPORT jobject convertNativeToJavaObjectAsWrapper(JNIEnv *env, const void *qt_object, jclass clazz);
 
-QTJAMBI_EXPORT jobject convertNativeToJavaObject(JNIEnv *env, const void *qt_object, jclass clazz, bool makeCopyOfValueTypes, bool cppOwnership = false);
+QTJAMBI_EXPORT jobject convertNativeToJavaObjectAsCopy(JNIEnv *env, const void *qt_object, const std::type_info& typeId, const char *nativeTypeName = nullptr);
+
+QTJAMBI_EXPORT jobject convertNativeToJavaObjectAsCopy(JNIEnv *env, const void *qt_object, jclass clazz);
 
 template<typename T>
-jobject convertNativeToJavaObject(JNIEnv *env, const T *qt_object, bool makeCopyOfValueTypes, bool cppOwnership = false)
+jobject convertNativeToJavaOwnedObjectAsWrapper(JNIEnv *env, const T *qt_object, const char *nativeTypeName = nullptr)
 {
-    return convertNativeToJavaObject(env, qt_object, typeid(T), makeCopyOfValueTypes, cppOwnership);
+    return convertNativeToJavaOwnedObjectAsWrapper(env, qt_object, typeid(T), nativeTypeName);
 }
 
 template<typename T>
-jobject convertNativeToJavaObject(JNIEnv *env, const T *qt_object, const char *className, bool makeCopyOfValueTypes, bool cppOwnership = false)
+jobject convertNativeToJavaObjectAsWrapper(JNIEnv *env, const T *qt_object, const char *nativeTypeName = nullptr)
 {
-    return convertNativeToJavaObject(env, qt_object, className, typeid(T), makeCopyOfValueTypes, cppOwnership);
+    return convertNativeToJavaObjectAsWrapper(env, qt_object, typeid(T), nativeTypeName);
 }
 
+template<typename T>
+jobject convertNativeToJavaObjectAsCopy(JNIEnv *env, const T *qt_object, const char *nativeTypeName = nullptr)
+{
+    return convertNativeToJavaObjectAsCopy(env, qt_object, typeid(T), nativeTypeName);
+}
+
+template<typename Ret, typename... Args>
+struct FunctionType{
+    typedef Ret(*type)(Args...);
+    typedef Ret(signature)(Args...);
+};
+
 QTJAMBI_EXPORT jobject convertQObjectToJavaObject(JNIEnv *env, const QObject *qt_object, const char *className);
 
 QTJAMBI_EXPORT jobject convertQObjectToJavaObject(JNIEnv *env, const QObject *qt_object, jclass clazz);
@@ -341,9 +353,9 @@ jobject convertQObjectToJavaObject(JNIEnv *env, const O *qt_object)
 QTJAMBI_EXPORT jobject convertQFlagsToJavaObject(JNIEnv *env, int qt_flags, jclass cls);
 
 template<typename E>
-jobject convertQFlagsToJavaObject(JNIEnv *env, const QFlags<E>& qt_flags)
+jobject convertQFlagsToJavaObject(JNIEnv *env, QFlags<E> qt_flags)
 {
-    return convertNativeToJavaObject(env, &qt_flags, typeid(QFlags<E>), true, false);
+    return convertNativeToJavaObjectAsCopy(env, &qt_flags, typeid(QFlags<E>));
 }
 
 QTJAMBI_EXPORT jobject convertEnumToJavaObject(JNIEnv *env, qint32 qt_enum, jclass cls);
@@ -365,7 +377,7 @@ QTJAMBI_EXPORT jobject convertEnumToJavaObject(JNIEnv *env, quint64 qt_enum, jcl
 template<typename E>
 jobject convertEnumToJavaObject(JNIEnv *env, E qt_enum)
 {
-    return convertNativeToJavaObject(env, &qt_enum, typeid(E), true, false);
+    return convertNativeToJavaObjectAsCopy(env, &qt_enum, typeid(E));
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -504,6 +516,8 @@ QTJAMBI_EXPORT void setCppOwnershipForTopLevelObject(JNIEnv *env, QObject* qobje
 
 QTJAMBI_EXPORT void setDefaultOwnershipForTopLevelObject(JNIEnv *env, QObject* qobject);
 
+QTJAMBI_EXPORT void registerDependency(JNIEnv *env, jobject dependentObject, QtJambiNativeID _this_nativeId);
+
 QTJAMBI_EXPORT uint getJavaObjectIdentity(JNIEnv *env, jobject object);
 
 QTJAMBI_EXPORT uint getJavaObjectHashCode(JNIEnv *env, jobject object);
diff --git a/src/cpp/QtJambi/qtjambilink.cpp b/src/cpp/QtJambi/qtjambilink.cpp
index c0ffdd03..a15cab83 100644
--- a/src/cpp/QtJambi/qtjambilink.cpp
+++ b/src/cpp/QtJambi/qtjambilink.cpp
@@ -41,6 +41,8 @@ QT_WARNING_DISABLE_DEPRECATED
 #include "qtjambimetaobject_p.h"
 #include "jnienvironment.h"
 
+#include <algorithm>
+#include <list>
 #include <cstring>
 #include <QDebug>
 #include <QHash>
@@ -365,72 +367,6 @@ void ValueOwnerUserData::addDeleter(const std::function<void()>& deleter){
     m_deleters << deleter;
 }
 
-QTJAMBI_OBJECTUSERDATA_ID_IMPL(,DependencyManagerUserData::)
-
-DependencyManagerUserData::DependencyManagerUserData() : QtJambiObjectData(), m_lock(QReadWriteLock::Recursive) {
-}
-
-DependencyManagerUserData::~DependencyManagerUserData(){
-    QList<QWeakPointer<QtJambiLink>> dependentObjects;
-    {
-        QWriteLocker locker(&m_lock);
-        dependentObjects.swap(m_dependentObjects);
-    }
-    if(!dependentObjects.isEmpty()){
-        if(JniEnvironment env{1024}){
-            clear(env, dependentObjects);
-        }
-    }
-}
-
-void DependencyManagerUserData::clear(JNIEnv* env){
-    QList<QWeakPointer<QtJambiLink>> dependentObjects;
-    {
-        QWriteLocker locker(&m_lock);
-        dependentObjects.swap(m_dependentObjects);
-    }
-    clear(env, dependentObjects);
-}
-
-void DependencyManagerUserData::clear(JNIEnv* env, QList<QWeakPointer<QtJambiLink>>& dependentObjects){
-    for(const QWeakPointer<QtJambiLink>& weakLink : dependentObjects){
-        if(QSharedPointer<QtJambiLink> link = weakLink.toStrongRef()){
-            link->invalidate(env);
-        }
-    }
-}
-
-void DependencyManagerUserData::addDependentObject(const QWeakPointer<QtJambiLink>& dependent){
-    QWriteLocker locker(&m_lock);
-    m_dependentObjects << dependent;
-    m_dependentObjects.removeAll({});
-}
-
-void DependencyManagerUserData::removeDependentObject(const QWeakPointer<QtJambiLink>& dependent){
-    QWriteLocker locker(&m_lock);
-    m_dependentObjects.removeAll(dependent);
-    m_dependentObjects.removeAll({});
-}
-
-bool DependencyManagerUserData::hasDependencies() const{
-    return !m_dependentObjects.isEmpty();
-}
-
-DependencyManagerUserData* DependencyManagerUserData::instance(const QObject* object, bool forceConstruction){
-    DependencyManagerUserData* dm{nullptr};
-    {
-        QReadLocker locker(QtJambiLinkUserData::lock());
-        dm = QTJAMBI_GET_OBJECTUSERDATA(DependencyManagerUserData, object);
-    }
-    if(!dm && forceConstruction){
-        QWriteLocker locker(QtJambiLinkUserData::lock());
-        if(!(dm = QTJAMBI_GET_OBJECTUSERDATA(DependencyManagerUserData, object))){
-            QTJAMBI_SET_OBJECTUSERDATA(DependencyManagerUserData, const_cast<QObject*>(object), dm = new DependencyManagerUserData());
-        }
-    }
-    return dm;
-}
-
 static volatile int sObjectCacheMode = 2;
 int QtJambiLink::getObjectCacheMode()
 {
@@ -527,6 +463,72 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForQObject(JNIEnv *env
     return qtJambiLink->getStrongPointer();
 }
 
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeQObject(JNIEnv *env, jobject javaObject, QObject *object, bool created_by_java, bool is_shell, const QMetaObject* superTypeForCustomMetaObject)
+{
+    QTJAMBI_DEBUG_METHOD_PRINT("native", "QtJambiLink::createLinkForQObject(JNIEnv *env, jobject java, QObject *object, bool created_by_java, bool hasCustomMetaObject)")
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(object);
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink;
+    if(superTypeForCustomMetaObject){
+            qtJambiLink = new PointerToPendingQObjectLink(env, nativeLink, javaObject, superTypeForCustomMetaObject, object, created_by_java, false, is_shell, ocurredException);
+    }else{
+        const QMetaObject* metaObject = object->metaObject();
+        QList<QMetaMethod> extraSignals = getExtraSignalsOfMetaObject(metaObject);
+        if(extraSignals.isEmpty())
+            qtJambiLink = new PointerToQObjectLink(env, nativeLink, javaObject, metaObject, object, created_by_java, false, is_shell, ocurredException);
+        else
+            qtJambiLink = new PointerToQObjectWithExtraSignalsLink(env, nativeLink, javaObject, metaObject, object, created_by_java, false, is_shell, ocurredException);
+    }
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeQObject(JNIEnv *env, jobject javaObject, QObject *object, bool created_by_java,
+                                                                           bool is_shell, const QMetaObject* superTypeForCustomMetaObject,
+                                                                           const QMap<size_t,uint>& interfaceOffsets,
+                                                                           const QSet<size_t>& interfaceTypes,
+                                                                           const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+{
+    QTJAMBI_DEBUG_METHOD_PRINT("native", "QtJambiLink::createLinkForNativeQObject(JNIEnv *env, jobject java, QObject *object, bool created_by_java, bool hasCustomMetaObject)")
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(object);
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink;
+    if(superTypeForCustomMetaObject){
+        qtJambiLink = new PointerToPendingQObjectInterfaceLink(env, nativeLink, javaObject, interfaceOffsets, interfaceTypes, inheritedInterfaces, superTypeForCustomMetaObject, object, created_by_java, false, is_shell, ocurredException);
+    }else{
+        const QMetaObject* metaObject = object->metaObject();
+        QList<QMetaMethod> extraSignals = getExtraSignalsOfMetaObject(metaObject);
+        if(extraSignals.isEmpty())
+            qtJambiLink = new PointerToQObjectInterfaceLink(env, nativeLink, javaObject, interfaceOffsets, interfaceTypes, inheritedInterfaces, metaObject, object, created_by_java, false, is_shell, ocurredException);
+        else
+            qtJambiLink = new PointerToQObjectInterfaceWithExtraSignalsLink(env, nativeLink, javaObject, interfaceOffsets, interfaceTypes, inheritedInterfaces, metaObject, object, created_by_java, false, is_shell, ocurredException);
+    }
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    return qtJambiLink->getStrongPointer();
+}
+
 const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNewQObject(JNIEnv *env, jclass objectClass, jobject nativeLink, jobject javaObject, const std::type_info& typeId, const QMetaObject* metaObject, QObject *object, const SuperTypeInfos* superTypeInfos, bool created_by_java, bool isDeclarativeCall, bool is_shell, bool hasCustomMetaObject, JavaException& ocurredException)
 {
     if(!ocurredException.object()){
@@ -682,23 +684,77 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForContainer(JNIEnv *e
     Q_ASSERT(ptr);
     Q_ASSERT(containerAccess);
     Q_ASSERT(metaType.isValid());
+    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
+    if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
+        return createLinkForNativeObject(env, javaObject, ptr, metaType,
+                                         created_by_java, isCopy, containerAccess, QtJambiLink::Ownership::None,
+                                         interfaceOffsets->offsets, interfaceOffsets->interfaces, interfaceOffsets->inheritedInterfaces);
+    }else{
+        return createLinkForNativeObject(env, javaObject, ptr, metaType,
+                                         created_by_java, isCopy, containerAccess, QtJambiLink::Ownership::None);
+    }
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                        bool created_by_java, bool isCopy, AbstractContainerAccess* containerAccess, QtJambiLink::Ownership ownership)
+{
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(containerAccess);
+    Q_ASSERT(metaType.isValid());
 
     // Initialize the link
     jobject nativeLink = getNativeLink(env, javaObject);
-    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
     JavaException ocurredException;
-    QtJambiLink* qtJambiLink;
-    if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
-        qtJambiLink = new MetaTypedPointerToContainerInterfaceLink(env, nativeLink, javaObject,
-                                                                     interfaceOffsets->offsets, interfaceOffsets->interfaces,
-                                                                     interfaceOffsets->inheritedInterfaces,
-                                                                     ptr, metaType, created_by_java, false,
-                                                                     containerAccess, ocurredException);
-    }else{
-        qtJambiLink = new MetaTypedPointerToContainerLink(env, nativeLink, javaObject,
+    QtJambiLink* qtJambiLink = new MetaTypedPointerToContainerLink(env, nativeLink, javaObject,
                                                             ptr, metaType, created_by_java, false,
                                                             containerAccess, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
     }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java || isCopy){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                       bool created_by_java, bool isCopy, AbstractContainerAccess* containerAccess, QtJambiLink::Ownership ownership,
+                                                                       const QMap<size_t,uint>& interfaceOffsets,
+                                                                       const QSet<size_t>& interfaceTypes,
+                                                                       const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+{
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(containerAccess);
+    Q_ASSERT(metaType.isValid());
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    //const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink;
+    qtJambiLink = new MetaTypedPointerToContainerInterfaceLink(env, nativeLink, javaObject,
+                                                                 interfaceOffsets, interfaceTypes,
+                                                                 inheritedInterfaces,
+                                                                 ptr, metaType, created_by_java, false,
+                                                                 containerAccess, ocurredException);
     if(ocurredException.object()){
         qtJambiLink->dispose();
         ocurredException.raise();
@@ -706,8 +762,18 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForContainer(JNIEnv *e
     }else{
         qtJambiLink->init(env);
     }
-    if(created_by_java || isCopy){
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
         qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java || isCopy){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
     }
     return qtJambiLink->getStrongPointer();
 }
@@ -721,25 +787,466 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForContainer(JNIEnv *e
     Q_ASSERT(ptr);
     Q_ASSERT(containerAccess);
     Q_ASSERT(destructor_function);
+    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
+    if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
+        return createLinkForNativeObject(env, javaObject, ptr,
+                                         LINK_NAME_ARG(qt_name)
+                                         created_by_java, isCopy, destructor_function, containerAccess, QtJambiLink::Ownership::None,
+                                         interfaceOffsets->offsets, interfaceOffsets->interfaces, interfaceOffsets->inheritedInterfaces);
+    }else{
+        return createLinkForNativeObject(env, javaObject, ptr,
+                                         LINK_NAME_ARG(qt_name)
+                                         created_by_java, isCopy, destructor_function, containerAccess, QtJambiLink::Ownership::None);
+    }
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr,
+                                                                        LINK_NAME_ARG(const char* qt_name)
+                                                                        bool created_by_java, bool isCopy, PtrDeleterFunction destructor_function, AbstractContainerAccess* containerAccess, QtJambiLink::Ownership ownership)
+{
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(containerAccess);
+    Q_ASSERT(destructor_function);
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new DeletablePointerToContainerLink(env, nativeLink, javaObject,
+                                                            LINK_NAME_ARG(qt_name)
+                                                            ptr, created_by_java,
+                                                            destructor_function, containerAccess, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java || isCopy){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr,
+                                                                        LINK_NAME_ARG(const char* qt_name)
+                                                                        bool created_by_java, bool isCopy, PtrDeleterFunction destructor_function, AbstractContainerAccess* containerAccess, QtJambiLink::Ownership ownership,
+                                                                          const QMap<size_t,uint>& interfaceOffsets,
+                                                                          const QSet<size_t>& interfaceTypes,
+                                                                          const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+{
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(containerAccess);
+    Q_ASSERT(destructor_function);
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new DeletablePointerToContainerInterfaceLink(env, nativeLink, javaObject,
+                                                                     interfaceOffsets, interfaceTypes,
+                                                                     inheritedInterfaces,
+                                                                     LINK_NAME_ARG(qt_name)
+                                                                     ptr, created_by_java,
+                                                                     destructor_function, containerAccess, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java || isCopy){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                        bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, QtJambiLink::Ownership ownership)
+{
+    if(!ownerFunction){
+        return createLinkForNativeObject(env, javaObject, ptr, metaType,
+                                   created_by_java, is_shell, ownership);
+    }
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(ownerFunction);
+    Q_ASSERT(metaType.isValid());
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new OwnedMetaTypedPointerToObjectLink(env, nativeLink, javaObject,
+                                                                     ptr, metaType, created_by_java,
+                                                                     is_shell, ownerFunction, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                          bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, QtJambiLink::Ownership ownership,
+                                                                          const QMap<size_t,uint>& interfaceOffsets,
+                                                                          const QSet<size_t>& interfaceTypes,
+                                                                          const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+{
+    if(!ownerFunction){
+        return createLinkForNativeObject(env, javaObject, ptr, metaType,
+                                         created_by_java, is_shell, ownership,
+                                         interfaceOffsets, interfaceTypes, inheritedInterfaces);
+    }
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(ownerFunction);
+    Q_ASSERT(metaType.isValid());
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new OwnedMetaTypedPointerToObjectInterfaceLink(env, nativeLink, javaObject,
+                                                                              interfaceOffsets, interfaceTypes,
+                                                                              inheritedInterfaces,
+                                                                              ptr, metaType, created_by_java,
+                                                                              is_shell, ownerFunction, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                          bool created_by_java, bool is_shell, QtJambiLink::Ownership ownership)
+{
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(metaType.isValid());
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new MetaTypedPointerToObjectLink(env, nativeLink, javaObject,
+                                                                ptr, metaType, created_by_java, is_shell, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                          bool created_by_java, bool is_shell, QtJambiLink::Ownership ownership,
+                                                                          const QMap<size_t,uint>& interfaceOffsets,
+                                                                          const QSet<size_t>& interfaceTypes,
+                                                                          const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+{
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(metaType.isValid());
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new MetaTypedPointerToObjectInterfaceLink(env, nativeLink, javaObject, interfaceOffsets, interfaceTypes, inheritedInterfaces,
+                                                                         ptr, metaType, created_by_java, is_shell, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForDependentObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                        bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, const QObject* dependsOn, QtJambiLink::Ownership ownership)
+{
+    if(!ownerFunction){
+        return createLinkForDependentObject(env, javaObject, ptr, metaType,
+                                   created_by_java, is_shell, dependsOn, ownership);
+    }
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(ownerFunction);
+    Q_ASSERT(metaType.isValid());
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new OwnedDependentMetaTypedPointerToObjectLink(env, nativeLink, javaObject,
+                                                                              ptr, metaType, created_by_java,
+                                                                              is_shell, ownerFunction, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    QtJambiLink::registerDependentObject(dependsOn, qtJambiLink->getStrongPointer());
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForDependentObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                        bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, const QObject* dependsOn, QtJambiLink::Ownership ownership,
+                                                                             const QMap<size_t,uint>& interfaceOffsets,
+                                                                             const QSet<size_t>& interfaceTypes,
+                                                                             const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+{
+    if(!ownerFunction){
+        return createLinkForDependentObject(env, javaObject, ptr, metaType,
+                                   created_by_java, is_shell, dependsOn, ownership);
+    }
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(ownerFunction);
+    Q_ASSERT(metaType.isValid());
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new OwnedDependentMetaTypedPointerToObjectInterfaceLink(env, nativeLink, javaObject,
+                                                                                       interfaceOffsets, interfaceTypes,
+                                                                                       inheritedInterfaces,
+                                                                                       ptr, metaType, created_by_java,
+                                                                                       is_shell, ownerFunction, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    QtJambiLink::registerDependentObject(dependsOn, qtJambiLink->getStrongPointer());
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForDependentObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                        bool created_by_java, bool is_shell, const QObject* dependsOn, QtJambiLink::Ownership ownership)
+{
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(metaType.isValid());
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new DependentMetaTypedPointerToObjectLink(env, nativeLink, javaObject,
+                                                                         ptr, metaType, created_by_java, is_shell, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    QtJambiLink::registerDependentObject(dependsOn, qtJambiLink->getStrongPointer());
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForDependentObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
+                                                                             bool created_by_java, bool is_shell, const QObject* dependsOn, QtJambiLink::Ownership ownership,
+                                                                             const QMap<size_t,uint>& interfaceOffsets,
+                                                                             const QSet<size_t>& interfaceTypes,
+                                                                             const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+{
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(metaType.isValid());
+
+    // Initialize the link
+    jobject nativeLink = getNativeLink(env, javaObject);
+    JavaException ocurredException;
+    QtJambiLink* qtJambiLink = new DependentMetaTypedPointerToObjectInterfaceLink(env, nativeLink, javaObject,
+                                                                                  interfaceOffsets, interfaceTypes, inheritedInterfaces,
+                                                                                  ptr, metaType, created_by_java, is_shell, ocurredException);
+    if(ocurredException.object()){
+        qtJambiLink->dispose();
+        ocurredException.raise();
+        Q_ASSERT(false);// should not reach this
+    }else{
+        qtJambiLink->init(env);
+    }
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
+        qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
+    }
+    QtJambiLink::registerDependentObject(dependsOn, qtJambiLink->getStrongPointer());
+    return qtJambiLink->getStrongPointer();
+}
+
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr,
+                                                                        LINK_NAME_ARG(const char* qt_name)
+                                                                        bool created_by_java, bool is_shell, PtrDeleterFunction deleter_function, PtrOwnerFunction ownerFunction, QtJambiLink::Ownership ownership)
+{
+    if(!ownerFunction){
+        return createLinkForNativeObject(env, javaObject, ptr,
+                                   LINK_NAME_ARG(qt_name)
+                                   created_by_java, is_shell, deleter_function, ownership);
+    }
+    if(!deleter_function){
+        return createLinkForNativeObject(env, javaObject, ptr,
+                                   LINK_NAME_ARG(qt_name)
+                                   created_by_java, is_shell, ownership);
+    }
+    Q_ASSERT(env);
+    Q_ASSERT(javaObject);
+    Q_ASSERT(ptr);
+    Q_ASSERT(ownerFunction);
+    Q_ASSERT(deleter_function);
 
     // Initialize the link
     jobject nativeLink = getNativeLink(env, javaObject);
-    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
     JavaException ocurredException;
-    QtJambiLink* qtJambiLink;
-    if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
-        qtJambiLink = new DeletablePointerToContainerInterfaceLink(env, nativeLink, javaObject,
-                                                                     interfaceOffsets->offsets, interfaceOffsets->interfaces,
-                                                                     interfaceOffsets->inheritedInterfaces,
+    QtJambiLink* qtJambiLink = new DeletableOwnedPointerToObjectLink(env, nativeLink, javaObject,
                                                                      LINK_NAME_ARG(qt_name)
                                                                      ptr, created_by_java,
-                                                                     destructor_function, containerAccess, ocurredException);
-    }else{
-        qtJambiLink = new DeletablePointerToContainerLink(env, nativeLink, javaObject,
-                                                            LINK_NAME_ARG(qt_name)
-                                                            ptr, created_by_java,
-                                                            destructor_function, containerAccess, ocurredException);
-    }
+                                                                     is_shell, deleter_function,
+                                                                     ownerFunction, ocurredException);
     if(ocurredException.object()){
         qtJambiLink->dispose();
         ocurredException.raise();
@@ -747,42 +1254,62 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForContainer(JNIEnv *e
     }else{
         qtJambiLink->init(env);
     }
-    if(created_by_java || isCopy){
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
         qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
     }
     return qtJambiLink->getStrongPointer();
 }
 
-
-const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
-                                                                        bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction)
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr,
+                                                                          LINK_NAME_ARG(const char* qt_name)
+                                                                          bool created_by_java, bool is_shell, PtrDeleterFunction deleter_function, PtrOwnerFunction ownerFunction, QtJambiLink::Ownership ownership,
+                                                                          const QMap<size_t,uint>& interfaceOffsets,
+                                                                          const QSet<size_t>& interfaceTypes,
+                                                                          const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
 {
     if(!ownerFunction){
-        return createLinkForObject(env, javaObject, ptr, metaType,
-                                   created_by_java, is_shell);
+        return createLinkForNativeObject(env, javaObject, ptr,
+                                   LINK_NAME_ARG(qt_name)
+                                   created_by_java, is_shell, deleter_function, ownership,
+                                   interfaceOffsets,
+                                   interfaceTypes,
+                                   inheritedInterfaces);
+    }
+    if(!deleter_function){
+        return createLinkForNativeObject(env, javaObject, ptr,
+                                   LINK_NAME_ARG(qt_name)
+                                   created_by_java, is_shell, ownership,
+                                   interfaceOffsets,
+                                   interfaceTypes,
+                                   inheritedInterfaces);
     }
     Q_ASSERT(env);
     Q_ASSERT(javaObject);
     Q_ASSERT(ptr);
     Q_ASSERT(ownerFunction);
-    Q_ASSERT(metaType.isValid());
+    Q_ASSERT(deleter_function);
 
     // Initialize the link
     jobject nativeLink = getNativeLink(env, javaObject);
-    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
     JavaException ocurredException;
-    QtJambiLink* qtJambiLink;
-    if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
-        qtJambiLink = new OwnedMetaTypedPointerToObjectInterfaceLink(env, nativeLink, javaObject,
-                                                                     interfaceOffsets->offsets, interfaceOffsets->interfaces,
-                                                                     interfaceOffsets->inheritedInterfaces,
-                                                                     ptr, metaType, created_by_java,
-                                                                     is_shell, ownerFunction, ocurredException);
-    }else{
-        qtJambiLink = new OwnedMetaTypedPointerToObjectLink(env, nativeLink, javaObject,
-                                                            ptr, metaType, created_by_java,
-                                                            is_shell, ownerFunction, ocurredException);
-    }
+    QtJambiLink* qtJambiLink = new DeletableOwnedPointerToObjectInterfaceLink(env, nativeLink, javaObject,
+                                                                              interfaceOffsets,
+                                                                              interfaceTypes,
+                                                                              inheritedInterfaces,
+                                                                              LINK_NAME_ARG(qt_name)
+                                                                              ptr, created_by_java,
+                                                                              is_shell, deleter_function,
+                                                                              ownerFunction, ocurredException);
     if(ocurredException.object()){
         qtJambiLink->dispose();
         ocurredException.raise();
@@ -790,32 +1317,43 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env,
     }else{
         qtJambiLink->init(env);
     }
-    if(created_by_java){
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
         qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
     }
     return qtJambiLink->getStrongPointer();
 }
 
-const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env, jobject javaObject, void *ptr, const QMetaType& metaType,
-                                                                        bool created_by_java, bool is_shell)
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr,
+                                                                        LINK_NAME_ARG(const char* qt_name)
+                                                                        bool created_by_java, bool is_shell, PtrDeleterFunction deleter_function, QtJambiLink::Ownership ownership)
 {
+    if(!deleter_function){
+        return createLinkForNativeObject(env, javaObject, ptr,
+                                   LINK_NAME_ARG(qt_name)
+                                   created_by_java, is_shell, ownership);
+    }
     Q_ASSERT(env);
     Q_ASSERT(javaObject);
     Q_ASSERT(ptr);
-    Q_ASSERT(metaType.isValid());
+    Q_ASSERT(deleter_function);
 
     // Initialize the link
     jobject nativeLink = getNativeLink(env, javaObject);
-    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
     JavaException ocurredException;
-    QtJambiLink* qtJambiLink;
-    if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
-        qtJambiLink = new MetaTypedPointerToObjectInterfaceLink(env, nativeLink, javaObject, interfaceOffsets->offsets, interfaceOffsets->interfaces, interfaceOffsets->inheritedInterfaces,
-                                                       ptr, metaType, created_by_java, is_shell, ocurredException);
-    }else{
-        qtJambiLink = new MetaTypedPointerToObjectLink(env, nativeLink, javaObject,
-                                              ptr, metaType, created_by_java, is_shell, ocurredException);
-    }
+    QtJambiLink* qtJambiLink = new DeletablePointerToObjectLink(env, nativeLink, javaObject,
+                                                                LINK_NAME_ARG(qt_name)
+                                                                ptr, created_by_java,
+                                                                is_shell, deleter_function, ocurredException);
     if(ocurredException.object()){
         qtJambiLink->dispose();
         ocurredException.raise();
@@ -823,53 +1361,53 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env,
     }else{
         qtJambiLink->init(env);
     }
-    if(created_by_java){
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
         qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
     }
     return qtJambiLink->getStrongPointer();
 }
 
-const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env, jobject javaObject, void *ptr,
-                                                                        LINK_NAME_ARG(const char* qt_name)
-                                                                        bool created_by_java, bool is_shell, PtrDeleterFunction deleter_function, PtrOwnerFunction ownerFunction)
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr,
+                                                                          LINK_NAME_ARG(const char* qt_name)
+                                                                          bool created_by_java, bool is_shell, PtrDeleterFunction deleter_function, QtJambiLink::Ownership ownership,
+                                                                          const QMap<size_t,uint>& interfaceOffsets,
+                                                                          const QSet<size_t>& interfaceTypes,
+                                                                          const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
 {
-    if(!ownerFunction){
-        return createLinkForObject(env, javaObject, ptr,
-                                   LINK_NAME_ARG(qt_name)
-                                   created_by_java, is_shell, deleter_function);
-    }
     if(!deleter_function){
-        return createLinkForObject(env, javaObject, ptr,
-                                   LINK_NAME_ARG(qt_name)
-                                   created_by_java, is_shell);
+        return createLinkForNativeObject(env, javaObject, ptr,
+                                         LINK_NAME_ARG(qt_name)
+                                         created_by_java, is_shell, ownership,
+                                         interfaceOffsets,
+                                         interfaceTypes,
+                                         inheritedInterfaces
+                                    );
     }
     Q_ASSERT(env);
     Q_ASSERT(javaObject);
     Q_ASSERT(ptr);
-    Q_ASSERT(ownerFunction);
     Q_ASSERT(deleter_function);
 
     // Initialize the link
     jobject nativeLink = getNativeLink(env, javaObject);
-    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
     JavaException ocurredException;
-    QtJambiLink* qtJambiLink;
-    if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
-        qtJambiLink = new DeletableOwnedPointerToObjectInterfaceLink(env, nativeLink, javaObject,
-                                                                              interfaceOffsets->offsets,
-                                                                              interfaceOffsets->interfaces,
-                                                                              interfaceOffsets->inheritedInterfaces,
-                                                                              LINK_NAME_ARG(qt_name)
-                                                                              ptr, created_by_java,
-                                                                              is_shell, deleter_function,
-                                                                              ownerFunction, ocurredException);
-    }else{
-        qtJambiLink = new DeletableOwnedPointerToObjectLink(env, nativeLink, javaObject,
-                                                                     LINK_NAME_ARG(qt_name)
-                                                                     ptr, created_by_java,
-                                                                     is_shell, deleter_function,
-                                                                     ownerFunction, ocurredException);
-    }
+    QtJambiLink* qtJambiLink = new DeletablePointerToObjectInterfaceLink(env, nativeLink, javaObject,
+                                                                interfaceOffsets,
+                                                                interfaceTypes,
+                                                                inheritedInterfaces,
+                                                                LINK_NAME_ARG(qt_name)
+                                                                ptr, created_by_java,
+                                                                is_shell, deleter_function, ocurredException);
     if(ocurredException.object()){
         qtJambiLink->dispose();
         ocurredException.raise();
@@ -877,44 +1415,36 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env,
     }else{
         qtJambiLink->init(env);
     }
-    if(created_by_java){
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
         qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
     }
     return qtJambiLink->getStrongPointer();
 }
 
-const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env, jobject javaObject, void *ptr,
-                                                                        LINK_NAME_ARG(const char* qt_name)
-                                                                        bool created_by_java, bool is_shell, PtrDeleterFunction deleter_function)
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr,
+                                                                          LINK_NAME_ARG(const char* qt_name)
+                                                                          bool created_by_java, bool is_shell, QtJambiLink::Ownership ownership)
 {
-    if(!deleter_function){
-        return createLinkForObject(env, javaObject, ptr,
-                                   LINK_NAME_ARG(qt_name)
-                                   created_by_java, is_shell);
-    }
     Q_ASSERT(env);
     Q_ASSERT(javaObject);
     Q_ASSERT(ptr);
-    Q_ASSERT(deleter_function);
 
     // Initialize the link
     jobject nativeLink = getNativeLink(env, javaObject);
-    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
     JavaException ocurredException;
-    QtJambiLink* qtJambiLink;
-    if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
-        qtJambiLink = new DeletablePointerToObjectInterfaceLink(env, nativeLink, javaObject,
-                                                                         interfaceOffsets->offsets, interfaceOffsets->interfaces,
-                                                                         interfaceOffsets->inheritedInterfaces,
-                                                                         LINK_NAME_ARG(qt_name)
-                                                                         ptr, created_by_java,
-                                                                         is_shell, deleter_function, ocurredException);
-    }else{
-        qtJambiLink = new DeletablePointerToObjectLink(env, nativeLink, javaObject,
-                                                                LINK_NAME_ARG(qt_name)
-                                                                ptr, created_by_java,
-                                                                is_shell, deleter_function, ocurredException);
-    }
+    QtJambiLink* qtJambiLink = new PointerToObjectLink(env, nativeLink, javaObject,
+                                              LINK_NAME_ARG(qt_name)
+                                              ptr, created_by_java, is_shell, ocurredException);
     if(ocurredException.object()){
         qtJambiLink->dispose();
         ocurredException.raise();
@@ -922,15 +1452,28 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env,
     }else{
         qtJambiLink->init(env);
     }
-    if(created_by_java){
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
         qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
     }
     return qtJambiLink->getStrongPointer();
 }
 
-const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env, jobject javaObject, void *ptr,
-                                                                        LINK_NAME_ARG(const char* qt_name)
-                                                                        bool created_by_java, bool is_shell)
+const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForNativeObject(JNIEnv *env, jobject javaObject, void *ptr,
+                                                                          LINK_NAME_ARG(const char* qt_name)
+                                                                          bool created_by_java, bool is_shell, QtJambiLink::Ownership ownership,
+                                                                          const QMap<size_t,uint>& interfaceOffsets,
+                                                                          const QSet<size_t>& interfaceTypes,
+                                                                          const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
 {
     Q_ASSERT(env);
     Q_ASSERT(javaObject);
@@ -938,18 +1481,13 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env,
 
     // Initialize the link
     jobject nativeLink = getNativeLink(env, javaObject);
-    const InterfaceOffsetInfo* interfaceOffsets = getInterfaceOffsets(env, env->GetObjectClass(javaObject));
     JavaException ocurredException;
-    QtJambiLink* qtJambiLink;
-    if(interfaceOffsets && !interfaceOffsets->offsets.isEmpty()){
-        qtJambiLink = new PointerToObjectInterfaceLink(env, nativeLink, javaObject, interfaceOffsets->offsets, interfaceOffsets->interfaces, interfaceOffsets->inheritedInterfaces,
+    QtJambiLink* qtJambiLink = new PointerToObjectInterfaceLink(env, nativeLink, javaObject,
+                                                       interfaceOffsets,
+                                                       interfaceTypes,
+                                                       inheritedInterfaces,
                                                        LINK_NAME_ARG(qt_name)
                                                        ptr, created_by_java, is_shell, ocurredException);
-    }else{
-        qtJambiLink = new PointerToObjectLink(env, nativeLink, javaObject,
-                                              LINK_NAME_ARG(qt_name)
-                                              ptr, created_by_java, is_shell, ocurredException);
-    }
     if(ocurredException.object()){
         qtJambiLink->dispose();
         ocurredException.raise();
@@ -957,8 +1495,18 @@ const QSharedPointer<QtJambiLink>& QtJambiLink::createLinkForObject(JNIEnv *env,
     }else{
         qtJambiLink->init(env);
     }
-    if(created_by_java){
+    switch(ownership){
+    case QtJambiLink::Ownership::Java:
         qtJambiLink->setJavaOwnership(env);
+        break;
+    case QtJambiLink::Ownership::Cpp:
+        qtJambiLink->setCppOwnership(env);
+        break;
+    default:
+        if(created_by_java){
+            qtJambiLink->setJavaOwnership(env);
+        }
+        break;
     }
     return qtJambiLink->getStrongPointer();
 }
@@ -2037,52 +2585,150 @@ PointerToObjectLink::~PointerToObjectLink()
 
 bool PointerToObjectLink::isSmartPointer() const { return false; }
 
+DependentLink::~DependentLink(){}
+
+inline hash_type qHash(const QWeakPointer<QtJambiLink>& ptr, hash_type seed = 0){
+    return qHash(ptr.lock().get(), seed);
+}
+
+QTJAMBI_OBJECTUSERDATA_ID_IMPL(,DependencyManagerUserData::)
+
+DependencyManagerUserData::DependencyManagerUserData() : QtJambiObjectData() {
+}
+
+DependencyManagerUserData::~DependencyManagerUserData(){
+    QSet<QWeakPointer<QtJambiLink>> dependentObjects;
+    {
+        QWriteLocker locker(QtJambiLinkUserData::lock());
+        dependentObjects.swap(m_dependentObjects);
+    }
+    if(!dependentObjects.empty()){
+        if(JniEnvironment env{1024}){
+            clear(env, dependentObjects);
+        }
+    }
+}
+
+void DependencyManagerUserData::clear(JNIEnv* env){
+    QSet<QWeakPointer<QtJambiLink>> dependentObjects;
+    {
+        QWriteLocker locker(QtJambiLinkUserData::lock());
+        dependentObjects.swap(m_dependentObjects);
+    }
+    clear(env, dependentObjects);
+}
+
+void DependencyManagerUserData::clear(JNIEnv* env, QSet<QWeakPointer<QtJambiLink>>& dependentObjects){
+    for(const QWeakPointer<QtJambiLink>& weakLink : dependentObjects){
+        if(QSharedPointer<QtJambiLink> link = weakLink.toStrongRef()){
+            link->invalidate(env);
+        }
+    }
+    dependentObjects.clear();
+}
+
+void DependencyManagerUserData::addDependentObject(const QSharedPointer<QtJambiLink>& dependent){
+    QWriteLocker locker(QtJambiLinkUserData::lock());
+    m_dependentObjects.insert(dependent.toWeakRef());
+    if(DependentLink* dlink = dynamic_cast<DependentLink*>(dependent.data())){
+        dlink->setDependencyManager(this);
+    }else{
+#if QT_VERSION >= QT_VERSION_CHECK(6,1,0)
+        erase_if(m_dependentObjects, [](const QWeakPointer<QtJambiLink>& ptr)->bool{return ptr.isNull();});
+#else
+        auto it = m_dependentObjects.begin();
+        const auto e = m_dependentObjects.end();
+        while (it != e) {
+            if ((*it).isNull()) {
+                it = m_dependentObjects.erase(it);
+            } else {
+                ++it;
+            }
+        }
+#endif
+    }
+}
+
+void DependencyManagerUserData::removeDependentObject(const QSharedPointer<QtJambiLink>& dependent){
+    QWriteLocker locker(QtJambiLinkUserData::lock());
+    m_dependentObjects.remove(dependent.toWeakRef());
+    if(DependentLink* dlink = dynamic_cast<DependentLink*>(dependent.data())){
+        dlink->setDependencyManager(nullptr);
+    }
+}
+
+bool DependencyManagerUserData::hasDependencies() const{
+    return !m_dependentObjects.empty();
+}
+
+DependencyManagerUserData* DependencyManagerUserData::instance(const QObject* object, bool forceConstruction){
+    DependencyManagerUserData* dm{nullptr};
+    {
+        QReadLocker locker(QtJambiLinkUserData::lock());
+        dm = QTJAMBI_GET_OBJECTUSERDATA(DependencyManagerUserData, object);
+    }
+    if(!dm && forceConstruction){
+        QWriteLocker locker(QtJambiLinkUserData::lock());
+        if(!(dm = QTJAMBI_GET_OBJECTUSERDATA(DependencyManagerUserData, object))){
+            QTJAMBI_SET_OBJECTUSERDATA(DependencyManagerUserData, const_cast<QObject*>(object), dm = new DependencyManagerUserData());
+        }
+    }
+    return dm;
+}
+
 Q_GLOBAL_STATIC_WITH_ARGS(QReadWriteLock, gDependencyLock, (QReadWriteLock::Recursive))
 typedef QMultiHash<QSharedPointer<QtJambiLink>, QWeakPointer<QtJambiLink>> DependencyHash;
 Q_GLOBAL_STATIC(DependencyHash, gDependencies)
 
 void QtJambiLink::registerDependentObject(const QObject* object, const QSharedPointer<QtJambiLink>& link){
-    if(object){
-        DependencyManagerUserData* dm = DependencyManagerUserData::instance(object);
-        dm->addDependentObject(link);
+    if(object && !link->isShell() && !link->isSmartPointer() && !link->m_flags.testFlag(Flag::IsDependent)){
+        if(!link->isQObject()){
+            DependencyManagerUserData* dm = DependencyManagerUserData::instance(object);
+            dm->addDependentObject(link);
+        }
         if(link->ownership()!=Ownership::Java)
             link->m_flags.setFlag(Flag::NoNativeDeletion);
+        link->m_flags.setFlag(Flag::IsDependent);
     }
 }
 
 void QtJambiLink::unregisterDependentObject(const QObject* object, const QSharedPointer<QtJambiLink>& link){
-    if(object){
-        DependencyManagerUserData* dm = DependencyManagerUserData::instance(object);
-        dm->removeDependentObject(link);
+    if(object && !link->isShell() && !link->isSmartPointer() && link->m_flags.testFlag(Flag::IsDependent)){
+        if(!link->isQObject()){
+            if(DependencyManagerUserData* dm = DependencyManagerUserData::instance(object, false)){
+                dm->removeDependentObject(link);
+            }
+        }
         link->m_flags.setFlag(Flag::NoNativeDeletion, false);
+        link->m_flags.setFlag(Flag::IsDependent, false);
     }
 }
 
 void QtJambiLink::registerDependentObject(const QSharedPointer<QtJambiLink>& link)
 {
-    if(!link->m_flags.testFlag(Flag::IsDependent)){
-        if(isQObject()){
-            registerDependentObject(qobject(), link);
-        }else{
+    if(isQObject()){
+        registerDependentObject(qobject(), link);
+    }else if(!link->isShell() && !link->isSmartPointer() && !link->m_flags.testFlag(Flag::IsDependent)){
+        if(!link->isQObject()){
             if(!m_flags.testFlag(Flag::HasDependencies))
                 m_flags.setFlag(Flag::HasDependencies);
-            if(link->ownership()!=Ownership::Java)
-                link->m_flags.setFlag(Flag::NoNativeDeletion);
             QWriteLocker locker(gDependencyLock());
             Q_UNUSED(locker)
             gDependencies->insert(m_this, link);
             gDependencies->remove(m_this, QWeakPointer<QtJambiLink>{});
         }
+        if(link->ownership()!=Ownership::Java)
+            link->m_flags.setFlag(Flag::NoNativeDeletion);
         link->m_flags.setFlag(Flag::IsDependent);
     }
 }
 
 void QtJambiLink::unregisterDependentObject(const QSharedPointer<QtJambiLink>& link)
 {
-    if(link->m_flags.testFlag(Flag::IsDependent)){
-        if(isQObject()){
-            unregisterDependentObject(qobject(), link);
-        }else{
+    if(isQObject()){
+        unregisterDependentObject(qobject(), link);
+    }else if(!link->isShell() && !link->isQObject() && !link->isSmartPointer() && link->m_flags.testFlag(Flag::IsDependent)){
+        if(!link->isQObject()){
             QWriteLocker locker(gDependencyLock());
             Q_UNUSED(locker)
             gDependencies->remove(m_this, link);
@@ -2160,7 +2806,7 @@ void PointerToObjectLink::deleteNativeObject(JNIEnv *env, bool forced)
         }
     }
 }
-// Entry point for JVM finalization QtJambiObject#finalize()
+
 void PointerToObjectLink::onClean(JNIEnv *env)
 {
     if(!m_flags.testFlag(Flag::HasBeenCleaned)){
@@ -3715,6 +4361,98 @@ QSharedPointerToQObjectInterfaceLink::QSharedPointerToQObjectInterfaceLink(JNIEn
     }
 }
 
+DependentMetaTypedPointerToObjectLink::DependentMetaTypedPointerToObjectLink(JNIEnv *env, jobject nativeLink, jobject jobj,
+                                                                             void *ptr, const QMetaType& metaType, bool created_by_java, bool is_shell, JavaException& ocurredException)
+    : MetaTypedPointerToObjectLink(env, nativeLink, jobj, ptr, metaType, created_by_java, is_shell, ocurredException)
+{}
+
+void DependentMetaTypedPointerToObjectLink::setDependencyManager(DependencyManagerUserData* dependencyManager) {
+    m_dependencyManager = dependencyManager;
+}
+
+void DependentMetaTypedPointerToObjectLink::deleteNativeObject(JNIEnv *env, bool forced){
+    if(m_dependencyManager)
+        m_dependencyManager->removeDependentObject(m_this);
+    MetaTypedPointerToObjectLink::deleteNativeObject(env, forced);
+}
+
+void DependentMetaTypedPointerToObjectLink::invalidate(JNIEnv *env){
+    if(m_dependencyManager)
+        m_dependencyManager->removeDependentObject(m_this);
+    MetaTypedPointerToObjectLink::invalidate(env);
+}
+
+OwnedDependentMetaTypedPointerToObjectLink::OwnedDependentMetaTypedPointerToObjectLink(JNIEnv *env, jobject nativeLink, jobject jobj,
+                    void *ptr, const QMetaType& metaType, bool created_by_java, bool is_shell,
+                    PtrOwnerFunction ownerFunction, JavaException& ocurredException)
+    : OwnedMetaTypedPointerToObjectLink(env, nativeLink, jobj,
+       ptr, metaType, created_by_java, is_shell,
+       ownerFunction, ocurredException){}
+
+void OwnedDependentMetaTypedPointerToObjectLink::setDependencyManager(DependencyManagerUserData* dependencyManager) {
+    m_dependencyManager = dependencyManager;
+}
+
+void OwnedDependentMetaTypedPointerToObjectLink::deleteNativeObject(JNIEnv *env, bool forced){
+    if(m_dependencyManager)
+        m_dependencyManager->removeDependentObject(m_this);
+    OwnedMetaTypedPointerToObjectLink::deleteNativeObject(env, forced);
+}
+
+void OwnedDependentMetaTypedPointerToObjectLink::invalidate(JNIEnv *env){
+    if(m_dependencyManager)
+        m_dependencyManager->removeDependentObject(m_this);
+    OwnedMetaTypedPointerToObjectLink::invalidate(env);
+}
+
+DependentMetaTypedPointerToObjectInterfaceLink::DependentMetaTypedPointerToObjectInterfaceLink(JNIEnv *env, jobject nativeLink, jobject jobj, const QMap<size_t, uint>& interfaceOffsets, const QSet<size_t>& interfaces, const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces,
+                                               void *ptr, const QMetaType& metaType, bool created_by_java, bool is_shell, JavaException& ocurredException)
+    : MetaTypedPointerToObjectInterfaceLink(env, nativeLink, jobj, interfaceOffsets, interfaces, inheritedInterfaces,
+                                            ptr, metaType, created_by_java, is_shell, ocurredException)
+{
+}
+
+
+void DependentMetaTypedPointerToObjectInterfaceLink::setDependencyManager(DependencyManagerUserData* dependencyManager) {
+    m_dependencyManager = dependencyManager;
+}
+
+void DependentMetaTypedPointerToObjectInterfaceLink::deleteNativeObject(JNIEnv *env, bool forced){
+    if(m_dependencyManager)
+        m_dependencyManager->removeDependentObject(m_this);
+    MetaTypedPointerToObjectInterfaceLink::deleteNativeObject(env, forced);
+}
+
+void DependentMetaTypedPointerToObjectInterfaceLink::invalidate(JNIEnv *env){
+    if(m_dependencyManager)
+        m_dependencyManager->removeDependentObject(m_this);
+    MetaTypedPointerToObjectInterfaceLink::invalidate(env);
+}
+
+OwnedDependentMetaTypedPointerToObjectInterfaceLink::OwnedDependentMetaTypedPointerToObjectInterfaceLink(JNIEnv *env, jobject nativeLink, jobject jobj, const QMap<size_t, uint>& interfaceOffsets, const QSet<size_t>& interfaces, const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces,
+                                               void *ptr, const QMetaType& metaType, bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, JavaException& ocurredException)
+    : OwnedMetaTypedPointerToObjectInterfaceLink(env, nativeLink, jobj, interfaceOffsets, interfaces, inheritedInterfaces,
+                                            ptr, metaType, created_by_java, is_shell, ownerFunction, ocurredException)
+{
+}
+
+
+void OwnedDependentMetaTypedPointerToObjectInterfaceLink::setDependencyManager(DependencyManagerUserData* dependencyManager) {
+    m_dependencyManager = dependencyManager;
+}
+
+void OwnedDependentMetaTypedPointerToObjectInterfaceLink::deleteNativeObject(JNIEnv *env, bool forced){
+    if(m_dependencyManager)
+        m_dependencyManager->removeDependentObject(m_this);
+    OwnedMetaTypedPointerToObjectInterfaceLink::deleteNativeObject(env, forced);
+}
+
+void OwnedDependentMetaTypedPointerToObjectInterfaceLink::invalidate(JNIEnv *env){
+    if(m_dependencyManager)
+        m_dependencyManager->removeDependentObject(m_this);
+    OwnedMetaTypedPointerToObjectInterfaceLink::invalidate(env);
+}
+
 #define INTERFACE_METHODS(LINKTYPE,LINKSUPERTYPE) \
 LINKTYPE::~LINKTYPE()\
 {\
diff --git a/src/cpp/QtJambi/qtjambilink_p.h b/src/cpp/QtJambi/qtjambilink_p.h
index b2a7c9de..29b049c8 100644
--- a/src/cpp/QtJambi/qtjambilink_p.h
+++ b/src/cpp/QtJambi/qtjambilink_p.h
@@ -129,17 +129,25 @@ struct DependencyManagerUserData : public QtJambiObjectData
 {
     DependencyManagerUserData();
     ~DependencyManagerUserData() override;
-    void addDependentObject(const QWeakPointer<QtJambiLink>& dependent);
-    void removeDependentObject(const QWeakPointer<QtJambiLink>& dependent);
+    void addDependentObject(const QSharedPointer<QtJambiLink>& dependent);
+    void removeDependentObject(const QSharedPointer<QtJambiLink>& dependent);
     bool hasDependencies() const;
     void clear(JNIEnv* env);
     static DependencyManagerUserData* instance(const QObject* object, bool forceConstruction = true);
     QTJAMBI_OBJECTUSERDATA_ID_DECL
 private:
     Q_DISABLE_COPY_MOVE(DependencyManagerUserData)
-    void clear(JNIEnv* env, QList<QWeakPointer<QtJambiLink>>& dependentObjects);
-    QList<QWeakPointer<QtJambiLink>> m_dependentObjects;
-    QReadWriteLock m_lock;
+    void clear(JNIEnv* env, QSet<QWeakPointer<QtJambiLink>>& dependentObjects);
+    QSet<QWeakPointer<QtJambiLink>> m_dependentObjects;
+};
+
+class DependentLink{
+protected:
+    DependentLink() = default;
+    virtual ~DependentLink();
+    virtual void setDependencyManager(DependencyManagerUserData*) = 0;
+    friend QtJambiLink;
+    friend DependencyManagerUserData;
 };
 
 struct QtJambiLinkUserData : public QtJambiObjectData
@@ -205,24 +213,122 @@ class PointerContainerWithPendingExtraSignals : public PointerContainer{
 
 class QtJambiLink{
 public:
+    enum class Ownership : quint8 {
+        None = 0,
+        Java = 0x001,   // Weak ref to java object, deleteNativeObject deletes c++ object
+        Cpp = 0x002,    // Strong ref to java object until c++ object is deleted, deleteNativeObject does *not* delete c++ obj.
+        Split = 0x004  // Weak ref to java object, deleteNativeObject does *not* delete c++ object. Only for objects not created by Java.
+    };
+
+    enum class Flag : quint32
+{
+        None = 0,
+        JavaOwnership = quint32(Ownership::Java),   // Weak ref to java object, deleteNativeObject deletes c++ object
+        CppOwnership = quint32(Ownership::Cpp),    // Strong ref to java object until c++ object is deleted, deleteNativeObject does *not* delete c++ obj.
+        SplitOwnership = quint32(Ownership::Split),  // Weak ref to java object, deleteNativeObject does *not* delete c++ object. Only for objects not created by Java.
+        OwnershipMask = JavaOwnership | CppOwnership | SplitOwnership,
+        GlobalReference = 0x0008,
+        IsInitialized = 0x0010,
+        IsOffsetsUnregistered = 0x0020,
+        HasBeenCleaned = 0x0040,
+        CreatedByJava = 0x0080,
+        IsShell = 0x0100,
+        IsJavaLinkDetached = 0x0200,
+        BlockDeletion = 0x0400,
+        IsDependent = 0x0800,
+        HasDependencies = 0x080000,
+        IsInDestructor = 0x1000,
+        IsDeleteLater = 0x2000,
+        NoThreadInitializationOnPurge = 0x4000,
+        CreatedByQml = 0x8000,
+#if defined(QTJAMBI_DEBUG_TOOLS)
+        IsListed = 0x010000,   // Weak ref to java object, deleteNativeObject deletes c++ object
+#endif
+        HasDisposedSignal = 0x020000,
+        IsPendingObjectResolved = 0x040000,
+        IsPendingValueOwner = 0x080000,
+        NoNativeDeletion = 0x100000
+    };
+    typedef QFlags<Flag> Flags;
+
     static const QSharedPointer<QtJambiLink>& createLinkForContainer(JNIEnv *env, jobject java, void *ptr,
                                                                   LINK_NAME_ARG(const char* qt_name)
                                                                   bool created_by_java, bool isCopy, PtrDeleterFunction destructor_function, AbstractContainerAccess* containerAccess);
     static const QSharedPointer<QtJambiLink>& createLinkForContainer(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
                                                                   bool created_by_java, bool isCopy, AbstractContainerAccess* containerAccess);
-    static const QSharedPointer<QtJambiLink>& createLinkForObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
-                                                                  bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction);
-    static const QSharedPointer<QtJambiLink>& createLinkForObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
-                                                                  bool created_by_java, bool is_shell);
-    static const QSharedPointer<QtJambiLink>& createLinkForObject(JNIEnv *env, jobject java, void *ptr,
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr,
                                                                   LINK_NAME_ARG(const char* qt_name)
-                                                                  bool created_by_java, bool is_shell, PtrDeleterFunction destructor_function, PtrOwnerFunction ownerFunction);
-    static const QSharedPointer<QtJambiLink>& createLinkForObject(JNIEnv *env, jobject java, void *ptr,
+                                                                  bool created_by_java, bool isCopy, PtrDeleterFunction destructor_function, AbstractContainerAccess* containerAccess,
+                                                                        QtJambiLink::Ownership ownership);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr,
+                                                                        LINK_NAME_ARG(const char* qt_name)
+                                                                        bool created_by_java, bool isCopy, PtrDeleterFunction destructor_function, AbstractContainerAccess* containerAccess,
+                                                                        QtJambiLink::Ownership ownership,
+                                                                        const QMap<size_t,uint>& interfaceOffsets,
+                                                                        const QSet<size_t>& interfaceTypes,
+                                                                        const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                  bool created_by_java, bool isCopy, AbstractContainerAccess* containerAccess, QtJambiLink::Ownership ownership);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                     bool created_by_java, bool isCopy, AbstractContainerAccess* containerAccess, QtJambiLink::Ownership ownership,
+                                                                     const QMap<size_t,uint>& interfaceOffsets,
+                                                                     const QSet<size_t>& interfaceTypes,
+                                                                     const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr,
                                                                   LINK_NAME_ARG(const char* qt_name)
-                                                                  bool created_by_java, bool is_shell, PtrDeleterFunction destructor_function);
-    static const QSharedPointer<QtJambiLink>& createLinkForObject(JNIEnv *env, jobject java, void *ptr,
+                                                                  bool created_by_java, bool is_shell, PtrDeleterFunction destructor_function, PtrOwnerFunction ownerFunction, QtJambiLink::Ownership ownership);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr,
                                                                   LINK_NAME_ARG(const char* qt_name)
-                                                                  bool created_by_java, bool is_shell);
+                                                                  bool created_by_java, bool is_shell, PtrDeleterFunction destructor_function, QtJambiLink::Ownership ownership);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr,
+                                                                  LINK_NAME_ARG(const char* qt_name)
+                                                                  bool created_by_java, bool is_shell, QtJambiLink::Ownership ownership);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                  bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, QtJambiLink::Ownership ownership);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                  bool created_by_java, bool is_shell, QtJambiLink::Ownership ownership);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr,
+                                                                        LINK_NAME_ARG(const char* qt_name)
+                                                                        bool created_by_java, bool is_shell, PtrDeleterFunction destructor_function, PtrOwnerFunction ownerFunction, QtJambiLink::Ownership ownership,
+                                                                        const QMap<size_t,uint>& interfaceOffsets,
+                                                                        const QSet<size_t>& interfaceTypes,
+                                                                        const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr,
+                                                                        LINK_NAME_ARG(const char* qt_name)
+                                                                        bool created_by_java, bool is_shell, PtrDeleterFunction destructor_function, QtJambiLink::Ownership ownership,
+                                                                        const QMap<size_t,uint>& interfaceOffsets,
+                                                                        const QSet<size_t>& interfaceTypes,
+                                                                        const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr,
+                                                                        LINK_NAME_ARG(const char* qt_name)
+                                                                        bool created_by_java, bool is_shell, QtJambiLink::Ownership ownership,
+                                                                        const QMap<size_t,uint>& interfaceOffsets,
+                                                                        const QSet<size_t>& interfaceTypes,
+                                                                        const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                        bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, QtJambiLink::Ownership ownership,
+                                                                        const QMap<size_t,uint>& interfaceOffsets,
+                                                                        const QSet<size_t>& interfaceTypes,
+                                                                        const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                        bool created_by_java, bool is_shell, QtJambiLink::Ownership ownership,
+                                                                        const QMap<size_t,uint>& interfaceOffsets,
+                                                                        const QSet<size_t>& interfaceTypes,
+                                                                        const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    static const QSharedPointer<QtJambiLink>& createLinkForDependentObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                           bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, const QObject* dependsOn, QtJambiLink::Ownership ownership);
+    static const QSharedPointer<QtJambiLink>& createLinkForDependentObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                           bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, const QObject* dependsOn, QtJambiLink::Ownership ownership,
+                                                                           const QMap<size_t,uint>& interfaceOffsets,
+                                                                           const QSet<size_t>& interfaceTypes,
+                                                                           const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    static const QSharedPointer<QtJambiLink>& createLinkForDependentObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                           bool created_by_java, bool is_shell, const QObject* dependsOn, QtJambiLink::Ownership ownership);
+    static const QSharedPointer<QtJambiLink>& createLinkForDependentObject(JNIEnv *env, jobject java, void *ptr, const QMetaType& metaType,
+                                                                           bool created_by_java, bool is_shell, const QObject* dependsOn, QtJambiLink::Ownership ownership,
+                                                                           const QMap<size_t,uint>& interfaceOffsets,
+                                                                           const QSet<size_t>& interfaceTypes,
+                                                                           const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
     static const QSharedPointer<QtJambiLink>& createLinkForOwnedObject(JNIEnv *env, jobject java, void *ptr,
                                                                        LINK_NAME_ARG(const char* qt_name)
                                                                        QtJambiNativeID owner, PtrDeleterFunction destructor_function);
@@ -242,6 +348,11 @@ class QtJambiLink{
                                                                                  LINK_NAME_ARG(const char* qt_name)
                                                                                  void* ptr_shared_pointer, SmartPointerDeleter pointerDeleter, SmartPointerGetterFunction pointerGetter, AbstractContainerAccess* containerAccess);
     static const QSharedPointer<QtJambiLink>& createLinkForQObject(JNIEnv *env, jobject java, QObject *object, bool created_by_java, bool is_shell, const QMetaObject* superTypeForCustomMetaObject = nullptr);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeQObject(JNIEnv *env, jobject java, QObject *object, bool created_by_java, bool is_shell, const QMetaObject* superTypeForCustomMetaObject);
+    static const QSharedPointer<QtJambiLink>& createLinkForNativeQObject(JNIEnv *env, jobject java, QObject *object, bool created_by_java, bool is_shell, const QMetaObject* superTypeForCustomMetaObject,
+                                                                         const QMap<size_t,uint>& interfaceOffsets,
+                                                                         const QSet<size_t>& interfaceTypes,
+                                                                         const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
     static const QSharedPointer<QtJambiLink>& createLinkForSmartPointerToQObject(JNIEnv *env, jobject java, bool created_by_java, bool is_shell, void* ptr_shared_pointer, SmartPointerDeleter pointerDeleter, SmartPointerGetterFunction pointerGetter, const QMetaObject* superTypeForCustomMetaObject = nullptr);
     static const QSharedPointer<QtJambiLink>& createLinkForNewQObject(JNIEnv *env, jclass objectClass, jobject nativeLink, jobject java, const std::type_info& typeId, const QMetaObject* metaObject, QObject *object, const SuperTypeInfos* superTypeInfos, bool created_by_java, bool isDeclarativeCall, bool is_shell, bool hasCustomMetaObject, JavaException& ocurredException);
     static const QSharedPointer<QtJambiLink>& createLinkForNewObject(JNIEnv *env, jclass objectClass, jobject nativeLink, jobject java, const std::type_info& typeId, void *ptr, const SuperTypeInfos* superTypeInfos, const QMetaType& metaType, bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, JavaException& ocurredException);
@@ -264,44 +375,6 @@ class QtJambiLink{
     static void unregisterQObjectInitialization(void *ptr);
 private:
 public:
-    enum class Ownership : quint8 {
-        None = 0,
-        Java = 0x001,   // Weak ref to java object, deleteNativeObject deletes c++ object
-        Cpp = 0x002,    // Strong ref to java object until c++ object is deleted, deleteNativeObject does *not* delete c++ obj.
-        Split = 0x004  // Weak ref to java object, deleteNativeObject does *not* delete c++ object. Only for objects not created by Java.
-    };
-
-    enum class Flag : quint32
-{
-        None = 0,
-        JavaOwnership = quint32(Ownership::Java),   // Weak ref to java object, deleteNativeObject deletes c++ object
-        CppOwnership = quint32(Ownership::Cpp),    // Strong ref to java object until c++ object is deleted, deleteNativeObject does *not* delete c++ obj.
-        SplitOwnership = quint32(Ownership::Split),  // Weak ref to java object, deleteNativeObject does *not* delete c++ object. Only for objects not created by Java.
-        OwnershipMask = JavaOwnership | CppOwnership | SplitOwnership,
-        GlobalReference = 0x0008,
-        IsInitialized = 0x0010,
-        IsOffsetsUnregistered = 0x0020,
-        HasBeenCleaned = 0x0040,
-        CreatedByJava = 0x0080,
-        IsShell = 0x0100,
-        IsJavaLinkDetached = 0x0200,
-        BlockDeletion = 0x0400,
-        IsDependent = 0x0800,
-        HasDependencies = 0x080000,
-        IsInDestructor = 0x1000,
-        IsDeleteLater = 0x2000,
-        NoThreadInitializationOnPurge = 0x4000,
-        CreatedByQml = 0x8000,
-#if defined(QTJAMBI_DEBUG_TOOLS)
-        IsListed = 0x010000,   // Weak ref to java object, deleteNativeObject deletes c++ object
-#endif
-        HasDisposedSignal = 0x020000,
-        IsPendingObjectResolved = 0x040000,
-        IsPendingValueOwner = 0x080000,
-        NoNativeDeletion = 0x100000
-    };
-    typedef QFlags<Flag> Flags;
-
     QtJambiLink(JNIEnv *env, jobject nativeLink, jobject jobj,
                     LINK_NAME_ARG(const char* qt_name)
                     bool created_by_java, bool isDeclarativeCall, bool is_shell, JavaException& ocurredException);
@@ -465,6 +538,18 @@ class MetaTypedPointerToObjectLink : public PointerToObjectLink{
     friend QtJambiLink;
 };
 
+class DependentMetaTypedPointerToObjectLink : public MetaTypedPointerToObjectLink, public DependentLink{
+protected:
+    DependentMetaTypedPointerToObjectLink(JNIEnv *env, jobject nativeLink, jobject jobj,
+                                          void *ptr, const QMetaType& metaType, bool created_by_java, bool is_shell, JavaException& ocurredException);
+    void setDependencyManager(DependencyManagerUserData*) override;
+    void deleteNativeObject(JNIEnv *env, bool forced) override;
+    void invalidate(JNIEnv *env) override;
+private:
+    DependencyManagerUserData* m_dependencyManager;
+    friend QtJambiLink;
+};
+
 class MetaTypedPointerToContainerLink : public MetaTypedPointerToObjectLink{
 protected:
     MetaTypedPointerToContainerLink(JNIEnv *env, jobject nativeLink, jobject jobj,
@@ -500,13 +585,26 @@ class OwnedMetaTypedPointerToObjectLink : public MetaTypedPointerToObjectLink{
                         PtrOwnerFunction ownerFunction, JavaException& ocurredException);
 public:
     void init(JNIEnv* env) override;
-    void deleteNativeObject(JNIEnv *env, bool forced = false) final override;
+    void deleteNativeObject(JNIEnv *env, bool forced = false) override;
     inline PtrOwnerFunction ownerFunction() const override {return m_owner_function;}
 private:
     PtrOwnerFunction m_owner_function;
     friend QtJambiLink;
 };
 
+class OwnedDependentMetaTypedPointerToObjectLink : public OwnedMetaTypedPointerToObjectLink, public DependentLink{
+protected:
+    OwnedDependentMetaTypedPointerToObjectLink(JNIEnv *env, jobject nativeLink, jobject jobj,
+                        void *ptr, const QMetaType& metaType, bool created_by_java, bool is_shell,
+                        PtrOwnerFunction ownerFunction, JavaException& ocurredException);
+    void setDependencyManager(DependencyManagerUserData*) override;
+    void deleteNativeObject(JNIEnv *env, bool forced) override;
+    void invalidate(JNIEnv *env) override;
+private:
+    DependencyManagerUserData* m_dependencyManager;
+    friend QtJambiLink;
+};
+
 class DeletableOwnedPointerToObjectLink : public PointerToObjectLink{
 protected:
     DeletableOwnedPointerToObjectLink(JNIEnv *env, jobject nativeLink, jobject jobj,
@@ -583,6 +681,18 @@ class MetaTypedPointerToObjectInterfaceLink : public MetaTypedPointerToObjectLin
     INTERFACE_DECL(MetaTypedPointerToObjectInterfaceLink)
 };
 
+class DependentMetaTypedPointerToObjectInterfaceLink : public MetaTypedPointerToObjectInterfaceLink, public DependentLink{
+protected:
+    DependentMetaTypedPointerToObjectInterfaceLink(JNIEnv *env, jobject nativeLink, jobject jobj, const QMap<size_t, uint>& interfaceOffsets, const QSet<size_t>& interfaces, const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces,
+                                                   void *ptr, const QMetaType& metaType, bool created_by_java, bool is_shell, JavaException& ocurredException);
+    void setDependencyManager(DependencyManagerUserData*) override;
+    void deleteNativeObject(JNIEnv *env, bool forced) override;
+    void invalidate(JNIEnv *env) override;
+private:
+    DependencyManagerUserData* m_dependencyManager;
+    friend QtJambiLink;
+};
+
 class OwnedMetaTypedPointerToObjectInterfaceLink : public OwnedMetaTypedPointerToObjectLink{
 protected:
     OwnedMetaTypedPointerToObjectInterfaceLink(JNIEnv *env, jobject nativeLink, jobject jobj, const QMap<size_t, uint>& interfaceOffsets, const QSet<size_t>& interfaces, const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces,
@@ -590,6 +700,18 @@ class OwnedMetaTypedPointerToObjectInterfaceLink : public OwnedMetaTypedPointerT
     INTERFACE_DECL(OwnedMetaTypedPointerToObjectInterfaceLink)
 };
 
+class OwnedDependentMetaTypedPointerToObjectInterfaceLink : public OwnedMetaTypedPointerToObjectInterfaceLink, public DependentLink{
+protected:
+    OwnedDependentMetaTypedPointerToObjectInterfaceLink(JNIEnv *env, jobject nativeLink, jobject jobj, const QMap<size_t, uint>& interfaceOffsets, const QSet<size_t>& interfaces, const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces,
+                                 void *ptr, const QMetaType& metaType, bool created_by_java, bool is_shell, PtrOwnerFunction ownerFunction, JavaException& ocurredException);
+    void setDependencyManager(DependencyManagerUserData*) override;
+    void deleteNativeObject(JNIEnv *env, bool forced) override;
+    void invalidate(JNIEnv *env) override;
+private:
+    DependencyManagerUserData* m_dependencyManager;
+    friend QtJambiLink;
+};
+
 class PointerToContainerInterfaceLink : public PointerToContainerLink{
 protected:
     PointerToContainerInterfaceLink(JNIEnv *env, jobject nativeLink, jobject jobj, const QMap<size_t, uint>& interfaceOffsets, const QSet<size_t>& interfaces, const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces,
diff --git a/src/cpp/QtJambi/qtjambimetaobject.cpp b/src/cpp/QtJambi/qtjambimetaobject.cpp
index 0150f8fb..e3c4aa32 100644
--- a/src/cpp/QtJambi/qtjambimetaobject.cpp
+++ b/src/cpp/QtJambi/qtjambimetaobject.cpp
@@ -311,7 +311,7 @@ void static_metacall_QObject(const QtJambiMetaObject* q, QObject * o, QMetaObjec
 void static_metacall_QtSubType(const QtJambiMetaObject* q, QObject * o, QMetaObject::Call cl, int idx, void ** argv)
 {
     if(JniEnvironment env{200}){
-        if(jobject object = o ? QtJambiAPI::convertNativeToJavaObject(env, o, q->javaClass(), false, false) : nullptr){
+        if(jobject object = o ? QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, o, q->javaClass()) : nullptr){
             switch(cl){
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             case QMetaObject::QueryPropertyUser:
@@ -1406,12 +1406,14 @@ jobject QtJambiMetaObject::toReflected(JNIEnv * env, const QMetaMethod& method)
     return nullptr;
 }
 
-hash_type qHash(const QMetaMethod& method){
+hash_type qHash(const QMetaMethod& method, hash_type seed = 0){
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    return qHashMulti(0, method.enclosingMetaObject(), method.methodIndex());
+    return qHashMulti(seed, method.enclosingMetaObject(), method.methodIndex());
 #else
-    QList<quintptr> range{quintptr(method.enclosingMetaObject()),quintptr(method.methodIndex())};
-    return qHashRange(range.begin(), range.end());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, qintptr(method.enclosingMetaObject()));
+    seed = hash(seed, method.methodIndex());
+    return seed;
 #endif
 }
 
diff --git a/src/cpp/QtJambi/qtjambishell.cpp b/src/cpp/QtJambi/qtjambishell.cpp
index 77e19d6d..bb1e9e68 100644
--- a/src/cpp/QtJambi/qtjambishell.cpp
+++ b/src/cpp/QtJambi/qtjambishell.cpp
@@ -2736,17 +2736,17 @@ QList<jmethodID> getMethodIDs(JNIEnv *env, jclass object_class, const std::type_
 {
     bool is_interface = isInterface(typeId) || isFunctional(typeId);
     QList<jmethodID> methods;
-    const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId);
+    QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeId);
     Q_ASSERT(typeEntry);
     const QVector<const FunctionInfo>* virtualFcts(nullptr);
     if(typeEntry->isObject()){
-        virtualFcts = static_cast<const ObjectTypeEntry*>(typeEntry)->virtualFunctions();
+        virtualFcts = static_cast<const ObjectTypeEntry*>(typeEntry.data())->virtualFunctions();
     }else if(typeEntry->isQObject()){
-        virtualFcts = static_cast<const QObjectTypeEntry*>(typeEntry)->virtualFunctions();
+        virtualFcts = static_cast<const QObjectTypeEntry*>(typeEntry.data())->virtualFunctions();
     }else if(typeEntry->isInterface()){
-        virtualFcts = static_cast<const InterfaceTypeEntry*>(typeEntry)->virtualFunctions();
+        virtualFcts = static_cast<const InterfaceTypeEntry*>(typeEntry.data())->virtualFunctions();
     }else if(typeEntry->isFunctional()){
-        virtualFcts = static_cast<const FunctionalTypeEntry*>(typeEntry)->virtualFunctions();
+        virtualFcts = static_cast<const FunctionalTypeEntry*>(typeEntry.data())->virtualFunctions();
     }
     if(virtualFcts){
         for (int i=0; i<virtualFcts->size(); ++i) {
diff --git a/src/cpp/QtJambi/registry.cpp b/src/cpp/QtJambi/registry.cpp
index 75bb761e..d7b52551 100644
--- a/src/cpp/QtJambi/registry.cpp
+++ b/src/cpp/QtJambi/registry.cpp
@@ -230,6 +230,115 @@ class JObjectWrapperConverter : public QtPrivate::AbstractConverterFunction{
 };
 #endif
 
+ParameterInfo::ParameterInfo()
+    : metaTypeId(0),
+      javaClass(nullptr),
+      qtToJavaConverterFunction(nullptr),
+      javaToQtConverterFunction(nullptr){}
+ParameterInfo::ParameterInfo(const ParameterInfo& other)
+    : metaTypeId(other.metaTypeId),
+      javaClass(other.javaClass),
+      qtToJavaConverterFunction(other.qtToJavaConverterFunction),
+      javaToQtConverterFunction(other.javaToQtConverterFunction){}
+ParameterInfo::ParameterInfo(int _metaTypeId):metaTypeId(_metaTypeId){}
+ParameterInfo::ParameterInfo(int _metaTypeId, const char* _javaClass, QtToJavaConverterFunction _qtToJavaConverterFunction, JavaToQtConverterFunction _javaToQtConverterFunction)
+    : metaTypeId(_metaTypeId),
+      javaClass(_javaClass),
+      qtToJavaConverterFunction(_qtToJavaConverterFunction),
+      javaToQtConverterFunction(_javaToQtConverterFunction){}
+ParameterInfo& ParameterInfo::operator=(const ParameterInfo& other){
+    metaTypeId = other.metaTypeId;
+    javaClass = other.javaClass;
+    qtToJavaConverterFunction = other.qtToJavaConverterFunction;
+    javaToQtConverterFunction = other.javaToQtConverterFunction;
+    return *this;
+}
+ParameterInfo::ParameterInfo(ParameterInfo&& other)
+    : metaTypeId(other.metaTypeId),
+      javaClass(other.javaClass),
+      qtToJavaConverterFunction(other.qtToJavaConverterFunction),
+      javaToQtConverterFunction(other.javaToQtConverterFunction){}
+ParameterInfo& ParameterInfo::operator=(ParameterInfo&& other){
+    metaTypeId = other.metaTypeId;
+    javaClass = other.javaClass;
+    qtToJavaConverterFunction = other.qtToJavaConverterFunction;
+    javaToQtConverterFunction = other.javaToQtConverterFunction;
+    return *this;
+}
+
+ConstructorInfo::ConstructorInfo(): constructorFunction(nullptr),signature(nullptr){}
+ConstructorInfo::ConstructorInfo(const ConstructorInfo& copy): constructorFunction(copy.constructorFunction),signature(copy.signature){}
+ConstructorInfo::ConstructorInfo(ConstructorInfo&& copy): constructorFunction(copy.constructorFunction),signature(copy.signature){}
+ConstructorInfo::ConstructorInfo(Constructor _constructorFunction, const char *_signature): constructorFunction(_constructorFunction),signature(_signature){}
+ConstructorInfo& ConstructorInfo::operator=(const ConstructorInfo& copy){
+    constructorFunction = copy.constructorFunction;
+    signature = copy.signature;
+    return *this;
+}
+ConstructorInfo& ConstructorInfo::operator=(ConstructorInfo&& copy){
+    constructorFunction = copy.constructorFunction;
+    signature = copy.signature;
+    return *this;
+}
+
+FunctionInfo::FunctionInfo(): name(nullptr),signature(nullptr),flags(None){}
+FunctionInfo::FunctionInfo(const FunctionInfo& copy): name(copy.name),signature(copy.signature),flags(copy.flags){}
+FunctionInfo::FunctionInfo(FunctionInfo&& copy): name(copy.name),signature(copy.signature),flags(copy.flags){}
+FunctionInfo::FunctionInfo(const char *_name, const char *_signature, Flags _flags): name(_name),signature(_signature),flags(_flags){}
+FunctionInfo& FunctionInfo::operator=(const FunctionInfo& copy){
+    name = copy.name;
+    signature = copy.signature;
+    flags = copy.flags;
+    return *this;
+}
+FunctionInfo& FunctionInfo::operator=(FunctionInfo&& copy){
+    name = copy.name;
+    signature = copy.signature;
+    flags = copy.flags;
+    return *this;
+}
+
+SignalMetaInfo::SignalMetaInfo():
+    signal_name(nullptr),
+    signal_signature(nullptr),
+    signal_argumentcount(0),
+    signal_method_index_provider(nullptr){}
+SignalMetaInfo::SignalMetaInfo(const SignalMetaInfo& copy):
+    signal_name(copy.signal_name),
+    signal_signature(copy.signal_signature),
+    signal_argumentcount(copy.signal_argumentcount),
+    signal_method_index_provider(copy.signal_method_index_provider)
+{}
+SignalMetaInfo::SignalMetaInfo(SignalMetaInfo&& copy):
+    signal_name(copy.signal_name),
+    signal_signature(copy.signal_signature),
+    signal_argumentcount(copy.signal_argumentcount),
+    signal_method_index_provider(copy.signal_method_index_provider)
+{}
+SignalMetaInfo::SignalMetaInfo(const char * _signal_name,
+                        const char * _signal_signature,
+                        const int _signal_argumentcount,
+                        SignalMethodIndexProvider _signal_method_index_provider):
+    signal_name(_signal_name),
+    signal_signature(_signal_signature),
+    signal_argumentcount(_signal_argumentcount),
+    signal_method_index_provider(_signal_method_index_provider)
+{}
+SignalMetaInfo& SignalMetaInfo::operator=(const SignalMetaInfo& copy){
+    signal_name = copy.signal_name;
+    signal_signature = copy.signal_signature;
+    signal_argumentcount = copy.signal_argumentcount;
+    signal_method_index_provider = copy.signal_method_index_provider;
+    return *this;
+}
+SignalMetaInfo& SignalMetaInfo::operator=(SignalMetaInfo&& copy){
+    signal_name = copy.signal_name;
+    signal_signature = copy.signal_signature;
+    signal_argumentcount = copy.signal_argumentcount;
+    signal_method_index_provider = copy.signal_method_index_provider;
+    return *this;
+}
+
 hash_type qHash(const char *p, hash_type seed) Q_DECL_NOEXCEPT
 {
     hash_type h = seed;
@@ -782,10 +891,13 @@ void registerMetaTypeID(const std::type_info& typeId, const std::type_info& nonP
                     new (target)JObjectWrapper();
                     return true;
                 }else if(JniEnvironment env{200}){
-                    jobject output(nullptr);
-                    bool result = QtJambiAPI::convertNativeToJava(env, *_nonPointerTypeId, nullptr, src, true, false, output);
-                    new (target)JObjectWrapper(env, output);
-                    return result;
+                    try{
+                        jobject output = QtJambiAPI::convertNativeToJavaObjectAsCopy(env, src, *_nonPointerTypeId);
+                        new (target)JObjectWrapper(env, output);
+                        return true;
+                    }catch(const JavaException& exn){
+                        exn.report(env);
+                    }
                 }
                 return false;
             }, metaType, jObjectWrapperMetaType);
@@ -1671,12 +1783,13 @@ Destructor registeredDestructor(const std::type_info& typeId){
     return gDestructorHash->value(unique_id(typeId), nullptr);
 }
 
-hash_type qHash(const QMetaObject* mo){
-    hash_type hashCode = qHash(qintptr(mo));
+hash_type qHash(const QMetaObject* mo, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, qintptr(mo));
     if(mo){
-        hashCode = hashCode * 31 + qHash(mo->className());
+        seed = hash(seed, mo->className());
     }
-    return hashCode;
+    return seed;
 }
 
 void RegistryAPI::registerCustomMetaObject(const std::type_info& typeId, const QMetaObject& superTypeMetaObject)
@@ -2826,7 +2939,7 @@ bool JObjectValueWrapper::isNull()const{return !p;}
 void JObjectValueWrapper::writeTo(QDataStream &d)const{
     if(JniEnvironment env{200}){
         try{
-            jobject _d = QtJambiAPI::convertNativeToJavaObject(env, &d, false);
+            jobject _d = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, &d);
             QTJAMBI_INVALIDATE_AFTER_USE(env, _d);
             env->CallVoidMethod(object(), p->writeTo, _d);
         }catch(const JavaException& exn){
@@ -2837,7 +2950,7 @@ void JObjectValueWrapper::writeTo(QDataStream &d)const{
 void JObjectValueWrapper::readFrom(QDataStream &d){
     if(JniEnvironment env{200}){
         try{
-            jobject _d = QtJambiAPI::convertNativeToJavaObject(env, &d, false);
+            jobject _d = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, &d);
             QTJAMBI_INVALIDATE_AFTER_USE(env, _d);
             env->CallVoidMethod(object(), p->readFrom, _d);
         }catch(const JavaException& exn){
@@ -2849,7 +2962,7 @@ void JObjectValueWrapper::readFrom(QDataStream &d){
 void JObjectValueWrapper::serializeTo(QDataStream &d)const{
     if(JniEnvironment env{200}){
         try{
-            jobject _d = QtJambiAPI::convertNativeToJavaObject(env, &d, false);
+            jobject _d = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, &d);
             QTJAMBI_INVALIDATE_AFTER_USE(env, _d);
             Java::QtJambi::MetaTypeUtility::writeSerializableJavaObject(env, _d, object());
         }catch(const JavaException& exn){
@@ -2860,7 +2973,7 @@ void JObjectValueWrapper::serializeTo(QDataStream &d)const{
 void JObjectValueWrapper::serializeFrom(QDataStream &d){
     if(JniEnvironment env{200}){
         try{
-            jobject _d = QtJambiAPI::convertNativeToJavaObject(env, &d, false);
+            jobject _d = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, &d);
             QTJAMBI_INVALIDATE_AFTER_USE(env, _d);
             jobject newValue = Java::QtJambi::MetaTypeUtility::readSerializableJavaObject(env, _d);
             *this = JObjectValueWrapper(env, newValue, p);
diff --git a/src/cpp/QtJambi/registryapi.h b/src/cpp/QtJambi/registryapi.h
index 1e1753c4..963672e1 100644
--- a/src/cpp/QtJambi/registryapi.h
+++ b/src/cpp/QtJambi/registryapi.h
@@ -52,7 +52,7 @@ class QtJambiTypeInfo
                                  );
     }
 
-    QtJambiTypeInfo(const QtJambiTypeInfo& info)
+    inline QtJambiTypeInfo(const QtJambiTypeInfo& info)
         :
           isPointer(info.isPointer)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -78,77 +78,69 @@ class QtJambiTypeInfo
 #endif //QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
           {}
 };
-
-typedef int(*SignalMethodIndexProvider)();
-
-struct SignalMetaInfo
+struct QTJAMBI_EXPORT SignalMetaInfo
 {
-    inline SignalMetaInfo():
-        signal_name(nullptr),
-        signal_signature(nullptr),
-        signal_argumentcount(0),
-        signal_method_index_provider(nullptr){}
-    inline SignalMetaInfo(const SignalMetaInfo& copy):
-        signal_name(copy.signal_name),
-        signal_signature(copy.signal_signature),
-        signal_argumentcount(copy.signal_argumentcount),
-        signal_method_index_provider(copy.signal_method_index_provider)
-    {}
-    inline SignalMetaInfo(const char * _signal_name,
+    typedef int(*SignalMethodIndexProvider)();
+    SignalMetaInfo();
+    SignalMetaInfo(const SignalMetaInfo& other);
+    SignalMetaInfo(SignalMetaInfo&& other);
+    SignalMetaInfo& operator=(const SignalMetaInfo& other);
+    SignalMetaInfo& operator=(SignalMetaInfo&& other);
+    SignalMetaInfo(const char * _signal_name,
                             const char * _signal_signature,
                             const int _signal_argumentcount,
-                            SignalMethodIndexProvider _signal_method_index_provider):
-        signal_name(_signal_name),
-        signal_signature(_signal_signature),
-        signal_argumentcount(_signal_argumentcount),
-        signal_method_index_provider(_signal_method_index_provider)
-    {}
+                            SignalMethodIndexProvider _signal_method_index_provider);
     const char * signal_name;
     const char * signal_signature;
     int signal_argumentcount;
     SignalMethodIndexProvider signal_method_index_provider;
 };
 
-struct FunctionInfo{
+struct QTJAMBI_EXPORT FunctionInfo{
     enum Flags : quint8{
         None = 0,
         Abstract = 0x01,
         Private = 0x02,
     };
-    inline FunctionInfo(): name(nullptr),signature(nullptr),flags(None){}
-    inline FunctionInfo(const FunctionInfo& copy): name(copy.name),signature(copy.signature),flags(copy.flags){}
-    inline FunctionInfo(const char *_name, const char *_signature, Flags _flags = None): name(_name),signature(_signature),flags(_flags){}
+    FunctionInfo();
+    FunctionInfo(const FunctionInfo& other);
+    FunctionInfo(FunctionInfo&& other);
+    FunctionInfo(const char *_name, const char *_signature, Flags _flags = None);
+    FunctionInfo& operator=(const FunctionInfo& other);
+    FunctionInfo& operator=(FunctionInfo&& other);
     const char * name;
     const char * signature;
     Flags flags;
 };
 
-struct ConstructorInfo{
+struct QTJAMBI_EXPORT ConstructorInfo{
     typedef void (*Constructor)(void*, JNIEnv*, jobject, jvalue*);
-    inline ConstructorInfo(): constructorFunction(nullptr),signature(nullptr){}
-    inline ConstructorInfo(const ConstructorInfo& copy): constructorFunction(copy.constructorFunction),signature(copy.signature){}
-    inline ConstructorInfo(Constructor _constructorFunction, const char *_signature): constructorFunction(_constructorFunction),signature(_signature){}
+    ConstructorInfo();
+    ConstructorInfo(const ConstructorInfo& other);
+    ConstructorInfo(Constructor _constructorFunction, const char *_signature);
+    ConstructorInfo(ConstructorInfo&& other);
+    ConstructorInfo& operator=(const ConstructorInfo& other);
+    ConstructorInfo& operator=(ConstructorInfo&& other);
     Constructor constructorFunction;
     const char *signature;
 };
 
 class QtJambiScope;
 
-struct ParameterInfo{
+struct QTJAMBI_EXPORT ParameterInfo{
     typedef bool(*QtToJavaConverterFunction)(JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* out, bool forceBoxedType);
     typedef bool(*JavaToQtConverterFunction)(JNIEnv* env, QtJambiScope* scope, const jvalue&val, void* &out, jValueType valueType);
     int metaTypeId = 0;
     const char* javaClass = nullptr;
     QtToJavaConverterFunction qtToJavaConverterFunction = nullptr;
     JavaToQtConverterFunction javaToQtConverterFunction = nullptr;
-    ParameterInfo() = default;
-    ParameterInfo(const ParameterInfo&) = default;
-    ParameterInfo(int _metaTypeId):metaTypeId(_metaTypeId){}
-    ParameterInfo(int _metaTypeId, const char* _javaClass, QtToJavaConverterFunction _qtToJavaConverterFunction, JavaToQtConverterFunction _javaToQtConverterFunction)
-        : metaTypeId(_metaTypeId),
-          javaClass(_javaClass),
-          qtToJavaConverterFunction(_qtToJavaConverterFunction),
-          javaToQtConverterFunction(_javaToQtConverterFunction){}
+    ParameterInfo();
+    ParameterInfo(const ParameterInfo& other);
+    ParameterInfo& operator=(const ParameterInfo& other);
+    ParameterInfo(ParameterInfo&& other);
+    ParameterInfo& operator=(ParameterInfo&& other);
+    ParameterInfo(int _metaTypeId);
+    ParameterInfo(int _metaTypeId, const char* _javaClass, QtToJavaConverterFunction _qtToJavaConverterFunction, JavaToQtConverterFunction _javaToQtConverterFunction);
 };
 
 typedef bool (*ParameterInfoProvider)(const QMetaMethod& method, QList<ParameterInfo>& infos);
@@ -193,7 +185,7 @@ constexpr const char * interfaceIID(){
 
 template<typename T, bool = QtJambiPrivate::supports_qHash<T>::value>
 struct RegistryHelper{
-    static void registerHashFunction(){ RegistryAPI::registerHashFunction(typeid(T), [](const void* ptr, hash_type seed)->hash_type{ return !ptr ? 0 : ::qHash(*reinterpret_cast<const T*>(ptr), seed); }); }
+    static void registerHashFunction(){ RegistryAPI::registerHashFunction(typeid(T), [](const void* ptr, hash_type seed)->hash_type{ return !ptr ? 0 : qHash(*reinterpret_cast<const T*>(ptr), seed); }); }
 };
 
 template<typename T>
@@ -631,25 +623,45 @@ int registerMetaType(const char *typeName,
                             );
 }
 
+namespace Private{
+
+template<typename T, bool = QMetaTypeId<T>::Defined>
+struct MetaTypeUtil{
+    static int registerMetaType(const char *typeName){
+        return RegistryAPI::registerMetaType<T>(typeName,
+    #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+                                  QtMetaTypePrivate::QMetaTypeFunctionHelper<T>::Destruct,
+                                  QtMetaTypePrivate::QMetaTypeFunctionHelper<T>::Construct
+    #else
+                                  QtJambiPrivate::QMetaTypeInterfaceFunctions<T>::defaultCtr,
+                                  QtJambiPrivate::QMetaTypeInterfaceFunctions<T>::copyCtr,
+                                  QtJambiPrivate::QMetaTypeInterfaceFunctions<T>::moveCtr,
+                                  QtJambiPrivate::QMetaTypeInterfaceFunctions<T>::dtor,
+                                  QtPrivate::QEqualityOperatorForType<T>::equals,
+                                  QtPrivate::QLessThanOperatorForType<T>::lessThan,
+                                  QtPrivate::QDebugStreamOperatorForType<T>::debugStream,
+                                  QtPrivate::QDataStreamOperatorForType<T>::dataStreamOut,
+                                  QtPrivate::QDataStreamOperatorForType<T>::dataStreamIn
+    #endif
+                                );
+    }
+};
+
+template<typename T>
+struct MetaTypeUtil<T,true>{
+    static int registerMetaType(const char *){
+        registerOperators<T>();
+        registerMetaTypeID(typeid(T), QMetaTypeId<T>::qt_metatype_id());
+        return QMetaTypeId<T>::qt_metatype_id();
+    }
+};
+
+}
+
 template<typename T>
 int registerMetaType(const char *typeName)
 {
-    return registerMetaType<T>(typeName,
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-                              QtMetaTypePrivate::QMetaTypeFunctionHelper<T>::Destruct,
-                              QtMetaTypePrivate::QMetaTypeFunctionHelper<T>::Construct
-#else
-                              QtJambiPrivate::QMetaTypeInterfaceFunctions<T>::defaultCtr,
-                              QtJambiPrivate::QMetaTypeInterfaceFunctions<T>::copyCtr,
-                              QtJambiPrivate::QMetaTypeInterfaceFunctions<T>::moveCtr,
-                              QtJambiPrivate::QMetaTypeInterfaceFunctions<T>::dtor,
-                              QtPrivate::QEqualityOperatorForType<T>::equals,
-                              QtPrivate::QLessThanOperatorForType<T>::lessThan,
-                              QtPrivate::QDebugStreamOperatorForType<T>::debugStream,
-                              QtPrivate::QDataStreamOperatorForType<T>::dataStreamOut,
-                              QtPrivate::QDataStreamOperatorForType<T>::dataStreamIn
-#endif
-                            );
+    return Private::MetaTypeUtil<T>::registerMetaType(typeName);
 }
 
 template<typename T>
diff --git a/src/cpp/QtJambi/scope.cpp b/src/cpp/QtJambi/scope.cpp
index 3292e6c0..2c096a71 100644
--- a/src/cpp/QtJambi/scope.cpp
+++ b/src/cpp/QtJambi/scope.cpp
@@ -175,6 +175,20 @@ void QtJambiScope::addObjectInvalidation(JNIEnv *env, jobject object, bool check
     }
 }
 
+void QtJambiScope::addObjectInvalidation(JNIEnv *env, QtJambiNativeID nativeId, bool persistent){
+    if(persistent){
+        addFinalAction([nativeId](){
+            if(JniEnvironment env{200}){
+                InvalidateAfterUse::invalidate(env, nativeId);
+            }
+        });
+    }else{
+        addFinalAction([env, nativeId](){
+            InvalidateAfterUse::invalidate(env, nativeId);
+        });
+    }
+}
+
 void QtJambiScope::addFinalAction(std::function<void()>&& action){
     if(!d)
         d = new QtJambiScopePrivate();
diff --git a/src/cpp/QtJambi/scope.h b/src/cpp/QtJambi/scope.h
index 0e53faaa..9111ccee 100644
--- a/src/cpp/QtJambi/scope.h
+++ b/src/cpp/QtJambi/scope.h
@@ -60,6 +60,7 @@ class QTJAMBI_EXPORT QtJambiScope{
         addFinalAction([pointer](){delete[] pointer;});
     }
     void addObjectInvalidation(JNIEnv *env, jobject object, bool checkJavaOwnership, bool persistent = true);
+    void addObjectInvalidation(JNIEnv *env, QtJambiNativeID nativeId, bool persistent = true);
     QtJambiNativeID relatedNativeID() const;
 protected:
     QtJambiScope(QtJambiScopePrivate&);
diff --git a/src/cpp/QtJambi/typeentry.cpp b/src/cpp/QtJambi/typeentry.cpp
index d75de3ee..533b457f 100644
--- a/src/cpp/QtJambi/typeentry.cpp
+++ b/src/cpp/QtJambi/typeentry.cpp
@@ -51,7 +51,7 @@ QT_WARNING_DISABLE_DEPRECATED
 
 bool isQObject(const std::type_info& typeId);
 
-typedef QMap<size_t, QMap<QByteArray,const QtJambiTypeEntry*>> TypeEntryHash;
+typedef QMap<size_t, QMap<QByteArray,QtJambiTypeEntryPtr>> TypeEntryHash;
 Q_GLOBAL_STATIC(TypeEntryHash, gTypeEntryHash)
 Q_GLOBAL_STATIC_WITH_ARGS(QReadWriteLock, gTypeEntryLock, (QReadWriteLock::Recursive))
 
@@ -60,24 +60,24 @@ QList<const PolymorphicIdHandler*> getPolymorphicIdHandlers(const std::type_info
 
 void clear_type_entry(const std::type_info& typeId)
 {
-    QWriteLocker locker(gTypeEntryLock());
-    Q_UNUSED(locker)
-    if(gTypeEntryHash()->contains(unique_id(typeId))){
-        for(const QtJambiTypeEntry* entry : gTypeEntryHash()->take(unique_id(typeId)).values()){
-            delete entry;
+    QMap<QByteArray,QtJambiTypeEntryPtr> typeEntries;
+    {
+        QWriteLocker locker(gTypeEntryLock());
+        if(gTypeEntryHash()->contains(unique_id(typeId))){
+            typeEntries = gTypeEntryHash()->take(unique_id(typeId));
         }
     }
 }
 
-const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId, bool recursive, const char* qtName)
+QtJambiTypeEntryPtr get_type_entry(JNIEnv* env, const std::type_info& typeId, bool recursive, const char* qtName)
 {
     {
         QReadLocker locker(gTypeEntryLock());
         Q_UNUSED(locker)
         if(gTypeEntryHash()->contains(unique_id(typeId))){
-            const QMap<QByteArray,const QtJambiTypeEntry*>& entries = (*gTypeEntryHash())[unique_id(typeId)];
+            const QMap<QByteArray,QtJambiTypeEntryPtr>& entries = (*gTypeEntryHash())[unique_id(typeId)];
             if(qtName){
-                if(const QtJambiTypeEntry* result = entries.value(qtName)){
+                if(QtJambiTypeEntryPtr result = entries.value(qtName)){
                     return result;
                 }
             }else if(!entries.isEmpty()){
@@ -85,7 +85,7 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
             }
         }
     }
-    const QtJambiTypeEntry* result = nullptr;
+    QtJambiTypeEntryPtr result;
     const char *qt_name = nullptr;
     EntryTypes entryType = getEntryType(typeId);
     if(entryType!=EntryTypes::Unspecific){
@@ -101,7 +101,7 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
         jclass java_class = JavaAPI::resolveClass(env, java_name);
         if(!java_class){
             JavaException::raiseError(env, "class cannot be found" QTJAMBI_STACKTRACEINFO );
-            return nullptr;
+            return QtJambiTypeEntryPtr();
         }
 
         switch(entryType){
@@ -110,8 +110,9 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
             if(recursive){
                 const std::type_info* flagId = getFlagForEnum(typeId);
                 if(flagId){
-                    if(const FlagsTypeEntry* flagsType = dynamic_cast<const FlagsTypeEntry*>(QtJambiTypeEntry::getTypeEntry(env, *flagId))){
-                        return flagsType->enumType();
+                    QtJambiTypeEntryPtr e = QtJambiTypeEntry::getTypeEntry(env, *flagId);
+                    if(const FlagsTypeEntry* flagsType = dynamic_cast<const FlagsTypeEntry*>(e.data())){
+                        return QtJambiTypeEntryPtr(flagsType->enumType());
                     }
                 }
             }
@@ -141,7 +142,8 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
             if(exceptionOccurred)
                 JavaException(env, exceptionOccurred).raise();
             Q_ASSERT(creator_method);
-            result = new FlagsTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, dynamic_cast<const EnumTypeEntry*>(get_type_entry(env, *flagId, false, nullptr)));
+            auto e = get_type_entry(env, *flagId, false, nullptr);
+            result = new FlagsTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, dynamic_cast<const EnumTypeEntry*>(e.data()));
             break;
         }
         case EntryTypes::FunctionalTypeInfo:
@@ -155,7 +157,7 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
                 java_impl_class = JavaAPI::resolveClass(env, qPrintable(QString("%1$Impl").arg(java_name)));
                 if(!java_impl_class){
                     JavaException::raiseError(env, "class cannot be found" QTJAMBI_STACKTRACEINFO );
-                    return nullptr;
+                    return QtJambiTypeEntryPtr();
                 }
                 int modifiers = Java::Runtime::Class::getModifiers(env,java_impl_class);
                 if(Java::Runtime::Modifier::isAbstract(env, modifiers)){
@@ -175,7 +177,7 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
             creator_method = findInternalPrivateConstructor(env, java_wrapper_class);
             if(!creator_method){
                 JavaException::raiseError(env, "constructor cannot be found" QTJAMBI_STACKTRACEINFO );
-                return nullptr;
+                return QtJambiTypeEntryPtr();
             }
             const QVector<const FunctionInfo>* _virtualFunctions = virtualFunctions(typeId);
             Destructor destructor = registeredDestructor(typeId);
@@ -195,11 +197,9 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
         case EntryTypes::ObjectTypeInfo:
         {
             const std::type_info* super_type = nullptr; // TODO
-            QList<const std::type_info*> interface_types; // TODO
             size_t value_size = getValueSize(typeId);
             InterfaceOffsetInfo interfaceOffsetInfo;
             registeredInterfaceOffsets(typeId, &interfaceOffsetInfo);
-            const QMap<size_t, uint>& interface_offsets = interfaceOffsetInfo.offsets;
             size_t shell_size = getShellSize(typeId);
             PtrDeleterFunction _deleter = deleter(typeId);
             PtrOwnerFunction owner_function = registeredOwnerFunction(typeId);
@@ -218,36 +218,48 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
                     creator_method = findInternalPrivateConstructor(env, java_wrapper_class);
                     if(!creator_method){
                         JavaException::raiseError(env, "constructor cannot be found" QTJAMBI_STACKTRACEINFO );
-                        return nullptr;
+                        return QtJambiTypeEntryPtr();
                     }
                 }
-                result = new ObjectAbstractTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
-                                                     interface_types, interface_offsets,
+                if(interfaceOffsetInfo.offsets.isEmpty()){
+                    result = new ObjectAbstractTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
                                                      shell_size, _deleter, owner_function, _virtualFunctions,
                                                      destructor, polymorphicIdHandlers, java_wrapper_class
                                                  );
+                }else{
+                    result = new ObjectAbstractIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                     shell_size, _deleter, owner_function, _virtualFunctions,
+                                                     destructor, polymorphicIdHandlers, java_wrapper_class,
+                                                     interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                 );
+                }
             }else{
                 jmethodID creator_method = findInternalPrivateConstructor(env, java_class);
                 if(!creator_method){
                     JavaException::raiseError(env, "constructor cannot be found" QTJAMBI_STACKTRACEINFO );
-                    return nullptr;
+                    return QtJambiTypeEntryPtr();
+                }
+                if(interfaceOffsetInfo.offsets.isEmpty()){
+                    result = new ObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                 shell_size, _deleter, owner_function, _virtualFunctions,
+                                                 destructor, polymorphicIdHandlers
+                                             );
+                }else{
+                    result = new ObjectIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                   shell_size, _deleter, owner_function, _virtualFunctions,
+                                                   destructor, polymorphicIdHandlers,
+                                                   interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                );
                 }
-                result = new ObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
-                                                     interface_types, interface_offsets,
-                                                     shell_size, _deleter, owner_function, _virtualFunctions,
-                                                     destructor, polymorphicIdHandlers
-                                                 );
             }
             break;
         }
         case EntryTypes::ValueTypeInfo:
         {
             const std::type_info* super_type = nullptr; // TODO
-            QList<const std::type_info*> interface_types; // TODO
             size_t value_size = getValueSize(typeId);
             InterfaceOffsetInfo interfaceOffsetInfo;
             registeredInterfaceOffsets(typeId, &interfaceOffsetInfo);
-            const QMap<size_t, uint>& interface_offsets = interfaceOffsetInfo.offsets;
             size_t shell_size = getShellSize(typeId);
             NewContainerAccessFunction containerAccessFactory = getSequentialContainerAccessFactory(typeId);
             PtrOwnerFunction owner_function = registeredOwnerFunction(typeId);
@@ -268,69 +280,110 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
                     creator_method = findInternalPrivateConstructor(env, java_wrapper_class);
                     if(!creator_method){
                         JavaException::raiseError(env, "constructor cannot be found" QTJAMBI_STACKTRACEINFO );
-                        return nullptr;
+                        return QtJambiTypeEntryPtr();
                     }
                 }
                 if(containerAccessFactory){
                     Q_ASSERT(qt_meta_type.isValid());
-                    result = new ObjectAbstractContainerTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
-                                                         interface_types, interface_offsets,
-                                                         shell_size, containerAccessFactory, owner_function, _virtualFunctions,
-                                                         destructor, polymorphicIdHandlers, qt_meta_type, java_wrapper_class
-                                                     );
-                }else{
-                    if(qt_meta_type.isValid()){
-                        result = new ObjectAbstractValueTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
-                                                             interface_types, interface_offsets,
-                                                             shell_size, owner_function, _virtualFunctions,
+                    if(interfaceOffsetInfo.offsets.isEmpty()){
+                        result = new ObjectAbstractContainerTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                             shell_size, containerAccessFactory, owner_function, _virtualFunctions,
                                                              destructor, polymorphicIdHandlers, qt_meta_type, java_wrapper_class
                                                          );
+                    }else{
+                        result = new ObjectAbstractContainerIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                             shell_size, containerAccessFactory, owner_function, _virtualFunctions,
+                                                             destructor, polymorphicIdHandlers, qt_meta_type, java_wrapper_class,
+                                                             interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                         );
+                    }
+                }else{
+                    if(qt_meta_type.isValid()){
+                        if(interfaceOffsetInfo.offsets.isEmpty()){
+                            result = new ObjectAbstractValueTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                                 shell_size, owner_function, _virtualFunctions,
+                                                                 destructor, polymorphicIdHandlers, qt_meta_type, java_wrapper_class
+                                                             );
+                        }else{
+                            result = new ObjectAbstractValueIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                                 shell_size, owner_function, _virtualFunctions,
+                                                                 destructor, polymorphicIdHandlers, qt_meta_type, java_wrapper_class,
+                                                                 interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                             );
+                        }
                     }else{
                         PtrDeleterFunction _deleter = deleter(typeId);
                         Q_ASSERT(_deleter);
-                        result = new ObjectAbstractTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
-                                                             interface_types, interface_offsets,
-                                                             shell_size, _deleter, owner_function, _virtualFunctions,
-                                                             destructor, polymorphicIdHandlers, java_wrapper_class
-                                                         );
+                        if(interfaceOffsetInfo.offsets.isEmpty()){
+                            result = new ObjectAbstractTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                                 shell_size, _deleter, owner_function, _virtualFunctions,
+                                                                 destructor, polymorphicIdHandlers, java_wrapper_class
+                                                             );
+                        }else{
+                            result = new ObjectAbstractIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                                 shell_size, _deleter, owner_function, _virtualFunctions,
+                                                                 destructor, polymorphicIdHandlers, java_wrapper_class,
+                                                                 interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                             );
+                        }
                     }
                 }
             }else{
                 jmethodID creator_method = findInternalPrivateConstructor(env, java_class);
                 if(!creator_method){
                     JavaException::raiseError(env, "constructor cannot be found" QTJAMBI_STACKTRACEINFO );
-                    return nullptr;
+                    return QtJambiTypeEntryPtr();
                 }
                 if(containerAccessFactory){
                     Q_ASSERT(qt_meta_type.isValid());
-                    result = new ObjectContainerTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
-                                                      interface_types, interface_offsets,
-                                                      shell_size, containerAccessFactory, owner_function, _virtualFunctions,
-                                                      destructor, polymorphicIdHandlers, qt_meta_type
-                                                     );
+                    if(interfaceOffsetInfo.offsets.isEmpty()){
+                        result = new ObjectContainerTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                             shell_size, containerAccessFactory, owner_function, _virtualFunctions,
+                                                             destructor, polymorphicIdHandlers, qt_meta_type
+                                                         );
+                    }else{
+                        result = new ObjectContainerIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                                shell_size, containerAccessFactory, owner_function, _virtualFunctions,
+                                                                destructor, polymorphicIdHandlers, qt_meta_type,
+                                                                interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                         );
+                    }
                 }else{
                     if(qt_meta_type.isValid()){
                         if(unique_id(typeId)==unique_id(typeid(QModelIndex))){
                             result = new QModelIndexTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
-                                                              interface_types, interface_offsets,
                                                               shell_size, owner_function, _virtualFunctions,
                                                               destructor, polymorphicIdHandlers, qt_meta_type
                                                              );
                         }else{
-                            result = new ObjectValueTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
-                                                              interface_types, interface_offsets,
-                                                              shell_size, owner_function, _virtualFunctions,
-                                                              destructor, polymorphicIdHandlers, qt_meta_type
-                                                             );
+                            if(interfaceOffsetInfo.offsets.isEmpty()){
+                                result = new ObjectValueTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                                  shell_size, owner_function, _virtualFunctions,
+                                                                  destructor, polymorphicIdHandlers, qt_meta_type
+                                                                 );
+                            }else{
+                                result = new ObjectValueIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                                    shell_size, owner_function, _virtualFunctions,
+                                                                    destructor, polymorphicIdHandlers, qt_meta_type,
+                                                                    interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                                 );
+                            }
                         }
                     }else{
                         PtrDeleterFunction _deleter = deleter(typeId);
                         Q_ASSERT(_deleter);
-                        result = new ObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
-                                                             interface_types, interface_offsets,
-                                                             shell_size, _deleter, owner_function, _virtualFunctions,
-                                                             destructor, polymorphicIdHandlers
-                                                         );
+                        if(interfaceOffsetInfo.offsets.isEmpty()){
+                            result = new ObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                                 shell_size, _deleter, owner_function, _virtualFunctions,
+                                                                 destructor, polymorphicIdHandlers
+                                                             );
+                        }else{
+                            result = new ObjectIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, super_type,
+                                                                 shell_size, _deleter, owner_function, _virtualFunctions,
+                                                                 destructor, polymorphicIdHandlers,
+                                                                 interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                             );
+                        }
                     }
                 }
             }
@@ -339,12 +392,11 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
         case EntryTypes::InterfaceTypeInfo:
         {
             const std::type_info* super_type = nullptr; // TODO
-            QList<const std::type_info*> interface_types; // TODO
             size_t value_size = getValueSize(typeId);
             jclass java_impl_class = JavaAPI::resolveClass(env, qPrintable(QString("%1$Impl").arg(java_name)));
             if(!java_impl_class){
                 JavaException::raiseError(env, "class cannot be found" QTJAMBI_STACKTRACEINFO );
-                return nullptr;
+                return QtJambiTypeEntryPtr();
             }
             jclass java_wrapper_class = nullptr;
             int modifiers = Java::Runtime::Class::getModifiers(env,java_impl_class);
@@ -352,7 +404,7 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
                 java_wrapper_class = JavaAPI::resolveClass(env, qPrintable(QString("%1$Impl$ConcreteWrapper").arg(java_name)));
                 if(!java_wrapper_class){
                     JavaException::raiseError(env, "class cannot be found" QTJAMBI_STACKTRACEINFO );
-                    return nullptr;
+                    return QtJambiTypeEntryPtr();
                 }
             }else{
                 java_wrapper_class = java_impl_class;
@@ -360,11 +412,10 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
             jmethodID creator_method = findInternalPrivateConstructor(env, java_wrapper_class);
             if(!creator_method){
                 JavaException::raiseError(env, "constructor cannot be found" QTJAMBI_STACKTRACEINFO );
-                return nullptr;
+                return QtJambiTypeEntryPtr();
             }
             InterfaceOffsetInfo interfaceOffsetInfo;
             registeredInterfaceOffsets(typeId, &interfaceOffsetInfo);
-            const QMap<size_t, uint>& interface_offsets = interfaceOffsetInfo.offsets;
             size_t shell_size = getShellSize(typeId);
             PtrDeleterFunction _deleter = deleter(typeId);
             PtrOwnerFunction owner_function = registeredOwnerFunction(typeId);
@@ -377,22 +428,30 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
                     polymorphicIdHandlers << handler;
                 }
             }
-            result = new InterfaceTypeEntry(env, typeId,
-                                        qt_name, java_name, java_class, creator_method,
-                                        value_size, java_impl_class, java_wrapper_class,
-                                        super_type, interface_types, interface_offsets, shell_size,
-                                        _deleter, owner_function, _virtualFunctions, destructor, polymorphicIdHandlers );
+            if(interfaceOffsetInfo.offsets.isEmpty()){
+                result = new InterfaceTypeEntry(env, typeId,
+                                            qt_name, java_name, java_class, creator_method,
+                                            value_size, java_impl_class, java_wrapper_class,
+                                            super_type, shell_size,
+                                            _deleter, owner_function, _virtualFunctions, destructor, polymorphicIdHandlers );
+            }else{
+                result = new InterfaceIFTypeEntry(env, typeId,
+                                            qt_name, java_name, java_class, creator_method,
+                                            value_size, java_impl_class, java_wrapper_class,
+                                            super_type, shell_size,
+                                            _deleter, owner_function, _virtualFunctions, destructor, polymorphicIdHandlers,
+                                            interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces );
+            }
             break;
         }
         case EntryTypes::InterfaceValueTypeInfo:
         {
             const std::type_info* super_type = nullptr; // TODO
-            QList<const std::type_info*> interface_types; // TODO
             size_t value_size = getValueSize(typeId);
             jclass java_impl_class = JavaAPI::resolveClass(env, qPrintable(QString("%1$Impl").arg(java_name)));
             if(!java_impl_class){
                 JavaException::raiseError(env, "class cannot be found" QTJAMBI_STACKTRACEINFO );
-                return nullptr;
+                return QtJambiTypeEntryPtr();
             }
             jclass java_wrapper_class = nullptr;
             int modifiers = Java::Runtime::Class::getModifiers(env,java_impl_class);
@@ -400,7 +459,7 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
                 java_wrapper_class = JavaAPI::resolveClass(env, qPrintable(QString("%1$Impl$ConcreteWrapper").arg(java_name)));
                 if(!java_wrapper_class){
                     JavaException::raiseError(env, "class cannot be found" QTJAMBI_STACKTRACEINFO );
-                    return nullptr;
+                    return QtJambiTypeEntryPtr();
                 }
             }else{
                 java_wrapper_class = java_impl_class;
@@ -408,11 +467,10 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
             jmethodID creator_method = findInternalPrivateConstructor(env, java_wrapper_class);
             if(!creator_method){
                 JavaException::raiseError(env, "constructor cannot be found" QTJAMBI_STACKTRACEINFO );
-                return nullptr;
+                return QtJambiTypeEntryPtr();
             }
             InterfaceOffsetInfo interfaceOffsetInfo;
             registeredInterfaceOffsets(typeId, &interfaceOffsetInfo);
-            const QMap<size_t, uint>& interface_offsets = interfaceOffsetInfo.offsets;
             size_t shell_size = getShellSize(typeId);
             PtrDeleterFunction _deleter = deleter(typeId);
             PtrOwnerFunction owner_function = registeredOwnerFunction(typeId);
@@ -428,23 +486,29 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
                 }
             }
 
-            result = new InterfaceValueTypeEntry(env, typeId,
-                                        qt_name, java_name, java_class, creator_method,
-                                        value_size, java_impl_class, java_wrapper_class,
-                                        super_type, interface_types, interface_offsets,
-                                        shell_size, _deleter, owner_function, _virtualFunctions,
-                                        destructor, polymorphicIdHandlers, qt_meta_type );
+            if(interfaceOffsetInfo.offsets.isEmpty()){
+                result = new InterfaceValueTypeEntry(env, typeId,
+                                            qt_name, java_name, java_class, creator_method,
+                                            value_size, java_impl_class, java_wrapper_class,
+                                            super_type, shell_size, _deleter, owner_function, _virtualFunctions,
+                                            destructor, polymorphicIdHandlers, qt_meta_type );
+            }else{
+                result = new InterfaceValueIFTypeEntry(env, typeId,
+                                            qt_name, java_name, java_class, creator_method,
+                                            value_size, java_impl_class, java_wrapper_class,
+                                            super_type, shell_size, _deleter, owner_function, _virtualFunctions,
+                                            destructor, polymorphicIdHandlers, qt_meta_type,
+                                            interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces );
+            }
             break;
         }
         case EntryTypes::QObjectTypeInfo:
         {
             const std::type_info* super_type = nullptr; // TODO
-            QList<const std::type_info*> interface_types; // TODO
             size_t value_size = getValueSize(typeId);
             size_t shell_size = getShellSize(typeId);
             InterfaceOffsetInfo interfaceOffsetInfo;
             registeredInterfaceOffsets(typeId, &interfaceOffsetInfo);
-            const QMap<size_t, uint>& interface_offsets = interfaceOffsetInfo.offsets;
             const QVector<const FunctionInfo>* _virtualFunctions = virtualFunctions(typeId);
             const QMetaObject* original_meta_object = registeredOriginalMetaObject(typeId);
             int modifiers = Java::Runtime::Class::getModifiers(env,java_class);
@@ -466,41 +530,74 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
                     creator_method = findInternalPrivateConstructor(env, java_wrapper_class);
                     if(!creator_method){
                         JavaException::raiseError(env, "constructor cannot be found" QTJAMBI_STACKTRACEINFO );
-                        return nullptr;
+                        return QtJambiTypeEntryPtr();
                     }
                 }
                 if(polymorphicIdHandlers.isEmpty()){
-                    result = new QObjectAbstractTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
-                                                  value_size, super_type, interface_types, interface_offsets, shell_size,
-                                                  _virtualFunctions, original_meta_object, java_wrapper_class
-                                             );
+                    if(interfaceOffsetInfo.offsets.isEmpty()){
+                        result = new QObjectAbstractTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
+                                                      value_size, super_type, shell_size,
+                                                      _virtualFunctions, original_meta_object, java_wrapper_class
+                                                 );
+                    }else{
+                        result = new QObjectAbstractIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
+                                                      value_size, super_type, shell_size,
+                                                      _virtualFunctions, original_meta_object, java_wrapper_class,
+                                                                interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                 );
+                    }
                 }else{
-                    result = new QObjectAbstractPolymorphicTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
-                                                  value_size, super_type, interface_types, interface_offsets, shell_size,
-                                                  _virtualFunctions, original_meta_object, polymorphicIdHandlers, java_wrapper_class
-                                             );
+                    if(interfaceOffsetInfo.offsets.isEmpty()){
+                        result = new QObjectAbstractPolymorphicTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
+                                                      value_size, super_type, shell_size,
+                                                      _virtualFunctions, original_meta_object, polymorphicIdHandlers, java_wrapper_class
+                                                 );
+                    }else{
+                        result = new QObjectAbstractPolymorphicIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
+                                                                          value_size, super_type, shell_size,
+                                                                          _virtualFunctions, original_meta_object, polymorphicIdHandlers, java_wrapper_class,
+                                                                           interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                 );
+                    }
                 }
             }else{
                 jmethodID creator_method = findInternalPrivateConstructor(env, java_class);
                 if(!creator_method){
                     JavaException::raiseError(env, "constructor cannot be found" QTJAMBI_STACKTRACEINFO );
-                    return nullptr;
+                    return QtJambiTypeEntryPtr();
                 }
                 if(Java::QtCore::QThread::isAssignableFrom(env, java_class))
                     result = new QThreadTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
-                                                  value_size, super_type, interface_types, interface_offsets,
+                                                  value_size, super_type,
                                                   shell_size, _virtualFunctions, original_meta_object
                                              );
                 else if(polymorphicIdHandlers.isEmpty()){
-                    result = new QObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
-                                                  value_size, super_type, interface_types, interface_offsets,
-                                                  shell_size, _virtualFunctions, original_meta_object
-                                             );
-                }else
-                    result = new QObjectPolymorphicTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
-                                                  value_size, super_type, interface_types, interface_offsets,
+                    if(interfaceOffsetInfo.offsets.isEmpty()){
+                        result = new QObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
+                                                      value_size, super_type,
+                                                      shell_size, _virtualFunctions, original_meta_object
+                                                 );
+                    }else{
+                        result = new QObjectIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
+                                                      value_size, super_type,
+                                                      shell_size, _virtualFunctions, original_meta_object,
+                                                        interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                                 );
+                    }
+                }else{
+                    if(interfaceOffsetInfo.offsets.isEmpty()){
+                        result = new QObjectPolymorphicTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
+                                                  value_size, super_type,
                                                   shell_size, _virtualFunctions, original_meta_object, polymorphicIdHandlers
                                              );
+                    }else{
+                        result = new QObjectPolymorphicIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method,
+                                                                  value_size, super_type,
+                                                                  shell_size, _virtualFunctions, original_meta_object, polymorphicIdHandlers,
+                                                                   interfaceOffsetInfo.offsets, interfaceOffsetInfo.interfaces, interfaceOffsetInfo.inheritedInterfaces
+                                             );
+                    }
+                }
             }
             break;
         }
@@ -566,7 +663,7 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
             break;
         }
         default:
-            return nullptr;
+            return QtJambiTypeEntryPtr();
         }
     }
 
@@ -575,13 +672,14 @@ const QtJambiTypeEntry* get_type_entry(JNIEnv* env, const std::type_info& typeId
         Q_UNUSED(locker)
 
         if(gTypeEntryHash()->contains(unique_id(typeId))){
-            QMap<QByteArray,const QtJambiTypeEntry*>& entries = (*gTypeEntryHash())[unique_id(typeId)];
+            QMap<QByteArray,QtJambiTypeEntryPtr>& entries = (*gTypeEntryHash())[unique_id(typeId)];
             if(qtName){
-                if(const QtJambiTypeEntry* altresult = entries.value(qtName, nullptr)){
+                if(QtJambiTypeEntryPtr altresult = entries.value(qtName)){
                     return altresult;
                 }
             }else if(!entries.isEmpty()){
-                return entries.first();
+                QtJambiTypeEntryPtr e = entries.first();
+                return e;
             }
         }
         (*gTypeEntryHash())[unique_id(typeId)][qt_name] = result;
@@ -597,53 +695,48 @@ void clearTypeHandlersAtShutdown(JNIEnv *){
         if(!gTypeEntryHash.isDestroyed())
             typeEntryHash.swap(*gTypeEntryHash);
     }
-    for(const QMap<QByteArray,const QtJambiTypeEntry*>& map : typeEntryHash){
-        for(const QtJambiTypeEntry* entry : map){
-            delete entry;
-        }
-    }
 }
 
-const QtJambiTypeEntry* QtJambiTypeEntry::getTypeEntry(JNIEnv* env, const std::type_info& typeId)
+QtJambiTypeEntryPtr QtJambiTypeEntry::getTypeEntry(JNIEnv* env, const std::type_info& typeId)
 {
     return get_type_entry(env, typeId, true, nullptr);
 }
 
-const QtJambiTypeEntry* QtJambiTypeEntry::getTypeEntry(JNIEnv* env, const std::type_info& typeId, const char* qtName)
+QtJambiTypeEntryPtr QtJambiTypeEntry::getTypeEntry(JNIEnv* env, const std::type_info& typeId, const char* qtName)
 {
     return get_type_entry(env, typeId, true, qtName);
 }
 
-const QtJambiTypeEntry* QtJambiTypeEntry::getTypeEntryByJavaName(JNIEnv* env, const char* java_name)
+QtJambiTypeEntryPtr QtJambiTypeEntry::getTypeEntryByJavaName(JNIEnv* env, const char* java_name)
 {
     const std::type_info* typeId = getTypeByJavaName(java_name);
     if(typeId)
         return getTypeEntry(env, *typeId);
-    else return nullptr;
+    else return QtJambiTypeEntryPtr();
 }
 
-const QtJambiTypeEntry* QtJambiTypeEntry::getTypeEntryByJavaName(JNIEnv* env, const QString& java_name)
+QtJambiTypeEntryPtr QtJambiTypeEntry::getTypeEntryByJavaName(JNIEnv* env, const QString& java_name)
 {
     const std::type_info* typeId = getTypeByJavaName(java_name);
     if(typeId)
         return getTypeEntry(env, *typeId);
-    else return nullptr;
+    else return QtJambiTypeEntryPtr();
 }
 
-const QtJambiTypeEntry* QtJambiTypeEntry::getTypeEntryByQtName(JNIEnv* env, const char* qt_name)
+QtJambiTypeEntryPtr QtJambiTypeEntry::getTypeEntryByQtName(JNIEnv* env, const char* qt_name)
 {
     const std::type_info* typeId = getTypeByQtName(qt_name);
     if(typeId)
         return getTypeEntry(env, *typeId, qt_name);
-    else  return nullptr;
+    else  return QtJambiTypeEntryPtr();
 }
 
-const QtJambiTypeEntry* QtJambiTypeEntry::getTypeEntryByIID(JNIEnv* env, const char* iid)
+QtJambiTypeEntryPtr QtJambiTypeEntry::getTypeEntryByIID(JNIEnv* env, const char* iid)
 {
     const std::type_info* typeId = getInterfaceTypeForIID(iid);
     if(typeId)
         return getTypeEntry(env, *typeId);
-    else  return nullptr;
+    else  return QtJambiTypeEntryPtr();
 }
 
 bool QtJambiTypeEntry::isEnum() const {return false;}
@@ -667,6 +760,12 @@ const QVector<const FunctionInfo>* QObjectTypeEntry::virtualFunctions() const {
 const QVector<const FunctionInfo>* InterfaceTypeEntry::virtualFunctions() const { return m_virtualFunctions; }
 const QVector<const FunctionInfo>* FunctionalTypeEntry::virtualFunctions() const { return m_virtualFunctions; }
 
+QtJambiTypeEntry::NativeToJavaResult::NativeToJavaResult(bool success) : m_success(success) {}
+QtJambiTypeEntry::NativeToJavaResult::NativeToJavaResult(const QSharedPointer<QtJambiLink>& link) : m_link(link), m_success(true) {}
+QtJambiTypeEntry::NativeToJavaResult::operator bool() const{return m_success;}
+bool QtJambiTypeEntry::NativeToJavaResult::operator!() const{return !m_success;}
+const QSharedPointer<QtJambiLink>& QtJambiTypeEntry::NativeToJavaResult::link() const{return m_link;}
+
 const FlagsTypeEntry* EnumTypeEntry::flagType() const
 {
     return m_flagType;
@@ -696,12 +795,6 @@ const std::type_info* QtJambiTypeEntry::superType() const
     return nullptr;
 }
 
-const QList<const std::type_info*>& QtJambiTypeEntry::interfaceTypes() const
-{
-    static QList<const std::type_info*> emptyList = QList<const std::type_info*>();
-    return emptyList;
-}
-
 jclass QtJambiTypeEntry::javaClass() const
 {
     return m_java_class;
@@ -722,21 +815,11 @@ const std::type_info* ObjectTypeEntry::superType() const
     return m_super_type;
 }
 
-const QList<const std::type_info*>& ObjectTypeEntry::interfaceTypes() const
-{
-    return m_interface_types;
-}
-
 const std::type_info* QObjectTypeEntry::superType() const
 {
     return m_super_type;
 }
 
-const QList<const std::type_info*>& QObjectTypeEntry::interfaceTypes() const
-{
-    return m_interface_types;
-}
-
 const std::type_info* InterfaceTypeEntry::superType() const
 {
     return m_super_type;
@@ -762,11 +845,6 @@ size_t QObjectTypeEntry::shellSize() const
     return m_shell_size;
 }
 
-const QList<const std::type_info*>& InterfaceTypeEntry::interfaceTypes() const
-{
-    return m_interface_types;
-}
-
 const char *QtJambiTypeEntry::qtName() const
 {
     return m_qt_name;
@@ -782,39 +860,49 @@ jclass QObjectAbstractTypeEntry::creatableClass() const
     return m_java_wrapper_class;
 }
 
+jclass QObjectAbstractIFTypeEntry::creatableClass() const
+{
+    return m_java_wrapper_class;
+}
+
 jclass ObjectAbstractValueTypeEntry::creatableClass() const
 {
     return m_java_wrapper_class;
 }
 
+jclass ObjectAbstractValueIFTypeEntry::creatableClass() const
+{
+    return m_java_wrapper_class;
+}
+
 jclass QObjectAbstractPolymorphicTypeEntry::creatableClass() const
 {
     return m_java_wrapper_class;
 }
 
-jclass ObjectAbstractTypeEntry::creatableClass() const
+jclass QObjectAbstractPolymorphicIFTypeEntry::creatableClass() const
 {
     return m_java_wrapper_class;
 }
 
-jclass InterfaceTypeEntry::creatableClass() const
+jclass ObjectAbstractTypeEntry::creatableClass() const
 {
     return m_java_wrapper_class;
 }
 
-jclass InterfaceTypeEntry::implementationClass() const
+jclass ObjectAbstractIFTypeEntry::creatableClass() const
 {
-    return m_java_impl_class;
+    return m_java_wrapper_class;
 }
 
-const QMap<size_t, uint>& ObjectTypeEntry::interfaceOffsets() const
+jclass InterfaceTypeEntry::creatableClass() const
 {
-    return m_interface_offsets;
+    return m_java_wrapper_class;
 }
 
-const QMap<size_t, uint>& InterfaceTypeEntry::interfaceOffsets() const
+jclass InterfaceTypeEntry::implementationClass() const
 {
-    return m_interface_offsets;
+    return m_java_impl_class;
 }
 
 Destructor ObjectTypeEntry::destructor() const
@@ -837,16 +925,16 @@ const QMetaObject* QObjectTypeEntry::originalMetaObject() const
     return m_original_meta_object;
 }
 
-uint InterfaceTypeEntry::offset(const std::type_info& toType) const{
-    return m_interface_offsets.value(unique_id(toType), 0);
+uint InterfaceIFTypeEntry::offset(const std::type_info& toType) const{
+    return m_interfaceOffsets.value(unique_id(toType), 0);
 }
 
-uint ObjectTypeEntry::offset(const std::type_info& toType) const{
-    return m_interface_offsets.value(unique_id(toType), 0);
+uint ObjectIFTypeEntry::offset(const std::type_info& toType) const{
+    return m_interfaceOffsets.value(unique_id(toType), 0);
 }
 
-uint QObjectTypeEntry::offset(const std::type_info& toType) const{
-    return m_interface_offsets.value(unique_id(toType), 0);
+uint QObjectIFTypeEntry::offset(const std::type_info& toType) const{
+    return m_interfaceOffsets.value(unique_id(toType), 0);
 }
 
 FunctionalResolver FunctionalTypeEntry::registeredFunctionalResolver() const
@@ -901,8 +989,6 @@ InterfaceTypeEntry::InterfaceTypeEntry(JNIEnv* env, const std::type_info& typeId
                    jclass java_impl_class,
                    jclass java_wrapper_class,
                    const std::type_info* super_type,
-                   const QList<const std::type_info*>& interface_types,
-                   const QMap<size_t, uint>& interface_offsets,
                    size_t shell_size,
                    PtrDeleterFunction deleter,
                    PtrOwnerFunction owner_function,
@@ -914,8 +1000,6 @@ InterfaceTypeEntry::InterfaceTypeEntry(JNIEnv* env, const std::type_info& typeId
       m_java_impl_class(java_impl_class ? getGlobalClassRef(env, java_impl_class) : nullptr),
       m_java_wrapper_class(java_wrapper_class ? getGlobalClassRef(env, java_wrapper_class) : nullptr),
       m_super_type(super_type),
-      m_interface_types(interface_types),
-      m_interface_offsets(interface_offsets),
       m_shell_size(shell_size),
       m_deleter(deleter),
       m_owner_function(owner_function),
@@ -926,6 +1010,35 @@ InterfaceTypeEntry::InterfaceTypeEntry(JNIEnv* env, const std::type_info& typeId
 
 }
 
+InterfaceIFTypeEntry::InterfaceIFTypeEntry(JNIEnv* env, const std::type_info& typeId,
+                   const char *qt_name,
+                   const char *java_name,
+                   jclass java_class,
+                   jmethodID creator_method,
+                   size_t value_size,
+                   jclass java_impl_class,
+                   jclass java_wrapper_class,
+                   const std::type_info* super_type,
+                   size_t shell_size,
+                   PtrDeleterFunction deleter,
+                   PtrOwnerFunction owner_function,
+                   const QVector<const FunctionInfo>* virtualFunctions,
+                   Destructor destructor,
+                   const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                   const QMap<size_t,uint>& interfaceOffsets,
+                   const QSet<size_t>& interfaceTypes,
+                   const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                )
+    : InterfaceTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, java_impl_class, java_wrapper_class,
+                       super_type, shell_size, deleter, owner_function, virtualFunctions, destructor,
+                       polymorphicHandlers),
+      m_interfaceOffsets(interfaceOffsets),
+      m_interfaceTypes(interfaceTypes),
+      m_inheritedInterfaces(inheritedInterfaces)
+{
+
+}
+
 InterfaceValueTypeEntry::InterfaceValueTypeEntry(JNIEnv* env, const std::type_info& typeId,
                    const char *qt_name,
                    const char *java_name,
@@ -935,8 +1048,6 @@ InterfaceValueTypeEntry::InterfaceValueTypeEntry(JNIEnv* env, const std::type_in
                    jclass java_impl_class,
                    jclass java_wrapper_class,
                    const std::type_info* super_type,
-                   const QList<const std::type_info*>& interface_types,
-                   const QMap<size_t, uint>& interface_offsets,
                    size_t shell_size,
                    PtrDeleterFunction deleter,
                    PtrOwnerFunction owner_function,
@@ -946,7 +1057,7 @@ InterfaceValueTypeEntry::InterfaceValueTypeEntry(JNIEnv* env, const std::type_in
                    const QMetaType& qt_meta_type
                 )
     : InterfaceTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size, java_impl_class, java_wrapper_class,
-                         super_type, interface_types, interface_offsets, shell_size, deleter, owner_function, virtualFunctions, destructor,
+                         super_type, shell_size, deleter, owner_function, virtualFunctions, destructor,
                          polymorphicHandlers),
       m_qt_meta_type(qt_meta_type
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -1001,8 +1112,6 @@ ObjectTypeEntry::ObjectTypeEntry(JNIEnv* env,
                 jmethodID creator_method,
                 size_t value_size,
                 const std::type_info* super_type,
-                const QList<const std::type_info*>& interface_types,
-                const QMap<size_t, uint>& interface_offsets,
                 size_t shell_size,
                 PtrDeleterFunction deleter,
                 PtrOwnerFunction owner_function,
@@ -1012,8 +1121,6 @@ ObjectTypeEntry::ObjectTypeEntry(JNIEnv* env,
             )
     : QtJambiTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size),
       m_super_type(super_type),
-      m_interface_types(interface_types),
-      m_interface_offsets(interface_offsets),
       m_shell_size(shell_size),
       m_deleter(deleter),
       m_owner_function(owner_function),
@@ -1032,8 +1139,6 @@ ObjectAbstractTypeEntry::ObjectAbstractTypeEntry(JNIEnv* env,
                 jmethodID creator_method,
                 size_t value_size,
                 const std::type_info* super_type,
-                const QList<const std::type_info*>& interface_types,
-                const QMap<size_t, uint>& interface_offsets,
                 size_t shell_size,
                 PtrDeleterFunction deleter,
                 PtrOwnerFunction owner_function,
@@ -1050,8 +1155,6 @@ ObjectAbstractTypeEntry::ObjectAbstractTypeEntry(JNIEnv* env,
                      creator_method,
                      value_size,
                      super_type,
-                     interface_types,
-                     interface_offsets,
                      shell_size,
                      deleter,
                      owner_function,
@@ -1072,8 +1175,6 @@ ObjectValueTypeEntry::ObjectValueTypeEntry(JNIEnv* env,
                 jmethodID creator_method,
                 size_t value_size,
                 const std::type_info* super_type,
-                const QList<const std::type_info*>& interface_types,
-                const QMap<size_t, uint>& interface_offsets,
                 size_t shell_size,
                 PtrOwnerFunction owner_function,
                 const QVector<const FunctionInfo>* virtualFunctions,
@@ -1089,8 +1190,6 @@ ObjectValueTypeEntry::ObjectValueTypeEntry(JNIEnv* env,
                      creator_method,
                      value_size,
                      super_type,
-                     interface_types,
-                     interface_offsets,
                      shell_size,
                      nullptr,
                      owner_function,
@@ -1107,6 +1206,90 @@ ObjectValueTypeEntry::ObjectValueTypeEntry(JNIEnv* env,
 
 }
 
+ObjectContainerIFTypeEntry::ObjectContainerIFTypeEntry(JNIEnv* env,
+                                                       const std::type_info& typeId,
+                                                       const char *qt_name,
+                                                       const char *java_name,
+                                                       jclass java_class,
+                                                       jmethodID creator_method,
+                                                       size_t value_size,
+                                                       const std::type_info* super_type,
+                                                       size_t shell_size,
+                                                       NewContainerAccessFunction containerAccessFactory,
+                                                       PtrOwnerFunction owner_function,
+                                                       const QVector<const FunctionInfo>* virtualFunctions,
+                                                       Destructor destructor,
+                                                       const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                                                       const QMetaType& qt_meta_type,
+                                                       const QMap<size_t,uint>& interfaceOffsets,
+                                                       const QSet<size_t>& interfaceTypes,
+                                                       const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                                                   )
+                                           : ObjectValueIFTypeEntry(env,
+                                                            typeId,
+                                                            qt_name,
+                                                            java_name,
+                                                            java_class,
+                                                            creator_method,
+                                                            value_size,
+                                                            super_type,
+                                                            shell_size,
+                                                            owner_function,
+                                                            virtualFunctions,
+                                                            destructor,
+                                                            polymorphicHandlers,
+                                                            qt_meta_type,
+                                                            interfaceOffsets,
+                                                            interfaceTypes,
+                                                            inheritedInterfaces
+                                                        ),
+                                             m_containerAccessFactory(containerAccessFactory)
+{
+
+}
+
+ObjectAbstractValueIFTypeEntry::ObjectAbstractValueIFTypeEntry(JNIEnv* env,
+                const std::type_info& typeId,
+                const char *qt_name,
+                const char *java_name,
+                jclass java_class,
+                jmethodID creator_method,
+                size_t value_size,
+                const std::type_info* super_type,
+                size_t shell_size,
+                PtrOwnerFunction owner_function,
+                const QVector<const FunctionInfo>* virtualFunctions,
+                Destructor destructor,
+                const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                const QMetaType& qt_meta_type,
+                jclass java_wrapper_class,
+                const QMap<size_t,uint>& interfaceOffsets,
+                const QSet<size_t>& interfaceTypes,
+                const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+            )
+    : ObjectValueIFTypeEntry(env,
+                     typeId,
+                     qt_name,
+                     java_name,
+                     java_class,
+                     creator_method,
+                     value_size,
+                     super_type,
+                     shell_size,
+                     owner_function,
+                     virtualFunctions,
+                     destructor,
+                     polymorphicHandlers,
+                     qt_meta_type,
+                     interfaceOffsets,
+                     interfaceTypes,
+                     inheritedInterfaces
+                 ),
+      m_java_wrapper_class(java_wrapper_class ? getGlobalClassRef(env, java_wrapper_class) : nullptr)
+{
+
+}
+
 ObjectAbstractValueTypeEntry::ObjectAbstractValueTypeEntry(JNIEnv* env,
                 const std::type_info& typeId,
                 const char *qt_name,
@@ -1115,8 +1298,6 @@ ObjectAbstractValueTypeEntry::ObjectAbstractValueTypeEntry(JNIEnv* env,
                 jmethodID creator_method,
                 size_t value_size,
                 const std::type_info* super_type,
-                const QList<const std::type_info*>& interface_types,
-                const QMap<size_t, uint>& interface_offsets,
                 size_t shell_size,
                 PtrOwnerFunction owner_function,
                 const QVector<const FunctionInfo>* virtualFunctions,
@@ -1133,8 +1314,6 @@ ObjectAbstractValueTypeEntry::ObjectAbstractValueTypeEntry(JNIEnv* env,
                      creator_method,
                      value_size,
                      super_type,
-                     interface_types,
-                     interface_offsets,
                      shell_size,
                      owner_function,
                      virtualFunctions,
@@ -1155,16 +1334,12 @@ QObjectTypeEntry::QObjectTypeEntry(JNIEnv* env,
                  jmethodID creator_method,
                  size_t value_size,
                  const std::type_info* super_type,
-                 const QList<const std::type_info*>& interface_types,
-                 const QMap<size_t, uint>& interface_offsets,
                  size_t shell_size,
                  const QVector<const FunctionInfo>* virtualFunctions,
                  const QMetaObject* original_meta_object
             )
     : QtJambiTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size),
       m_super_type(super_type),
-      m_interface_types(interface_types),
-      m_interface_offsets(interface_offsets),
       m_shell_size(shell_size),
       m_virtualFunctions(virtualFunctions),
       m_original_meta_object(original_meta_object),
@@ -1172,6 +1347,29 @@ QObjectTypeEntry::QObjectTypeEntry(JNIEnv* env,
 {
 }
 
+QObjectIFTypeEntry::QObjectIFTypeEntry(JNIEnv* env,
+                 const std::type_info& typeId,
+                 const char *qt_name,
+                 const char *java_name,
+                 jclass java_class,
+                 jmethodID creator_method,
+                 size_t value_size,
+                 const std::type_info* super_type,
+                 size_t shell_size,
+                 const QVector<const FunctionInfo>* virtualFunctions,
+                 const QMetaObject* original_meta_object,
+                 const QMap<size_t,uint>& interfaceOffsets,
+                 const QSet<size_t>& interfaceTypes,
+                 const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+            )
+    : QObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size,
+                       super_type, shell_size, virtualFunctions, original_meta_object),
+      m_interfaceOffsets(interfaceOffsets),
+      m_interfaceTypes(interfaceTypes),
+      m_inheritedInterfaces(inheritedInterfaces)
+{
+}
+
 QThreadTypeEntry::QThreadTypeEntry(JNIEnv* env,
                  const std::type_info& typeId,
                  const char *qt_name,
@@ -1180,15 +1378,12 @@ QThreadTypeEntry::QThreadTypeEntry(JNIEnv* env,
                  jmethodID creator_method,
                  size_t value_size,
                  const std::type_info* super_type,
-                 const QList<const std::type_info*>& interface_types,
-                 const QMap<size_t, uint>& interface_offsets,
                  size_t shell_size,
                  const QVector<const FunctionInfo>* virtualFunctions,
                  const QMetaObject* original_meta_object
             )
     : QObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size,
-                       super_type, interface_types, interface_offsets,
-                       shell_size, virtualFunctions, original_meta_object)
+                       super_type, shell_size, virtualFunctions, original_meta_object)
 {
 }
 
@@ -1196,9 +1391,9 @@ namespace ThreadPrivate{
     jobject fromQThread(JNIEnv * env, jobject java_qthread, QThread *thread);
 }
 
-bool QThreadTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const
+QtJambiTypeEntry::NativeToJavaResult QThreadTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const
 {
-    bool result = QObjectTypeEntry::convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, output, valueType);
+    QtJambiTypeEntry::NativeToJavaResult result = QObjectTypeEntry::convertToJava(env, qt_object, makeCopyOfValues, output, valueType);
     if(result){
         QThread* thread = const_cast<QThread*>(reinterpret_cast<const QThread*>(qt_object));
         if (thread){
@@ -1240,16 +1435,37 @@ QObjectAbstractTypeEntry::QObjectAbstractTypeEntry(JNIEnv* env,
                  jmethodID creator_method,
                  size_t value_size,
                  const std::type_info* super_type,
-                 const QList<const std::type_info*>& interface_types,
-                 const QMap<size_t, uint>& interface_offsets,
                  size_t shell_size,
                  const QVector<const FunctionInfo>* virtualFunctions,
                  const QMetaObject* original_meta_object,
                  jclass java_wrapper_class
             )
     : QObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size,
-                      super_type, interface_types, interface_offsets,
-                      shell_size, virtualFunctions, original_meta_object),
+                      super_type, shell_size, virtualFunctions, original_meta_object),
+      m_java_wrapper_class(java_wrapper_class ? getGlobalClassRef(env, java_wrapper_class) : nullptr)
+{
+
+}
+
+QObjectAbstractIFTypeEntry::QObjectAbstractIFTypeEntry(JNIEnv* env,
+                 const std::type_info& typeId,
+                 const char *qt_name,
+                 const char *java_name,
+                 jclass java_class,
+                 jmethodID creator_method,
+                 size_t value_size,
+                 const std::type_info* super_type,
+                 size_t shell_size,
+                 const QVector<const FunctionInfo>* virtualFunctions,
+                 const QMetaObject* original_meta_object,
+                 jclass java_wrapper_class,
+                 const QMap<size_t,uint>& interfaceOffsets,
+                 const QSet<size_t>& interfaceTypes,
+                 const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+            )
+    : QObjectIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size,
+                      super_type, shell_size, virtualFunctions, original_meta_object,
+                      interfaceOffsets, interfaceTypes, inheritedInterfaces),
       m_java_wrapper_class(java_wrapper_class ? getGlobalClassRef(env, java_wrapper_class) : nullptr)
 {
 
@@ -1263,8 +1479,6 @@ QObjectAbstractPolymorphicTypeEntry::QObjectAbstractPolymorphicTypeEntry(JNIEnv*
                  jmethodID creator_method,
                  size_t value_size,
                  const std::type_info* super_type,
-                 const QList<const std::type_info*>& interface_types,
-                 const QMap<size_t, uint>& interface_offsets,
                  size_t shell_size,
                  const QVector<const FunctionInfo>* virtualFunctions,
                  const QMetaObject* original_meta_object,
@@ -1272,8 +1486,32 @@ QObjectAbstractPolymorphicTypeEntry::QObjectAbstractPolymorphicTypeEntry(JNIEnv*
                  jclass java_wrapper_class
             )
     : QObjectPolymorphicTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size,
-                      super_type, interface_types, interface_offsets,
-                      shell_size, virtualFunctions, original_meta_object, polymorphicIdHandlers),
+                      super_type, shell_size, virtualFunctions, original_meta_object, polymorphicIdHandlers),
+      m_java_wrapper_class(java_wrapper_class ? getGlobalClassRef(env, java_wrapper_class) : nullptr)
+{
+
+}
+
+QObjectAbstractPolymorphicIFTypeEntry::QObjectAbstractPolymorphicIFTypeEntry(JNIEnv* env,
+                 const std::type_info& typeId,
+                 const char *qt_name,
+                 const char *java_name,
+                 jclass java_class,
+                 jmethodID creator_method,
+                 size_t value_size,
+                 const std::type_info* super_type,
+                 size_t shell_size,
+                 const QVector<const FunctionInfo>* virtualFunctions,
+                 const QMetaObject* original_meta_object,
+                 const QList<const PolymorphicIdHandler*>& polymorphicIdHandlers,
+                 jclass java_wrapper_class,
+                 const QMap<size_t,uint>& interfaceOffsets,
+                 const QSet<size_t>& interfaceTypes,
+                 const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+            )
+    : QObjectPolymorphicIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size,
+                      super_type, shell_size, virtualFunctions, original_meta_object, polymorphicIdHandlers,
+                                    interfaceOffsets, interfaceTypes, inheritedInterfaces),
       m_java_wrapper_class(java_wrapper_class ? getGlobalClassRef(env, java_wrapper_class) : nullptr)
 {
 
@@ -1287,16 +1525,37 @@ QObjectPolymorphicTypeEntry::QObjectPolymorphicTypeEntry(JNIEnv* env,
                  jmethodID creator_method,
                  size_t value_size,
                  const std::type_info* super_type,
-                 const QList<const std::type_info*>& interface_types,
-                 const QMap<size_t, uint>& interface_offsets,
                  size_t shell_size,
                  const QVector<const FunctionInfo>* virtualFunctions,
                  const QMetaObject* original_meta_object,
                  const QList<const PolymorphicIdHandler*>& polymorphicIdHandlers
             )
     : QObjectTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size,
-                       super_type, interface_types, interface_offsets,
-                       shell_size, virtualFunctions, original_meta_object),
+                       super_type, shell_size, virtualFunctions, original_meta_object),
+      m_polymorphicIdHandlers(polymorphicIdHandlers)
+{
+
+}
+
+QObjectPolymorphicIFTypeEntry::QObjectPolymorphicIFTypeEntry(JNIEnv* env,
+                 const std::type_info& typeId,
+                 const char *qt_name,
+                 const char *java_name,
+                 jclass java_class,
+                 jmethodID creator_method,
+                 size_t value_size,
+                 const std::type_info* super_type,
+                 size_t shell_size,
+                 const QVector<const FunctionInfo>* virtualFunctions,
+                 const QMetaObject* original_meta_object,
+                 const QList<const PolymorphicIdHandler*>& polymorphicIdHandlers,
+                 const QMap<size_t,uint>& interfaceOffsets,
+                 const QSet<size_t>& interfaceTypes,
+                 const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+            )
+    : QObjectIFTypeEntry(env, typeId, qt_name, java_name, java_class, creator_method, value_size,
+                       super_type, shell_size, virtualFunctions, original_meta_object,
+                         interfaceOffsets, interfaceTypes, inheritedInterfaces),
       m_polymorphicIdHandlers(polymorphicIdHandlers)
 {
 
@@ -1317,7 +1576,7 @@ const std::type_info* qtjambi_resolve_polymorphy(const QList<const PolymorphicId
     return nullptr;
 }
 
-bool InterfaceTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult InterfaceTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
     if (!qt_object){
@@ -1335,9 +1594,9 @@ bool InterfaceTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
             uint offset = typeEntry->offset(type());
-            return typeEntry->convertToJava(env, reinterpret_cast<const void*>( qintptr(qt_object) - offset ), makeCopyOfValueTypes, cppOwnership, output, javaType);
+            return typeEntry->convertToJava(env, reinterpret_cast<const void*>( qintptr(qt_object) - offset ), makeCopyOfValues, output, javaType);
         }else{
             return false;
         }
@@ -1346,7 +1605,7 @@ bool InterfaceTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool
             JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
         output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
         JavaException::check(env QTJAMBI_STACKTRACEINFO );
-        const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+        const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
                 env,
                 output->l,
                 const_cast<void*>(qt_object),
@@ -1354,12 +1613,10 @@ bool InterfaceTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool
                 false,
                 false,
                 m_deleter,
-                m_owner_function
+                m_owner_function,
+                QtJambiLink::Ownership::None
             );
-        if(cppOwnership){
-            link->setCppOwnership(env);
-        }// split ownership
-        return true;
+        return {link};
     }
 }
 
@@ -1417,7 +1674,7 @@ bool InterfaceTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_share
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
             SmartPointerGetterFunction _sharedPointerGetter = sharedPointerGetter;
             uint offset = typeEntry->offset(type());
             if(offset>0){
@@ -1491,76 +1748,120 @@ bool InterfaceTypeEntry::convertToNative(JNIEnv *env, const jvalue& java_value,
     return true;
 }
 
-bool InterfaceValueTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult InterfaceIFTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
     if (!qt_object){
         output->l = nullptr;
         return true;
     }
-    if(!makeCopyOfValueTypes){
-        for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
-            if(link){
-                jobject obj = link->getJavaObjectLocalRef(env);
-                if(obj && env->IsInstanceOf(obj, javaClass())){
-                    output->l = obj;
-                    return true;
-                }
+    for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
+        if(link){
+            jobject obj = link->getJavaObjectLocalRef(env);
+            if(obj && env->IsInstanceOf(obj, javaClass())){
+                output->l = obj;
+                return true;
             }
         }
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
             uint offset = typeEntry->offset(type());
-            return typeEntry->convertToJava(env, reinterpret_cast<const void*>( qintptr(qt_object) - offset ), makeCopyOfValueTypes, cppOwnership, output, javaType);
+            return typeEntry->convertToJava(env, reinterpret_cast<const void*>( qintptr(qt_object) - offset ), makeCopyOfValues, output, javaType);
         }else{
             return false;
         }
     }else{
-        void *copy = makeCopyOfValueTypes ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
-        if (!copy){
-            output->l = nullptr;
-            return true;
-        }
         if(!creatableClass() || !creatorMethod())
             JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
         output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
         JavaException::check(env QTJAMBI_STACKTRACEINFO );
-        const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+        const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
                 env,
                 output->l,
-                copy,
-                m_qt_meta_type,
+                const_cast<void*>(qt_object),
+                LINK_NAME_ARG(qtName())
                 false,
                 false,
-                m_owner_function
+                m_deleter,
+                m_owner_function,
+                QtJambiLink::Ownership::None,
+                m_interfaceOffsets,
+                m_interfaceTypes,
+                m_inheritedInterfaces
             );
-        if(makeCopyOfValueTypes){
-            link->setJavaOwnership(env);
-        }else if(cppOwnership){
-            link->setCppOwnership(env);
-        }
+        Q_UNUSED(link)
         return true;
     }
 }
 
-bool InterfaceValueTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult InterfaceValueTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
-    if (!ptr_shared_pointer || !sharedPointerDeleter || !sharedPointerGetter){
-        output->l = nullptr;
-        return true;
-    }
-    void* qt_object = sharedPointerGetter(ptr_shared_pointer);
     if (!qt_object){
         output->l = nullptr;
         return true;
     }
-
-    for(QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
-        if(link && !link->isSmartPointer()){
-            jobject obj = link->getJavaObjectLocalRef(env);
+    if(!makeCopyOfValues){
+        for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
+            if(link){
+                jobject obj = link->getJavaObjectLocalRef(env);
+                if(obj && env->IsInstanceOf(obj, javaClass())){
+                    output->l = obj;
+                    return true;
+                }
+            }
+        }
+    }
+    const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
+    if(_typeId && *_typeId!=type()){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            uint offset = typeEntry->offset(type());
+            return typeEntry->convertToJava(env, reinterpret_cast<const void*>( qintptr(qt_object) - offset ), makeCopyOfValues, output, javaType);
+        }else{
+            return false;
+        }
+    }else{
+        void *copy = makeCopyOfValues ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
+        if (!copy){
+            output->l = nullptr;
+            return true;
+        }
+        if(!creatableClass() || !creatorMethod())
+            JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
+        output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
+        JavaException::check(env QTJAMBI_STACKTRACEINFO );
+        const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
+                env,
+                output->l,
+                copy,
+                m_qt_meta_type,
+                false,
+                false,
+                m_owner_function,
+                makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None
+            );
+        return {link};
+    }
+}
+
+bool InterfaceValueTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType javaType) const{
+    if(javaType!=jValueType::l)
+        JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
+    if (!ptr_shared_pointer || !sharedPointerDeleter || !sharedPointerGetter){
+        output->l = nullptr;
+        return true;
+    }
+    void* qt_object = sharedPointerGetter(ptr_shared_pointer);
+    if (!qt_object){
+        output->l = nullptr;
+        return true;
+    }
+
+    for(QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
+        if(link && !link->isSmartPointer()){
+            jobject obj = link->getJavaObjectLocalRef(env);
             if(obj && env->IsInstanceOf(obj, javaClass())){
                 output->l = obj;
                 bool createdByJava = link->createdByJava();
@@ -1600,13 +1901,13 @@ bool InterfaceValueTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
             SmartPointerGetterFunction _sharedPointerGetter = sharedPointerGetter;
-            uint offset = m_interface_offsets.value(unique_id(type()), 0);
-            if(offset>0){
-                _sharedPointerGetter = [sharedPointerGetter,offset](const void* sharedPtr)-> void* {
+            uint _offset = typeEntry->offset(type());
+            if(_offset>0){
+                _sharedPointerGetter = [sharedPointerGetter,_offset](const void* sharedPtr)-> void* {
                     void* ptr = sharedPointerGetter(sharedPtr);
-                    return reinterpret_cast<void*>( qintptr(ptr) - offset );
+                    return reinterpret_cast<void*>( qintptr(ptr) - _offset );
                 };
             }
             return typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, sharedPointerDeleter, _sharedPointerGetter, output, javaType);
@@ -1634,7 +1935,104 @@ bool InterfaceValueTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_
     }
 }
 
-bool ObjectTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+InterfaceValueIFTypeEntry::InterfaceValueIFTypeEntry(JNIEnv* env, const std::type_info& typeId,
+                          const char *qt_name,
+                          const char *java_name,
+                          jclass java_class,
+                          jmethodID creator_method,
+                          size_t value_size,
+                          jclass java_impl_class,
+                          jclass java_wrapper_class,
+                          const std::type_info* super_type,
+                          size_t shell_size,
+                          PtrDeleterFunction deleter,
+                          PtrOwnerFunction owner_function,
+                          const QVector<const FunctionInfo>* virtualFunctions,
+                          Destructor destructor,
+                          const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                          const QMetaType& qt_meta_type,
+                          const QMap<size_t,uint>& interfaceOffsets,
+                          const QSet<size_t>& interfaceTypes,
+                          const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+    : InterfaceIFTypeEntry(env,
+                           typeId,
+                           qt_name,
+                           java_name,
+                           java_class,
+                           creator_method,
+                           value_size,
+                           java_impl_class,
+                           java_wrapper_class,
+                           super_type,
+                           shell_size,
+                           deleter,
+                           owner_function,
+                           virtualFunctions,
+                           destructor,
+                           polymorphicHandlers,
+                           interfaceOffsets,
+                           interfaceTypes,
+                           inheritedInterfaces
+          ),
+      m_qt_meta_type(qt_meta_type
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+                            .id()
+#endif
+                     ){}
+
+QtJambiTypeEntry::NativeToJavaResult InterfaceValueIFTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
+    if(javaType!=jValueType::l)
+        JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
+    if (!qt_object){
+        output->l = nullptr;
+        return true;
+    }
+    if(!makeCopyOfValues){
+        for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
+            if(link){
+                jobject obj = link->getJavaObjectLocalRef(env);
+                if(obj && env->IsInstanceOf(obj, javaClass())){
+                    output->l = obj;
+                    return true;
+                }
+            }
+        }
+    }
+    const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
+    if(_typeId && *_typeId!=type()){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            uint offset = typeEntry->offset(type());
+            return typeEntry->convertToJava(env, reinterpret_cast<const void*>( qintptr(qt_object) - offset ), makeCopyOfValues, output, javaType);
+        }else{
+            return false;
+        }
+    }else{
+        void *copy = makeCopyOfValues ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
+        if (!copy){
+            output->l = nullptr;
+            return true;
+        }
+        if(!creatableClass() || !creatorMethod())
+            JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
+        output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
+        JavaException::check(env QTJAMBI_STACKTRACEINFO );
+        return QtJambiLink::createLinkForNativeObject(
+                env,
+                output->l,
+                copy,
+                m_qt_meta_type,
+                false,
+                false,
+                m_owner_function,
+                makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None,
+                m_interfaceOffsets,
+                m_interfaceTypes,
+                m_inheritedInterfaces
+            );
+    }
+}
+
+QtJambiTypeEntry::NativeToJavaResult ObjectTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
     if (!qt_object){
@@ -1652,8 +2050,8 @@ bool ObjectTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool mak
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
-            return typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, output, javaType);
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
         }else{
             return false;
         }
@@ -1662,7 +2060,7 @@ bool ObjectTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool mak
             JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
         output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
         JavaException::check(env QTJAMBI_STACKTRACEINFO );
-        const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+        return QtJambiLink::createLinkForNativeObject(
                 env,
                 output->l,
                 const_cast<void*>(qt_object),
@@ -1670,12 +2068,9 @@ bool ObjectTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool mak
                 false,
                 false,
                 m_deleter,
-                m_owner_function
+                m_owner_function,
+                QtJambiLink::Ownership::None
             );
-        if(cppOwnership){
-            link->setCppOwnership(env);
-        } // split ownership
-        return true;
     }
 }
 
@@ -1733,13 +2128,13 @@ bool ObjectTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_p
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
             SmartPointerGetterFunction _sharedPointerGetter = sharedPointerGetter;
-            uint offset = m_interface_offsets.value(unique_id(*_typeId), 0);
-            if(offset>0){
-                _sharedPointerGetter = [sharedPointerGetter,offset](const void* sharedPtr)-> void* {
+            uint _offset = typeEntry->offset(type());
+            if(_offset>0){
+                _sharedPointerGetter = [sharedPointerGetter,_offset](const void* sharedPtr)-> void* {
                     void* ptr = sharedPointerGetter(sharedPtr);
-                    return reinterpret_cast<void*>( qintptr(ptr) - offset );
+                    return reinterpret_cast<void*>( qintptr(ptr) - _offset );
                 };
             }
             return typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, sharedPointerDeleter, sharedPointerGetter, output, javaType);
@@ -1781,14 +2176,135 @@ bool ObjectTypeEntry::convertToNative(JNIEnv *env, const jvalue& java_value, jVa
     }else return false;
 }
 
-bool ObjectValueTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+ObjectIFTypeEntry::ObjectIFTypeEntry(JNIEnv* env,
+                const std::type_info& typeId,
+                const char *qt_name,
+                const char *java_name,
+                jclass java_class,
+                jmethodID creator_method,
+                size_t value_size,
+                const std::type_info* super_type,
+                size_t shell_size,
+                PtrDeleterFunction deleter,
+                PtrOwnerFunction owner_function,
+                const QVector<const FunctionInfo>* virtualFunctions,
+                Destructor destructor,
+                const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                const QMap<size_t,uint>& interfaceOffsets,
+                const QSet<size_t>& interfaceTypes,
+                const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+    :    ObjectTypeEntry(env,
+                         typeId,
+                         qt_name,
+                         java_name,
+                         java_class,
+                         creator_method,
+                         value_size,
+                         super_type,
+                         shell_size,
+                         deleter,
+                         owner_function,
+                         virtualFunctions,
+                         destructor,
+                         polymorphicHandlers
+                     ),
+      m_interfaceOffsets(interfaceOffsets),
+      m_interfaceTypes(interfaceTypes),
+      m_inheritedInterfaces(inheritedInterfaces){
+}
+
+ObjectAbstractIFTypeEntry::ObjectAbstractIFTypeEntry(JNIEnv* env,
+                const std::type_info& typeId,
+                const char *qt_name,
+                const char *java_name,
+                jclass java_class,
+                jmethodID creator_method,
+                size_t value_size,
+                const std::type_info* super_type,
+                size_t shell_size,
+                PtrDeleterFunction deleter,
+                PtrOwnerFunction owner_function,
+                const QVector<const FunctionInfo>* virtualFunctions,
+                Destructor destructor,
+                const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                jclass java_wrapper_class,
+                const QMap<size_t,uint>& interfaceOffsets,
+                const QSet<size_t>& interfaceTypes,
+                const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+    :     ObjectIFTypeEntry(env,
+                            typeId,
+                            qt_name,
+                            java_name,
+                            java_class,
+                            creator_method,
+                            value_size,
+                            super_type,
+                            shell_size,
+                            deleter,
+                            owner_function,
+                            virtualFunctions,
+                            destructor,
+                            polymorphicHandlers,
+                            interfaceOffsets,
+                            interfaceTypes,
+                            inheritedInterfaces
+                        ),
+      m_java_wrapper_class(java_wrapper_class ? getGlobalClassRef(env, java_wrapper_class) : nullptr)
+{}
+
+QtJambiTypeEntry::NativeToJavaResult ObjectIFTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
+    if(javaType!=jValueType::l)
+        JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
+    if (!qt_object){
+        output->l = nullptr;
+        return true;
+    }
+    for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
+        if(link){
+            jobject obj = link->getJavaObjectLocalRef(env);
+            if(obj && env->IsInstanceOf(obj, javaClass())){
+                output->l = obj;
+                return true;
+            }
+        }
+    }
+    const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
+    if(_typeId && *_typeId!=type()){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
+        }else{
+            return false;
+        }
+    }else{
+        if(!creatableClass() || !creatorMethod())
+            JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
+        output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
+        JavaException::check(env QTJAMBI_STACKTRACEINFO );
+        return QtJambiLink::createLinkForNativeObject(
+                env,
+                output->l,
+                const_cast<void*>(qt_object),
+                LINK_NAME_ARG(qtName())
+                false,
+                false,
+                m_deleter,
+                m_owner_function,
+                QtJambiLink::Ownership::None,
+                m_interfaceOffsets,
+                m_interfaceTypes,
+                m_inheritedInterfaces
+            );
+    }
+}
+
+QtJambiTypeEntry::NativeToJavaResult ObjectValueTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
     if (!qt_object){
         output->l = nullptr;
         return true;
     }
-    if(!makeCopyOfValueTypes){
+    if(!makeCopyOfValues){
         for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
             if(link){
                 jobject obj = link->getJavaObjectLocalRef(env);
@@ -1801,13 +2317,13 @@ bool ObjectValueTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, boo
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
-            return typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, output, javaType);
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
         }else{
             return false;
         }
     }else{
-        void *copy = makeCopyOfValueTypes ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
+        void *copy = makeCopyOfValues ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
         if (!copy){
             output->l = nullptr;
             return true;
@@ -1816,30 +2332,25 @@ bool ObjectValueTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, boo
             JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
         output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
         JavaException::check(env QTJAMBI_STACKTRACEINFO );
-        const QSharedPointer<QtJambiLink>& link =
-                m_owner_function ?
-                    QtJambiLink::createLinkForObject(
+        return m_owner_function ?
+                    QtJambiLink::createLinkForNativeObject(
                         env,
                         output->l,
                         copy,
                         m_qt_meta_type,
                         false,
                         false,
-                        m_owner_function
-                    ) : QtJambiLink::createLinkForObject(
+                        m_owner_function,
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None
+                    ) : QtJambiLink::createLinkForNativeObject(
                         env,
                         output->l,
                         copy,
                         m_qt_meta_type,
                         false,
-                        false
+                        makeCopyOfValues,
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None
                     );
-        if(makeCopyOfValueTypes){
-            link->setJavaOwnership(env);
-        }else if(cppOwnership){
-            link->setCppOwnership(env);
-        }
-        return true;
     }
 }
 
@@ -1897,13 +2408,13 @@ bool ObjectValueTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_sha
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
             SmartPointerGetterFunction _sharedPointerGetter = sharedPointerGetter;
-            uint offset = m_interface_offsets.value(unique_id(*_typeId), 0);
-            if(offset>0){
-                _sharedPointerGetter = [sharedPointerGetter,offset](const void* sharedPtr)-> void* {
+            uint _offset = typeEntry->offset(type());
+            if(_offset>0){
+                _sharedPointerGetter = [sharedPointerGetter,_offset](const void* sharedPtr)-> void* {
                     void* ptr = sharedPointerGetter(sharedPtr);
-                    return reinterpret_cast<void*>( qintptr(ptr) - offset );
+                    return reinterpret_cast<void*>( qintptr(ptr) - _offset );
                 };
             }
             return typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, sharedPointerDeleter, sharedPointerGetter, output, javaType);
@@ -1931,6 +2442,110 @@ bool ObjectValueTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_sha
     }
 }
 
+ObjectValueIFTypeEntry::ObjectValueIFTypeEntry(JNIEnv* env,
+                                                   const std::type_info& typeId,
+                                                   const char *qt_name,
+                                                   const char *java_name,
+                                                   jclass java_class,
+                                                   jmethodID creator_method,
+                                                   size_t value_size,
+                                                   const std::type_info* super_type,
+                                                   size_t shell_size,
+                                                   PtrOwnerFunction owner_function,
+                                                   const QVector<const FunctionInfo>* virtualFunctions,
+                                                   Destructor destructor,
+                                                   const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                                                   const QMetaType& qt_meta_type,
+                                                   const QMap<size_t,uint>& interfaceOffsets,
+                                                   const QSet<size_t>& interfaceTypes,
+                                                   const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                                                   )
+    : ObjectIFTypeEntry(env,
+                        typeId,
+                        qt_name,
+                        java_name,
+                        java_class,
+                        creator_method,
+                        value_size,
+                        super_type,
+                        shell_size,
+                        nullptr,
+                        owner_function,
+                        virtualFunctions,
+                        destructor,
+                        polymorphicHandlers,
+                        interfaceOffsets,
+                        interfaceTypes,
+                        inheritedInterfaces),
+        m_qt_meta_type(qt_meta_type
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+                                    .id()
+#endif
+                       ){}
+
+QtJambiTypeEntry::NativeToJavaResult ObjectValueIFTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
+    if(javaType!=jValueType::l)
+        JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
+    if (!qt_object){
+        output->l = nullptr;
+        return true;
+    }
+    if(!makeCopyOfValues){
+        for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
+            if(link){
+                jobject obj = link->getJavaObjectLocalRef(env);
+                if(obj && env->IsInstanceOf(obj, javaClass())){
+                    output->l = obj;
+                    return true;
+                }
+            }
+        }
+    }
+    const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
+    if(_typeId && *_typeId!=type()){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
+        }else{
+            return false;
+        }
+    }else{
+        void *copy = makeCopyOfValues ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
+        if (!copy){
+            output->l = nullptr;
+            return true;
+        }
+        if(!creatableClass() || !creatorMethod())
+            JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
+        output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
+        JavaException::check(env QTJAMBI_STACKTRACEINFO );
+        return m_owner_function ?
+                    QtJambiLink::createLinkForNativeObject(
+                        env,
+                        output->l,
+                        copy,
+                        m_qt_meta_type,
+                        false,
+                        false,
+                        m_owner_function,
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None,
+                        m_interfaceOffsets,
+                        m_interfaceTypes,
+                        m_inheritedInterfaces
+                    ) : QtJambiLink::createLinkForNativeObject(
+                        env,
+                        output->l,
+                        copy,
+                        m_qt_meta_type,
+                        false,
+                        false,
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None,
+                        m_interfaceOffsets,
+                        m_interfaceTypes,
+                        m_inheritedInterfaces
+                    );
+    }
+}
+
 ObjectContainerTypeEntry::ObjectContainerTypeEntry(JNIEnv* env,
                 const std::type_info& typeId,
                 const char *qt_name,
@@ -1939,8 +2554,6 @@ ObjectContainerTypeEntry::ObjectContainerTypeEntry(JNIEnv* env,
                 jmethodID creator_method,
                 size_t value_size,
                 const std::type_info* super_type,
-                const QList<const std::type_info*>& interface_types,
-                const QMap<size_t, uint>& interface_offsets,
                 size_t shell_size,
                 NewContainerAccessFunction containerAccessFactory,
                 PtrOwnerFunction owner_function,
@@ -1956,8 +2569,6 @@ ObjectContainerTypeEntry::ObjectContainerTypeEntry(JNIEnv* env,
                            creator_method,
                            value_size,
                            super_type,
-                           interface_types,
-                           interface_offsets,
                            shell_size,
                            owner_function,
                            virtualFunctions,
@@ -1975,8 +2586,6 @@ ObjectAbstractContainerTypeEntry::ObjectAbstractContainerTypeEntry(JNIEnv* env,
                 jmethodID creator_method,
                 size_t value_size,
                 const std::type_info* super_type,
-                const QList<const std::type_info*>& interface_types,
-                const QMap<size_t, uint>& interface_offsets,
                 size_t shell_size,
                 NewContainerAccessFunction containerAccessFactory,
                 PtrOwnerFunction owner_function,
@@ -1993,8 +2602,6 @@ ObjectAbstractContainerTypeEntry::ObjectAbstractContainerTypeEntry(JNIEnv* env,
                            creator_method,
                            value_size,
                            super_type,
-                           interface_types,
-                           interface_offsets,
                            shell_size,
                            owner_function,
                            virtualFunctions,
@@ -2005,14 +2612,14 @@ ObjectAbstractContainerTypeEntry::ObjectAbstractContainerTypeEntry(JNIEnv* env,
       m_containerAccessFactory(containerAccessFactory)
 {}
 
-bool ObjectContainerTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult ObjectContainerTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
     if (!qt_object){
         output->l = nullptr;
         return true;
     }
-    if(!makeCopyOfValueTypes){
+    if(!makeCopyOfValues){
         for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
             if(link){
                 jobject obj = link->getJavaObjectLocalRef(env);
@@ -2025,13 +2632,13 @@ bool ObjectContainerTypeEntry::convertToJava(JNIEnv *env, const void *qt_object,
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
-            return typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, output, javaType);
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
         }else{
             return false;
         }
     }else{
-        void *copy = makeCopyOfValueTypes ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
+        void *copy = makeCopyOfValues ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
         if (!copy){
             output->l = nullptr;
             return true;
@@ -2040,21 +2647,16 @@ bool ObjectContainerTypeEntry::convertToJava(JNIEnv *env, const void *qt_object,
             JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
         output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
         JavaException::check(env QTJAMBI_STACKTRACEINFO );
-        const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForContainer(
+        return QtJambiLink::createLinkForNativeObject(
                         env,
                         output->l,
                         copy,
                         m_qt_meta_type,
                         false,
                         false,
-                        m_containerAccessFactory()
+                        m_containerAccessFactory(),
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None
                     );
-        if(makeCopyOfValueTypes){
-            link->setJavaOwnership(env);
-        }else if(cppOwnership){
-            link->setCppOwnership(env);
-        }
-        return true;
     }
 }
 
@@ -2104,13 +2706,13 @@ bool ObjectContainerTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
             SmartPointerGetterFunction _sharedPointerGetter = sharedPointerGetter;
-            uint offset = m_interface_offsets.value(unique_id(*_typeId), 0);
-            if(offset>0){
-                _sharedPointerGetter = [sharedPointerGetter,offset](const void* sharedPtr)-> void* {
+            uint _offset = typeEntry->offset(type());
+            if(_offset>0){
+                _sharedPointerGetter = [sharedPointerGetter,_offset](const void* sharedPtr)-> void* {
                     void* ptr = sharedPointerGetter(sharedPtr);
-                    return reinterpret_cast<void*>( qintptr(ptr) - offset );
+                    return reinterpret_cast<void*>( qintptr(ptr) - _offset );
                 };
             }
             return typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, sharedPointerDeleter, sharedPointerGetter, output, javaType);
@@ -2136,14 +2738,14 @@ bool ObjectContainerTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr
     }
 }
 
-bool ObjectAbstractContainerTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult ObjectContainerIFTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
     if (!qt_object){
         output->l = nullptr;
         return true;
     }
-    if(!makeCopyOfValueTypes){
+    if(!makeCopyOfValues){
         for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
             if(link){
                 jobject obj = link->getJavaObjectLocalRef(env);
@@ -2156,13 +2758,13 @@ bool ObjectAbstractContainerTypeEntry::convertToJava(JNIEnv *env, const void *qt
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
-            return typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, output, javaType);
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
         }else{
             return false;
         }
     }else{
-        void *copy = makeCopyOfValueTypes ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
+        void *copy = makeCopyOfValues ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
         if (!copy){
             output->l = nullptr;
             return true;
@@ -2171,22 +2773,68 @@ bool ObjectAbstractContainerTypeEntry::convertToJava(JNIEnv *env, const void *qt
             JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
         output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
         JavaException::check(env QTJAMBI_STACKTRACEINFO );
-        const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForContainer(
+        return QtJambiLink::createLinkForNativeObject(
                         env,
                         output->l,
                         copy,
                         m_qt_meta_type,
                         false,
                         false,
-                        m_containerAccessFactory()
+                        m_containerAccessFactory(),
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None,
+                        m_interfaceOffsets,
+                        m_interfaceTypes,
+                        m_inheritedInterfaces
                     );
-        if(makeCopyOfValueTypes){
-            link->setJavaOwnership(env);
-        }else if(cppOwnership){
-            link->setCppOwnership(env);
-        }
+    }
+}
+
+QtJambiTypeEntry::NativeToJavaResult ObjectAbstractContainerTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
+    if(javaType!=jValueType::l)
+        JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
+    if (!qt_object){
+        output->l = nullptr;
         return true;
     }
+    if(!makeCopyOfValues){
+        for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
+            if(link){
+                jobject obj = link->getJavaObjectLocalRef(env);
+                if(obj && env->IsInstanceOf(obj, javaClass())){
+                    output->l = obj;
+                    return true;
+                }
+            }
+        }
+    }
+    const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
+    if(_typeId && *_typeId!=type()){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
+        }else{
+            return false;
+        }
+    }else{
+        void *copy = makeCopyOfValues ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
+        if (!copy){
+            output->l = nullptr;
+            return true;
+        }
+        if(!creatableClass() || !creatorMethod())
+            JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
+        output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
+        JavaException::check(env QTJAMBI_STACKTRACEINFO );
+        return QtJambiLink::createLinkForNativeObject(
+                        env,
+                        output->l,
+                        copy,
+                        m_qt_meta_type,
+                        false,
+                        false,
+                        m_containerAccessFactory(),
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None
+                    );
+    }
 }
 
 bool ObjectAbstractContainerTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType javaType) const{
@@ -2235,13 +2883,13 @@ bool ObjectAbstractContainerTypeEntry::convertSharedPointerToJava(JNIEnv *env, v
     }
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
             SmartPointerGetterFunction _sharedPointerGetter = sharedPointerGetter;
-            uint offset = m_interface_offsets.value(unique_id(*_typeId), 0);
-            if(offset>0){
-                _sharedPointerGetter = [sharedPointerGetter,offset](const void* sharedPtr)-> void* {
+            uint _offset = typeEntry->offset(type());
+            if(_offset>0){
+                _sharedPointerGetter = [sharedPointerGetter,_offset](const void* sharedPtr)-> void* {
                     void* ptr = sharedPointerGetter(sharedPtr);
-                    return reinterpret_cast<void*>( qintptr(ptr) - offset );
+                    return reinterpret_cast<void*>( qintptr(ptr) - _offset );
                 };
             }
             return typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, sharedPointerDeleter, sharedPointerGetter, output, javaType);
@@ -2267,7 +2915,98 @@ bool ObjectAbstractContainerTypeEntry::convertSharedPointerToJava(JNIEnv *env, v
     }
 }
 
-bool QObjectTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+ObjectAbstractContainerIFTypeEntry::ObjectAbstractContainerIFTypeEntry(JNIEnv* env,
+                const std::type_info& typeId,
+                const char *qt_name,
+                const char *java_name,
+                jclass java_class,
+                jmethodID creator_method,
+                size_t value_size,
+                const std::type_info* super_type,
+                size_t shell_size,
+                NewContainerAccessFunction containerAccessFactory,
+                PtrOwnerFunction owner_function,
+                const QVector<const FunctionInfo>* virtualFunctions,
+                Destructor destructor,
+                const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                const QMetaType& qt_meta_type,
+                jclass java_wrapper_class,
+                const QMap<size_t,uint>& interfaceOffsets,
+                const QSet<size_t>& interfaceTypes,
+                const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces)
+    : ObjectAbstractValueIFTypeEntry(env,
+                           typeId,
+                           qt_name,
+                           java_name,
+                           java_class,
+                           creator_method,
+                           value_size,
+                           super_type,
+                           shell_size,
+                           owner_function,
+                           virtualFunctions,
+                           destructor,
+                           polymorphicHandlers,
+                           qt_meta_type,
+                           java_wrapper_class,
+                           interfaceOffsets,
+                           interfaceTypes,
+                           inheritedInterfaces),
+      m_containerAccessFactory(containerAccessFactory)
+{}
+
+QtJambiTypeEntry::NativeToJavaResult ObjectAbstractContainerIFTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
+    if(javaType!=jValueType::l)
+        JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
+    if (!qt_object){
+        output->l = nullptr;
+        return true;
+    }
+    if(!makeCopyOfValues){
+        for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
+            if(link){
+                jobject obj = link->getJavaObjectLocalRef(env);
+                if(obj && env->IsInstanceOf(obj, javaClass())){
+                    output->l = obj;
+                    return true;
+                }
+            }
+        }
+    }
+    const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
+    if(_typeId && *_typeId!=type()){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
+        }else{
+            return false;
+        }
+    }else{
+        void *copy = makeCopyOfValues ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
+        if (!copy){
+            output->l = nullptr;
+            return true;
+        }
+        if(!creatableClass() || !creatorMethod())
+            JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
+        output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
+        JavaException::check(env QTJAMBI_STACKTRACEINFO );
+        return QtJambiLink::createLinkForNativeObject(
+                        env,
+                        output->l,
+                        copy,
+                        m_qt_meta_type,
+                        false,
+                        false,
+                        m_containerAccessFactory(),
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None,
+                        m_interfaceOffsets,
+                        m_interfaceTypes,
+                        m_inheritedInterfaces
+                    );
+    }
+}
+
+QtJambiTypeEntry::NativeToJavaResult QObjectTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
     QObject* qt_object = reinterpret_cast<QObject*>( const_cast<void*>(ptr) );
@@ -2349,8 +3088,8 @@ bool QObjectTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bool makeCopy
                 mo = mo->superClass();
             }
             if(*typeId!=type()){
-                if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
-                    return typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, output, javaType);
+                if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
+                    return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
                 }else{
                     return false;
                 }
@@ -2361,8 +3100,7 @@ bool QObjectTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bool makeCopy
         JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
     output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
     JavaException::check(env QTJAMBI_STACKTRACEINFO );
-    QtJambiLink::createLinkForQObject(env, output->l, qt_object, false, false, m_superTypeForCustomMetaObject);
-    return true;
+    return QtJambiLink::createLinkForNativeQObject(env, output->l, qt_object, false, false, m_superTypeForCustomMetaObject);
 }
 
 bool QObjectTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType javaType) const{
@@ -2477,7 +3215,7 @@ bool QObjectTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_
                 mo = mo->superClass();
             }
             if(*typeId!=type()){
-                if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
+                if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
                     return typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, sharedPointerDeleter, sharedPointerGetter, output, javaType);
                 }else{
                     return false;
@@ -2493,7 +3231,106 @@ bool QObjectTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_
     return true;
 }
 
-bool QObjectPolymorphicTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult QObjectIFTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
+    if(javaType!=jValueType::l)
+        JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
+    QObject* qt_object = reinterpret_cast<QObject*>( const_cast<void*>(ptr) );
+    if (!qt_object){
+        output->l = nullptr;
+        return true;
+    }
+
+    if(QSharedPointer<QtJambiLink> link = QtJambiLink::findLinkForQObject(qt_object)){
+        jobject nativeLink = link->nativeLink(env);
+        QScopedPointer<JObjectSynchronizer> synchronizer(new JObjectSynchronizer(env, nativeLink));
+        // Since QObjects are created in a class based on virtual function calls,
+        // if they at some point during their constructor are converted to Java,
+        // the Java object will get the wrong class. In order to fix this as well
+        // as possible, we replace the java object if it turns out it has previously
+        // been created using a different metaObject than the current. This should
+        // at least make the brokeness identical to that of C++, and we can't do this
+        // better than C++ since we depend on C++ to do it.
+        if(!link->createdByJava()){
+            QWriteLocker locker(QtJambiLinkUserData::lock());
+            QtJambiLinkUserData *p = QTJAMBI_GET_OBJECTUSERDATA(QtJambiLinkUserData, qt_object);
+            if (p && p->metaObject() && p->metaObject() != qt_object->metaObject()) {
+                QTJAMBI_SET_OBJECTUSERDATA(QtJambiLinkUserData, qt_object, nullptr);
+                locker.unlock();
+                delete p;
+                // It should already be split ownership, but in case it has been changed, we need to make sure the c++
+                // object isn't deleted.
+                Java::QtJambi::NativeUtility$NativeLink::reset(env, nativeLink);
+                link->setSplitOwnership(env);
+                link.clear();
+                locker.relock();
+            }
+        }
+        if(link){
+            output->l = link->getJavaObjectLocalRef(env);
+            if(!output->l && link->ownership()==QtJambiLink::Ownership::Split){
+                {
+                    bool isInvalidated = false;
+                    {
+                        QWriteLocker locker(QtJambiLinkUserData::lock());
+                        if(QtJambiLinkUserData *p = QTJAMBI_GET_OBJECTUSERDATA(QtJambiLinkUserData, qt_object)){
+                            QTJAMBI_SET_OBJECTUSERDATA(QtJambiLinkUserData, qt_object, nullptr);
+                            locker.unlock();
+                            delete p;
+                            isInvalidated = true;
+                            locker.relock();
+                        }
+                    }
+                    if(!isInvalidated)
+                        link->invalidate(env);
+                    link.clear();
+                }
+            }else return true;
+        }
+    }
+
+    if(this->m_original_meta_object){
+        const QMetaObject *mo = QtJambiMetaObject::findFirstStaticMetaObject(qt_object->metaObject());
+        if(this->m_original_meta_object!=mo){
+            const std::type_info* typeId = &type();
+            // Search the hierarchy of classes for a class that has been mapped to Java.
+            // Prefer the requested class if no other can be found.
+            // Only return objects of subclasses of the requested class
+            // If the requested class is not in the object's hierarchy, then we prefer
+            // the requested class (this means it's basically a proper subclass of the
+            // requested class, and thus probably the concrete wrapper, but atleast a
+            // more specific version than anything we can find)
+            while (mo) {
+                const std::type_info* _typeId = getTypeByMetaObject(mo);
+                if(_typeId){
+                    if(*typeId==*_typeId){
+                        // Never go further down the hierarchy than the requested class
+                        break;
+                    }else{
+                        typeId = _typeId;
+                        break;
+                    }
+                }
+                mo = mo->superClass();
+            }
+            if(*typeId!=type()){
+                if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
+                    return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
+                }else{
+                    return false;
+                }
+            }
+        }
+    }
+    if(!creatableClass() || !creatorMethod())
+        JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
+    output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
+    JavaException::check(env QTJAMBI_STACKTRACEINFO );
+    return QtJambiLink::createLinkForNativeQObject(env, output->l, qt_object,
+                                            false, false, m_superTypeForCustomMetaObject,
+                                            m_interfaceOffsets, m_interfaceTypes, m_inheritedInterfaces);
+}
+
+QtJambiTypeEntry::NativeToJavaResult QObjectPolymorphicTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
     QObject* qt_object = reinterpret_cast<QObject*>( const_cast<void*>(ptr) );
@@ -2552,8 +3389,8 @@ bool QObjectPolymorphicTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bo
 
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
-            return typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, output, javaType);
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
         }else{
             return false;
         }
@@ -2583,8 +3420,8 @@ bool QObjectPolymorphicTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bo
             mo = mo->superClass();
         }
         if(*typeId!=type()){
-            if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
-                return typeEntry->convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, output, javaType);
+            if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
+                return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
             }else{
                 return false;
             }
@@ -2594,8 +3431,7 @@ bool QObjectPolymorphicTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bo
         JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
     output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
     JavaException::check(env QTJAMBI_STACKTRACEINFO );
-    QtJambiLink::createLinkForQObject(env, output->l, qt_object, false, false, m_superTypeForCustomMetaObject);
-    return true;
+    return QtJambiLink::createLinkForNativeQObject(env, output->l, qt_object, false, false, m_superTypeForCustomMetaObject);
 }
 
 bool QObjectPolymorphicTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType javaType) const{
@@ -2687,7 +3523,7 @@ bool QObjectPolymorphicTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *
 
     const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
     if(_typeId && *_typeId!=type()){
-        if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
             return typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, sharedPointerDeleter, sharedPointerGetter, output, javaType);
         }else{
             return false;
@@ -2718,7 +3554,7 @@ bool QObjectPolymorphicTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *
             mo = mo->superClass();
         }
         if(*typeId!=type()){
-            if(const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
+            if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
                 return typeEntry->convertSharedPointerToJava(env, ptr_shared_pointer, sharedPointerDeleter, sharedPointerGetter, output, javaType);
             }else{
                 return false;
@@ -2747,11 +3583,114 @@ bool QObjectTypeEntry::convertToNative(JNIEnv *env, const jvalue& java_value, jV
     }else return false;
 }
 
-bool FunctionalTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult QObjectPolymorphicIFTypeEntry::convertToJava(JNIEnv *env, const void *ptr, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
+    if(javaType!=jValueType::l)
+        JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
+    QObject* qt_object = reinterpret_cast<QObject*>( const_cast<void*>(ptr) );
+    if (!qt_object){
+        output->l = nullptr;
+        return true;
+    }
+
+    if(QSharedPointer<QtJambiLink> link = QtJambiLink::findLinkForQObject(qt_object)){
+        jobject nativeLink = link->nativeLink(env);
+        QScopedPointer<JObjectSynchronizer> synchronizer(new JObjectSynchronizer(env, nativeLink));
+        // Since QObjects are created in a class based on virtual function calls,
+        // if they at some point during their constructor are converted to Java,
+        // the Java object will get the wrong class. In order to fix this as well
+        // as possible, we replace the java object if it turns out it has previously
+        // been created using a different metaObject than the current. This should
+        // at least make the brokeness identical to that of C++, and we can't do this
+        // better than C++ since we depend on C++ to do it.
+        if(!link->createdByJava()){
+            QWriteLocker locker(QtJambiLinkUserData::lock());
+            QtJambiLinkUserData *p = QTJAMBI_GET_OBJECTUSERDATA(QtJambiLinkUserData, qt_object);
+            if (p && p->metaObject() && p->metaObject() != qt_object->metaObject()) {
+                QTJAMBI_SET_OBJECTUSERDATA(QtJambiLinkUserData, qt_object, nullptr);
+                locker.unlock();
+                delete p;
+                // It should already be split ownership, but in case it has been changed, we need to make sure the c++
+                // object isn't deleted.
+                Java::QtJambi::NativeUtility$NativeLink::reset(env, nativeLink);
+                link->setSplitOwnership(env);
+                link.clear();
+                locker.relock();
+            }
+        }
+        if(link){
+            output->l = link->getJavaObjectLocalRef(env);
+            if(!output->l && link->ownership()==QtJambiLink::Ownership::Split){
+                {
+                    bool isInvalidated = false;
+                    {
+                        QWriteLocker locker(QtJambiLinkUserData::lock());
+                        if(QtJambiLinkUserData *p = QTJAMBI_GET_OBJECTUSERDATA(QtJambiLinkUserData, qt_object)){
+                            QTJAMBI_SET_OBJECTUSERDATA(QtJambiLinkUserData, qt_object, nullptr);
+                            locker.unlock();
+                            isInvalidated = true;
+                            delete p;
+                            locker.relock();
+                        }
+                    }
+                    if(!isInvalidated)
+                        link->invalidate(env);
+                    link.clear();
+                }
+            }else return true;
+        }
+    }
+
+    const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
+    if(_typeId && *_typeId!=type()){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
+        }else{
+            return false;
+        }
+    }
+
+    const QMetaObject *mo = QtJambiMetaObject::findFirstStaticMetaObject(qt_object->metaObject());
+    if(this->originalMetaObject() && this->originalMetaObject()!=mo){
+        const std::type_info* typeId = &type();
+        // Search the hierarchy of classes for a class that has been mapped to Java.
+        // Prefer the requested class if no other can be found.
+        // Only return objects of subclasses of the requested class
+        // If the requested class is not in the object's hierarchy, then we prefer
+        // the requested class (this means it's basically a proper subclass of the
+        // requested class, and thus probably the concrete wrapper, but atleast a
+        // more specific version than anything we can find)
+        while (mo) {
+            const std::type_info* _typeId = getTypeByMetaObject(mo);
+            if(_typeId){
+                if(*typeId==*_typeId){
+                    // Never go further down the hierarchy than the requested class
+                    break;
+                }else{
+                    typeId = _typeId;
+                    break;
+                }
+            }
+            mo = mo->superClass();
+        }
+        if(*typeId!=type()){
+            if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *typeId)){
+                return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
+            }else{
+                return false;
+            }
+        }
+    }
+    if(!creatableClass() || !creatorMethod())
+        JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
+    output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
+    JavaException::check(env QTJAMBI_STACKTRACEINFO );
+    return QtJambiLink::createLinkForNativeQObject(env, output->l, qt_object, false, false, m_superTypeForCustomMetaObject,
+                                            m_interfaceOffsets, m_interfaceTypes, m_inheritedInterfaces);
+}
+
+QtJambiTypeEntry::NativeToJavaResult FunctionalTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert functional type" QTJAMBI_STACKTRACEINFO );
-    Q_UNUSED(makeCopyOfValueTypes)
-    Q_UNUSED(cppOwnership)
     if(m_registered_functional_resolver){
         output->l = m_registered_functional_resolver(env, m_is_std_function ? qt_object : &qt_object);
         if(output->l)
@@ -2761,19 +3700,19 @@ bool FunctionalTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool
         JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
     output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
     JavaException::check(env QTJAMBI_STACKTRACEINFO );
-    QtJambiLink::createLinkForObject(
+    return QtJambiLink::createLinkForNativeObject(
             env,
             output->l,
             m_qt_meta_type.create(m_is_std_function ? qt_object : &qt_object),
             m_qt_meta_type,
             false,
-            false
-        )->setJavaOwnership(env);
-    return true;
+            false,
+            QtJambiLink::Ownership::Java
+        );
 }
 
 bool FunctionalTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *qt_object, SmartPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType javaType) const{
-    return convertToJava(env, sharedPointerGetter(qt_object), true, false, output, javaType);
+    return convertToJava(env, sharedPointerGetter(qt_object), true, output, javaType);
 }
 
 bool FunctionalTypeEntry::convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope*) const{
@@ -2813,7 +3752,7 @@ bool FunctionalTypeEntry::convertToNative(JNIEnv *env, const jvalue& java_value,
     return true;
 }
 
-bool EnumTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult EnumTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     switch (javaType) {
     case jValueType::l:
         if(!creatableClass() || !creatorMethod())
@@ -2853,7 +3792,7 @@ bool EnumTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool
 }
 
 bool EnumTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *qt_object, SmartPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType javaType) const{
-    return convertToJava(env, sharedPointerGetter(qt_object), true, false, output, javaType);
+    return convertToJava(env, sharedPointerGetter(qt_object), true, output, javaType);
 }
 
 bool EnumTypeEntry::convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope*) const{
@@ -2974,7 +3913,7 @@ bool EnumTypeEntry::convertToNative(JNIEnv *env, const jvalue& java_value, jValu
     return true;
 }
 
-bool FlagsTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult FlagsTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     switch (javaType) {
     case jValueType::l:
         if(!creatableClass() || !creatorMethod())
@@ -2994,7 +3933,7 @@ bool FlagsTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, boo
 }
 
 bool FlagsTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *qt_object, SmartPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType javaType) const{
-    return convertToJava(env, sharedPointerGetter(qt_object), true, false, output, javaType);
+    return convertToJava(env, sharedPointerGetter(qt_object), true, output, javaType);
 }
 
 bool FlagsTypeEntry::convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope*) const{
@@ -3033,7 +3972,7 @@ AbstractSimpleTypeEntry::AbstractSimpleTypeEntry(JNIEnv* env, const std::type_in
 }
 
 bool AbstractSimpleTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *qt_object, SmartPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType javaType) const{
-    return convertToJava(env, sharedPointerGetter(qt_object), true, false, output, javaType);
+    return convertToJava(env, sharedPointerGetter(qt_object), true, output, javaType);
 }
 
 JLongTypeEntry::JLongTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size)
@@ -3046,7 +3985,7 @@ StringTypeEntry::StringTypeEntry(JNIEnv* env, const std::type_info& typeId, cons
 {
 }
 
-bool StringTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult StringTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     const QString* strg = reinterpret_cast<const QString*>(qt_object);
     switch (javaType) {
     case jValueType::l:
@@ -3109,12 +4048,12 @@ QCborValueRefTypeEntry::QCborValueRefTypeEntry(JNIEnv* env, const std::type_info
 {
 }
 
-bool QCborValueRefTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult QCborValueRefTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
     const QCborValueRef* vref = reinterpret_cast<const QCborValueRef*>(qt_object);
-    const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeid(QCborValue), "QCborValue");
+    QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeid(QCborValue), "QCborValue");
     Q_ASSERT(typeEntry);
     QCborValue value = *vref;
-    return typeEntry->convertToJava(env, &value, makeCopyOfValueTypes, cppOwnership, output, javaType);
+    return typeEntry->convertToJava(env, &value, makeCopyOfValues, output, javaType);
 }
 
 bool QCborValueRefTypeEntry::convertToNative(JNIEnv *env, const jvalue&, jValueType, void *, QtJambiScope*) const{
@@ -3128,7 +4067,7 @@ StringUtilTypeEntry::StringUtilTypeEntry(JNIEnv* env, const std::type_info& type
 {
 }
 
-bool StringUtilTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult StringUtilTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     if(unique_id(type())==unique_id(typeid(QStringView))){
         const QStringView* sref = reinterpret_cast<const QStringView*>(qt_object);
         if(sref){
@@ -3278,22 +4217,23 @@ MetaUtilTypeEntry::MetaUtilTypeEntry(JNIEnv* env, const std::type_info& typeId,
 {
 }
 
-bool MetaUtilTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult MetaUtilTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert to primitive value" QTJAMBI_STACKTRACEINFO );
     if(qt_object){
         if(unique_id(type())==unique_id(typeid(QMetaObject::Connection))){
             static QMetaType metaTypeId(registeredMetaTypeID(typeid(QMetaObject::Connection)));
             output->l = Java::QtJambi::SignalUtility$NativeConnection::newInstance(env, nullptr);
-            const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForObject(
+            const QSharedPointer<QtJambiLink>& link = QtJambiLink::createLinkForNativeObject(
                     env,
                     output->l,
                     new QMetaObject::Connection(*reinterpret_cast<const QMetaObject::Connection*>(qt_object)),
                     metaTypeId,
                     false,
-                    false
+                    false,
+                    QtJambiLink::Ownership::Java
                 );
-            link->setJavaOwnership(env);
+            Q_UNUSED(link)
         }else if(unique_id(type())==unique_id(typeid(QMetaObject))){
             output->l = QtJambiMetaObject::convertToJavaObject(env, reinterpret_cast<const QMetaObject*>(qt_object));
         }else if(unique_id(type())==unique_id(typeid(JIteratorWrapper))
@@ -3350,8 +4290,6 @@ QModelIndexTypeEntry::QModelIndexTypeEntry(JNIEnv* env,
                                            jmethodID creator_method,
                                            size_t value_size,
                                            const std::type_info* super_type,
-                                           const QList<const std::type_info*>& interface_types,
-                                           const QMap<size_t, uint>& interface_offsets,
                                            size_t shell_size,
                                            PtrOwnerFunction owner_function,
                                            const QVector<const FunctionInfo>* virtualFunctions,
@@ -3366,8 +4304,6 @@ QModelIndexTypeEntry::QModelIndexTypeEntry(JNIEnv* env,
                            creator_method,
                            value_size,
                            super_type,
-                           interface_types,
-                           interface_offsets,
                            shell_size,
                            owner_function,
                            virtualFunctions,
@@ -3377,14 +4313,85 @@ QModelIndexTypeEntry::QModelIndexTypeEntry(JNIEnv* env,
 {
 }
 
-bool QModelIndexTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const{
-    bool result = ObjectValueTypeEntry::convertToJava(env, qt_object, makeCopyOfValueTypes, cppOwnership, output, valueType);
-    if(valueType==jValueType::l && result && qt_object){
+QtJambiTypeEntry::NativeToJavaResult QModelIndexTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType javaType) const{
+    if(javaType!=jValueType::l)
+        JavaException::raiseIllegalArgumentException(env, "Cannot convert object type" QTJAMBI_STACKTRACEINFO );
+    if (!qt_object){
+        output->l = nullptr;
+        return true;
+    }
+    if(!makeCopyOfValues){
+        for(const QSharedPointer<QtJambiLink>& link : QtJambiLink::findLinksForPointer(qt_object)){
+            if(link){
+                jobject obj = link->getJavaObjectLocalRef(env);
+                if(obj && env->IsInstanceOf(obj, javaClass())){
+                    output->l = obj;
+                    return true;
+                }
+            }
+        }
+    }
+    const std::type_info* _typeId = qtjambi_resolve_polymorphy(m_polymorphicIdHandlers, qt_object);
+    if(_typeId && *_typeId!=type()){
+        if(QtJambiTypeEntryPtr typeEntry = QtJambiTypeEntry::getTypeEntry(env, *_typeId)){
+            return typeEntry->convertToJava(env, qt_object, makeCopyOfValues, output, javaType);
+        }else{
+            return false;
+        }
+    }else{
+        void *copy = makeCopyOfValues ? m_qt_meta_type.create(qt_object) : const_cast<void*>(qt_object);
+        if (!copy){
+            output->l = nullptr;
+            return true;
+        }
+        if(!creatableClass() || !creatorMethod())
+            JavaException::raiseError(env, "Uncreatable type" QTJAMBI_STACKTRACEINFO );
         const QModelIndex* index = reinterpret_cast<const QModelIndex*>(qt_object);
-        if(index->model())
-            QtJambiLink::registerDependentObject(index->model(), QtJambiLink::findLinkForJavaObject(env, output->l));
+        output->l = env->NewObject(creatableClass(), creatorMethod(), nullptr);
+        JavaException::check(env QTJAMBI_STACKTRACEINFO );
+        return index->model() ?
+                (m_owner_function ?
+                    QtJambiLink::createLinkForDependentObject(
+                        env,
+                        output->l,
+                        copy,
+                        m_qt_meta_type,
+                        false,
+                        false,
+                        m_owner_function,
+                        index->model(),
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None
+                    ) : QtJambiLink::createLinkForDependentObject(
+                        env,
+                        output->l,
+                        copy,
+                        m_qt_meta_type,
+                        false,
+                        false,
+                        index->model(),
+                        makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None
+                    ))
+                  :
+                    (m_owner_function ?
+                     QtJambiLink::createLinkForNativeObject(
+                         env,
+                         output->l,
+                         copy,
+                         m_qt_meta_type,
+                         false,
+                         false,
+                         m_owner_function,
+                         makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None
+                     ) : QtJambiLink::createLinkForNativeObject(
+                         env,
+                         output->l,
+                         copy,
+                         m_qt_meta_type,
+                         false,
+                         false,
+                         makeCopyOfValues ? QtJambiLink::Ownership::Java : QtJambiLink::Ownership::None
+                     ));
     }
-    return result;
 }
 
 bool QModelIndexTypeEntry::convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const{
@@ -3403,7 +4410,7 @@ QVariantTypeEntry::QVariantTypeEntry(JNIEnv* env, const std::type_info& typeId,
 {
 }
 
-bool QVariantTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult QVariantTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     if(javaType!=jValueType::l)
         JavaException::raiseIllegalArgumentException(env, "Cannot convert QVariant to primitive value" QTJAMBI_STACKTRACEINFO );
     output->l = QtJambiAPI::convertQVariantToJavaObject(env, *reinterpret_cast<const QVariant*>(qt_object));
@@ -3417,7 +4424,7 @@ bool QVariantTypeEntry::convertToNative(JNIEnv *env, const jvalue& java_value, j
     return true;
 }
 
-bool JLongTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult JLongTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     const jlong* value = reinterpret_cast<const jlong*>(qt_object);
     if(value){
         switch (javaType) {
@@ -3499,7 +4506,7 @@ JIntTypeEntry::JIntTypeEntry(JNIEnv* env, const std::type_info& typeId, const ch
 {
 }
 
-bool JIntTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult JIntTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     const jint* value = reinterpret_cast<const jint*>(qt_object);
     if(value){
         switch (javaType) {
@@ -3580,7 +4587,7 @@ JShortTypeEntry::JShortTypeEntry(JNIEnv* env, const std::type_info& typeId, cons
 {
 }
 
-bool JShortTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult JShortTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     const jshort* value = reinterpret_cast<const jshort*>(qt_object);
     if(value){
         switch (javaType) {
@@ -3661,7 +4668,7 @@ JByteTypeEntry::JByteTypeEntry(JNIEnv* env, const std::type_info& typeId, const
 {
 }
 
-bool JByteTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult JByteTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     const jbyte* value = reinterpret_cast<const jbyte*>(qt_object);
     if(value){
         switch (javaType) {
@@ -3742,7 +4749,7 @@ JCharTypeEntry::JCharTypeEntry(JNIEnv* env, const std::type_info& typeId, const
 {
 }
 
-bool JCharTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult JCharTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     if(unique_id(type())==unique_id(typeid(wchar_t)) || unique_id(type())==unique_id(typeid(jchar))){
         const jchar* value = reinterpret_cast<const jchar*>(qt_object);
         if(value){
@@ -3961,7 +4968,7 @@ JBooleanTypeEntry::JBooleanTypeEntry(JNIEnv* env, const std::type_info& typeId,
 {
 }
 
-bool JBooleanTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult JBooleanTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     const jboolean* value = reinterpret_cast<const jboolean*>(qt_object);
     if(value){
         switch (javaType) {
@@ -4040,7 +5047,7 @@ JDoubleTypeEntry::JDoubleTypeEntry(JNIEnv* env, const std::type_info& typeId, co
 {
 }
 
-bool JDoubleTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult JDoubleTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     const jdouble* value = reinterpret_cast<const jdouble*>(qt_object);
     if(value){
         switch (javaType) {
@@ -4119,7 +5126,7 @@ JFloatTypeEntry::JFloatTypeEntry(JNIEnv* env, const std::type_info& typeId, cons
 {
 }
 
-bool JFloatTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, bool, jvalue* output, jValueType javaType) const{
+QtJambiTypeEntry::NativeToJavaResult JFloatTypeEntry::convertToJava(JNIEnv *env, const void *qt_object, bool, jvalue* output, jValueType javaType) const{
     const jfloat* value = reinterpret_cast<const jfloat*>(qt_object);
     if(value){
         switch (javaType) {
@@ -4201,7 +5208,7 @@ NullptrTypeEntry::NullptrTypeEntry(JNIEnv* env, const std::type_info& typeId, co
 {
 }
 
-bool NullptrTypeEntry::convertToJava(JNIEnv *, const void *, bool, bool, jvalue* output, jValueType) const{
+QtJambiTypeEntry::NativeToJavaResult NullptrTypeEntry::convertToJava(JNIEnv *, const void *, bool, jvalue* output, jValueType) const{
     output->l = nullptr;
     return true;
 }
diff --git a/src/cpp/QtJambi/typeentry_p.h b/src/cpp/QtJambi/typeentry_p.h
index 56f4d68a..40fb6b94 100644
--- a/src/cpp/QtJambi/typeentry_p.h
+++ b/src/cpp/QtJambi/typeentry_p.h
@@ -63,8 +63,23 @@ enum class EntryTypes
     PrimitiveTypeInfo
 };
 
-class QtJambiTypeEntry{
-public:
+typedef QExplicitlySharedDataPointer<const class QtJambiTypeEntry> QtJambiTypeEntryPtr;
+
+class QtJambiLink;
+
+class QtJambiTypeEntry : public QSharedData{
+public:
+    class NativeToJavaResult{
+    public:
+        NativeToJavaResult(bool success);
+        NativeToJavaResult(const QSharedPointer<QtJambiLink>& link);
+        operator bool() const;
+        bool operator!() const;
+        const QSharedPointer<QtJambiLink>& link() const;
+    private:
+        QSharedPointer<QtJambiLink> m_link;
+        bool m_success;
+    };
     virtual ~QtJambiTypeEntry();
     virtual bool isEnum() const;
     virtual bool isFlags() const;
@@ -75,7 +90,6 @@ class QtJambiTypeEntry{
     virtual bool isValue() const;
     const std::type_info& type() const;
     virtual const std::type_info* superType() const;
-    virtual const QList<const std::type_info*>& interfaceTypes() const;
     const char *qtName() const;
     const char *javaName() const;
     jclass javaClass() const;
@@ -84,16 +98,16 @@ class QtJambiTypeEntry{
     size_t valueSize() const;
     virtual uint offset(const std::type_info& toType) const;
 
-    virtual bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const = 0;
+    virtual NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const = 0;
     virtual bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const = 0;
     virtual bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const = 0;
 
-    static const QtJambiTypeEntry* getTypeEntry(JNIEnv* env, const std::type_info& typeId);
-    static const QtJambiTypeEntry* getTypeEntry(JNIEnv* env, const std::type_info& typeId, const char* qtName);
-    static const QtJambiTypeEntry* getTypeEntryByJavaName(JNIEnv* env, const char* java_name);
-    static const QtJambiTypeEntry* getTypeEntryByJavaName(JNIEnv* env, const QString& java_name);
-    static const QtJambiTypeEntry* getTypeEntryByQtName(JNIEnv* env, const char* qt_name);
-    static const QtJambiTypeEntry* getTypeEntryByIID(JNIEnv* env, const char* iid);
+    static QtJambiTypeEntryPtr getTypeEntry(JNIEnv* env, const std::type_info& typeId);
+    static QtJambiTypeEntryPtr getTypeEntry(JNIEnv* env, const std::type_info& typeId, const char* qtName);
+    static QtJambiTypeEntryPtr getTypeEntryByJavaName(JNIEnv* env, const char* java_name);
+    static QtJambiTypeEntryPtr getTypeEntryByJavaName(JNIEnv* env, const QString& java_name);
+    static QtJambiTypeEntryPtr getTypeEntryByQtName(JNIEnv* env, const char* qt_name);
+    static QtJambiTypeEntryPtr getTypeEntryByIID(JNIEnv* env, const char* iid);
 
 protected:
     QtJambiTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, jmethodID creator_method, size_t value_size);
@@ -113,7 +127,7 @@ class EnumTypeEntry : public QtJambiTypeEntry{
     bool isEnum() const final;
     const FlagsTypeEntry* flagType() const;
     EnumTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, jmethodID creator_method, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
@@ -126,7 +140,7 @@ class FlagsTypeEntry : public QtJambiTypeEntry{
     bool isFlags() const final;
     const EnumTypeEntry* enumType() const;
     FlagsTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, jmethodID creator_method, size_t value_size, const EnumTypeEntry* enumType);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
@@ -144,7 +158,7 @@ class AbstractSimpleTypeEntry : public QtJambiTypeEntry{
 class QCborValueRefTypeEntry : public AbstractSimpleTypeEntry{
 public:
     QCborValueRefTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -153,7 +167,7 @@ class QCborValueRefTypeEntry : public AbstractSimpleTypeEntry{
 class StringTypeEntry : public AbstractSimpleTypeEntry{
 public:
     StringTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -161,7 +175,7 @@ class StringTypeEntry : public AbstractSimpleTypeEntry{
 class StringUtilTypeEntry : public AbstractSimpleTypeEntry{
 public:
     StringUtilTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -169,7 +183,7 @@ class StringUtilTypeEntry : public AbstractSimpleTypeEntry{
 class MetaUtilTypeEntry : public AbstractSimpleTypeEntry{
 public:
     MetaUtilTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -177,7 +191,7 @@ class MetaUtilTypeEntry : public AbstractSimpleTypeEntry{
 class QVariantTypeEntry : public AbstractSimpleTypeEntry{
 public:
     QVariantTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -185,7 +199,7 @@ class QVariantTypeEntry : public AbstractSimpleTypeEntry{
 class JLongTypeEntry : public AbstractSimpleTypeEntry{
 public:
     JLongTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -193,7 +207,7 @@ class JLongTypeEntry : public AbstractSimpleTypeEntry{
 class JIntTypeEntry : public AbstractSimpleTypeEntry{
 public:
     JIntTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -201,7 +215,7 @@ class JIntTypeEntry : public AbstractSimpleTypeEntry{
 class JShortTypeEntry : public AbstractSimpleTypeEntry{
 public:
     JShortTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -209,7 +223,7 @@ class JShortTypeEntry : public AbstractSimpleTypeEntry{
 class JByteTypeEntry : public AbstractSimpleTypeEntry{
 public:
     JByteTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -217,7 +231,7 @@ class JByteTypeEntry : public AbstractSimpleTypeEntry{
 class JCharTypeEntry : public AbstractSimpleTypeEntry{
 public:
     JCharTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -225,7 +239,7 @@ class JCharTypeEntry : public AbstractSimpleTypeEntry{
 class JBooleanTypeEntry : public AbstractSimpleTypeEntry{
 public:
     JBooleanTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -233,7 +247,7 @@ class JBooleanTypeEntry : public AbstractSimpleTypeEntry{
 class JDoubleTypeEntry : public AbstractSimpleTypeEntry{
 public:
     JDoubleTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -241,7 +255,7 @@ class JDoubleTypeEntry : public AbstractSimpleTypeEntry{
 class JFloatTypeEntry : public AbstractSimpleTypeEntry{
 public:
     JFloatTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -249,7 +263,7 @@ class JFloatTypeEntry : public AbstractSimpleTypeEntry{
 class NullptrTypeEntry : public AbstractSimpleTypeEntry{
 public:
     NullptrTypeEntry(JNIEnv* env, const std::type_info& typeId, const char *qt_name, const char *java_name, jclass java_class, size_t value_size);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
 };
@@ -258,13 +272,10 @@ class InterfaceTypeEntry : public QtJambiTypeEntry{
 public:
     bool isInterface() const final;
     const std::type_info* superType() const override;
-    const QList<const std::type_info*>& interfaceTypes() const override;
     jclass creatableClass() const override;
     jclass implementationClass() const;
     size_t shellSize() const;
     const QVector<const FunctionInfo>* virtualFunctions() const;
-    const QMap<size_t, uint>& interfaceOffsets() const;
-    uint offset(const std::type_info& toType) const override;
     Destructor destructor() const;
     ~InterfaceTypeEntry() override;
     InterfaceTypeEntry(JNIEnv* env, const std::type_info& typeId,
@@ -276,8 +287,6 @@ class InterfaceTypeEntry : public QtJambiTypeEntry{
                        jclass java_impl_class,
                        jclass java_wrapper_class,
                        const std::type_info* super_type,
-                       const QList<const std::type_info*>& interface_types,
-                       const QMap<size_t, uint>& interface_offsets,
                        size_t shell_size,
                        PtrDeleterFunction deleter,
                        PtrOwnerFunction owner_function,
@@ -285,15 +294,13 @@ class InterfaceTypeEntry : public QtJambiTypeEntry{
                        Destructor destructor,
                        const QList<const PolymorphicIdHandler*>& polymorphicHandlers
                     );
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
-private:
+protected:
     jclass m_java_impl_class;
     jclass m_java_wrapper_class;
     const std::type_info* m_super_type;
-    QList<const std::type_info*> m_interface_types;
-    QMap<size_t, uint> m_interface_offsets;
     size_t m_shell_size;
     PtrDeleterFunction m_deleter;
     PtrOwnerFunction m_owner_function;
@@ -303,6 +310,35 @@ class InterfaceTypeEntry : public QtJambiTypeEntry{
     friend class InterfaceValueTypeEntry;
 };
 
+class InterfaceIFTypeEntry : public InterfaceTypeEntry{
+public:
+    InterfaceIFTypeEntry(JNIEnv* env, const std::type_info& typeId,
+                         const char *qt_name,
+                         const char *java_name,
+                         jclass java_class,
+                         jmethodID creator_method,
+                         size_t value_size,
+                         jclass java_impl_class,
+                         jclass java_wrapper_class,
+                         const std::type_info* super_type,
+                         size_t shell_size,
+                         PtrDeleterFunction deleter,
+                         PtrOwnerFunction owner_function,
+                         const QVector<const FunctionInfo>* virtualFunctions,
+                         Destructor destructor,
+                         const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                         const QMap<size_t,uint>& interfaceOffsets,
+                         const QSet<size_t>& interfaceTypes,
+                         const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
+    //bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
+    uint offset(const std::type_info& toType) const override;
+protected:
+    QMap<size_t,uint> m_interfaceOffsets;
+    QSet<size_t> m_interfaceTypes;
+    QMap<size_t, QSet<const std::type_info*>> m_inheritedInterfaces;
+};
+
 class InterfaceValueTypeEntry : public InterfaceTypeEntry{
 public:
     bool isValue() const final;
@@ -315,8 +351,6 @@ class InterfaceValueTypeEntry : public InterfaceTypeEntry{
                        jclass java_impl_class,
                        jclass java_wrapper_class,
                        const std::type_info* super_type,
-                       const QList<const std::type_info*>& interface_types,
-                       const QMap<size_t, uint>& interface_offsets,
                        size_t shell_size,
                        PtrDeleterFunction deleter,
                        PtrOwnerFunction owner_function,
@@ -325,9 +359,36 @@ class InterfaceValueTypeEntry : public InterfaceTypeEntry{
                        const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
                        const QMetaType& qt_meta_type
                     );
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
-private:
+protected:
+    QMetaType m_qt_meta_type;
+};
+
+class InterfaceValueIFTypeEntry : public InterfaceIFTypeEntry{
+public:
+    InterfaceValueIFTypeEntry(JNIEnv* env, const std::type_info& typeId,
+                              const char *qt_name,
+                              const char *java_name,
+                              jclass java_class,
+                              jmethodID creator_method,
+                              size_t value_size,
+                              jclass java_impl_class,
+                              jclass java_wrapper_class,
+                              const std::type_info* super_type,
+                              size_t shell_size,
+                              PtrDeleterFunction deleter,
+                              PtrOwnerFunction owner_function,
+                              const QVector<const FunctionInfo>* virtualFunctions,
+                              Destructor destructor,
+                              const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                              const QMetaType& qt_meta_type,
+                              const QMap<size_t,uint>& interfaceOffsets,
+                              const QSet<size_t>& interfaceTypes,
+                              const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces);
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
+    //bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
+protected:
     QMetaType m_qt_meta_type;
 };
 
@@ -355,7 +416,7 @@ class FunctionalTypeEntry : public QtJambiTypeEntry{
                         const QMetaType& qt_meta_type,
                         bool is_std_function
                     );
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
 private:
@@ -373,12 +434,9 @@ class ObjectTypeEntry : public QtJambiTypeEntry{
 public:
     bool isObject() const final;
     const std::type_info* superType() const final;
-    const QList<const std::type_info*>& interfaceTypes() const final;
     size_t shellSize() const;
     const QVector<const FunctionInfo>* virtualFunctions() const;
-    const QMap<size_t, uint>& interfaceOffsets() const;
     Destructor destructor() const;
-    uint offset(const std::type_info& toType) const override;
     ObjectTypeEntry(JNIEnv* env,
                     const std::type_info& typeId,
                     const char *qt_name,
@@ -387,8 +445,6 @@ class ObjectTypeEntry : public QtJambiTypeEntry{
                     jmethodID creator_method,
                     size_t value_size,
                     const std::type_info* super_type,
-                    const QList<const std::type_info*>& interface_types,
-                    const QMap<size_t, uint>& interface_offsets,
                     size_t shell_size,
                     PtrDeleterFunction deleter,
                     PtrOwnerFunction owner_function,
@@ -396,13 +452,11 @@ class ObjectTypeEntry : public QtJambiTypeEntry{
                     Destructor destructor,
                     const QList<const PolymorphicIdHandler*>& polymorphicHandlers
                 );
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
-private:
+protected:
     const std::type_info* m_super_type;
-    QList<const std::type_info*> m_interface_types;
-    QMap<size_t, uint> m_interface_offsets;
     size_t m_shell_size;
     PtrDeleterFunction m_deleter;
     PtrOwnerFunction m_owner_function;
@@ -414,6 +468,35 @@ class ObjectTypeEntry : public QtJambiTypeEntry{
     friend class ObjectAbstractContainerTypeEntry;
 };
 
+class ObjectIFTypeEntry : public ObjectTypeEntry{
+public:
+    ObjectIFTypeEntry(JNIEnv* env,
+                    const std::type_info& typeId,
+                    const char *qt_name,
+                    const char *java_name,
+                    jclass java_class,
+                    jmethodID creator_method,
+                    size_t value_size,
+                    const std::type_info* super_type,
+                    size_t shell_size,
+                    PtrDeleterFunction deleter,
+                    PtrOwnerFunction owner_function,
+                    const QVector<const FunctionInfo>* virtualFunctions,
+                    Destructor destructor,
+                    const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                    const QMap<size_t,uint>& interfaceOffsets,
+                    const QSet<size_t>& interfaceTypes,
+                    const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
+    //bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
+    uint offset(const std::type_info& toType) const override;
+protected:
+    QMap<size_t,uint> m_interfaceOffsets;
+    QSet<size_t> m_interfaceTypes;
+    QMap<size_t, QSet<const std::type_info*>> m_inheritedInterfaces;
+};
+
 class ObjectAbstractTypeEntry : public ObjectTypeEntry{
 public:
     jclass creatableClass() const final;
@@ -425,8 +508,6 @@ class ObjectAbstractTypeEntry : public ObjectTypeEntry{
                     jmethodID creator_method,
                     size_t value_size,
                     const std::type_info* super_type,
-                    const QList<const std::type_info*>& interface_types,
-                    const QMap<size_t, uint>& interface_offsets,
                     size_t shell_size,
                     PtrDeleterFunction deleter,
                     PtrOwnerFunction owner_function,
@@ -439,6 +520,32 @@ class ObjectAbstractTypeEntry : public ObjectTypeEntry{
     jclass m_java_wrapper_class;
 };
 
+class ObjectAbstractIFTypeEntry : public ObjectIFTypeEntry{
+public:
+    jclass creatableClass() const final;
+    ObjectAbstractIFTypeEntry(JNIEnv* env,
+                    const std::type_info& typeId,
+                    const char *qt_name,
+                    const char *java_name,
+                    jclass java_class,
+                    jmethodID creator_method,
+                    size_t value_size,
+                    const std::type_info* super_type,
+                    size_t shell_size,
+                    PtrDeleterFunction deleter,
+                    PtrOwnerFunction owner_function,
+                    const QVector<const FunctionInfo>* virtualFunctions,
+                    Destructor destructor,
+                    const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                    jclass java_wrapper_class,
+                    const QMap<size_t,uint>& interfaceOffsets,
+                    const QSet<size_t>& interfaceTypes,
+                    const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+private:
+    jclass m_java_wrapper_class;
+};
+
 class ObjectValueTypeEntry : public ObjectTypeEntry{
 public:
     bool isValue() const final;
@@ -450,8 +557,6 @@ class ObjectValueTypeEntry : public ObjectTypeEntry{
                     jmethodID creator_method,
                     size_t value_size,
                     const std::type_info* super_type,
-                    const QList<const std::type_info*>& interface_types,
-                    const QMap<size_t, uint>& interface_offsets,
                     size_t shell_size,
                     PtrOwnerFunction owner_function,
                     const QVector<const FunctionInfo>* virtualFunctions,
@@ -459,7 +564,7 @@ class ObjectValueTypeEntry : public ObjectTypeEntry{
                     const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
                     const QMetaType& qt_meta_type
                 );
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
 private:
     QMetaType m_qt_meta_type;
@@ -468,6 +573,35 @@ class ObjectValueTypeEntry : public ObjectTypeEntry{
     friend class QModelIndexTypeEntry;
 };
 
+class ObjectValueIFTypeEntry : public ObjectIFTypeEntry{
+public:
+    ObjectValueIFTypeEntry(JNIEnv* env,
+                    const std::type_info& typeId,
+                    const char *qt_name,
+                    const char *java_name,
+                    jclass java_class,
+                    jmethodID creator_method,
+                    size_t value_size,
+                    const std::type_info* super_type,
+                    size_t shell_size,
+                    PtrOwnerFunction owner_function,
+                    const QVector<const FunctionInfo>* virtualFunctions,
+                    Destructor destructor,
+                    const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                    const QMetaType& qt_meta_type,
+                    const QMap<size_t,uint>& interfaceOffsets,
+                    const QSet<size_t>& interfaceTypes,
+                    const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
+    //bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
+protected:
+    QMetaType m_qt_meta_type;
+    friend class ObjectContainerTypeEntry;
+    friend class ObjectAbstractContainerTypeEntry;
+    friend class QModelIndexTypeEntry;
+};
+
 class QModelIndexTypeEntry : public ObjectValueTypeEntry{
 public:
     QModelIndexTypeEntry(JNIEnv* env,
@@ -478,15 +612,13 @@ class QModelIndexTypeEntry : public ObjectValueTypeEntry{
                          jmethodID creator_method,
                          size_t value_size,
                          const std::type_info* super_type,
-                         const QList<const std::type_info*>& interface_types,
-                         const QMap<size_t, uint>& interface_offsets,
                          size_t shell_size,
                          PtrOwnerFunction owner_function,
                          const QVector<const FunctionInfo>* virtualFunctions,
                          Destructor destructor,
                          const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
                          const QMetaType& qt_meta_type);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
 private:
 };
@@ -502,8 +634,6 @@ class ObjectAbstractValueTypeEntry : public ObjectValueTypeEntry{
                     jmethodID creator_method,
                     size_t value_size,
                     const std::type_info* super_type,
-                    const QList<const std::type_info*>& interface_types,
-                    const QMap<size_t, uint>& interface_offsets,
                     size_t shell_size,
                     PtrOwnerFunction owner_function,
                     const QVector<const FunctionInfo>* virtualFunctions,
@@ -516,6 +646,32 @@ class ObjectAbstractValueTypeEntry : public ObjectValueTypeEntry{
     jclass m_java_wrapper_class;
 };
 
+class ObjectAbstractValueIFTypeEntry : public ObjectValueIFTypeEntry{
+public:
+    jclass creatableClass() const final;
+    ObjectAbstractValueIFTypeEntry(JNIEnv* env,
+                    const std::type_info& typeId,
+                    const char *qt_name,
+                    const char *java_name,
+                    jclass java_class,
+                    jmethodID creator_method,
+                    size_t value_size,
+                    const std::type_info* super_type,
+                    size_t shell_size,
+                    PtrOwnerFunction owner_function,
+                    const QVector<const FunctionInfo>* virtualFunctions,
+                    Destructor destructor,
+                    const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                    const QMetaType& qt_meta_type,
+                    jclass java_wrapper_class,
+                    const QMap<size_t,uint>& interfaceOffsets,
+                    const QSet<size_t>& interfaceTypes,
+                    const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+private:
+    jclass m_java_wrapper_class;
+};
+
 class ObjectContainerTypeEntry : public ObjectValueTypeEntry{
 public:
     ObjectContainerTypeEntry(JNIEnv* env,
@@ -526,8 +682,6 @@ class ObjectContainerTypeEntry : public ObjectValueTypeEntry{
                     jmethodID creator_method,
                     size_t value_size,
                     const std::type_info* super_type,
-                    const QList<const std::type_info*>& interface_types,
-                    const QMap<size_t, uint>& interface_offsets,
                     size_t shell_size,
                     NewContainerAccessFunction containerAccessFactory,
                     PtrOwnerFunction owner_function,
@@ -536,12 +690,39 @@ class ObjectContainerTypeEntry : public ObjectValueTypeEntry{
                     const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
                     const QMetaType& qt_meta_type
                 );
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
 private:
     NewContainerAccessFunction m_containerAccessFactory;
 };
 
+class ObjectContainerIFTypeEntry : public ObjectValueIFTypeEntry{
+public:
+    ObjectContainerIFTypeEntry(JNIEnv* env,
+                    const std::type_info& typeId,
+                    const char *qt_name,
+                    const char *java_name,
+                    jclass java_class,
+                    jmethodID creator_method,
+                    size_t value_size,
+                    const std::type_info* super_type,
+                    size_t shell_size,
+                    NewContainerAccessFunction containerAccessFactory,
+                    PtrOwnerFunction owner_function,
+                    const QVector<const FunctionInfo>* virtualFunctions,
+                    Destructor destructor,
+                    const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                    const QMetaType& qt_meta_type,
+                    const QMap<size_t,uint>& interfaceOffsets,
+                    const QSet<size_t>& interfaceTypes,
+                    const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
+    //bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
+private:
+    NewContainerAccessFunction m_containerAccessFactory;
+};
+
 class ObjectAbstractContainerTypeEntry : public ObjectAbstractValueTypeEntry{
 public:
     ObjectAbstractContainerTypeEntry(JNIEnv* env,
@@ -552,8 +733,6 @@ class ObjectAbstractContainerTypeEntry : public ObjectAbstractValueTypeEntry{
                     jmethodID creator_method,
                     size_t value_size,
                     const std::type_info* super_type,
-                    const QList<const std::type_info*>& interface_types,
-                    const QMap<size_t, uint>& interface_offsets,
                     size_t shell_size,
                     NewContainerAccessFunction containerAccessFactory,
                     PtrOwnerFunction owner_function,
@@ -563,21 +742,47 @@ class ObjectAbstractContainerTypeEntry : public ObjectAbstractValueTypeEntry{
                     const QMetaType& qt_meta_type,
                     jclass java_wrapper_class
                 );
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
 private:
     NewContainerAccessFunction m_containerAccessFactory;
 };
 
+class ObjectAbstractContainerIFTypeEntry : public ObjectAbstractValueIFTypeEntry{
+public:
+    ObjectAbstractContainerIFTypeEntry(JNIEnv* env,
+                    const std::type_info& typeId,
+                    const char *qt_name,
+                    const char *java_name,
+                    jclass java_class,
+                    jmethodID creator_method,
+                    size_t value_size,
+                    const std::type_info* super_type,
+                    size_t shell_size,
+                    NewContainerAccessFunction containerAccessFactory,
+                    PtrOwnerFunction owner_function,
+                    const QVector<const FunctionInfo>* virtualFunctions,
+                    Destructor destructor,
+                    const QList<const PolymorphicIdHandler*>& polymorphicHandlers,
+                    const QMetaType& qt_meta_type,
+                    jclass java_wrapper_class,
+                    const QMap<size_t,uint>& interfaceOffsets,
+                    const QSet<size_t>& interfaceTypes,
+                    const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
+    //bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
+private:
+    NewContainerAccessFunction m_containerAccessFactory;
+};
+
 class QObjectTypeEntry : public QtJambiTypeEntry{
 public:
     bool isQObject() const final;
     const std::type_info* superType() const override;
-    const QList<const std::type_info*>& interfaceTypes() const final;
     size_t shellSize() const;
     const QVector<const FunctionInfo>* virtualFunctions() const;
     const QMetaObject* originalMetaObject() const;
-    uint offset(const std::type_info& toType) const override;
     QObjectTypeEntry(JNIEnv* env,
                      const std::type_info& typeId,
                      const char *qt_name,
@@ -586,19 +791,15 @@ class QObjectTypeEntry : public QtJambiTypeEntry{
                      jmethodID creator_method,
                      size_t value_size,
                      const std::type_info* super_type,
-                     const QList<const std::type_info*>& interface_types,
-                     const QMap<size_t, uint>& interface_offsets,
                      size_t shell_size,
                      const QVector<const FunctionInfo>* virtualFunctions,
                      const QMetaObject* original_meta_object
                 );
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
     bool convertToNative(JNIEnv *env, const jvalue& java_value, jValueType javaType, void * output, QtJambiScope* scope) const override;
-private:
+protected:
     const std::type_info* m_super_type;
-    QList<const std::type_info*> m_interface_types;
-    QMap<size_t, uint> m_interface_offsets;
     size_t m_shell_size;
     const QVector<const FunctionInfo>* m_virtualFunctions;
     const QMetaObject* m_original_meta_object;
@@ -606,6 +807,32 @@ class QObjectTypeEntry : public QtJambiTypeEntry{
     friend class QObjectPolymorphicTypeEntry;
 };
 
+class QObjectIFTypeEntry : public QObjectTypeEntry{
+public:
+    QObjectIFTypeEntry(JNIEnv* env,
+                     const std::type_info& typeId,
+                     const char *qt_name,
+                     const char *java_name,
+                     jclass java_class,
+                     jmethodID creator_method,
+                     size_t value_size,
+                     const std::type_info* super_type,
+                     size_t shell_size,
+                     const QVector<const FunctionInfo>* virtualFunctions,
+                     const QMetaObject* original_meta_object,
+                       const QMap<size_t,uint>& interfaceOffsets,
+                       const QSet<size_t>& interfaceTypes,
+                       const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+    uint offset(const std::type_info& toType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
+    //bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
+protected:
+    QMap<size_t,uint> m_interfaceOffsets;
+    QSet<size_t> m_interfaceTypes;
+    QMap<size_t, QSet<const std::type_info*>> m_inheritedInterfaces;
+};
+
 class QObjectPolymorphicTypeEntry : public QObjectTypeEntry{
 public:
     QObjectPolymorphicTypeEntry(JNIEnv* env,
@@ -616,19 +843,41 @@ class QObjectPolymorphicTypeEntry : public QObjectTypeEntry{
                      jmethodID creator_method,
                      size_t value_size,
                      const std::type_info* super_type,
-                     const QList<const std::type_info*>& interface_types,
-                     const QMap<size_t, uint>& interface_offsets,
                      size_t shell_size,
                      const QVector<const FunctionInfo>* virtualFunctions,
                      const QMetaObject* original_meta_object,
                      const QList<const PolymorphicIdHandler*>& polymorphicIdHandlers
                 );
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
 private:
     QList<const PolymorphicIdHandler*> m_polymorphicIdHandlers;
 };
 
+class QObjectPolymorphicIFTypeEntry : public QObjectIFTypeEntry{
+public:
+    QObjectPolymorphicIFTypeEntry(JNIEnv* env,
+                     const std::type_info& typeId,
+                     const char *qt_name,
+                     const char *java_name,
+                     jclass java_class,
+                     jmethodID creator_method,
+                     size_t value_size,
+                     const std::type_info* super_type,
+                     size_t shell_size,
+                     const QVector<const FunctionInfo>* virtualFunctions,
+                     const QMetaObject* original_meta_object,
+                     const QList<const PolymorphicIdHandler*>& polymorphicIdHandlers,
+                    const QMap<size_t,uint>& interfaceOffsets,
+                    const QSet<size_t>& interfaceTypes,
+                    const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
+    //bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
+private:
+    QList<const PolymorphicIdHandler*> m_polymorphicIdHandlers;
+};
+
 class QThreadTypeEntry : public QObjectTypeEntry{
 public:
     QThreadTypeEntry(JNIEnv* env,
@@ -639,12 +888,10 @@ class QThreadTypeEntry : public QObjectTypeEntry{
                      jmethodID creator_method,
                      size_t value_size,
                      const std::type_info* super_type,
-                     const QList<const std::type_info*>& interface_types,
-                     const QMap<size_t, uint>& interface_offsets,
                      size_t shell_size,
                      const QVector<const FunctionInfo>* virtualFunctions,
                      const QMetaObject* original_meta_object);
-    bool convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValueTypes, bool cppOwnership, jvalue* output, jValueType valueType) const override;
+    NativeToJavaResult convertToJava(JNIEnv *env, const void *qt_object, bool makeCopyOfValues, jvalue* output, jValueType valueType) const override;
     bool convertSharedPointerToJava(JNIEnv *env, void *ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter, jvalue* output, jValueType valueType) const override;
 };
 
@@ -658,8 +905,6 @@ class QObjectAbstractTypeEntry : public QObjectTypeEntry{
                      jmethodID creator_method,
                      size_t value_size,
                      const std::type_info* super_type,
-                     const QList<const std::type_info*>& interface_types,
-                     const QMap<size_t, uint>& interface_offsets,
                      size_t shell_size,
                      const QVector<const FunctionInfo>* virtualFunctions,
                      const QMetaObject* original_meta_object,
@@ -670,6 +915,29 @@ class QObjectAbstractTypeEntry : public QObjectTypeEntry{
     jclass m_java_wrapper_class;
 };
 
+class QObjectAbstractIFTypeEntry : public QObjectIFTypeEntry{
+public:
+    QObjectAbstractIFTypeEntry(JNIEnv* env,
+                     const std::type_info& typeId,
+                     const char *qt_name,
+                     const char *java_name,
+                     jclass java_class,
+                     jmethodID creator_method,
+                     size_t value_size,
+                     const std::type_info* super_type,
+                     size_t shell_size,
+                     const QVector<const FunctionInfo>* virtualFunctions,
+                     const QMetaObject* original_meta_object,
+                     jclass java_wrapper_class,
+                   const QMap<size_t,uint>& interfaceOffsets,
+                   const QSet<size_t>& interfaceTypes,
+                   const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+    jclass creatableClass() const final;
+private:
+    jclass m_java_wrapper_class;
+};
+
 class QObjectAbstractPolymorphicTypeEntry : public QObjectPolymorphicTypeEntry{
 public:
     QObjectAbstractPolymorphicTypeEntry(JNIEnv* env,
@@ -680,8 +948,6 @@ class QObjectAbstractPolymorphicTypeEntry : public QObjectPolymorphicTypeEntry{
                      jmethodID creator_method,
                      size_t value_size,
                      const std::type_info* super_type,
-                     const QList<const std::type_info*>& interface_types,
-                     const QMap<size_t, uint>& interface_offsets,
                      size_t shell_size,
                      const QVector<const FunctionInfo>* virtualFunctions,
                      const QMetaObject* original_meta_object,
@@ -693,4 +959,28 @@ class QObjectAbstractPolymorphicTypeEntry : public QObjectPolymorphicTypeEntry{
     jclass m_java_wrapper_class;
 };
 
+class QObjectAbstractPolymorphicIFTypeEntry : public QObjectPolymorphicIFTypeEntry{
+public:
+    QObjectAbstractPolymorphicIFTypeEntry(JNIEnv* env,
+                     const std::type_info& typeId,
+                     const char *qt_name,
+                     const char *java_name,
+                     jclass java_class,
+                     jmethodID creator_method,
+                     size_t value_size,
+                     const std::type_info* super_type,
+                     size_t shell_size,
+                     const QVector<const FunctionInfo>* virtualFunctions,
+                     const QMetaObject* original_meta_object,
+                     const QList<const PolymorphicIdHandler*>& polymorphicIdHandlers,
+                     jclass java_wrapper_class,
+                      const QMap<size_t,uint>& interfaceOffsets,
+                      const QSet<size_t>& interfaceTypes,
+                      const QMap<size_t, QSet<const std::type_info*>>& inheritedInterfaces
+                );
+    jclass creatableClass() const final;
+private:
+    jclass m_java_wrapper_class;
+};
+
 #endif // QTJAMBI_TYPEENTRY_P_H
diff --git a/src/cpp/QtJambi/typemanager.cpp b/src/cpp/QtJambi/typemanager.cpp
index bb36deae..e7796ce1 100644
--- a/src/cpp/QtJambi/typemanager.cpp
+++ b/src/cpp/QtJambi/typemanager.cpp
@@ -1492,7 +1492,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
     } else if (Java::QtCore::QMetaType$GenericValue::isSameClass(_env,externalClass)) {
         jint _internalMetaType = internalMetaType.id();
         return [_internalMetaType](JNIEnv* env, QtJambiScope*, const void* in, jvalue* p, bool)->bool{
-            p->l = QtJambiAPI::convertNativeToJavaObject(env, QMetaType::create(_internalMetaType, in), Java::QtCore::QMetaType$GenericValue::getClass(env), false);
+            p->l = QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(env, QMetaType::create(_internalMetaType, in), Java::QtCore::QMetaType$GenericValue::getClass(env));
             if(p->l){
                 Java::QtCore::QMetaType$GenericValue::set_type(env, p->l, _internalMetaType);
             }
@@ -1501,7 +1501,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
     } else if (Java::QtCore::QMetaType$GenericObject::isSameClass(_env,externalClass)) {
         jint _internalMetaType = internalMetaType.id();
         return [_internalMetaType](JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* p, bool)->bool{
-            p->l = QtJambiAPI::convertNativeToJavaObject(env, in, Java::QtCore::QMetaType$GenericObject::getClass(env), false);
+            p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, in, Java::QtCore::QMetaType$GenericObject::getClass(env));
             if(p->l){
                 Java::QtCore::QMetaType$GenericObject::set_type(env, p->l, _internalMetaType);
                 if(scope)
@@ -1513,7 +1513,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
         jint _internalMetaType = internalMetaType.id();
         if(internalMetaType.flags() & QMetaType::PointerToGadget){
             return [_internalMetaType](JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* p, bool)->bool{
-                p->l = QtJambiAPI::convertNativeToJavaObject(env, in, Java::QtCore::QMetaType$GenericGadget::getClass(env), false);
+                p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, in, Java::QtCore::QMetaType$GenericGadget::getClass(env));
                 if(p->l){
                     Java::QtCore::QMetaType$GenericGadget::set_type(env, p->l, _internalMetaType);
                     jobject mo = qtjambi_cast<jobject>(env, QMetaType::metaObjectForType(_internalMetaType));
@@ -1525,7 +1525,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
             };
         }else{
             return [_internalMetaType](JNIEnv* env, QtJambiScope*, const void* in, jvalue* p, bool)->bool{
-                p->l = QtJambiAPI::convertNativeToJavaObject(env, QMetaType::create(_internalMetaType, in), Java::QtCore::QMetaType$GenericGadget::getClass(env), false);
+                p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, QMetaType::create(_internalMetaType, in), Java::QtCore::QMetaType$GenericGadget::getClass(env));
                 if(p->l){
                     Java::QtCore::QMetaType$GenericGadget::set_type(env, p->l, _internalMetaType);
                     jobject mo = qtjambi_cast<jobject>(env, QMetaType::metaObjectForType(_internalMetaType));
@@ -1550,11 +1550,10 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
         }
     }else if (Java::QtCore::QMetaObject$Connection::isAssignableFrom(_env,externalClass)) {
         return [](JNIEnv* env, QtJambiScope*, const void* in, jvalue* p, bool)->bool{
-            const QtJambiTypeEntry* typeEntry = QtJambiTypeEntry::getTypeEntry(env, typeid(QMetaObject::Connection));
-            if(in && typeEntry){
-                return typeEntry->convertToJava(env, in, true, false, p, jValueType::l);
+            if(in){
+                p->l = qtjambi_cast<jobject>(env, *reinterpret_cast<const QMetaObject::Connection*>(in));
             }
-            return false;
+            return true;
         };
     }else if((internalMetaType.id()==QMetaType::QStringList
               || internalTypeName=="QStringList")
@@ -2314,8 +2313,8 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                                 }
                                 void* ptr = access->createContainer(in);
                                 QMetaType _containerMetaType(containerMetaType);
-                                QSharedPointer<QtJambiLink> link = QtJambiLink::createLinkForContainer(env, p->l, ptr, _containerMetaType,
-                                                                                                    false, true, access);
+                                QSharedPointer<QtJambiLink> link = QtJambiLink::createLinkForNativeObject(env, p->l, ptr, _containerMetaType,
+                                                                                                    false, true, access, QtJambiLink::Ownership::None);
                                 if (!link) {
                                     p->l = nullptr;
                                     if(access)
@@ -2496,7 +2495,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                     return [typeId](JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* p, bool)->bool{
                         const QScopedPointer<void*>* ptr = reinterpret_cast<const QScopedPointer<void*>*>(in);
                         if(ptr){
-                            p->l = QtJambiAPI::convertNativeToJavaObject(env, ptr->data(), *typeId, false);
+                            p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, ptr->data(), *typeId);
                             if(scope)
                                 scope->addObjectInvalidation(env, p->l, false, true);
                         }
@@ -2506,7 +2505,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                     return [typeId](JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* p, bool)->bool{
                         const std::unique_ptr<void*>* ptr = reinterpret_cast<const std::unique_ptr<void*>*>(in);
                         if(ptr){
-                            p->l = QtJambiAPI::convertNativeToJavaObject(env, ptr->get(), *typeId, false);
+                            p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, ptr->get(), *typeId);
                             if(scope)
                                 scope->addObjectInvalidation(env, p->l, false, true);
                         }
@@ -2525,7 +2524,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                                         jobject obj = link->getJavaObjectLocalRef(env);
                                         if(!obj && link->ownership()==QtJambiLink::Ownership::Split){
                                             link->invalidate(env);
-                                            p->l = QtJambiAPI::convertNativeToJavaObject(env, *ptr, *typeId, false);
+                                            p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, *ptr, *typeId);
                                             found = true;
                                         }else{
                                             QByteArray className = getJavaName(*typeId);
@@ -2541,7 +2540,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                                     }
                                 }
                                 if(!found){
-                                    p->l = QtJambiAPI::convertNativeToJavaObject(env, *ptr, *typeId, false);
+                                    p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, *ptr, *typeId);
                                     if(scope)
                                         scope->addObjectInvalidation(env, p->l, false, true);
                                 }
@@ -2551,7 +2550,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                     }else{
                         return [typeId](JNIEnv* env, QtJambiScope*, const void* in, jvalue* p, bool)->bool{
                             if(in){
-                                p->l = QtJambiAPI::convertNativeToJavaObject(env, in, *typeId, true);
+                                p->l = QtJambiAPI::convertNativeToJavaObjectAsCopy(env, in, *typeId);
                             }
                             return true;
                         };
@@ -2608,7 +2607,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                     return [typeId](JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* p, bool)->bool{
                         const QScopedPointer<void*>* ptr = reinterpret_cast<const QScopedPointer<void*>*>(in);
                         if(ptr){
-                            p->l = QtJambiAPI::convertNativeToJavaObject(env, ptr->data(), *typeId, false);
+                            p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, ptr->data(), *typeId);
                             if(scope)
                                 scope->addObjectInvalidation(env, p->l, false, true);
                         }
@@ -2618,7 +2617,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                     return [typeId](JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* p, bool)->bool{
                         const std::unique_ptr<void*>* ptr = reinterpret_cast<const std::unique_ptr<void*>*>(in);
                         if(ptr){
-                            p->l = QtJambiAPI::convertNativeToJavaObject(env, ptr->get(), *typeId, false);
+                            p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, ptr->get(), *typeId);
                             if(scope)
                                 scope->addObjectInvalidation(env, p->l, false, true);
                         }
@@ -2644,7 +2643,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                                     jobject obj = link->getJavaObjectLocalRef(env);
                                     if(!obj && link->ownership()==QtJambiLink::Ownership::Split){
                                         link->invalidate(env);
-                                        p->l = QtJambiAPI::convertNativeToJavaObject(env, in, *typeId, false);
+                                        p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, in, *typeId);
                                         found = true;
                                         if(scope)
                                             scope->addObjectInvalidation(env, p->l, false, true);
@@ -2661,7 +2660,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                                     }
                                 }
                                 if(!found){
-                                    p->l = QtJambiAPI::convertNativeToJavaObject(env, *ptr, *typeId, false);
+                                    p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, *ptr, *typeId);
                                     if(scope)
                                         scope->addObjectInvalidation(env, p->l, false, true);
                                 }
@@ -2679,7 +2678,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                                         jobject obj = link->getJavaObjectLocalRef(env);
                                         if(!obj && link->ownership()==QtJambiLink::Ownership::Split){
                                             link->invalidate(env);
-                                            p->l = QtJambiAPI::convertNativeToJavaObject(env, in, *typeId, false);
+                                            p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, in, *typeId);
                                             found = true;
                                             if(scope)
                                                 scope->addObjectInvalidation(env, p->l, false, true);
@@ -2696,7 +2695,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                                         }
                                     }
                                     if(!found){
-                                        p->l = QtJambiAPI::convertNativeToJavaObject(env, in, *typeId, false);
+                                        p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, in, *typeId);
                                         if(scope)
                                             scope->addObjectInvalidation(env, p->l, false, true);
                                     }
@@ -2706,7 +2705,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                         }else{
                             return [typeId](JNIEnv* env, QtJambiScope*, const void* in, jvalue* p, bool)->bool{
                                 if(in){
-                                    p->l = QtJambiAPI::convertNativeToJavaObject(env, in, *typeId, true);
+                                    p->l = QtJambiAPI::convertNativeToJavaObjectAsCopy(env, in, *typeId);
                                 }
                                 return true;
                             };
@@ -2841,7 +2840,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                 return [className](JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* p, bool)->bool{
                     const QScopedPointer<void*>* ptr = reinterpret_cast<const QScopedPointer<void*>*>(in);
                     if(ptr){
-                        p->l = QtJambiAPI::convertNativeToJavaObject(env, ptr->data(), className.constData(), false);
+                        p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, ptr->data(), className.constData());
                         if(scope)
                             scope->addObjectInvalidation(env, p->l, false, true);
                     }
@@ -2851,7 +2850,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                 return [className](JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* p, bool)->bool{
                     const std::unique_ptr<void*>* ptr = reinterpret_cast<const std::unique_ptr<void*>*>(in);
                     if(ptr){
-                        p->l = QtJambiAPI::convertNativeToJavaObject(env, ptr->get(), className.constData(), false);
+                        p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, ptr->get(), className.constData());
                         if(scope)
                             scope->addObjectInvalidation(env, p->l, false, true);
                     }
@@ -2882,7 +2881,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                                 jobject obj = link->getJavaObjectLocalRef(env);
                                 if(!obj && link->ownership()==QtJambiLink::Ownership::Split){
                                     link->invalidate(env);
-                                    p->l = QtJambiAPI::convertNativeToJavaObject(env, *ptr, className, false);
+                                    p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, *ptr, className);
                                     found = true;
                                     if(scope)
                                         scope->addObjectInvalidation(env, p->l, true, true);
@@ -2898,7 +2897,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                                 }
                             }
                             if(!found){
-                                p->l = QtJambiAPI::convertNativeToJavaObject(env, *ptr, className, false);
+                                p->l = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, *ptr, className);
                                 if(scope)
                                     scope->addObjectInvalidation(env, p->l, true, true);
                             }
@@ -2908,7 +2907,7 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
                 }else{
                     return [className](JNIEnv* env, QtJambiScope*, const void* in, jvalue* p, bool)->bool{
                         if(in){
-                            p->l = QtJambiAPI::convertNativeToJavaObject(env, in, qPrintable(className), true);
+                            p->l = QtJambiAPI::convertNativeToJavaObjectAsCopy(env, in, qPrintable(className));
                         }
                         return true;
                     };
@@ -2947,14 +2946,14 @@ InternalToExternalConverter QtJambiTypeManager::getInternalToExternalConverterIm
             };
         }else if(const std::type_info* interfaceTypeId = getTypeByQtName(metaObject->className())){
             return [interfaceTypeId](JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* p, bool)->bool{
-                p->l = QtJambiAPI::convertNativeToJavaObject(env, in, *interfaceTypeId, true, false);
+                p->l = QtJambiAPI::convertNativeToJavaObjectAsCopy(env, in, *interfaceTypeId);
                 if(scope)
                     scope->addObjectInvalidation(env, p->l, false, true);
                 return true;
             };
         }else if(const std::type_info* interfaceTypeId = getTypeByMetaType(internalMetaType)){
             return [interfaceTypeId](JNIEnv* env, QtJambiScope*, const void* in, jvalue* p, bool)->bool{
-                p->l = QtJambiAPI::convertNativeToJavaObject(env, in, *interfaceTypeId, true, false);
+                p->l = QtJambiAPI::convertNativeToJavaObjectAsCopy(env, in, *interfaceTypeId);
                 return true;
             };
         }
@@ -3888,7 +3887,7 @@ ExternalToInternalConverter QtJambiTypeManager::getExternalToInternalConverterIm
         if(!internalMetaType.isValid()){
             return [](JNIEnv* env, QtJambiScope* scope, const jvalue& val, void* &out, jValueType) -> bool{
                 if(val.l && !Java::QtJambi::QNativePointer::isInstanceOf(env, val.l))
-                    Java::Runtime::IllegalArgumentException::throwNew(env, QString("Wrong argument given: %1, expected: io.qt.QNativePointer").arg(QtJambiAPI::getObjectClassName(env, val.l).replace("$", ".")) QTJAMBI_STACKTRACEINFO );
+                    Java::Runtime::IllegalArgumentException::throwNew(env, QString("Wrong argument given: %1, expected: QNativePointer").arg(QtJambiAPI::getObjectClassName(env, val.l).replace("$", ".")) QTJAMBI_STACKTRACEINFO );
                 if(scope && !out){
                     void** ptr;
                     out = ptr = new void*(!val.l ? nullptr : QtJambiAPI::convertQNativePointerToNative(env, val.l, 1));
@@ -3904,7 +3903,7 @@ ExternalToInternalConverter QtJambiTypeManager::getExternalToInternalConverterIm
             int _internalMetaType = internalMetaType.id();
             return [_internalMetaType](JNIEnv* env, QtJambiScope* scope, const jvalue& val, void* &out, jValueType) -> bool{
                 if(val.l && !Java::QtJambi::QNativePointer::isInstanceOf(env, val.l))
-                    Java::Runtime::IllegalArgumentException::throwNew(env, QString("Wrong argument given: %1, expected: io.qt.QNativePointer").arg(QtJambiAPI::getObjectClassName(env, val.l).replace("$", ".")) QTJAMBI_STACKTRACEINFO );
+                    Java::Runtime::IllegalArgumentException::throwNew(env, QString("Wrong argument given: %1, expected: QNativePointer").arg(QtJambiAPI::getObjectClassName(env, val.l).replace("$", ".")) QTJAMBI_STACKTRACEINFO );
                 void* nptr = !val.l ? nullptr : QtJambiAPI::convertQNativePointerToNative(env, val.l, 1);
                 if(scope && !out){
                     void* ptr;
diff --git a/src/cpp/QtJambi/utils_p.h b/src/cpp/QtJambi/utils_p.h
index 8ef0764f..56f8c2fc 100644
--- a/src/cpp/QtJambi/utils_p.h
+++ b/src/cpp/QtJambi/utils_p.h
@@ -61,6 +61,13 @@ typedef QObject*(*SmartPointerQObjectGetter)(const void *);
 typedef std::function<void*(const void *)> SmartPointerGetterFunction;
 typedef void(*SmartPointerDeleter)(void *, bool);
 
+enum class NativeToJavaConversionMode{
+    None,
+    MakeCopyOfValues,
+    TransferOwnership
+};
+
+jobject internal_convertNativeToJavaObject(JNIEnv *env, const void *qt_object, const std::type_info& typeId, const char *qtName, NativeToJavaConversionMode mode, bool *ok = nullptr);
 jobject internal_convertSmartPointerToJavaObject(JNIEnv *env, const char *className,
                             void* ptr_shared_pointer, SmartPointerDeleter sharedPointerDeleter, SmartPointerGetterFunction sharedPointerGetter);
 jobject internal_convertSmartPointerToJavaInterface(JNIEnv *env, const std::type_info& interfaceType,
diff --git a/src/cpp/QtJambi3DAnimation/hashes.h b/src/cpp/QtJambi3DAnimation/hashes.h
index d6c4a9a6..e860ff91 100644
--- a/src/cpp/QtJambi3DAnimation/hashes.h
+++ b/src/cpp/QtJambi3DAnimation/hashes.h
@@ -97,45 +97,46 @@ inline bool operator==(const QAnimationClipData &lhs, const QAnimationClipData &
 #ifndef QTJAMBI_GENERATOR_RUNNING
 inline hash_type qHash(const QKeyFrame &value, hash_type seed = 0)
 {
-    hash_type hashCode = seed;
-    hashCode = hashCode * 31 + qHash(value.coordinates());
-    hashCode = hashCode * 31 + ::qHash(value.interpolationType());
-    hashCode = hashCode * 31 + qHash(value.leftControlPoint());
-    hashCode = hashCode * 31 + qHash(value.rightControlPoint());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.coordinates());
+    seed = hash(seed, value.interpolationType());
+    seed = hash(seed, value.leftControlPoint());
+    seed = hash(seed, value.rightControlPoint());
+    return seed;
 }
 
 inline hash_type qHash(const QChannelComponent &value, hash_type seed = 0)
 {
-    hash_type hashCode = seed;
-    hashCode = hashCode * 31 + qHash(value.name());
-    hashCode = hashCode * 31 + ::qHash(value.keyFrameCount());
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.keyFrameCount());
     for(const QKeyFrame & f : value){
-        hashCode = hashCode * 31 + qHash(f);
+        seed = hash(seed, f);
     }
-    return hashCode;
+    return seed;
 }
 
 inline hash_type qHash(const QChannel &value, hash_type seed = 0)
 {
+    QtPrivate::QHashCombine hash;
     hash_type hashCode = seed;
-    hashCode = hashCode * 31 + qHash(value.name());
+    seed = hash(seed, value.name());
     hashCode = hashCode * 31 + ::qHash(value.channelComponentCount());
     for(const QChannelComponent & c : value){
-        hashCode = hashCode * 31 + qHash(c);
+        seed = hash(seed, c);
     }
     return hashCode;
 }
 
 inline hash_type qHash(const QAnimationClipData &value, hash_type seed = 0)
 {
-    hash_type hashCode = seed;
-    hashCode = hashCode * 31 + qHash(value.name());
-    hashCode = hashCode * 31 + ::qHash(value.channelCount());
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.channelCount());
     for(const QChannel & c : value){
-        hashCode = hashCode * 31 + qHash(c);
+        seed = hash(seed, c);
     }
-    return hashCode;
+    return seed;
 }
 
 #endif
diff --git a/src/cpp/QtJambi3DRender/hashes.h b/src/cpp/QtJambi3DRender/hashes.h
index 8c250ad1..781cd1b4 100644
--- a/src/cpp/QtJambi3DRender/hashes.h
+++ b/src/cpp/QtJambi3DRender/hashes.h
@@ -49,45 +49,45 @@ hash_type qHash(const Qt3DRender::QTextureDataUpdate& p, hash_type seed = 0);
 namespace Qt3DRender{
 	typedef Qt3DCore::QNode QNode;
     inline hash_type qHash(const QLevelOfDetailBoundingSphere& p, hash_type seed = 0){
-        hash_type hashCode = seed;
-        hashCode = hashCode * 31 + qHash(p.center());
-        hashCode = hashCode * 31 + ::qHash(p.radius());
-        return hashCode;
+        QtPrivate::QHashCombine hash;
+        seed = hash(seed, p.center());
+        seed = hash(seed, p.radius());
+        return seed;
     }
 #if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
     inline hash_type qHash(const QTextureImageData& p, hash_type seed = 0){
-        hash_type hashCode = seed;
-        hashCode = hashCode * 31 + ::qHash(p.width());
-        hashCode = hashCode * 31 + ::qHash(p.height());
-        hashCode = hashCode * 31 + ::qHash(p.depth());
-        hashCode = hashCode * 31 + ::qHash(p.layers());
-        hashCode = hashCode * 31 + ::qHash(p.mipLevels());
-        hashCode = hashCode * 31 + ::qHash(p.faces());
-        hashCode = hashCode * 31 + ::qHash(p.target());
-        hashCode = hashCode * 31 + ::qHash(p.format());
-        hashCode = hashCode * 31 + ::qHash(p.pixelType());
-        hashCode = hashCode * 31 + ::qHash(p.pixelFormat());
+        QtPrivate::QHashCombineCommutative hash;
+        seed = hash(seed, p.width());
+        seed = hash(seed, p.height());
+        seed = hash(seed, p.depth());
+        seed = hash(seed, p.layers());
+        seed = hash(seed, p.mipLevels());
+        seed = hash(seed, p.faces());
+        seed = hash(seed, p.target());
+        seed = hash(seed, p.format());
+        seed = hash(seed, p.pixelType());
+        seed = hash(seed, p.pixelFormat());
         for(int i=0; i<p.layers(); ++i){
             for(int j=0; j<p.faces(); ++j){
                 for(int k=0; k<p.mipLevels(); ++k){
-                    hashCode = hashCode * 31 + qHash(p.data(i,j,k));
+                    seed = hash(seed, p.data(i,j,k));
                 }
             }
         }
-        return hashCode;
+        return seed;
     }
 
     inline hash_type qHash(const QTextureDataUpdate& p, hash_type seed = 0){
-        hash_type hashCode = seed;
-        hashCode = hashCode * 31 + ::qHash(p.x());
-        hashCode = hashCode * 31 + ::qHash(p.y());
-        hashCode = hashCode * 31 + ::qHash(p.z());
-        hashCode = hashCode * 31 + ::qHash(p.layer());
-        hashCode = hashCode * 31 + ::qHash(p.mipLevel());
-        hashCode = hashCode * 31 + ::qHash(p.face());
+        QtPrivate::QHashCombine hash;
+        seed = hash(seed, p.x());
+        seed = hash(seed, p.y());
+        seed = hash(seed, p.z());
+        seed = hash(seed, p.layer());
+        seed = hash(seed, p.mipLevel());
+        seed = hash(seed, p.face());
         if(p.data())
-            hashCode = hashCode * 31 + qHash(*p.data().get());
-        return hashCode;
+            seed = hash(seed, *p.data().get());
+        return seed;
     }
 #endif
 };
diff --git a/src/cpp/QtJambiBluetooth/hashes.h b/src/cpp/QtJambiBluetooth/hashes.h
index 123548b3..a3a814d0 100644
--- a/src/cpp/QtJambiBluetooth/hashes.h
+++ b/src/cpp/QtJambiBluetooth/hashes.h
@@ -39,175 +39,186 @@ namespace QtJambiPrivate {
     template<> struct supports_qHash<QBluetoothServiceInfo::Sequence> : supports_qHash<QList<QVariant>>{};
 }
 
-hash_type qHash(const QLowEnergyCharacteristicData &value);
+hash_type qHash(const QLowEnergyCharacteristicData &value, hash_type seed = 0);
 
-inline hash_type qHash(const QBluetoothUuid &value)
+inline hash_type qHash(const QBluetoothUuid &value, hash_type seed = 0)
 {
-    return qHash(value.toByteArray());
+    return qHash(value.toByteArray(), seed);
 }
 
-inline hash_type qHash(const QBluetoothAddress &value)
+inline hash_type qHash(const QBluetoothAddress &value, hash_type seed = 0)
 {
-    return qHash(value.toString());
+    return qHash(value.toString(), seed);
 }
 
-inline hash_type qHash(const QBluetoothDeviceInfo &value)
+inline hash_type qHash(const QBluetoothDeviceInfo &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.rssi());
-    hashCode = hashCode * 31 + qHash(value.address());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.isCached());
-    hashCode = hashCode * 31 + qHash(value.deviceUuid());
-    hashCode = hashCode * 31 + qHash(value.serviceUuids());
-    hashCode = hashCode * 31 + qHash(value.serviceClasses());
-    hashCode = hashCode * 31 + qHash(value.majorDeviceClass());
-    hashCode = hashCode * 31 + qHash(value.minorDeviceClass());
-    hashCode = hashCode * 31 + qHash(value.coreConfigurations());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.rssi());
+    seed = hash(seed, value.address());
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.isCached());
+    seed = hash(seed, value.deviceUuid());
+    seed = hash(seed, value.serviceUuids());
+    seed = hash(seed, value.serviceClasses());
+    seed = hash(seed, value.majorDeviceClass());
+    seed = hash(seed, value.minorDeviceClass());
+    seed = hash(seed, value.coreConfigurations());
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    hashCode = hashCode * 31 + qHash(value.serviceUuidsCompleteness());
+    seed = hash(seed, value.serviceUuidsCompleteness());
 #else
-    hashCode = hashCode * 31 + qHash(value.manufacturerData());
-    hashCode = hashCode * 31 + qHash(value.coreConfigurations());
+    seed = hash(seed, value.manufacturerData());
+    seed = hash(seed, value.coreConfigurations());
 #endif
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QBluetoothHostInfo &value)
+inline hash_type qHash(const QBluetoothHostInfo &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.address());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.address());
+    return seed;
 }
 
-inline hash_type qHash(const QLowEnergyDescriptor &value)
+inline hash_type qHash(const QLowEnergyDescriptor &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.type());
-    hashCode = hashCode * 31 + qHash(value.uuid());
-    hashCode = hashCode * 31 + qHash(value.value());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.type());
+    seed = hash(seed, value.uuid());
+    seed = hash(seed, value.value());
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    hashCode = hashCode * 31 + qHash(value.handle());
+    seed = hash(seed, value.handle());
 #endif
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    return hashCode;
+    seed = hash(seed, value.isValid());
+    return seed;
 }
 
-inline hash_type qHash(const QLowEnergyAdvertisingData &value)
+inline hash_type qHash(const QLowEnergyAdvertisingData &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.rawData());
-    hashCode = hashCode * 31 + qHash(value.services());
-    hashCode = hashCode * 31 + qHash(value.localName());
-    hashCode = hashCode * 31 + qHash(value.manufacturerId());
-    hashCode = hashCode * 31 + qHash(value.discoverability());
-    hashCode = hashCode * 31 + qHash(value.manufacturerData());
-    hashCode = hashCode * 31 + qHash(value.includePowerLevel());
-    hashCode = hashCode * 31 + qHash(value.invalidManufacturerId());
-    return hashCode;
-}
-
-inline hash_type qHash(const QLowEnergyServiceData &value)
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.rawData());
+    seed = hash(seed, value.services());
+    seed = hash(seed, value.localName());
+    seed = hash(seed, value.manufacturerId());
+    seed = hash(seed, value.discoverability());
+    seed = hash(seed, value.manufacturerData());
+    seed = hash(seed, value.includePowerLevel());
+    seed = hash(seed, value.invalidManufacturerId());
+    return seed;
+}
+
+inline hash_type qHash(const QLowEnergyServiceData &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.type());
-    hashCode = hashCode * 31 + qHash(value.uuid());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.characteristics());
-    hashCode = hashCode * 31 + qHash(value.includedServices());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.type());
+    seed = hash(seed, value.uuid());
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.characteristics());
+    seed = hash(seed, value.includedServices());
+    return seed;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QBluetoothTransferRequest &value)
+inline hash_type qHash(const QBluetoothTransferRequest &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.address());
-    return hashCode;
+    return qHash(value.address(), seed);
 }
 #endif
 
-inline hash_type qHash(const QLowEnergyAdvertisingParameters::AddressInfo &value)
+inline hash_type qHash(const QLowEnergyAdvertisingParameters::AddressInfo &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.type);
-    hashCode = hashCode * 31 + qHash(value.address);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.type);
+    seed = hash(seed, value.address);
+    return seed;
 }
 
-inline hash_type qHash(const QLowEnergyAdvertisingParameters &value)
+inline hash_type qHash(const QLowEnergyAdvertisingParameters &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.mode());
-    hashCode = hashCode * 31 + qHash(value.filterPolicy());
-    hashCode = hashCode * 31 + qHash(value.maximumInterval());
-    hashCode = hashCode * 31 + qHash(value.minimumInterval());
-    hashCode = hashCode * 31 + qHash(value.whiteList());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.mode());
+    seed = hash(seed, value.filterPolicy());
+    seed = hash(seed, value.maximumInterval());
+    seed = hash(seed, value.minimumInterval());
+    seed = hash(seed, value.whiteList());
+    return seed;
 }
 
-inline hash_type qHash(const QLowEnergyDescriptorData &value)
+inline hash_type qHash(const QLowEnergyDescriptorData &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.uuid());
-    hashCode = hashCode * 31 + qHash(value.value());
-    hashCode = hashCode * 31 + qHash(int(value.readConstraints()));
-    hashCode = hashCode * 31 + qHash(int(value.writeConstraints()));
-    hashCode = hashCode * 31 + qHash(value.isReadable());
-    hashCode = hashCode * 31 + qHash(value.isWritable());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    return hashCode;
-}
-
-inline hash_type qHash(const QLowEnergyCharacteristicData &value)
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.uuid());
+    seed = hash(seed, value.value());
+    seed = hash(seed, int(value.readConstraints()));
+    seed = hash(seed, int(value.writeConstraints()));
+    seed = hash(seed, value.isReadable());
+    seed = hash(seed, value.isWritable());
+    seed = hash(seed, value.isValid());
+    return seed;
+}
+
+inline hash_type qHash(const QLowEnergyCharacteristicData &value, hash_type seed)
 {
-    hash_type hashCode = qHash(value.uuid());
-    hashCode = hashCode * 31 + qHash(value.value());
-    hashCode = hashCode * 31 + qHash(int(value.properties()));
-    hashCode = hashCode * 31 + qHash(int(value.readConstraints()));
-    hashCode = hashCode * 31 + qHash(int(value.writeConstraints()));
-    hashCode = hashCode * 31 + qHash(value.minimumValueLength());
-    hashCode = hashCode * 31 + qHash(value.maximumValueLength());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.descriptors());
-    return hashCode;
-}
-
-inline hash_type qHash(const QLowEnergyCharacteristic &value)
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.uuid());
+    seed = hash(seed, value.value());
+    seed = hash(seed, int(value.properties()));
+    seed = hash(seed, int(value.readConstraints()));
+    seed = hash(seed, int(value.writeConstraints()));
+    seed = hash(seed, value.minimumValueLength());
+    seed = hash(seed, value.maximumValueLength());
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.descriptors());
+    return seed;
+}
+
+inline hash_type qHash(const QLowEnergyCharacteristic &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.uuid());
-    hashCode = hashCode * 31 + qHash(value.value());
-    hashCode = hashCode * 31 + qHash(int(value.properties()));
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.descriptors());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.uuid());
+    seed = hash(seed, value.value());
+    seed = hash(seed, int(value.properties()));
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.descriptors());
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    hashCode = hashCode * 31 + qHash(value.handle());
+    seed = hash(seed, value.handle());
 #else
-    hashCode = hashCode * 31 + qHash(value.clientCharacteristicConfiguration());
+    seed = hash(seed, value.clientCharacteristicConfiguration());
 #endif
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QLowEnergyConnectionParameters &value)
+inline hash_type qHash(const QLowEnergyConnectionParameters &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.minimumInterval());
-    hashCode = hashCode * 31 + qHash(value.maximumInterval());
-    hashCode = hashCode * 31 + qHash(value.latency());
-    hashCode = hashCode * 31 + qHash(value.supervisionTimeout());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.minimumInterval());
+    seed = hash(seed, value.maximumInterval());
+    seed = hash(seed, value.latency());
+    seed = hash(seed, value.supervisionTimeout());
+    return seed;
 }
 
-inline hash_type qHash(const QBluetoothServiceInfo &value)
+inline hash_type qHash(const QBluetoothServiceInfo &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.serviceName());
-    hashCode = hashCode * 31 + qHash(value.serviceDescription());
-    hashCode = hashCode * 31 + qHash(value.serviceProvider());
-    hashCode = hashCode * 31 + qHash(value.serverChannel());
-    hashCode = hashCode * 31 + qHash(value.protocolServiceMultiplexer());
-    hashCode = hashCode * 31 + qHash(int(value.socketProtocol()));
-    hashCode = hashCode * 31 + qHash(value.device());
-    hashCode = hashCode * 31 + qHash(value.isComplete());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.serviceAvailability());
-    hashCode = hashCode * 31 + qHash(value.serviceUuid());
-    hashCode = hashCode * 31 + qHash(value.isRegistered());
-    hashCode = hashCode * 31 + qHash(value.serviceClassUuids());
-    hashCode = hashCode * 31 + qHash(value.attributes());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.serviceName());
+    seed = hash(seed, value.serviceDescription());
+    seed = hash(seed, value.serviceProvider());
+    seed = hash(seed, value.serverChannel());
+    seed = hash(seed, value.protocolServiceMultiplexer());
+    seed = hash(seed, int(value.socketProtocol()));
+    seed = hash(seed, value.device());
+    seed = hash(seed, value.isComplete());
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.serviceAvailability());
+    seed = hash(seed, value.serviceUuid());
+    seed = hash(seed, value.isRegistered());
+    seed = hash(seed, value.serviceClassUuids());
+    seed = hash(seed, value.attributes());
+    return seed;
 }
 
 #endif // QTJAMI_BLUETOOTH_HASHES_H
diff --git a/src/cpp/QtJambiCore/hashes.h b/src/cpp/QtJambiCore/hashes.h
index b954d4cd..7872ed6c 100644
--- a/src/cpp/QtJambiCore/hashes.h
+++ b/src/cpp/QtJambiCore/hashes.h
@@ -34,6 +34,9 @@
 
 #include <QtCore/QtCore>
 #include <QtJambi/Global>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_CONFIG(permissions)
+#include <QtCore/QPermission>
+#endif
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && defined(QTJAMBI_GENERATOR_RUNNING)
 bool operator==(QByteArrayView, QByteArray);
@@ -49,9 +52,9 @@ hash_type genericHash(const T &value, hash_type seed = 0)
     return qHashBits(&value, sizeof(T), seed);
 }
 
-inline hash_type qHash(const QAbstractEventDispatcher::TimerInfo &value)
+inline hash_type qHash(const QAbstractEventDispatcher::TimerInfo &value, hash_type seed = 0)
 {
-    return genericHash<QAbstractEventDispatcher::TimerInfo>(value);
+    return genericHash(value, seed);
 }
 
 inline bool operator==(const QAbstractEventDispatcher::TimerInfo &v1, const QAbstractEventDispatcher::TimerInfo &v2){
@@ -61,22 +64,23 @@ inline bool operator==(const QAbstractEventDispatcher::TimerInfo &v1, const QAbs
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
-inline hash_type qHash(const QMetaType &value)
+inline hash_type qHash(const QMetaType &value, hash_type seed = 0)
 {
-    return qHash(value.id());
+    return qHash(value.id(), seed);
 }
 #endif
 
-inline hash_type qHash(const QSizeF &size)
+inline hash_type qHash(const QSizeF &size, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(qint64(size.width()));
-    hashCode = hashCode * 31 + qHash(qint64(size.height()));
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, qint64(size.width()));
+    seed = hash(seed, qint64(size.height()));
+    return seed;
 }
 
-inline hash_type qHash(const QByteArrayMatcher &value)
+inline hash_type qHash(const QByteArrayMatcher &value, hash_type seed = 0)
 {
-    return qHash(value.pattern());
+    return qHash(value.pattern(), seed);
 }
 
 inline bool operator==(const QByteArrayMatcher &value1, const QByteArrayMatcher &value2)
@@ -84,9 +88,9 @@ inline bool operator==(const QByteArrayMatcher &value1, const QByteArrayMatcher
     return value1.pattern()==value2.pattern();
 }
 
-inline hash_type qHash(const QCalendar &value)
+inline hash_type qHash(const QCalendar &value, hash_type seed = 0)
 {
-    return qHash(value.name());
+    return qHash(value.name(), seed);
 }
 
 inline bool operator==(const QCalendar &value1, const QCalendar &value2)
@@ -94,9 +98,9 @@ inline bool operator==(const QCalendar &value1, const QCalendar &value2)
     return value1.name()==value2.name();
 }
 
-inline hash_type qHash(const QCalendar::YearMonthDay &value)
+inline hash_type qHash(const QCalendar::YearMonthDay &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
 inline bool operator==(const QCalendar::YearMonthDay &value1, const QCalendar::YearMonthDay &value2)
@@ -104,9 +108,9 @@ inline bool operator==(const QCalendar::YearMonthDay &value1, const QCalendar::Y
     return value1.year==value2.year && value1.month==value2.month && value1.day==value2.day;
 }
 
-inline hash_type qHash(const QCborError &value)
+inline hash_type qHash(const QCborError &value, hash_type seed = 0)
 {
-    return qHash(QCborError::Code(value));
+    return qHash(QCborError::Code(value), seed);
 }
 
 inline bool operator==(const QCborError &value1, const QCborError &value2)
@@ -114,11 +118,12 @@ inline bool operator==(const QCborError &value1, const QCborError &value2)
     return QCborError::Code(value1)==QCborError::Code(value2);
 }
 
-inline hash_type qHash(const QCborParserError &value)
+inline hash_type qHash(const QCborParserError &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.offset);
-    hashCode = hashCode * 31 + qHash(value.error);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.offset);
+    seed = hash(seed, value.error);
+    return seed;
 }
 
 inline bool operator==(const QCborParserError &value1, const QCborParserError &value2)
@@ -126,13 +131,14 @@ inline bool operator==(const QCborParserError &value1, const QCborParserError &v
     return value1.offset==value2.offset && value1.error==value2.error;
 }
 
-inline hash_type qHash(const QOperatingSystemVersion &value)
+inline hash_type qHash(const QOperatingSystemVersion &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.type());
-    hashCode = hashCode * 31 + qHash(value.majorVersion());
-    hashCode = hashCode * 31 + qHash(value.minorVersion());
-    hashCode = hashCode * 31 + qHash(value.microVersion());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.type());
+    seed = hash(seed, value.majorVersion());
+    seed = hash(seed, value.minorVersion());
+    seed = hash(seed, value.microVersion());
+    return seed;
 }
 
 inline bool operator==(const QOperatingSystemVersion &value1, const QOperatingSystemVersion &value2)
@@ -144,13 +150,14 @@ inline bool operator==(const QOperatingSystemVersion &value1, const QOperatingSy
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
-inline hash_type qHash(const QOperatingSystemVersionBase &value)
+inline hash_type qHash(const QOperatingSystemVersionBase &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.type());
-    hashCode = hashCode * 31 + qHash(value.majorVersion());
-    hashCode = hashCode * 31 + qHash(value.minorVersion());
-    hashCode = hashCode * 31 + qHash(value.microVersion());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.type());
+    seed = hash(seed, value.majorVersion());
+    seed = hash(seed, value.minorVersion());
+    seed = hash(seed, value.microVersion());
+    return seed;
 }
 
 inline bool operator==(const QOperatingSystemVersionBase &value1, const QOperatingSystemVersionBase &value2)
@@ -162,9 +169,9 @@ inline bool operator==(const QOperatingSystemVersionBase &value1, const QOperati
 }
 
 #ifdef QFACTORYLOADER_P_H
-inline hash_type qHash(const QPluginParsedMetaData &value)
+inline hash_type qHash(const QPluginParsedMetaData &value, hash_type seed = 0)
 {
-    return qHash(*reinterpret_cast<const QCborValue*>(&value));
+    return qHash(*reinterpret_cast<const QCborValue*>(&value), seed);
 }
 
 inline bool operator==(const QPluginParsedMetaData &value1, const QPluginParsedMetaData &value2)
@@ -174,13 +181,14 @@ inline bool operator==(const QPluginParsedMetaData &value1, const QPluginParsedM
 #endif
 #endif
 
-inline hash_type qHash(const QCollator &value)
+inline hash_type qHash(const QCollator &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.locale());
-    hashCode = hashCode * 31 + qHash(value.caseSensitivity());
-    hashCode = hashCode * 31 + qHash(value.numericMode());
-    hashCode = hashCode * 31 + qHash(value.ignorePunctuation());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.locale());
+    seed = hash(seed, value.caseSensitivity());
+    seed = hash(seed, value.numericMode());
+    seed = hash(seed, value.ignorePunctuation());
+    return seed;
 }
 
 inline bool operator==(const QCollator &value1, const QCollator &value2)
@@ -191,20 +199,22 @@ inline bool operator==(const QCollator &value1, const QCollator &value2)
             && value1.ignorePunctuation()==value2.ignorePunctuation();
 }
 
-inline hash_type qHash(const QDeadlineTimer &value)
+inline hash_type qHash(const QDeadlineTimer &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.timerType());
-    hashCode = hashCode * 31 + qHash(value._q_data().first);
-    hashCode = hashCode * 31 + qHash(value._q_data().second);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.timerType());
+    seed = hash(seed, value._q_data().first);
+    seed = hash(seed, value._q_data().second);
+    return seed;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QSize &size)
+inline hash_type qHash(const QSize &size, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(size.width());
-    hashCode = hashCode * 31 + qHash(size.height());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, size.width());
+    seed = hash(seed, size.height());
+    return seed;
 }
 #else
 
@@ -218,11 +228,12 @@ bool operator==(const QFuture<T> &f1, const QFuture<T> &f2) {
 #endif //QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 2, 0)
-inline hash_type qHash(const QPointF &point)
+inline hash_type qHash(const QPointF &point, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(point.x());
-    hashCode = hashCode * 31 + qHash(point.y());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, point.x());
+    seed = hash(seed, point.y());
+    return seed;
 }
 #else
 inline hash_type qHash(const QPointF &point, QHashDummyValue, hash_type seed = 0)
@@ -231,324 +242,348 @@ inline hash_type qHash(const QPointF &point, QHashDummyValue, hash_type seed = 0
 }
 #endif
 
-inline hash_type qHash(const QFutureInterfaceBase &value)
+inline hash_type qHash(const QFutureInterfaceBase &value, hash_type seed = 0)
 {
-    return qHash(quintptr(&value.resultStoreBase()));
+    return qHash(quintptr(&value.resultStoreBase()), seed);
 }
 
 template<class T>
-inline hash_type qHash(const QFuture<T> &value)
+inline hash_type qHash(const QFuture<T> &value, hash_type seed = 0)
 {
     struct Future{
         QFutureInterfaceBase d;
     };
-    return qHash(reinterpret_cast<const Future*>(&value)->d);
+    return qHash(reinterpret_cast<const Future*>(&value)->d, seed);
 }
 
-inline hash_type qHash(const QFileInfo &fileInfo)
+inline hash_type qHash(const QFileInfo &fileInfo, hash_type seed = 0)
 {
-    return qHash(fileInfo.absoluteFilePath());
+    return qHash(fileInfo.absoluteFilePath(), seed);
 }
 
-inline hash_type qHash(const QDir &dir)
+inline hash_type qHash(const QDir &dir, hash_type seed = 0)
 {
-    return qHash(dir.absolutePath());
+    return qHash(dir.absolutePath(), seed);
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QRect &rect)
+inline hash_type qHash(const QRect &rect, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(rect.left());
-    hashCode = hashCode * 31 + qHash(rect.top());
-    hashCode = hashCode * 31 + qHash(rect.right());
-    hashCode = hashCode * 31 + qHash(rect.bottom());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, rect.left());
+    seed = hash(seed, rect.top());
+    seed = hash(seed, rect.right());
+    seed = hash(seed, rect.bottom());
+    return seed;
 }
 #endif //QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 
-inline hash_type qHash(const QRectF &rect)
+inline hash_type qHash(const QRectF &rect, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(rect.left());
-    hashCode = hashCode * 31 + qHash(rect.top());
-    hashCode = hashCode * 31 + qHash(rect.right());
-    hashCode = hashCode * 31 + qHash(rect.bottom());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, rect.left());
+    seed = hash(seed, rect.top());
+    seed = hash(seed, rect.right());
+    seed = hash(seed, rect.bottom());
+    return seed;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QPoint &point)
+inline hash_type qHash(const QPoint &point, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(point.x());
-    hashCode = hashCode * 31 + qHash(point.y());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, point.x());
+    seed = hash(seed, point.y());
+    return seed;
 }
 #endif
 
-inline hash_type qHash(const QLineF &line)
+inline hash_type qHash(const QLineF &line, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(line.p1().x());
-    hashCode = hashCode * 31 + qHash(line.p1().y());
-    hashCode = hashCode * 31 + qHash(line.p2().x());
-    hashCode = hashCode * 31 + qHash(line.p2().y());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, line.p1().x());
+    seed = hash(seed, line.p1().y());
+    seed = hash(seed, line.p2().x());
+    seed = hash(seed, line.p2().y());
+    return seed;
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QPartialOrdering &value)
+inline hash_type qHash(const QPartialOrdering &value, hash_type seed = 0)
 {
-    return qHash(reinterpret_cast<const qint8&>(value));
+    return qHash(reinterpret_cast<const qint8&>(value), seed);
 }
 
-inline hash_type qHash(const QItemSelectionRange &value)
+inline hash_type qHash(const QItemSelectionRange &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.topLeft());
-    hashCode = hashCode * 31 + qHash(value.bottomRight());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.topLeft());
+    seed = hash(seed, value.bottomRight());
+    return seed;
 }
 #endif
 
-inline hash_type qHash(const QJsonValueRef &value)
-{
-    hash_type hashCode = qHash(int(value.type()));
-    switch(value.type()){
-    case QJsonValue::Null:    hashCode = hashCode * 31; break;
-    case QJsonValue::Bool:    hashCode = hashCode * 31 + qHash(value.toBool()); break;
-    case QJsonValue::Double:    hashCode = hashCode * 31 + qHash(value.toDouble()); break;
-    case QJsonValue::String:    hashCode = hashCode * 31 + qHash(value.toString()); break;
-    case QJsonValue::Array:    hashCode = hashCode * 31 + qHash(value.toArray()); break;
-    case QJsonValue::Object:    hashCode = hashCode * 31 + qHash(value.toObject()); break;
+inline hash_type qHash(const QJsonValueRef &value, hash_type seed = 0)
+{
+    switch (value.type()) {
+    case QJsonValue::Null:
+        return qHash(nullptr, seed);
+    case QJsonValue::Bool:
+        return qHash(value.toBool(), seed);
+    case QJsonValue::Double:
+        return qHash(value.toDouble(), seed);
+    case QJsonValue::String:
+        return qHash(value.toString(), seed);
+    case QJsonValue::Array:
+        return qHash(value.toArray(), seed);
+    case QJsonValue::Object:
+        return qHash(value.toObject(), seed);
     default: break;
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QItemSelection &value)
+inline hash_type qHash(const QItemSelection &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.size());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.size());
     for(const QItemSelectionRange& r : value){
-        hashCode = hashCode * 31 + qHash(r);
+        seed = hash(seed, r);
     }
-    return hashCode;
+    return seed;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
-hash_type qHash(const QJsonObject &value);
-hash_type qHash(const QJsonArray &value);
-
-inline hash_type qHash(const QJsonValue &value)
-{
-    hash_type hashCode = qHash(int(value.type()));
-    switch(value.type()){
-    case QJsonValue::Null:    hashCode = hashCode * 31; break;
-    case QJsonValue::Bool:    hashCode = hashCode * 31 + qHash(value.toBool()); break;
-    case QJsonValue::Double:    hashCode = hashCode * 31 + qHash(value.toDouble()); break;
-    case QJsonValue::String:    hashCode = hashCode * 31 + qHash(value.toString()); break;
-    case QJsonValue::Array:    hashCode = hashCode * 31 + qHash(value.toArray()); break;
-    case QJsonValue::Object:    hashCode = hashCode * 31 + qHash(value.toObject()); break;
+hash_type qHash(const QJsonObject &value, hash_type seed = 0);
+hash_type qHash(const QJsonArray &value, hash_type seed = 0);
+
+inline hash_type qHash(const QJsonValue &value, hash_type seed = 0)
+{
+    switch (value.type()) {
+    case QJsonValue::Null:
+        return qHash(nullptr, seed);
+    case QJsonValue::Bool:
+        return qHash(value.toBool(), seed);
+    case QJsonValue::Double:
+        return qHash(value.toDouble(), seed);
+    case QJsonValue::String:
+        return qHash(value.toString(), seed);
+    case QJsonValue::Array:
+        return qHash(value.toArray(), seed);
+    case QJsonValue::Object:
+        return qHash(value.toObject(), seed);
     default: break;
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QJsonObject &value)
+inline hash_type qHash(const QJsonObject &object, hash_type seed)
 {
-    hash_type hashCode = qHash(value.keys().size());
-    for(const QString& key : value.keys()){
-        hashCode = hashCode * 31 + qHash(key);
-//        hashCode = hashCode * 31 + qHash(value[key]);
+    QtPrivate::QHashCombine hash;
+    for (auto it = object.begin(), end = object.end(); it != end; ++it) {
+        const QString key = it.key();
+        const QJsonValue value = it.value();
+        seed = hash(seed, QPair<const QString&, const QJsonValue&>(key, value));
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QJsonArray &value)
+inline hash_type qHash(const QJsonArray &array, hash_type seed)
 {
-    hash_type hashCode = qHash(value.size());
-    for(const QJsonValue& r : value){
-        hashCode = hashCode * 31 + qHash(r);
-    }
-    return hashCode;
+    return qHashRange(array.begin(), array.end(), seed);
 }
 #endif
 
-inline hash_type qHash(const QJsonDocument &value)
+inline hash_type qHash(const QJsonDocument &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.isArray());
-    hashCode = hashCode * 31 + qHash(value.isObject());
-    hashCode = hashCode * 31 + qHash(value.isNull());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isArray());
+    seed = hash(seed, value.isObject());
+    seed = hash(seed, value.isNull());
+    seed = hash(seed, value.isEmpty());
     if(value.isArray()){
-        hashCode = hashCode * 31 + qHash(value.array());
+        seed = hash(seed, value.array());
     }else if(value.isObject()){
-        hashCode = hashCode * 31 + qHash(value.object());
+        seed = hash(seed, value.object());
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QEasingCurve &curve)
+inline hash_type qHash(const QEasingCurve &curve, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(curve.amplitude());
-    hashCode = hashCode * 31 + qHash(curve.period());
-    hashCode = hashCode * 31 + qHash(curve.overshoot());
-    hashCode = hashCode * 31 + qHash(int(curve.type()));
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, curve.amplitude());
+    seed = hash(seed, curve.period());
+    seed = hash(seed, curve.overshoot());
+    seed = hash(seed, int(curve.type()));
     if(curve.type()==QEasingCurve::Custom){
-        hashCode = hashCode * 31 + qHash(qint64( reinterpret_cast<const void*>(curve.customType() )));
+        seed = hash(seed, qint64( reinterpret_cast<const void*>(curve.customType() )));
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QLine &line)
+inline hash_type qHash(const QLine &line, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(line.p1());
-    hashCode = hashCode * 31 + qHash(line.p2());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, line.p1());
+    seed = hash(seed, line.p2());
+    return seed;
 }
 
-inline hash_type qHash(const QMargins &value)
+inline hash_type qHash(const QMargins &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.top());
-    hashCode = hashCode * 31 + qHash(value.right());
-    hashCode = hashCode * 31 + qHash(value.bottom());
-    hashCode = hashCode * 31 + qHash(value.left());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.top());
+    seed = hash(seed, value.right());
+    seed = hash(seed, value.bottom());
+    seed = hash(seed, value.left());
+    return seed;
 }
 
-inline hash_type qHash(const QMarginsF &value)
+inline hash_type qHash(const QMarginsF &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.top());
-    hashCode = hashCode * 31 + qHash(value.right());
-    hashCode = hashCode * 31 + qHash(value.bottom());
-    hashCode = hashCode * 31 + qHash(value.left());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.top());
+    seed = hash(seed, value.right());
+    seed = hash(seed, value.bottom());
+    seed = hash(seed, value.left());
+    return seed;
 }
 
-inline hash_type qHash(const QXmlStreamAttribute &value)
+inline hash_type qHash(const QXmlStreamAttribute &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.namespaceUri());
-    hashCode = hashCode * 31 + qHash(value.prefix());
-    hashCode = hashCode * 31 + qHash(value.qualifiedName());
-    hashCode = hashCode * 31 + qHash(value.value());
-    hashCode = hashCode * 31 + qHash(value.isDefault());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.namespaceUri());
+    seed = hash(seed, value.prefix());
+    seed = hash(seed, value.qualifiedName());
+    seed = hash(seed, value.value());
+    seed = hash(seed, value.isDefault());
+    return seed;
 }
 
-inline hash_type qHash(const QXmlStreamAttributes &value)
+inline hash_type qHash(const QXmlStreamAttributes &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.size());
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.size());
     for(const QXmlStreamAttribute& a : value){
-        hashCode = hashCode * 31 + qHash(a);
+        seed = hash(seed, a);
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QTimeZone &value)
+inline hash_type qHash(const QTimeZone &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.id());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.id());
+    return seed;
 }
 
 #if QT_CONFIG(processenvironment)
-inline hash_type qHash(const QProcessEnvironment &value)
+inline hash_type qHash(const QProcessEnvironment &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.keys().size());
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.keys().size());
     for(const QString& key : value.keys()){
-        hashCode = hashCode * 31 + qHash(key);
-        hashCode = hashCode * 31 + qHash(value.value(key));
+        seed = hash(seed, key);
+        seed = hash(seed, value.value(key));
     }
-    return hashCode;
+    return seed;
 }
 #endif
 
-inline hash_type qHash(const QXmlStreamEntityDeclaration &value)
+inline hash_type qHash(const QXmlStreamEntityDeclaration &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.notationName());
-    hashCode = hashCode * 31 + qHash(value.publicId());
-    hashCode = hashCode * 31 + qHash(value.systemId());
-    hashCode = hashCode * 31 + qHash(value.value());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.notationName());
+    seed = hash(seed, value.publicId());
+    seed = hash(seed, value.systemId());
+    seed = hash(seed, value.value());
+    return seed;
 }
 
-inline hash_type qHash(const QXmlStreamNamespaceDeclaration &value)
+inline hash_type qHash(const QXmlStreamNamespaceDeclaration &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.namespaceUri());
-    hashCode = hashCode * 31 + qHash(value.prefix());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.namespaceUri());
+    seed = hash(seed, value.prefix());
+    return seed;
 }
 
-inline hash_type qHash(const QXmlStreamNotationDeclaration &value)
+inline hash_type qHash(const QXmlStreamNotationDeclaration &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.publicId());
-    hashCode = hashCode * 31 + qHash(value.systemId());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.publicId());
+    seed = hash(seed, value.systemId());
+    return seed;
 }
 
-hash_type qHash(const QMetaMethod &value);
+hash_type qHash(const QMetaMethod &value, hash_type seed = 0);
 
-inline hash_type qHash(const QStorageInfo &value)
+inline hash_type qHash(const QStorageInfo &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.rootPath());
-    hashCode = hashCode * 31 + qHash(value.device());
-    hashCode = hashCode * 31 + qHash(value.isRoot());
-    hashCode = hashCode * 31 + qHash(value.isReady());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.blockSize());
-    hashCode = hashCode * 31 + qHash(value.subvolume());
-    hashCode = hashCode * 31 + qHash(value.isReadOnly());
-    hashCode = hashCode * 31 + qHash(value.displayName());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.rootPath());
+    seed = hash(seed, value.device());
+    seed = hash(seed, value.isRoot());
+    seed = hash(seed, value.isReady());
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.blockSize());
+    seed = hash(seed, value.subvolume());
+    seed = hash(seed, value.isReadOnly());
+    seed = hash(seed, value.displayName());
+    return seed;
 }
 
-inline hash_type qHash(const QElapsedTimer &value)
+inline hash_type qHash(const QElapsedTimer &value, hash_type seed = 0)
 {
     struct ElapsedTimer{
         qint64 t1;
         qint64 t2;
     };
     const ElapsedTimer* t = reinterpret_cast<const ElapsedTimer*>(&value);
-    hash_type hashCode = qHash(t->t1);
-    hashCode = hashCode * 31 + qHash(t->t2);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, t->t1);
+    seed = hash(seed, t->t2);
+    return seed;
 }
 
-inline hash_type qHash(const QMetaObject &value)
+inline hash_type qHash(const QMetaObject &value, hash_type seed = 0)
 {
-    return qHash(qintptr(&value));
+    return qHash(qintptr(&value), seed);
 }
 
-inline hash_type qHash(const QMetaEnum &value)
+inline hash_type qHash(const QMetaEnum &value, hash_type seed = 0)
 {
     if(!value.isValid())
-        return 0;
-    hash_type prime = 31;
-    hash_type result = 1;
-    result = prime * result + qHash(value.enclosingMetaObject());
-    result = prime * result + hash_type(value.enclosingMetaObject()->indexOfEnumerator(value.name()));
-    return result;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.enclosingMetaObject());
+    seed = hash(seed, value.enclosingMetaObject()->indexOfEnumerator(value.name()));
+    return seed;
 }
 
-inline hash_type qHash(const QMetaMethod &value)
+inline hash_type qHash(const QMetaMethod &value, hash_type seed)
 {
     if(!value.isValid())
-        return 0;
-    hash_type prime = 31;
-    hash_type result = 1;
-    result = prime * result + qHash(value.enclosingMetaObject());
-    result = prime * result + hash_type(value.methodIndex());
-    return result;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.enclosingMetaObject());
+    seed = hash(seed, value.methodIndex());
+    return seed;
 }
 
-inline hash_type qHash(const QMetaProperty &value)
+inline hash_type qHash(const QMetaProperty &value, hash_type seed = 0)
 {
     if(!value.isValid())
-        return 0;
-    hash_type prime = 31;
-    hash_type result = 1;
-    result = prime * result + qHash(value.enclosingMetaObject());
-    result = prime * result + hash_type(value.propertyIndex());
-    return result;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.enclosingMetaObject());
+    seed = hash(seed, value.propertyIndex());
+    return seed;
 }
 
 inline bool operator==(const QMetaEnum &value1, const QMetaEnum &value2)
@@ -608,4 +643,82 @@ struct QtJambiStringList{
 };
 #endif //QTJAMBI_GENERATOR_RUNNING
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_CONFIG(permissions)
+inline size_t qHash(const QBluetoothPermission &, size_t seed = 0)
+{
+    return qHash(QString("QBluetoothPermission"), seed);
+}
+inline bool operator==(const QBluetoothPermission &, const QBluetoothPermission &){return true;}
+
+inline size_t qHash(const QCameraPermission &, size_t seed = 0)
+{
+    return qHash(QString("QCameraPermission"), seed);
+}
+inline bool operator==(const QCameraPermission &, const QCameraPermission &){return true;}
+
+inline size_t qHash(const QMicrophonePermission &, size_t seed = 0)
+{
+    return qHash(QString("QMicrophonePermission"), seed);
+}
+inline bool operator==(const QMicrophonePermission &, const QMicrophonePermission &){return true;}
+
+inline size_t qHash(const QContactsPermission &value, size_t seed = 0)
+{
+    return qHashMulti(seed, QString("QContactsPermission"), value.accessMode());
+}
+inline bool operator==(const QContactsPermission &v1, const QContactsPermission &v2){return v1.accessMode()==v2.accessMode();}
+
+inline size_t qHash(const QCalendarPermission &value, size_t seed = 0)
+{
+    return qHashMulti(seed, QString("QCalendarPermission"), value.accessMode());
+}
+inline bool operator==(const QCalendarPermission &v1, const QCalendarPermission &v2){return v1.accessMode()==v2.accessMode();}
+
+inline size_t qHash(const QLocationPermission &value, size_t seed = 0)
+{
+    return qHashMulti(seed, QString("QLocationPermission"), value.accuracy(), value.availability());
+}
+inline bool operator==(const QLocationPermission &v1, const QLocationPermission &v2){
+    return v1.accuracy()==v2.accuracy() && v1.availability()==v2.availability();
+}
+
+inline size_t qHash(const QPermission &value, size_t seed = 0)
+{
+    if(value.type()==QMetaType::fromType<QBluetoothPermission>()){
+        seed = qHash(value.value<QBluetoothPermission>().value(), seed);
+    }else if(value.type()==QMetaType::fromType<QCalendarPermission>()){
+        seed = qHash(value.value<QCalendarPermission>().value(), seed);
+    }else if(value.type()==QMetaType::fromType<QCameraPermission>()){
+        seed = qHash(value.value<QCameraPermission>().value(), seed);
+    }else if(value.type()==QMetaType::fromType<QContactsPermission>()){
+        seed = qHash(value.value<QContactsPermission>().value(), seed);
+    }else if(value.type()==QMetaType::fromType<QLocationPermission>()){
+        seed = qHash(value.value<QLocationPermission>().value(), seed);
+    }else if(value.type()==QMetaType::fromType<QMicrophonePermission>()){
+        seed = qHash(value.value<QMicrophonePermission>().value(), seed);
+    }
+    return qHash(value.status(), seed);
+}
+inline bool operator==(const QPermission &v1, const QPermission &v2){
+    if(v1.status()==v2.status()){
+        if(v1.type()==QMetaType::fromType<QBluetoothPermission>() && v2.type()==QMetaType::fromType<QBluetoothPermission>()){
+            return v1.value<QBluetoothPermission>().value()==v2.value<QBluetoothPermission>().value();
+        }else if(v1.type()==QMetaType::fromType<QCalendarPermission>() && v2.type()==QMetaType::fromType<QCalendarPermission>()){
+            return v1.value<QCalendarPermission>().value()==v2.value<QCalendarPermission>().value();
+        }else if(v1.type()==QMetaType::fromType<QCameraPermission>() && v2.type()==QMetaType::fromType<QCameraPermission>()){
+            return v1.value<QCameraPermission>().value()==v2.value<QCameraPermission>().value();
+        }else if(v1.type()==QMetaType::fromType<QContactsPermission>() && v2.type()==QMetaType::fromType<QContactsPermission>()){
+            return v1.value<QContactsPermission>().value()==v2.value<QContactsPermission>().value();
+        }else if(v1.type()==QMetaType::fromType<QLocationPermission>() && v2.type()==QMetaType::fromType<QLocationPermission>()){
+            return v1.value<QLocationPermission>().value()==v2.value<QLocationPermission>().value();
+        }else if(v1.type()==QMetaType::fromType<QMicrophonePermission>() && v2.type()==QMetaType::fromType<QMicrophonePermission>()){
+            return v1.value<QMicrophonePermission>().value()==v2.value<QMicrophonePermission>().value();
+        }
+    }
+    return false;
+}
+#endif
+#endif
+
 #endif // QTJAMBICORE_HASHES_H
diff --git a/src/cpp/QtJambiCore/impl.cpp b/src/cpp/QtJambiCore/impl.cpp
index a0501045..9c8f4d72 100644
--- a/src/cpp/QtJambiCore/impl.cpp
+++ b/src/cpp/QtJambiCore/impl.cpp
@@ -87,6 +87,8 @@ extern "C" Q_DECL_EXPORT jint JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_core_QC
 }
 
 inline hash_type qHash(const QVariant& v, hash_type seed = 0){
+    if(!v.isValid())
+        return seed;
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QMetaType metaType = v.metaType();
 #else
@@ -1756,7 +1758,7 @@ extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_core
     jobject _result{nullptr};
     QTJAMBI_TRY{
         if(void* ptr = QtJambiAPI::convertJavaObjectToNative(__jni_env, _this)){
-            _result = QtJambiAPI::convertNativeToJavaObject(__jni_env, QMetaType::create(type0, ptr), Java::QtCore::QMetaType$GenericValue::getClass(__jni_env), false);
+            _result = QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(__jni_env, QMetaType::create(type0, ptr), Java::QtCore::QMetaType$GenericValue::getClass(__jni_env));
             if(_result)
                 Java::QtCore::QMetaType$GenericValue::set_type(__jni_env, _result, type0);
         }
@@ -5601,87 +5603,62 @@ extern "C" Q_DECL_EXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_core_QF
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
 #if QT_CONFIG(permissions)
 struct Permission{
-    Qt::PermissionStatus m_status = Qt::PermissionStatus::Undetermined;
-    QVariant m_data;
+    Qt::PermissionStatus status = Qt::PermissionStatus::Undetermined;
+    QVariant data;
 };
 
-extern "C" Q_DECL_EXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_core_QPermission_setData)
-(JNIEnv * __jni_env, jclass, QtJambiNativeID __this_id, jobject value)
-{
-    QTJAMBI_TRY{
-        Permission* permission = QtJambiAPI::objectFromNativeId<Permission>(__this_id);
-        QtJambiAPI::checkPointer(__jni_env, permission);
-        permission->m_data = QtJambiAPI::convertJavaObjectToQVariant(__jni_env, value);
-    }QTJAMBI_CATCH(const JavaException& exn){
-        exn.raiseInJava(__jni_env);
-    }QTJAMBI_TRY_END
-}
-
-extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_core_QPermission_data)
-(JNIEnv * __jni_env, jclass, QtJambiNativeID __this_id)
-{
-    jobject result = nullptr;
-    QTJAMBI_TRY{
-        Permission* permission = QtJambiAPI::objectFromNativeId<Permission>(__this_id);
-        QtJambiAPI::checkPointer(__jni_env, permission);
-        result = QtJambiAPI::convertQVariantToJavaObject(__jni_env, permission->m_data);
-    }QTJAMBI_CATCH(const JavaException& exn){
-        exn.raiseInJava(__jni_env);
-    }QTJAMBI_TRY_END
-    return result;
-}
-
-extern "C" Q_DECL_EXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_core_QCoreApplication_requestPermissionSlot0)
-(JNIEnv * __jni_env, jclass, QtJambiNativeID this_id, QtJambiNativeID permission_id, QtJambiNativeID context_id, jobject slot)
+extern "C" Q_DECL_EXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_core_QCoreApplication_requestPermissionSlot2)
+(JNIEnv * __jni_env, jclass, QtJambiNativeID this_id, jobject permission_obj, QtJambiNativeID context_id, jobject slot)
 {
     QTJAMBI_TRY{
         QCoreApplication *__qt_this = QtJambiAPI::objectFromNativeId<QCoreApplication>(this_id);
         QtJambiAPI::checkPointer(__jni_env, __qt_this);
-        QPermission *permission = QtJambiAPI::objectFromNativeId<QPermission>(permission_id);
-        QtJambiAPI::checkPointer(__jni_env, permission);
+        Permission pm;
+        pm.data = qtjambi_cast<QVariant>(__jni_env, permission_obj);
         QObject *context = QtJambiAPI::objectFromNativeId<QObject>(context_id);
         JObjectWrapper _slot(__jni_env, slot);
-        auto functor = [_slot](const QPermission &){
+        auto functor = [_slot](const QPermission & perm){
             if(JniEnvironment env{200}){
                 QTJAMBI_TRY{
-                    Java::QtCore::QMetaObject$Slot0::invoke(env, _slot.object());
+                    const Permission &accessible_perm = reinterpret_cast<const Permission&>(perm);
+                    Java::QtCore::QMetaObject$Slot2::invoke(env, _slot.object(), qtjambi_cast<jobject>(env, accessible_perm.data), qtjambi_cast<jobject>(env, perm.status()));
                 }QTJAMBI_CATCH(const JavaException& exn){
                     exn.raiseInJava(env);
                 }QTJAMBI_TRY_END
             }
         };
         if(context)
-            __qt_this->requestPermission<decltype(functor)>(*permission, context, functor);
+            __qt_this->requestPermission<decltype(functor)>(*reinterpret_cast<QPermission*>(&pm), context, functor);
         else
-            __qt_this->requestPermission<decltype(functor)>(*permission, functor);
+            __qt_this->requestPermission<decltype(functor)>(*reinterpret_cast<QPermission*>(&pm), functor);
     }QTJAMBI_CATCH(const JavaException& exn){
         exn.raiseInJava(__jni_env);
     }QTJAMBI_TRY_END
 }
 
 extern "C" Q_DECL_EXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_core_QCoreApplication_requestPermissionSlot1)
-(JNIEnv * __jni_env, jclass, QtJambiNativeID this_id, QtJambiNativeID permission_id, QtJambiNativeID context_id, jobject slot)
+(JNIEnv * __jni_env, jclass, QtJambiNativeID this_id, jobject permission_obj, QtJambiNativeID context_id, jobject slot)
 {
     QTJAMBI_TRY{
         QCoreApplication *__qt_this = QtJambiAPI::objectFromNativeId<QCoreApplication>(this_id);
         QtJambiAPI::checkPointer(__jni_env, __qt_this);
-        QPermission *permission = QtJambiAPI::objectFromNativeId<QPermission>(permission_id);
-        QtJambiAPI::checkPointer(__jni_env, permission);
+        Permission pm;
+        pm.data = qtjambi_cast<QVariant>(__jni_env, permission_obj);
         QObject *context = QtJambiAPI::objectFromNativeId<QObject>(context_id);
         JObjectWrapper _slot(__jni_env, slot);
         auto functor = [_slot](const QPermission & perm){
             if(JniEnvironment env{200}){
                 QTJAMBI_TRY{
-                    Java::QtCore::QMetaObject$Slot0::invoke(env, _slot.object(), qtjambi_cast<jobject>(env, perm));
+                    Java::QtCore::QMetaObject$Slot1::invoke(env, _slot.object(), qtjambi_cast<jobject>(env, perm.status()));
                 }QTJAMBI_CATCH(const JavaException& exn){
                     exn.raiseInJava(env);
                 }QTJAMBI_TRY_END
             }
         };
         if(context)
-            __qt_this->requestPermission<decltype(functor)>(*permission, context, functor);
+            __qt_this->requestPermission<decltype(functor)>(*reinterpret_cast<QPermission*>(&pm), context, functor);
         else
-            __qt_this->requestPermission<decltype(functor)>(*permission, functor);
+            __qt_this->requestPermission<decltype(functor)>(*reinterpret_cast<QPermission*>(&pm), functor);
     }QTJAMBI_CATCH(const JavaException& exn){
         exn.raiseInJava(__jni_env);
     }QTJAMBI_TRY_END
diff --git a/src/cpp/QtJambiDataVisualization/hashes.h b/src/cpp/QtJambiDataVisualization/hashes.h
index 5f4bf536..dc079b08 100644
--- a/src/cpp/QtJambiDataVisualization/hashes.h
+++ b/src/cpp/QtJambiDataVisualization/hashes.h
@@ -89,6 +89,12 @@ struct RegistryHelper<QtDataVisualization::QScatterDataArray,false>{
 bool operator==(const QtDataVisualization::QBarDataItem& a, const QtDataVisualization::QBarDataItem& b);
 bool operator==(const QtDataVisualization::QScatterDataItem& a, const QtDataVisualization::QScatterDataItem& b);
 bool operator==(const QtDataVisualization::QSurfaceDataItem& a, const QtDataVisualization::QSurfaceDataItem& b);
+hash_type qHash(const QtDataVisualization::QBarDataItem &value, hash_type seed = 0);
+hash_type qHash(const QtDataVisualization::QScatterDataItem &value, hash_type seed = 0);
+hash_type qHash(const QtDataVisualization::QSurfaceDataItem &value, hash_type seed = 0);
+hash_type qHash(const QtDataVisualization::QBarDataRow &value, hash_type seed = 0);
+hash_type qHash(const QtDataVisualization::QSurfaceDataRow &value, hash_type seed = 0);
+hash_type qHash(const QtDataVisualization::QScatterDataArray &value, hash_type seed = 0);
 #else
 namespace QtDataVisualization{
 inline bool operator==(const QBarDataItem& a, const QBarDataItem& b){
@@ -102,46 +108,37 @@ inline bool operator==(const QScatterDataItem& a, const QScatterDataItem& b){
 inline bool operator==(const QSurfaceDataItem& a, const QSurfaceDataItem& b){
     return a.position()==b.position();
 }
-}
-#endif
-
-inline hash_type qHash(const QtDataVisualization::QBarDataItem &value, hash_type seed = 0){
-    hash_type hashCode = qHash(value.value(), seed);
-    hashCode = hashCode * 31 + qHash(value.rotation(), hashCode);
-    return hashCode;
+inline hash_type qHash(const QBarDataItem &value, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.value());
+    seed = hash(seed, value.rotation());
+    return seed;
 }
 
-inline hash_type qHash(const QtDataVisualization::QScatterDataItem &value, hash_type seed = 0){
-    hash_type hashCode = qHash(value.position(), seed);
-    hashCode = hashCode * 31 + qHash(value.rotation(), hashCode);
-    return hashCode;
+inline hash_type qHash(const QScatterDataItem &value, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.position());
+    seed = hash(seed, value.rotation());
+    return seed;
 }
 
-inline hash_type qHash(const QtDataVisualization::QSurfaceDataItem &value, hash_type seed = 0){
+inline hash_type qHash(const QSurfaceDataItem &value, hash_type seed = 0){
     return qHash(value.position(), seed);
 }
 
-namespace QtJambiPrivate {
-struct QHashCombine {
-    typedef uint result_type;
-    template <typename T>
-    Q_DECL_CONSTEXPR result_type operator()(uint seed, const T &t) const noexcept(noexcept(qHash(t)))
-    // combiner taken from N3876 / boost::hash_combine
-    { return seed ^ (qHash(t) + 0x9e3779b9 + (seed << 6) + (seed >> 2)) ; }
-};
+inline hash_type qHash(const QBarDataRow &value, hash_type seed = 0){
+    return qHashRange(value.begin(), value.end(), seed);
 }
 
-inline hash_type qHash(const QtDataVisualization::QBarDataRow &value, hash_type seed = 0){
-    return std::accumulate(value.begin(), value.end(), seed, QtJambiPrivate::QHashCombine());
+inline hash_type qHash(const QSurfaceDataRow &value, hash_type seed = 0){
+    return qHashRange(value.begin(), value.end(), seed);
 }
 
-inline hash_type qHash(const QtDataVisualization::QSurfaceDataRow &value, hash_type seed = 0){
-    return std::accumulate(value.begin(), value.end(), seed, QtJambiPrivate::QHashCombine());
+inline hash_type qHash(const QScatterDataArray &value, hash_type seed = 0){
+    return qHashRange(value.begin(), value.end(), seed);
 }
-
-inline hash_type qHash(const QtDataVisualization::QScatterDataArray &value, hash_type seed = 0){
-    return std::accumulate(value.begin(), value.end(), seed, QtJambiPrivate::QHashCombine());
 }
+#endif
 #else
 inline bool operator==(const QBarDataItem& a, const QBarDataItem& b){
     return qFuzzyCompare(a.value(), b.value()) && qFuzzyCompare(a.rotation(), b.rotation());
@@ -156,15 +153,11 @@ inline bool operator==(const QSurfaceDataItem& a, const QSurfaceDataItem& b){
 }
 
 inline hash_type qHash(const QBarDataItem &value, hash_type seed = 0){
-    hash_type hashCode = qHash(value.value(), seed);
-    hashCode = hashCode * 31 + qHash(value.rotation(), hashCode);
-    return hashCode;
+    return qHashMulti(seed, value.value(), value.rotation());
 }
 
 inline hash_type qHash(const QScatterDataItem &value, hash_type seed = 0){
-    hash_type hashCode = qHash(value.position(), seed);
-    hashCode = hashCode * 31 + qHash(value.rotation(), hashCode);
-    return hashCode;
+    return qHashMulti(seed, value.position(), value.rotation());
 }
 
 inline hash_type qHash(const QSurfaceDataItem &value, hash_type seed = 0){
diff --git a/src/cpp/QtJambiDesigner/QtJambiDesigner.pro b/src/cpp/QtJambiDesigner/QtJambiDesigner.pro
index fcece164..c50a7508 100644
--- a/src/cpp/QtJambiDesigner/QtJambiDesigner.pro
+++ b/src/cpp/QtJambiDesigner/QtJambiDesigner.pro
@@ -2,5 +2,7 @@ include(../QtJambi/configure.pri)
 
 QT += gui widgets uiplugin designer
 
+HEADERS += utils_p.h
+
 SOURCES += \
     impl.cpp
diff --git a/src/cpp/QtJambiDesigner/impl.cpp b/src/cpp/QtJambiDesigner/impl.cpp
index 3c8d7ff7..29e7df8e 100644
--- a/src/cpp/QtJambiDesigner/impl.cpp
+++ b/src/cpp/QtJambiDesigner/impl.cpp
@@ -30,6 +30,14 @@
 ****************************************************************************/
 
 #include <QtJambi/MetaInfo>
+#include <QtCore/QMutex>
+#include "utils_p.h"
+
+namespace Java{
+    namespace QtUIC{
+        QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/uic/ui4,DomUI,)
+    }
+}
 
 extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_designer_util_QtJambi_1LibraryUtilities_internalAccess)(JNIEnv *env, jclass cls){
     jobject result{0};
diff --git a/src/cpp/QtJambiDesigner/utils_p.h b/src/cpp/QtJambiDesigner/utils_p.h
new file mode 100644
index 00000000..d99d2455
--- /dev/null
+++ b/src/cpp/QtJambiDesigner/utils_p.h
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009-2023 Dr. Peter Droste, Omix Visualization GmbH & Co. KG. All rights reserved.
+**
+** This file is part of Qt Jambi.
+**
+** $BEGIN_LICENSE$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** $END_LICENSE$
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef UTILS_P_H
+#define UTILS_P_H
+
+#include <QtJambi/QtJambiAPI>
+#include <QtJambi/JavaAPI>
+
+class DomUI;
+
+namespace Java{
+    namespace QtUIC{
+        QTJAMBI_REPOSITORY_DECLARE_CLASS(DomUI,)
+    }
+}
+
+#endif // UTILS_P_H
diff --git a/src/cpp/QtJambiGenerator/abstractgenerator.cpp b/src/cpp/QtJambiGenerator/abstractgenerator.cpp
index 9aa1463d..6e28dcdb 100644
--- a/src/cpp/QtJambiGenerator/abstractgenerator.cpp
+++ b/src/cpp/QtJambiGenerator/abstractgenerator.cpp
@@ -164,11 +164,202 @@ void AbstractGenerator::verifyDirectoryFor(const QFile &file) {
     }
 }
 
+bool AbstractGenerator::isCharSequenceSubstitute(const MetaType* type){
+    return type->isQString()
+             && !type->typeEntry()->isQString()
+             && (type->isConstant() || type->actualIndirections()==0);
+}
+
+QString AbstractGenerator::annotationFreeTypeName(QString typeName){
+    auto index = typeName.indexOf('@');
+    if(index>=0){
+        QString result = typeName.left(index).trimmed();
+        typeName = typeName.mid(index);
+        while(typeName.startsWith('@')){
+            QChar lastChar = typeName[0];
+            QString annotation = lastChar;
+            bool isInIdentifier = false;
+            bool isInParentheses = false;
+            bool isInBraces = false;
+            bool isInString = false;
+            bool isInChar = false;
+            int parenteses = 0;
+            int braces = 0;
+            for(auto l = typeName.length(), i=decltype(l)(1); i<l; ++i){
+                QChar currentChar = typeName[i];
+                if(isInBraces){
+                    if(isInString){
+                        if(currentChar==QLatin1Char('"') && lastChar!=QLatin1Char('\\')){
+                            isInString = false;
+                        }
+                    }else if(isInChar){
+                        if(currentChar==QLatin1Char('\'') && lastChar!=QLatin1Char('\\')){
+                            isInChar = false;
+                        }
+                    }else{
+                        if(currentChar==QLatin1Char('>')){
+                            --braces;
+                            if(braces==0){
+                                result += currentChar;
+                                lastChar = currentChar;
+                                ++i;
+                                // take identifier
+                                while(i<l){
+                                    currentChar = typeName[i];
+                                    if(!currentChar.isSpace()){
+                                        break;
+                                    }
+                                    ++i;
+                                }
+                                typeName = typeName.mid(i);
+                                break;
+                            }
+                        }else if(currentChar==QLatin1Char('<')){
+                            ++braces;
+                        }else if(currentChar==QLatin1Char('"')){
+                            isInString = true;
+                        }else if(currentChar==QLatin1Char('\'')){
+                            isInChar = true;
+                        }
+                    }
+                }else if(isInParentheses){
+                    if(isInString){
+                        if(currentChar==QLatin1Char('"') && lastChar!=QLatin1Char('\\')){
+                            isInString = false;
+                        }
+                    }else if(isInChar){
+                        if(currentChar==QLatin1Char('\'') && lastChar!=QLatin1Char('\\')){
+                            isInChar = false;
+                        }
+                    }else{
+                        if(currentChar==QLatin1Char(')')){
+                            --parenteses;
+                            if(parenteses==0){
+                                isInParentheses = false;
+                                annotation += currentChar;
+                                lastChar = currentChar;
+                                ++i;
+                                // take identifier
+                                while(i<l){
+                                    currentChar = typeName[i];
+                                    if(isInIdentifier){
+                                        if(currentChar.isLetterOrNumber() || currentChar==QLatin1Char('_') || currentChar==QLatin1Char('$')){
+                                            result += currentChar;
+                                        }else{
+                                            break;
+                                        }
+                                    }else{
+                                        if(!currentChar.isSpace()){
+                                            if(lastChar.isLetterOrNumber() || lastChar==QLatin1Char('_') || lastChar==QLatin1Char('$')){
+                                                isInIdentifier = true;
+                                                result += currentChar;
+                                            }
+                                        }
+                                    }
+                                    ++i;
+                                }
+                                if(i<l && typeName[i]==QLatin1Char('<')){
+                                    isInBraces = true;
+                                    result += QLatin1Char('<');
+                                    ++braces;
+                                    continue;
+                                }
+                                typeName = typeName.mid(i);
+                                break;
+                            }
+                        }else if(currentChar==QLatin1Char('(')){
+                            ++parenteses;
+                        }else if(currentChar==QLatin1Char('"')){
+                            isInString = true;
+                        }else if(currentChar==QLatin1Char('\'')){
+                            isInChar = true;
+                        }
+                    }
+                }else {
+                    if(currentChar.isSpace()){
+                        if(isInIdentifier)
+                            isInIdentifier = false;
+                        continue;
+                    }
+                    if(isInIdentifier){
+                        if(currentChar.isLetterOrNumber() || currentChar==QLatin1Char('_') || currentChar==QLatin1Char('$')){
+                            // ok so far
+                        }else if(currentChar==QLatin1Char('.')){
+                            isInIdentifier = false;
+                            if(i+2<l && typeName[i+1]==QLatin1Char('.') && typeName[i+2]==QLatin1Char('.')){
+                                typeName = typeName.mid(i);
+                                break;
+                            }
+                        }else if(currentChar==QLatin1Char('(')){
+                            isInIdentifier = false;
+                            isInParentheses = true;
+                            ++parenteses;
+                        }else if(currentChar==QLatin1Char('@') || currentChar==QLatin1Char('[')){
+                            typeName = typeName.mid(i);
+                            break;
+                        }
+                    }else{
+                        if(lastChar.isLetterOrNumber() || lastChar==QLatin1Char('_') || lastChar==QLatin1Char('$')){
+                            if(currentChar.isLetter() || currentChar==QLatin1Char('_') || currentChar==QLatin1Char('$')){
+                                // take identifier
+                                while(i<l){
+                                    currentChar = typeName[i];
+                                    if(isInIdentifier){
+                                        if(currentChar.isLetterOrNumber() || currentChar==QLatin1Char('_') || currentChar==QLatin1Char('$')){
+                                            result += currentChar;
+                                        }else{
+                                            break;
+                                        }
+                                    }else{
+                                        if(lastChar.isLetterOrNumber() || lastChar==QLatin1Char('_') || lastChar==QLatin1Char('$')){
+                                            isInIdentifier = true;
+                                            result += currentChar;
+                                        }
+                                    }
+                                    ++i;
+                                }
+                                while(i<l){
+                                    currentChar = typeName[i];
+                                    if(!currentChar.isSpace())
+                                        break;
+                                    ++i;
+                                }
+                                if(i<l && typeName[i]==QLatin1Char('<')){
+                                    isInBraces = true;
+                                    result += QLatin1Char('<');
+                                    ++braces;
+                                    continue;
+                                }
+                            }
+                            typeName = typeName.mid(i);
+                            break;
+                        }
+                        if(currentChar.isLetter() || currentChar==QLatin1Char('_') || currentChar==QLatin1Char('$')){
+                            isInIdentifier = true;
+                        }else if(currentChar==QLatin1Char('(')){
+                            isInParentheses = true;
+                            ++parenteses;
+                        }
+                    }
+                }
+                if(isInBraces){
+                    result += currentChar;
+                }else{
+                    annotation += currentChar;
+                }
+                lastChar = currentChar;
+            }
+        }
+        return result + typeName;
+    }
+    return typeName;
+}
+
 bool AbstractGenerator::hasDefaultConstructor(const MetaType *type) {
     QString full_name = type->typeEntry()->qualifiedTargetLangName();
     QString class_name = type->typeEntry()->targetLangName();
 
-    for(const MetaClass *java_class : m_classes) {
+    for(const MetaClass *java_class : qAsConst(m_classes)) {
         if (java_class->typeEntry()->qualifiedTargetLangName() == full_name) {
             MetaFunctionList functions = java_class->functions();
             for(const MetaFunction *function : functions) {
diff --git a/src/cpp/QtJambiGenerator/abstractgenerator.h b/src/cpp/QtJambiGenerator/abstractgenerator.h
index 0c33d825..34a95b4f 100644
--- a/src/cpp/QtJambiGenerator/abstractgenerator.h
+++ b/src/cpp/QtJambiGenerator/abstractgenerator.h
@@ -100,6 +100,8 @@ class AbstractGenerator : public QObject {
             NoEnumAsInts                    = 0x2000000000,
             NoSuppressExports               = 0x4000000000,
             JNIProxyFunction                = 0x8000000000,
+            NoNullness                      = 0x10000000000,
+            StrictNonNull                   = 0x20000000000,
 
             ForceValueType                  = (ExcludeReference | ExcludeConst) & ~ForceConstReference
         };
@@ -142,6 +144,8 @@ class AbstractGenerator : public QObject {
     protected:
         void writeInclude(QTextStream &s, const TS::Include &inc, QSet<QString> &dedupe);
         void verifyDirectoryFor(const QFile &file);
+        static QString annotationFreeTypeName(QString typeName);
+        static bool isCharSequenceSubstitute(const MetaType* type);
 
         MetaClassList m_classes;
         int m_num_generated;
diff --git a/src/cpp/QtJambiGenerator/asttoxml.cpp b/src/cpp/QtJambiGenerator/asttoxml.cpp
index a1a394a4..452f44ce 100644
--- a/src/cpp/QtJambiGenerator/asttoxml.cpp
+++ b/src/cpp/QtJambiGenerator/asttoxml.cpp
@@ -56,8 +56,7 @@ void astToXML(const QString& name, FileModelItem dom) {
 
     s.writeStartElement("code");
 
-    QMap<QString, NamespaceModelItem> namespaceMap = dom->namespaceMap();
-    for(const NamespaceModelItem& item : namespaceMap.values()) {
+    for(const NamespaceModelItem& item : dom->namespaces()) {
         writeOutNamespace(s, item);
     }
 
@@ -71,8 +70,7 @@ void writeOutNamespace(QXmlStreamWriter &s, const NamespaceModelItem &item) {
     s.writeStartElement("namespace");
     s.writeAttribute("name", item->name());
 
-    QMap<QString, NamespaceModelItem> namespaceMap = item->namespaceMap();
-    for(const NamespaceModelItem& item : namespaceMap.values()) {
+    for(const NamespaceModelItem& item : item->namespaces()) {
         writeOutNamespace(s, item);
     }
 
@@ -80,8 +78,7 @@ void writeOutNamespace(QXmlStreamWriter &s, const NamespaceModelItem &item) {
         writeOutClass(s, item);
     }
 
-    QMap<QString, EnumModelItem> enumMap = item->enumMap();
-    for(const EnumModelItem& item : enumMap.values()) {
+    for(const EnumModelItem& item : item->enums()) {
         writeOutEnum(s, item);
     }
 
@@ -286,23 +283,21 @@ void writeOutClass(QXmlStreamWriter &s, const ClassModelItem &item) {
     s.writeStartElement("class");
     s.writeAttribute("name", qualified_name);
 
-    QList<QPair<QString,bool>> bases = item.constData()->baseClasses();
+    QList<QPair<TypeInfo,bool>> bases = item.constData()->baseClasses();
     s.writeStartElement("inherits");
-    for(const QPair<QString,bool> &c : bases) {
+    for(const QPair<TypeInfo,bool> &c : bases) {
         s.writeStartElement("class");
-        s.writeAttribute("name", c.first);
+        s.writeAttribute("name", c.first.toString());
         s.writeAttribute("access", c.second ? "public" : "protected");
         s.writeEndElement();
     }
     s.writeEndElement();
 
-    QMap<QString, EnumModelItem> enumMap = item->enumMap();
-    for(const EnumModelItem& item : enumMap.values()) {
+    for(const EnumModelItem& item : item->enums()) {
         writeOutEnum(s, item);
     }
 
-    QMultiHash<QString, FunctionModelItem> functionMap = item->functionMap();
-    for(const FunctionModelItem& item : functionMap.values()) {
+    for(const FunctionModelItem& item : item->functions()) {
         writeOutFunction(s, qualified_name, item);
     }
 
diff --git a/src/cpp/QtJambiGenerator/cppgenerator.cpp b/src/cpp/QtJambiGenerator/cppgenerator.cpp
index 1de08bca..0a09466f 100644
--- a/src/cpp/QtJambiGenerator/cppgenerator.cpp
+++ b/src/cpp/QtJambiGenerator/cppgenerator.cpp
@@ -79,18 +79,15 @@ QString CppGenerator::translateType(const MetaType *java_type, Option option) {
 
     if (java_type->hasNativeId() && (option & UseNativeIds)){
         return "QtJambiNativeID";
+    }else if (java_type->isCharString()){
+        return "jstring";
     }else if (java_type->isPrimitive()
-            || java_type->isTargetLangChar()
-            || java_type->isTargetLangString()
-            || java_type->isTargetLangStringRef()
-            || java_type->isVariant()
+            || java_type->isQChar()
+            || java_type->isQString()
+            || java_type->isQStringRef()
+            || java_type->isQVariant()
             || java_type->isJObjectWrapper()
-            || java_type->isJMapWrapper()
-            || java_type->isJCollectionWrapper()
-            || java_type->isJEnumWrapper()
-            || java_type->isJIteratorWrapper()
-            || java_type->isJQFlagsWrapper()
-            || java_type->isTargetLangChar()) {
+            || java_type->isQChar()) {
         return java_type->typeEntry()->jniName();
     } else if (java_type->isArray()){
         if(java_type->typeEntry()->isArray())
@@ -140,13 +137,14 @@ QString CppGenerator::translateType(const MetaType *java_type, Option option) {
         default: break;
         }
         return "jint";
-    } else if (java_type->isTargetLangString()
-               || java_type->isTargetLangStringRef()
-               || java_type->isTargetLangStringView()
-               || java_type->isTargetLangAnyStringView()
-               || java_type->isTargetLangUtf8StringView()
-               || java_type->isTargetLangLatin1String()
-               || java_type->isTargetLangLatin1StringView()
+    } else if (java_type->isQString()
+               || java_type->isCharString()
+               || java_type->isQStringRef()
+               || java_type->isQStringView()
+               || java_type->isQAnyStringView()
+               || java_type->isQUtf8StringView()
+               || java_type->isQLatin1String()
+               || java_type->isQLatin1StringView()
                || (java_type->typeEntry()->qualifiedTargetLangName()=="java.lang.String" && java_type->indirections().isEmpty())){
         return "jstring";
     } else {
@@ -155,7 +153,7 @@ QString CppGenerator::translateType(const MetaType *java_type, Option option) {
 }
 
 void writeTypeInfo(QTextStream &s, const MetaType *type){
-    CppGenerator::writeTypeInfo(s, type, CppGenerator::NoOption);
+    CppGenerator::writeTypeInfo(s, type, CppGenerator::SkipName);
 }
 
 void CppGenerator::writeTypeInfo(QTextStream &s, const MetaType *type, Option options) {
@@ -243,8 +241,6 @@ void CppGenerator::writeTypeInfo(QTextStream &s, const MetaType *type, Option op
             size = static_cast<const EnumTypeEntry*>(te)->size();
         }
         s << "qint" << size;
-    } else if (te->isFlags()) {
-        s << static_cast<const FlagsTypeEntry *>(te)->originalName();
     } else if (type->instantiations().size() > 0
                && (!type->isContainer()
                || (
@@ -273,7 +269,11 @@ void CppGenerator::writeTypeInfo(QTextStream &s, const MetaType *type, Option op
             s << ' ';
         s << '>';
     } else {
-        s << fixCppTypeName(te->qualifiedCppName());
+        s << te->qualifiedCppName();
+    }
+
+    if(type->typeEntry()->isTemplateArgument() && reinterpret_cast<const TemplateArgumentEntry *>(type->typeEntry())->isVariadic()){
+        s << "...";
     }
 
     for(int i=0; i<type->indirections().size(); i++){
@@ -393,7 +393,7 @@ void CppGenerator::writeFunctionArguments(QTextStream &s,
         if(option & JNIProxyFunction){
             QString typeReplaced = java_function->typeReplaced(arg->argumentIndex() + 1);
             if(!typeReplaced.isEmpty())
-                s << jniName(typeReplaced);
+                s << jniName(annotationFreeTypeName(typeReplaced));
             else{
                 if(java_function->argumentTypeBuffer(arg->argumentIndex() + 1)){
                     s << "jobject";
@@ -416,6 +416,8 @@ void CppGenerator::writeFunctionArguments(QTextStream &s,
                         }else if(arg->type()->typeEntry()->targetLangName()=="double"){
                             s << "jdoubleArray";
                         }
+                    }else if(arg->type()->typeEntry()->isQChar()){
+                        s << "jcharArray";
                     }else{
                         s << "jobjectArray";
                     }
@@ -501,7 +503,7 @@ void CppGenerator::writeFunctionSignature(QTextStream &s,
         if((option & JNIProxyFunction)){
             QString typeReplaced = java_function->typeReplaced(0);
             if(!typeReplaced.isEmpty())
-                s << jniName(typeReplaced) << " ";
+                s << jniName(typeReplaced.replace("@Nullable ", "").replace("@NonNull ", "")) << " ";
             else if (function_type) {
                 s << translateType(function_type, Option(Option(option & ~JNIProxyFunction) & ~UseNativeIds));
                 s << " ";
@@ -520,7 +522,11 @@ void CppGenerator::writeFunctionSignature(QTextStream &s,
 
     if (implementor) {
         if((option & JNIProxyFunction)){
-            s << implementor->name() + "_access" << "::";
+            if(implementor->typeEntry()->designatedInterface()){
+                s << implementor->extractInterface()->name() + "_access" << "::";
+            }else{
+                s << implementor->name() + "_access" << "::";
+            }
         }else{
             if (classname_prefix.isEmpty())
                 s << shellClassName(implementor) << "::";
@@ -720,7 +726,7 @@ QString CppGenerator::jni_signature(const MetaFunctional *function, JNISignature
                 if (modified_type.isEmpty())
                     returned += jni_signature(argument->type(), format);
                 else if(jniType.isEmpty())
-                    returned += jni_signature(modified_type, format);
+                    returned += jni_signature(modified_type.replace("@Nullable ", "").replace("@NonNull ", ""), format);
                 else
                     returned += jni_signature(jniType, format);
             }
@@ -734,7 +740,7 @@ QString CppGenerator::jni_signature(const MetaFunctional *function, JNISignature
     if (modified_type.isEmpty())
         returned += jni_signature(function->type(), JNISignatureFormat(format | ReturnType));
     else if(jniType.isEmpty())
-        returned += jni_signature(modified_type, JNISignatureFormat(format | ReturnType));
+        returned += jni_signature(annotationFreeTypeName(modified_type), JNISignatureFormat(format | ReturnType));
     else
         returned += jni_signature(jniType, JNISignatureFormat(format | ReturnType));
     return returned;
@@ -758,9 +764,9 @@ QString CppGenerator::jni_signature(const MetaFunction *function, JNISignatureFo
             QString t = parameterTypesByName[mod.modified_type];
             if(t.isEmpty())
                 t = "java.lang.Object";
-            returned += jni_signature(t, format);
+            returned += jni_signature(annotationFreeTypeName(t), format);
         }else if(mod.modified_jni_type.isEmpty())
-            returned += jni_signature(mod.modified_type, format);
+            returned += jni_signature(annotationFreeTypeName(mod.modified_type), format);
         else
             returned += jni_signature(mod.modified_jni_type, format);
         ++argumentCounter;
@@ -821,9 +827,9 @@ QString CppGenerator::jni_signature(const MetaFunction *function, JNISignatureFo
                         QString t = parameterTypesByName[modified_type];
                         if(t.isEmpty())
                             t = "java.lang.Object";
-                        returned += jni_signature(t, format);
+                        returned += jni_signature(annotationFreeTypeName(t), format);
                     }else if(jniType.isEmpty())
-                        returned += jni_signature(modified_type, format);
+                        returned += jni_signature(annotationFreeTypeName(modified_type), format);
                     else
                         returned += jni_signature(jniType, format);
                 }
@@ -836,9 +842,9 @@ QString CppGenerator::jni_signature(const MetaFunction *function, JNISignatureFo
                 QString t = parameterTypesByName[mod.modified_type];
                 if(t.isEmpty())
                     t = "java.lang.Object";
-                returned += jni_signature(t, format);
+                returned += jni_signature(annotationFreeTypeName(t), format);
             }else if(mod.modified_jni_type.isEmpty())
-                returned += jni_signature(mod.modified_type, format);
+                returned += jni_signature(annotationFreeTypeName(mod.modified_type), format);
             else
                 returned += jni_signature(mod.modified_jni_type, format);
             ++argumentCounter;
@@ -850,9 +856,9 @@ QString CppGenerator::jni_signature(const MetaFunction *function, JNISignatureFo
             QString t = parameterTypesByName[mod.modified_type];
             if(t.isEmpty())
                 t = "java.lang.Object";
-            returned += jni_signature(t, format);
+            returned += jni_signature(annotationFreeTypeName(t), format);
         }else if(mod.modified_jni_type.isEmpty())
-            returned += jni_signature(mod.modified_type, format);
+            returned += jni_signature(annotationFreeTypeName(mod.modified_type), format);
         else
             returned += jni_signature(mod.modified_jni_type, format);
     }
@@ -867,13 +873,14 @@ QString CppGenerator::jni_signature(const MetaFunction *function, JNISignatureFo
         else
             returned += jni_signature(function->type(), JNISignatureFormat(format | ReturnType | NoQContainers));
     }else{
+        modified_type = modified_type.replace("@Nullable ", "").replace("@NonNull ", "");
         if(parameterTypesByName.contains(modified_type)){
             QString t = parameterTypesByName[modified_type];
             if(t.isEmpty())
                 t = "java.lang.Object";
-            returned += jni_signature(t, JNISignatureFormat(format | ReturnType));
+            returned += jni_signature(annotationFreeTypeName(t), JNISignatureFormat(format | ReturnType));
         }else if(jniType.isEmpty())
-            returned += jni_signature(modified_type, JNISignatureFormat(format | ReturnType));
+            returned += jni_signature(annotationFreeTypeName(modified_type), JNISignatureFormat(format | ReturnType));
         else
             returned += jni_signature(jniType, JNISignatureFormat(format | ReturnType));
     }
@@ -886,10 +893,12 @@ QString CppGenerator::jni_signature(const QString &_full_name, JNISignatureForma
 
     if (full_name.endsWith("...")) {
         full_name.chop(3);
+        full_name = full_name.trimmed();
         signature = "[";
     }
     while(full_name.endsWith("[]")) {
         full_name.chop(2);
+        full_name = full_name.trimmed();
         signature = "[";
     }
 
@@ -898,17 +907,14 @@ QString CppGenerator::jni_signature(const QString &_full_name, JNISignatureForma
         full_name.remove(start, end - start + 1);
     }
 
-    static QMap<QString, QString> table;
-    if (table.isEmpty()) {
-        table["boolean"] = "Z";
-        table["byte"] = "B";
-        table["char"] = "C";
-        table["short"] = "S";
-        table["int"] = "I";
-        table["long"] = "J";
-        table["float"] = "F";
-        table["double"] = "D";
-    }
+    static QMap<QString, QString> table{        {"boolean", "Z"},
+                                                {"byte", "B"},
+                                                {"char", "C"},
+                                                {"short", "S"},
+                                                {"int", "I"},
+                                                {"long", "J"},
+                                                {"float", "F"},
+                                                {"double", "D"}};
 
     if ((format & Underscores) == Underscores)
         signature.replace("[", "_3");
@@ -1029,6 +1035,11 @@ QString CppGenerator::jni_signature(const MetaType *java_type, JNISignatureForma
         return jni_signature(instantiation, format);
     } else if(java_type->typeEntry()->type()==TypeEntry::InstantiatedTemplateArgumentType){
         return jni_signature(reinterpret_cast<const InstantiatedTemplateArgumentEntry*>(java_type->typeEntry())->javaInstantiationBaseType(), format);
+    } else if (java_type->isCharString()) {
+        if ((format & Underscores) == Underscores)
+            return "Ljava_lang_String_2";
+        else
+            return "Ljava/lang/String;";
     } else if (java_type->isNativePointer()) {
         if ((format & Underscores) == Underscores)
             return "Lio_qt_QNativePointer_2";
@@ -1108,18 +1119,69 @@ QStringList CppGenerator::getFunctionPPConditions(const MetaFunction *java_funct
     return pps;
 }
 
-/*!
- * The Visual Studio 2002 compiler doesn't support these symbols,
- * which our typedefs unforntuatly expand to.
- */
-QString CppGenerator::fixCppTypeName(const QString &name) {
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    QMetaType metaType(QMetaType::type(name.toLatin1().constData()));
-#else
-    QMetaType metaType = QMetaType::fromName(name.toLatin1().constData());
-#endif
-    if(metaType.isValid() && metaType.id()<=QMetaType::HighestInternalId){
-        return metaType.name();
+QString CppGenerator::resolveOutputDirectory() const { return cppOutputDirectory(); }
+
+QString CppGenerator::cppOutputDirectory() const {
+    if (!m_cpp_out_dir.isNull())
+        return m_cpp_out_dir;
+    return outputDirectory() + QLatin1String("/cpp");
+}
+void CppGenerator::setCppOutputDirectory(const QString &cppOutDir) { m_cpp_out_dir = cppOutDir; }
+
+QString CppGenerator::subDirectoryForFunctional(const MetaFunctional * cls) const
+{ return subDirectoryForPackage(cls->targetTypeSystem()); }
+
+QString CppGenerator::subDirectoryForClass(const MetaClass *cls) const {
+    return subDirectoryForPackage(cls->targetTypeSystem());
+}
+
+bool CppGenerator::shouldGenerateCpp(const MetaClass *java_class){
+    return (!java_class->isNamespace() || java_class->functionsInTargetLang().size() > 0)
+           && !java_class->isInterface()
+           && !java_class->typeEntry()->isQVariant()
+           && !java_class->typeEntry()->isIterator()
+           && (java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp)
+           && !java_class->isFake();
+}
+
+bool CppGenerator::shouldGenerate(const MetaClass *java_class) const {
+    return shouldGenerateCpp(java_class);
+}
+
+bool CppGenerator::shouldGenerate(const MetaFunctional *functional) const {
+    if(functional->enclosingClass()){
+        if(!(!functional->enclosingClass()->isFake()
+             && functional->enclosingClass()->typeEntry()
+             && (functional->enclosingClass()->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp))){
+            return false;
+        }
+        return functional->typeEntry()->getUsing().isEmpty() && (functional->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp);
+    }
+    return (functional->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp);
+}
+
+QString CppGenerator::shellClassName(const MetaClass *java_class) {
+    if(java_class->typeEntry()->designatedInterface() && java_class->enclosingClass()){
+        return java_class->generateShellClass()
+               ? java_class->enclosingClass()->name() + "_shell"
+               : java_class->enclosingClass()->qualifiedCppName();
+    }
+    return java_class->generateShellClass()
+           ? java_class->name() + "_shell"
+           : java_class->qualifiedCppName();
+}
+
+QString CppGenerator::shellClassName(const MetaFunctional *java_class) {
+    QString _shellClassName;
+    if(java_class->enclosingClass() && !java_class->enclosingClass()->isFake()){
+        _shellClassName = shellClassName(java_class->enclosingClass());
+        if(_shellClassName.endsWith("_shell")){
+            _shellClassName = _shellClassName.chopped(6);
+        }
+        _shellClassName += "$";
     }
-    return name;
+    return _shellClassName + java_class->name() + "_shell";
+    //return java_class->enclosingClass()
+    //        ? shellClassName(java_class->enclosingClass()) + "$" + java_class->name()
+    //                                    : java_class->name() + "_shell";
 }
diff --git a/src/cpp/QtJambiGenerator/cppgenerator.h b/src/cpp/QtJambiGenerator/cppgenerator.h
index b43268af..6f87b248 100644
--- a/src/cpp/QtJambiGenerator/cppgenerator.h
+++ b/src/cpp/QtJambiGenerator/cppgenerator.h
@@ -46,23 +46,14 @@
 class CppGenerator : public AbstractGenerator {
 public:
     CppGenerator(PriGenerator *_priGenerator);
-    QString resolveOutputDirectory() const override { return cppOutputDirectory(); }
+    QString resolveOutputDirectory() const override;
 
-    QString cppOutputDirectory() const {
-        if (!m_cpp_out_dir.isNull())
-            return m_cpp_out_dir;
-        return outputDirectory() + QLatin1String("/cpp");
-    }
-    void setCppOutputDirectory(const QString &cppOutDir) { m_cpp_out_dir = cppOutDir; }
+    QString cppOutputDirectory() const;
+    void setCppOutputDirectory(const QString &cppOutDir);
 
     QString subDirectoryForPackage(const QString &package) const;
-    virtual QString subDirectoryForFunctional(const MetaFunctional * cls) const override
-    { return subDirectoryForPackage(cls->targetTypeSystem()); }
-
-    virtual QString subDirectoryForClass(const MetaClass *cls) const override {
-        return subDirectoryForPackage(cls->targetTypeSystem());
-    }
-
+    QString subDirectoryForFunctional(const MetaFunctional * cls) const override;
+    QString subDirectoryForClass(const MetaClass *cls) const override;
     static QString fixNormalizedSignatureForQt(const QString &signature);
     static void writeTypeInfo(QTextStream &s, const MetaType *type, Option option = NoOption);
     void writeFunctionSignature(QTextStream &s, const MetaFunction *java_function,
@@ -77,52 +68,15 @@ class CppGenerator : public AbstractGenerator {
                                        Option option = NoOption,
                                        int numArguments = -1) const;
 
-    bool shouldGenerate(const MetaClass *java_class) const override {
-        return (!java_class->isNamespace() || java_class->functionsInTargetLang().size() > 0)
-               && !java_class->isInterface()
-               && !java_class->typeEntry()->isVariant()
-               && !java_class->typeEntry()->isIterator()
-               && (java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp)
-               && !java_class->isFake();
-    }
-
-    bool shouldGenerate(const MetaFunctional *functional) const override {
-        if(functional->enclosingClass()){
-            if(!(!functional->enclosingClass()->isFake()
-                 && functional->enclosingClass()->typeEntry()
-                 && (functional->enclosingClass()->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp))){
-                return false;
-            }
-        }
-        return functional->typeEntry()->getUsing().isEmpty() && (functional->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp);
-    }
-
-    static QString shellClassName(const MetaClass *java_class) {
-        if(java_class->typeEntry()->designatedInterface() && java_class->enclosingClass()){
-            return java_class->generateShellClass()
-                   ? java_class->enclosingClass()->name() + "_shell"
-                   : java_class->enclosingClass()->qualifiedCppName();
-        }
-        return java_class->generateShellClass()
-               ? java_class->name() + "_shell"
-               : java_class->qualifiedCppName();
-    }
-
-    static QString shellClassName(const MetaFunctional *java_class) {
-        QString _shellClassName;
-        if(java_class->enclosingClass() && !java_class->enclosingClass()->isFake()){
-            _shellClassName = shellClassName(java_class->enclosingClass());
-            if(_shellClassName.endsWith("_shell")){
-                _shellClassName = _shellClassName.chopped(6);
-            }
-            _shellClassName += "$";
-        }
-        return _shellClassName + java_class->name() + "_shell";
-        //return java_class->enclosingClass()
-        //        ? shellClassName(java_class->enclosingClass()) + "$" + java_class->name()
-        //                                    : java_class->name() + "_shell";
-    }
+    bool shouldGenerate(const MetaClass *java_class) const override;
+
+    static bool shouldGenerateCpp(const MetaClass *java_class);
+
+    bool shouldGenerate(const MetaFunctional *functional) const override;
+
+    static QString shellClassName(const MetaClass *java_class);
 
+    static QString shellClassName(const MetaFunctional *java_class);
     static QStringList getFunctionPPConditions(const MetaFunction *java_function);
 
     static QString translateType(const MetaType *java_type, Option option = NoOption);
@@ -141,7 +95,6 @@ class CppGenerator : public AbstractGenerator {
     static QString jni_signature(const MetaFunction *function, JNISignatureFormat format);
     static QString jni_signature(const MetaFunctional *function, JNISignatureFormat format);
     static QString jni_signature(const MetaType *java_type, JNISignatureFormat format);
-    static QString fixCppTypeName(const QString &name);
     inline TS::TypeDatabase* database() const {return priGenerator->database();}
 protected:
     QByteArray jniName(const QString &name) const;
diff --git a/src/cpp/QtJambiGenerator/cppheadergenerator.cpp b/src/cpp/QtJambiGenerator/cppheadergenerator.cpp
index ef2f5ad0..7663fac5 100644
--- a/src/cpp/QtJambiGenerator/cppheadergenerator.cpp
+++ b/src/cpp/QtJambiGenerator/cppheadergenerator.cpp
@@ -36,7 +36,6 @@
 ****************************************************************************/
 
 #include "cppheadergenerator.h"
-#include "typesystem/typedatabase.h"
 
 #include <QtCore/QDir>
 
@@ -44,6 +43,10 @@
 
 static Indentor INDENT;
 
+CppHeaderGenerator::CppHeaderGenerator(PriGenerator *pri)
+    : CppGenerator(pri){
+}
+
 QString CppHeaderGenerator::fileNameForClass(const MetaClass *java_class) const {
     if(java_class->typeEntry()->designatedInterface()){
         return fileNameForClass(java_class->enclosingClass());
@@ -165,6 +168,9 @@ void CppHeaderGenerator::write(QTextStream &s, const MetaFunctional *java_class,
     writeInclude(s, java_class->typeEntry()->include(), included);
     writeInclude(s, Include(Include::IncludePath, "QtJambi/QtJambiAPI"), included);
     writeInclude(s, Include(Include::IncludePath, "QtJambi/FunctionalBase"), included);
+    if(java_class->isFunctionPointer() && !java_class->typeEntry()->getUsing().isEmpty()){
+        writeInclude(s, Include(Include::IncludePath, "QtJambi/FunctionPointer"), included);
+    }
     IncludeList list = java_class->typeEntry()->extraIncludes();
     std::sort(list.begin(), list.end());
     for(const Include &inc : list) {
@@ -264,12 +270,22 @@ void CppHeaderGenerator::write(QTextStream &s, const MetaClass *java_class, int)
         if(java_class->typeEntry()->designatedInterface()){
             includes << java_class->typeEntry()->designatedInterface()->extraIncludes();
         }
-        for(const Include& icl : includes){
+        for(const Include& icl : qAsConst(includes)){
             if(icl.suppressed)
                 writeInclude(s, icl, included);
         }
     }
     writeInclude(s, Include(Include::IncludePath, "QtCore/QtGlobal"), included);
+
+    QList<const MetaFunction *> returnScopeRequired;
+    for(const MetaFunction *function : java_class->functionsInShellClass()) {
+        if((!function->isFinalInCpp() || function->isVirtualSlot()) && !function->wasPrivate() && function->needsReturnScope())
+            returnScopeRequired << function;
+    }
+
+    if(!returnScopeRequired.isEmpty())
+        writeInclude(s, Include(Include::IncludePath, "memory"), included);
+
     bool hasDeprecation = java_class->isDeclDeprecated();
     if(!hasDeprecation){
         for(const MetaFunction* f : java_class->functions()){
@@ -447,9 +463,18 @@ void CppHeaderGenerator::write(QTextStream &s, const MetaClass *java_class, int)
         }
 
         s << "private:" << Qt::endl;
-        for(const MetaFunction *function : privatePureVirtuals) {
+        for(const MetaFunction *function : qAsConst(privatePureVirtuals)) {
             writeFunction(s, function);
         }
+        for(const MetaFunction *function : qAsConst(returnScopeRequired)) {
+            s << "    ";
+            if(function->isConstant())
+                s << "mutable ";
+            s << "std::unique_ptr<QtJambiScope> __returnScope__" << function->name();
+            if(function->isConstant())
+                s << "_const";
+            s << ";" << Qt::endl;
+        }
         if(java_class->instantiateShellClass()){
             s << "    QtJambiShell* __shell() const";
             if(java_class->hasVirtualDestructor()){
@@ -489,7 +514,7 @@ void CppHeaderGenerator::write(QTextStream &s, const MetaClass *java_class, int)
         }
 
         if(needsAccess && java_class->generateShellClass()){
-            s << "struct " << java_class->name() + "_access"
+            s << "struct " << (java_class->typeEntry()->designatedInterface() ? java_class->extractInterface()->name() : java_class->name()) << "_access"
               << " : public " << java_class->qualifiedCppName() << Qt::endl
               << "{" << Qt::endl;
             {
@@ -560,8 +585,8 @@ void CppHeaderGenerator::write(QTextStream &s, const MetaClass *java_class, int)
                                     return fentry->targetLangName();
                                 }
                             }();
-                            QString qtFlagsAliasName = fentry->originalName();
-                            s << INDENT << "return RegistryAPI::registerEnumTypeInfo" << (entry->isHiddenMetaObject() ? "NoMetaObject" : "") << "<" << qtEnumName << ">(\"" << qtEnumName << "\", \"" << javaEnumName << "\", \"" << qtFlagName << "\", \"" << qtFlagsAliasName << "\", \"" << javaFlagName << "\");" << Qt::endl;
+                            QString qtFlagsTemplateName = fentry->flagsTemplate();
+                            s << INDENT << "return RegistryAPI::registerEnumTypeInfo" << (entry->isHiddenMetaObject() ? "NoMetaObject" : "") << "<" << qtEnumName << ">(\"" << qtEnumName << "\", \"" << javaEnumName << "\", \"" << qtFlagName << "\", \"" << qtFlagsTemplateName << "\", \"" << javaFlagName << "\");" << Qt::endl;
                         }else{
                             s << INDENT << "return RegistryAPI::registerEnumTypeInfo" << (entry->isHiddenMetaObject() ? "NoMetaObject" : "") << "<" << qtEnumName << ">(\"" << qtEnumName << "\", \"" << javaEnumName << "\");" << Qt::endl;
                         }
@@ -662,3 +687,22 @@ void CppHeaderGenerator::writeInjectedCode(QTextStream &s, const MetaFunctional
         }
     }
 }
+
+bool CppHeaderGenerator::shouldGenerateHeaders(const MetaClass *java_class){
+    return (java_class->generateShellClass()
+            && shouldGenerateCpp(java_class)
+            && !(java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateNoShell))
+           /*|| (  !java_class->isFake()
+               && !java_class->isInterface()
+               && (java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp)
+                 && !(java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateNoShell))*/;
+}
+
+bool CppHeaderGenerator::shouldGenerate(const MetaClass *java_class) const {
+    return shouldGenerateHeaders(java_class);
+}
+
+bool CppHeaderGenerator::shouldGenerate(const MetaFunctional *functional) const {
+    return (!(functional->typeEntry()->codeGeneration() & TypeEntry::GenerateNoShell)
+                && CppGenerator::shouldGenerate(functional));
+}
diff --git a/src/cpp/QtJambiGenerator/cppheadergenerator.h b/src/cpp/QtJambiGenerator/cppheadergenerator.h
index b9737e8b..9bfe327a 100644
--- a/src/cpp/QtJambiGenerator/cppheadergenerator.h
+++ b/src/cpp/QtJambiGenerator/cppheadergenerator.h
@@ -39,15 +39,11 @@
 #define CPP_HEADER_GENERATOR
 
 #include "cppgenerator.h"
-#include "metainfogenerator.h"
 #include "metalang.h"
 
 class CppHeaderGenerator : public CppGenerator {
     public:
-        CppHeaderGenerator(PriGenerator *pri)
-            : CppGenerator(pri){
-        }
-
+        CppHeaderGenerator(PriGenerator *pri);
         QString fileNameForClass(const MetaClass *cls) const override;
         QString fileNameForFunctional(const MetaFunctional *cls) const override;
 
@@ -61,19 +57,9 @@ class CppHeaderGenerator : public CppGenerator {
         void writeFieldAccessors(QTextStream &s, const MetaField *java_field);
         static void writeInjectedCode(QTextStream &s, const MetaClass *java_class, const QList<CodeSnip::Position>& positions);
         static void writeInjectedCode(QTextStream &s, const MetaFunctional *java_class, const QList<CodeSnip::Position>& positions);
-
-        bool shouldGenerate(const MetaClass *java_class) const override {
-            return (java_class->generateShellClass()
-                    && CppGenerator::shouldGenerate(java_class))
-                   || (  !java_class->isFake()
-                       && java_class->queryFunctions(MetaClass::Signals).size() > 0
-                       && (java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp));
-        }
-
-        bool shouldGenerate(const MetaFunctional *functional) const override {
-            return (!(functional->typeEntry()->codeGeneration() & TypeEntry::GenerateNoShell)
-                        && CppGenerator::shouldGenerate(functional));
-        }
+        bool shouldGenerate(const MetaClass *java_class) const override;
+        bool shouldGenerate(const MetaFunctional *functional) const override;
+        static bool shouldGenerateHeaders(const MetaClass *java_class);
 };
 
 #endif // CPP_HEADER_GENERATOR
diff --git a/src/cpp/QtJambiGenerator/cppimplgenerator.cpp b/src/cpp/QtJambiGenerator/cppimplgenerator.cpp
index 0db95ac1..950af96a 100644
--- a/src/cpp/QtJambiGenerator/cppimplgenerator.cpp
+++ b/src/cpp/QtJambiGenerator/cppimplgenerator.cpp
@@ -81,6 +81,18 @@ static const QMap<QString, QString> default_return_table{
     {"java.lang.Object", "nullptr"}
 };
 
+CppImplGenerator::CppImplGenerator(PriGenerator *pri) : CppGenerator(pri) {
+}
+
+bool CppImplGenerator::shouldGenerate(const MetaClass *java_class) const {
+    return /*(!java_class->isNamespace() || java_class->functionsInTargetLang().size() > 0)
+           &&*/ !java_class->isInterface()
+           && !java_class->typeEntry()->isQVariant()
+           && !java_class->typeEntry()->isIterator()
+           && (java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp)
+           && !java_class->isFake();
+}
+
 QString CppImplGenerator::default_return_statement_qt(const MetaType *java_type, AbstractGenerator::Option options) {
     QString returnStr;
     if((options & AbstractGenerator::NoReturnStatement) == 0)
@@ -126,31 +138,34 @@ QString CppImplGenerator::default_return_statement_qt(const MetaType *java_type,
         return returnStr;
 
     Q_ASSERT(!java_type->isPrimitive());
-    if (java_type->isJObjectWrapper())
-        return returnStr + "JObjectWrapper()";
-    if (java_type->isJMapWrapper())
-        return returnStr + "JMapWrapper()";
-    if (java_type->isJCollectionWrapper())
-        return returnStr + "JCollectionWrapper()";
-    if (java_type->isJIteratorWrapper())
-        return returnStr + "JIteratorWrapper()";
-    if (java_type->isJEnumWrapper())
-        return returnStr + "JEnumWrapper()";
-    if (java_type->isJQFlagsWrapper())
-        return returnStr + "JQFlagsWrapper()";
-    if (java_type->isVariant())
+    if (java_type->isJObjectWrapper()){
+        if (java_type->typeEntry()->isJMapWrapper())
+            return returnStr + "JMapWrapper()";
+        else if (java_type->typeEntry()->isJCollectionWrapper())
+            return returnStr + "JCollectionWrapper()";
+        else if (java_type->typeEntry()->isJIteratorWrapper())
+            return returnStr + "JIteratorWrapper()";
+        else if (java_type->typeEntry()->isJEnumWrapper())
+            return returnStr + "JEnumWrapper()";
+        else if (java_type->typeEntry()->isJQFlagsWrapper())
+            return returnStr + "JQFlagsWrapper()";
+        else return returnStr + "JObjectWrapper()";
+    }
+    if (java_type->isQVariant())
         return returnStr + "QVariant()";
-    if (java_type->isTargetLangString())
+    if (java_type->isCharString())
+        return returnStr + "nullptr";
+    if (java_type->isQString())
         return returnStr + "QString()";
-    if (java_type->isTargetLangStringRef())
+    if (java_type->isQStringRef())
         return returnStr + "QStringRef()";
-    if (java_type->isTargetLangStringView())
+    if (java_type->isQStringView())
         return returnStr + "QStringView()";
-    if (java_type->isTargetLangAnyStringView())
+    if (java_type->isQAnyStringView())
         return returnStr + "QAnyStringView()";
-    if (java_type->isTargetLangUtf8StringView())
+    if (java_type->isQUtf8StringView())
         return returnStr + "QUtf8StringView()";
-    if (java_type->isTargetLangChar())
+    if (java_type->isQChar())
         return returnStr + "QChar()";
     else if (java_type->isEnum())
         return returnStr + java_type->typeEntry()->name() + "(0)";
@@ -209,7 +224,7 @@ QString CppImplGenerator::jniReturnName(const MetaFunction *java_function) const
     QString return_type = translateType(java_function->type(), EnumAsInts);
     QString new_return_type = java_function->typeReplaced(0);
     if (!new_return_type.isEmpty()) {
-        return_type = jniName(new_return_type);
+        return_type = jniName(annotationFreeTypeName(new_return_type));
     }
     return return_type;
 }
@@ -218,7 +233,7 @@ QString CppImplGenerator::jniReturnName(const MetaFunction *java_function) const
 QByteArray jniTypeName(const MetaType *java_type) {
     if (!java_type) {
         return "Void";
-    } else if (java_type->isTargetLangChar()) {
+    } else if (java_type->isQChar()) {
         return "Char";
     } else if (java_type->isPrimitive()) {
         return jniTypeName(java_type->typeEntry()->jniName());
@@ -438,7 +453,7 @@ void CppImplGenerator::write(QTextStream &s, const MetaFunctional *java_class, i
         writeExtraIncludes(s, java_class, included);
     }
     writeInclude(s, Include(Include::IncludePath, "QtJambi/RegistryAPI"), included);
-    if(java_class->isFunctionPointer()){
+    if(java_class->isFunctionPointer() && java_class->typeEntry()->getUsing().isEmpty()){
         writeInclude(s, Include(Include::IncludePath, "QtJambi/FunctionPointer"), included);
     }
     writeInclude(s, Include(Include::IncludePath, "QtJambi/Cast"), included);
@@ -1051,17 +1066,8 @@ void CppImplGenerator::write(QTextStream &s, const MetaClass *java_class, int) {
                 writeInclude(s, icl, included);
         }
     }
-    // Includes
-    bool shellInclude = (java_class->generateShellClass()
-                         || (java_class->isQObject()
-                             &&
-                             java_class->queryFunctions(MetaClass::Constructors
-                                                        | MetaClass::Visible
-                                                        | MetaClass::NotRemovedFromShell).size() > 0
-                             )
-                         || java_class->cppSignalFunctions().size() > 0);
-
-    if (shellInclude){
+
+    if (CppHeaderGenerator::shouldGenerateHeaders(java_class)){
         if(java_class->typeEntry()->designatedInterface() && java_class->enclosingClass()){
             writeInclude(s, Include(Include::LocalPath, QString(java_class->enclosingClass()->name().replace("$", "_"))+"_shell.h"), included);
         }else{
@@ -1666,7 +1672,10 @@ void CppImplGenerator::writeJavaLangObjectOverrideFunctions(QTextStream &s, cons
                         }
                     }
                     s << INDENT << "QtJambiAPI::checkPointer(__jni_env, __qt_this);" << Qt::endl;
-                    s << INDENT << "hash_type hashValue = qHash(*__qt_this";
+                    s << INDENT << "hash_type hashValue = ";
+                    if(!cls->qHashScope().isEmpty())
+                        s << cls->qHashScope() << "::";
+                    s << "qHash(*__qt_this";
                     if(cls->needsHashWorkaround())
                         s << ", QHashDummyValue()";
                     s << ");" << Qt::endl;
@@ -1858,7 +1867,7 @@ void CppImplGenerator::writeExtraFunctions(QTextStream &s, const MetaClass *java
 }
 
 void CppImplGenerator::writeToStringFunction(QTextStream &s, const MetaClass *java_class) {
-    FunctionModelItem fun = java_class->toStringCapability();
+    const MetaFunction* fun = java_class->toStringCapability();
     bool core = java_class->package() == QLatin1String("io.qt.core");
     bool qevent = false;
 
@@ -1876,7 +1885,7 @@ void CppImplGenerator::writeToStringFunction(QTextStream &s, const MetaClass *ja
 
     if (!java_class->hasDefaultToStringFunction() && fun && !(qevent && core)) {
 
-        auto indirections = fun->arguments().at(1)->type().indirections().size();
+        auto indirections = fun->arguments().at(1)->type()->indirections().size();
         QString deref = QLatin1String(indirections == 0 ? "*" : "");
 
         QStringList lines;
@@ -2014,8 +2023,7 @@ void CppImplGenerator::writeCloneFunction(QTextStream &s, const MetaClass *java_
             }
             s << INDENT << "QtJambiAPI::checkPointer(__jni_env, __qt_this);" << Qt::endl;
             if(java_class->typeEntry()->isValue() && static_cast<const ValueTypeEntry*>(java_class->typeEntry())->skipMetaTypeRegistration()){
-                s << INDENT << "__java_return_value = QtJambiAPI::convertNativeToJavaObject(__jni_env, new " << java_class->typeEntry()->qualifiedCppName() << "(*__qt_this), false, false);" << Qt::endl
-                  << INDENT << "QtJambiAPI::setJavaOwnership(__jni_env, __java_return_value);" << Qt::endl;
+                s << INDENT << "__java_return_value = QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(__jni_env, new " << java_class->typeEntry()->qualifiedCppName() << "(*__qt_this));" << Qt::endl;
             }else if(java_class->qualifiedCppName()=="QString"){
                 s << INDENT << "__java_return_value = QtJambiAPI::convertQStringToJavaObject(__jni_env, *__qt_this);" << Qt::endl;
             }else if(java_class->qualifiedCppName()=="QChar"){
@@ -2636,146 +2644,117 @@ void CppImplGenerator::writeOwnership(QTextStream &s,
             type = java_function->arguments().at(var_index-1)->type();
         }
         if(type){
-            if (type->isContainer()){
-                if(type->instantiations().size()==1){
-                    if(type->instantiations()[0]->isQObject()){
-                        if (ownershipRule.ownership == TS::Invalidate)
-                            return;
-                        if(!ownershipRule.condition.isEmpty()){
-                            s << INDENT << "if(" << ownershipRule.condition << "){" << Qt::endl
-                              << INDENT << "    for(auto __element : " << qt_var_name << "){" << Qt::endl
-                              << INDENT << "        ";
-                            switch(ownershipRule.ownership){
-                            case TS::TargetLangOwnership:
-                                s << "QtJambiAPI::setJavaOwnershipForTopLevelObject"; break;
-                            case TS::CppOwnership:
-                                s << "QtJambiAPI::setCppOwnershipForTopLevelObject"; break;
-                            default:
-                                s << "QtJambiAPI::setDefaultOwnershipForTopLevelObject"; break;
-                            }
-                            s << "(" << __jni_env << ", __element);" << Qt::endl;
-                            s << INDENT << "    }" << Qt::endl
-                              << INDENT << "}" << Qt::endl;
-                        }else{
-                            s << INDENT << "for(auto __element : " << qt_var_name << "){" << Qt::endl
-                              << INDENT << "    ";
-                            switch(ownershipRule.ownership){
-                            case TS::TargetLangOwnership:
-                                s << "QtJambiAPI::setJavaOwnershipForTopLevelObject"; break;
-                            case TS::CppOwnership:
-                                s << "QtJambiAPI::setCppOwnershipForTopLevelObject"; break;
-                            default:
-                                s << "QtJambiAPI::setDefaultOwnershipForTopLevelObject"; break;
-                            }
-                            s << "(" << __jni_env << ", __element);" << Qt::endl;
-                            s << INDENT << "}" << Qt::endl;
-                        }
-                    }else{
+            switch(ownershipRule.ownership){
+            case TS::RegisterDependency:
+                if(!ownershipRule.condition.isEmpty()){
+                    s << INDENT << "if(" << ownershipRule.condition << ")" << Qt::endl
+                      << INDENT << "    QtJambiAPI::registerDependency(" << __jni_env << ", " << var_name << ", __this_nativeId);" << Qt::endl;
+                }else{
+                    s << INDENT << "QtJambiAPI::registerDependency(" << __jni_env << ", " << var_name << ", __this_nativeId);" << Qt::endl;
+                }
+                break;
+            default:
+                if (type->isContainer() && ownershipRule.ownership != TS::Invalidate){
+                    if(type->instantiations().size()==1){
+                        s << INDENT;
+                        QString indent;
                         if(!ownershipRule.condition.isEmpty()){
-                            s << INDENT << "if(" << ownershipRule.condition << "){" << Qt::endl
-                              << INDENT << "    for(auto __element : " << qt_var_name << "){" << Qt::endl
-                              << INDENT << "        ";
-                            switch(ownershipRule.ownership){
-                            case TS::TargetLangOwnership:
-                                s << "QtJambiAPI::setJavaOwnership"; break;
-                            case TS::CppOwnership:
-                                s << "QtJambiAPI::setCppOwnership"; break;
-                            case TS::Invalidate:
-                                s << "InvalidateAfterUse::invalidate"; break;
-                            default:
-                                s << "QtJambiAPI::setDefaultOwnership"; break;
-                            }
-                            s << "(" << __jni_env << ", __element);" << Qt::endl;
-                            s << INDENT << "    }" << Qt::endl
-                              << INDENT << "}" << Qt::endl;
-                        }else{
-                            s << INDENT << "for(auto __element : " << qt_var_name << "){" << Qt::endl
-                              << INDENT << "    ";
-                            switch(ownershipRule.ownership){
-                            case TS::TargetLangOwnership:
-                                s << "QtJambiAPI::setJavaOwnership"; break;
-                            case TS::CppOwnership:
-                                s << "QtJambiAPI::setCppOwnership"; break;
-                            case TS::Invalidate:
-                                s << "InvalidateAfterUse::invalidate"; break;
-                            default:
-                                s << "QtJambiAPI::setDefaultOwnership"; break;
-                            }
-                            s << "(" << __jni_env << ", __element);" << Qt::endl;
+                            s << "if(" << ownershipRule.condition << "){" << Qt::endl
+                              << INDENT;
+                            indent = "    ";
+                        }
+                        s << indent << "for(auto __element : " << qt_var_name << "){" << Qt::endl
+                          << INDENT << indent << "    ";
+                        switch(ownershipRule.ownership){
+                        case TS::TargetLangOwnership:
+                            s << "QtJambiAPI::setJavaOwnership"; break;
+                        case TS::CppOwnership:
+                            s << "QtJambiAPI::setCppOwnership"; break;
+                        default:
+                            s << "QtJambiAPI::setDefaultOwnership"; break;
+                        }
+                        if(type->instantiations()[0]->isQObject())
+                            s << "ForTopLevelObject";
+                        s << "(" << __jni_env << ", ";
+                        if(type->instantiations()[0]->isQObject() && type->instantiations()[0]->indirections().isEmpty())
+                            s << "&";
+                        s << "__element);" << Qt::endl
+                          << INDENT << indent << "}" << Qt::endl;
+                        if(!ownershipRule.condition.isEmpty())
                             s << INDENT << "}" << Qt::endl;
-                        }
                     }
-                }
-            }else{
-                if(type->isQObject()){
-                    if (ownershipRule.ownership == TS::Invalidate)
-                        return;
-                    s << INDENT;
-                    if(!ownershipRule.condition.isEmpty())
-                        s << "if(" << ownershipRule.condition << ")" << Qt::endl
-                          << INDENT << "    ";
-                    switch(ownershipRule.ownership){
-                    case TS::TargetLangOwnership:
-                        s << "QtJambiAPI::setJavaOwnershipForTopLevelObject"; break;
-                    case TS::CppOwnership:
-                        s << "QtJambiAPI::setCppOwnershipForTopLevelObject"; break;
-                    default:
-                        s << "QtJambiAPI::setDefaultOwnershipForTopLevelObject"; break;
-                    }
-                    s << "(" << __jni_env << ", " << qt_var_name << ");" << Qt::endl;
                 }else{
+                    if(type->isQObject() && ownershipRule.ownership == TS::Invalidate)
+                        return;
                     s << INDENT;
                     if(!ownershipRule.condition.isEmpty())
                         s << "if(" << ownershipRule.condition << ")" << Qt::endl
                           << INDENT << "    ";
+                    QString additionalArgument;
                     switch(ownershipRule.ownership){
                     case TS::TargetLangOwnership:
                         s << "QtJambiAPI::setJavaOwnership"; break;
                     case TS::CppOwnership:
                         s << "QtJambiAPI::setCppOwnership"; break;
                     case TS::Invalidate:
-                        s << "InvalidateAfterUse::invalidate"; break;
+                        if(var_index==0){
+                            s << "InvalidateAfterUse::invalidate";
+                        }else{
+                            if(ownershipRule.condition.isEmpty())
+                                s << "QTJAMBI_INVALIDATE_AFTER_USE";
+                            else{
+                                if(!java_function->arguments()[var_index-1]->type()->typeEntry()->isNativeIdBased())
+                                    additionalArgument = ", true";
+                                s << qtjambi_scope << ".addObjectInvalidation";
+                            }
+                        }
+                        break;
                     default:
                         s << "QtJambiAPI::setDefaultOwnership"; break;
                     }
-                    s << "(" << __jni_env << ", " << var_name << ");" << Qt::endl;
+                    if(type->isQObject())
+                        s << "ForTopLevelObject";
+                    s << "(" << __jni_env << ", ";
+                    if(type->isQObject()){
+                        if(type->indirections().isEmpty())
+                            s << "&";
+                        s << qt_var_name;
+                    }else{
+                        s << var_name;
+                    }
+                    s << additionalArgument << ");" << Qt::endl;
                 }
+                break;
             }
         }
     } else {
+        if(implementor->typeEntry()->isQObject() && ownershipRule.ownership == TS::Invalidate)
+            return;
+        s << INDENT;
+        if(!ownershipRule.condition.isEmpty())
+            s << "if(" << ownershipRule.condition << ")" << Qt::endl
+              << INDENT << "    ";
+        QString additionalArgument;
+        switch(ownershipRule.ownership){
+        case TS::TargetLangOwnership:
+            s << "QtJambiAPI::setJavaOwnership"; break;
+        case TS::CppOwnership:
+            s << "QtJambiAPI::setCppOwnership"; break;
+        case TS::Invalidate:
+            s << "InvalidateAfterUse::invalidate";
+            break;
+        default:
+            s << "QtJambiAPI::setDefaultOwnership"; break;
+        }
+        if(implementor->typeEntry()->isQObject())
+            s << "ForTopLevelObject";
+        s << "(" << __jni_env << ", ";
         if(implementor->typeEntry()->isQObject()){
-            if (ownershipRule.ownership == TS::Invalidate)
-                return;
-            s << INDENT;
-            if(!ownershipRule.condition.isEmpty())
-                s << "if(" << ownershipRule.condition << ")" << Qt::endl
-                  << INDENT << "    ";
-            switch(ownershipRule.ownership){
-            case TS::TargetLangOwnership:
-                s << "QtJambiAPI::setJavaOwnershipForTopLevelObject"; break;
-            case TS::CppOwnership:
-                s << "QtJambiAPI::setCppOwnershipForTopLevelObject"; break;
-            default:
-                s << "QtJambiAPI::setDefaultOwnershipForTopLevelObject"; break;
-            }
-            s << "(" << __jni_env << ", " << qt_var_name << ");" << Qt::endl;
+            s << qt_var_name;
         }else{
-            s << INDENT;
-            if(!ownershipRule.condition.isEmpty())
-                s << "if(" << ownershipRule.condition << ")" << Qt::endl
-                  << INDENT << "    ";
-            switch(ownershipRule.ownership){
-            case TS::TargetLangOwnership:
-                s << "QtJambiAPI::setJavaOwnership"; break;
-            case TS::CppOwnership:
-                s << "QtJambiAPI::setCppOwnership"; break;
-            case TS::Invalidate:
-                s << "InvalidateAfterUse::invalidate"; break;
-            default:
-                s << "QtJambiAPI::setDefaultOwnership"; break;
-            }
-            s << "(" << __jni_env << ", " << var_name << ");" << Qt::endl;
+            s << var_name;
         }
+        s << additionalArgument << ");" << Qt::endl;
     }
 
 }
@@ -2797,7 +2776,7 @@ void CppImplGenerator::writeShellFunction(QTextStream &s, const MetaFunction *ja
         MetaType *function_type = java_function->type();
         const MetaArgumentList& arguments = java_function->arguments();
         INDENTATION(INDENT)
-        QString java_function_signature = java_function->signature();
+        QString java_function_signature = java_function->originalSignature();
         if(java_function->isStatic()){
             s << INDENT << "QTJAMBI_DEBUG_METHOD_PRINT(\"shell\", \"" << implementor->typeEntry()->qualifiedCppName() << "::"
               << java_function_signature << "\")" << Qt::endl;
@@ -2823,7 +2802,7 @@ void CppImplGenerator::writeShellFunction(QTextStream &s, const MetaFunction *ja
                                                || !new_return_type.isEmpty())
                                               && new_return_type != "void");
                     s << INDENT << (java_function->isNoExcept() ? "QtJambiExceptionInhibitor" : "QtJambiExceptionHandler") << " __qj_exnhandler;" << Qt::endl;
-                    if (function_type) {
+                    if (function_type && !java_function->isSelfReturningFunction()) {
                         s << INDENT;
                         if(function_type->getReferenceType()!=MetaType::NoReference){
                             originalReferenceFunctionType = function_type;
@@ -2909,7 +2888,7 @@ void CppImplGenerator::writeShellFunction(QTextStream &s, const MetaFunction *ja
 
                                     s << INDENT;
                                     QString typeWrap;
-                                    if (has_function_type) {
+                                    if (has_function_type && !java_function->isSelfReturningFunction()) {
                                         QString _jniName;
                                         if (new_return_type.isEmpty()) {
                                             _jniName = translateType(function_type);
@@ -2952,17 +2931,18 @@ void CppImplGenerator::writeShellFunction(QTextStream &s, const MetaFunction *ja
                                     //  generated brace section is next.
                                     s << INDENT << "JavaException::check(__jni_env QTJAMBI_STACKTRACEINFO );" << Qt::endl;
 
-                                    if (has_function_type) {
+                                    if (has_function_type && !java_function->isSelfReturningFunction()) {
+                                        QString scopeName = java_function->needsReturnScope() ? QString("*__returnScope__%1%2").arg(java_function->name(), java_function->isConstant() ? "_const" : "") : QStringLiteral("__qtjambi_scope");
                                         if(java_function->hasConversionRule(TS::ShellCode, 0)){
                                             writeJavaToQt(s, function_type, "__qt_return_value_tmp", "__java_return_value",
                                                           java_function, nullptr, 0, Option(GlobalRefJObject | NoEnumAsInts), "__jni_env",
-                                                          "__qtjambi_scope");
+                                                          scopeName);
                                             if(java_function->type())
                                                 s << INDENT << "__qt_return_value = __qt_return_value_tmp;" << Qt::endl;
                                         }else{
                                             writeJavaToQt(s, function_type, "__qt_return_value", "__java_return_value",
                                                           java_function, nullptr, 0, Option(NoTmpVariable | GlobalRefJObject | NoEnumAsInts), "__jni_env",
-                                                          "__qtjambi_scope");
+                                                          scopeName);
                                         }
                                         QString defaultValue = java_function->nullPointerDefaultValue();
                                         if (!defaultValue.isEmpty()){
@@ -2990,7 +2970,7 @@ void CppImplGenerator::writeShellFunction(QTextStream &s, const MetaFunction *ja
                                     writeOwnership(s, java_function, "this", "__java_this", -1, implementor, TS::ShellCode, "__jni_env", "__qtjambi_scope");
                                     writeOwnership(s, java_function, "__java_return_value", "__qt_return_value", 0, implementor, TS::ShellCode, "__jni_env", "__qtjambi_scope");
                                     writeCodeInjections(s, java_function, implementor, CodeSnip::End, TS::ShellCode, "__jni_env", "__qtjambi_scope");
-                                    if (function_type){
+                                    if (function_type && !java_function->isSelfReturningFunction()){
                                         if(java_function->nullPointersDisabled() || originalReferenceFunctionType){
                                             s << INDENT << "if(!__qt_return_value)" << Qt::endl;
                                             s << INDENT << "    JavaException::raiseNullPointerException(__jni_env, \"" << implementor->typeEntry()->qualifiedCppName() << "::" << java_function->minimalSignature() << ": Unexpected null pointer returned.\" QTJAMBI_STACKTRACEINFO );" << Qt::endl;
@@ -3000,6 +2980,14 @@ void CppImplGenerator::writeShellFunction(QTextStream &s, const MetaFunction *ja
                                 if(lines.contains("__qtjambi_scope")){
                                     s << INDENT << "QtJambiScope __qtjambi_scope(" << shellClassName(implementor) << "::__shell());" << Qt::endl;
                                 }
+                                if(java_function->needsReturnScope()){
+                                    if(lines.contains(QString("*__returnScope__%1%2").arg(java_function->name(), java_function->isConstant() ? "_const" : ""))){
+                                        s << INDENT << "__returnScope__" << java_function->name();
+                                        if(java_function->isConstant())
+                                            s << "_const";
+                                        s << ".reset(new QtJambiScope(" << shellClassName(implementor) << "::__shell()));" << Qt::endl;
+                                    }
+                                }
                                 s << lines;
                             }
                         }
@@ -3068,7 +3056,9 @@ void CppImplGenerator::writeShellFunction(QTextStream &s, const MetaFunction *ja
                       << INDENT << "} QTJAMBI_TRY_END" << Qt::endl;
                     if(java_function->isBlockExceptions())
                         s << INDENT << "__qj_exceptionBlocker.release(__jni_env);" << Qt::endl;
-                    if (function_type){
+                    if(java_function->isSelfReturningFunction()){
+                        s << INDENT << "return *this;" << Qt::endl;
+                    }else if (function_type){
                         if(originalReferenceFunctionType){
                             delete function_type;
                             function_type = originalReferenceFunctionType;
@@ -3310,7 +3300,7 @@ void CppImplGenerator::writeVirtualFunctionOverride(QTextStream &s,
             s << INDENT << "QtJambiExceptionBlocker __qj_exceptionBlocker;" << Qt::endl;
 
         QString typeReplaced = java_function->typeReplaced(0);
-        if ((function_type || (!typeReplaced.isEmpty() && typeReplaced!="void")) && java_function->argumentReplaced(0)!="this") {
+        if ((function_type || (!typeReplaced.isEmpty() && typeReplaced!="void")) && !java_function->isSelfReturningFunction()) {
             const QString qt_return_value = "__qt_return_value";
             const QString java_return_value = "__java_return_value";
             if(java_function->implementingClass()->typeEntry()->isNativeIdBased()){
@@ -3414,11 +3404,8 @@ void CppImplGenerator::writeVirtualFunctionOverride(QTextStream &s,
                 s << INDENT << "__qj_exceptionBlocker.release(__jni_env);" << Qt::endl;
 
             writeCodeInjections(s, java_function, java_function->implementingClass(), CodeSnip::End, TS::NativeCode, "__jni_env", "__qtjambi_scope");
-            if(java_function->argumentReplaced(0)=="this"){
-                if(java_function->implementingClass()->typeEntry()->isNativeIdBased())
-                    s << INDENT << "return nullptr;" << Qt::endl;
-                else
-                    s << INDENT << "return __this;" << Qt::endl;
+            if(java_function->isSelfReturningFunction()){
+                s << INDENT << "return nullptr;" << Qt::endl;
             }
         }
     }
@@ -3618,9 +3605,9 @@ void CppImplGenerator::writeFunctionName(QTextStream &s,
             QString t = parameterTypesByName[mod.modified_type];
             if(t.isEmpty())
                 t = "java.lang.Object";
-            args += jni_signature(t, format);
+            args += jni_signature(annotationFreeTypeName(t), format);
         }else if(mod.modified_jni_type.isEmpty())
-            args += jni_signature(mod.modified_type, format);
+            args += jni_signature(annotationFreeTypeName(mod.modified_type), format);
         else
             args += jni_signature(mod.modified_jni_type, format);
         ++argumentCounter;
@@ -3676,18 +3663,19 @@ void CppImplGenerator::writeFunctionName(QTextStream &s,
                     }
                 }else if (!modified_type.isEmpty() || !argument->type()->hasNativeId() || java_function->isConstructor()) {
                     if (modified_type.isEmpty()){
-                        QString arg = jni_signature(argument->type(), format);
-                        if(arg=="Lio_qt_core_QString_2")
-                            arg = "Ljava_lang_CharSequence_2";
-                        args += arg;
+                        if(isCharSequenceSubstitute(argument->type())){
+                            args += jni_signature("java.lang.CharSequence", format);
+                        }else{
+                            args += jni_signature(argument->type(), format);
+                        }
                     }else{
                         if(parameterTypesByName.contains(modified_type)){
                             QString t = parameterTypesByName[modified_type];
                             if(t.isEmpty())
                                 t = "java.lang.Object";
-                            args += jni_signature(t, format);
+                            args += jni_signature(annotationFreeTypeName(t), format);
                         }else if(jniType.isEmpty()){
-                            args += jni_signature(modified_type, format);
+                            args += jni_signature(annotationFreeTypeName(modified_type), format);
                         }else{
                             args += jni_signature(jniType, format);
                         }
@@ -3703,9 +3691,9 @@ void CppImplGenerator::writeFunctionName(QTextStream &s,
                     QString t = parameterTypesByName[mod.modified_type];
                     if(t.isEmpty())
                         t = "java.lang.Object";
-                    args += jni_signature(t, format);
+                    args += jni_signature(annotationFreeTypeName(t), format);
                 }else if(mod.modified_jni_type.isEmpty())
-                    args += jni_signature(mod.modified_type, format);
+                    args += jni_signature(annotationFreeTypeName(mod.modified_type), format);
                 else
                     args += jni_signature(mod.modified_jni_type, format);
                 ++argumentCounter;
@@ -3717,9 +3705,9 @@ void CppImplGenerator::writeFunctionName(QTextStream &s,
             QString t = parameterTypesByName[mod.modified_type];
             if(t.isEmpty())
                 t = "java.lang.Object";
-            args += jni_signature(t, format);
+            args += jni_signature(annotationFreeTypeName(t), format);
         }else if(mod.modified_jni_type.isEmpty())
-            args += jni_signature(mod.modified_type, format);
+            args += jni_signature(annotationFreeTypeName(mod.modified_type), format);
         else
             args += jni_signature(mod.modified_jni_type, format);
     }
@@ -3773,7 +3761,7 @@ void CppImplGenerator::writeFinalFunctionArguments(QTextStream &s, const MetaFun
     while(addedArguments.first.contains(argumentCounter)){
         const ArgumentModification& argumentMod = addedArguments.first[argumentCounter];
         s << "," << Qt::endl
-          << " " << jniName(argumentMod.modified_type) << " " << argumentMod.modified_name;
+          << " " << jniName(annotationFreeTypeName(argumentMod.modified_type)) << " " << argumentMod.modified_name;
         ++argumentCounter;
     }
     for(const MetaArgument *argument : arguments) {
@@ -3799,20 +3787,20 @@ void CppImplGenerator::writeFinalFunctionArguments(QTextStream &s, const MetaFun
             }else if (modified_type.isEmpty())
                 s << " " << translateType(argument->type(), options);
             else
-                s << " " << jniName(modified_type);
+                s << " " << jniName(annotationFreeTypeName(modified_type));
             s << " " << argument->indexedName();
             ++argumentCounter;
             while(addedArguments.first.contains(argumentCounter)){
                 const ArgumentModification& argumentMod = addedArguments.first[argumentCounter];
                 s << "," << Qt::endl
-                  << " " << jniName(argumentMod.modified_type) << " " << argumentMod.modified_name;
+                  << " " << jniName(annotationFreeTypeName(argumentMod.modified_type)) << " " << argumentMod.modified_name;
                 ++argumentCounter;
             }
         }
     }
     for(const ArgumentModification& argumentMod : addedArguments.second){
         s << "," << Qt::endl
-          << " " << jniName(argumentMod.modified_type) << " " << argumentMod.modified_name;
+          << " " << jniName(annotationFreeTypeName(argumentMod.modified_type)) << " " << argumentMod.modified_name;
     }
     s << ")" << Qt::endl;
 }
@@ -4053,7 +4041,7 @@ void CppImplGenerator::writeConstructor(QTextStream &s, const MetaFunction *java
 
     const MetaClass *cls = java_class ? java_class : java_function->ownerClass();
 
-    QString java_function_signature = java_function->signature();
+    QString java_function_signature = java_function->originalSignature();
     s << "// new " << java_function_signature << Qt::endl
       << "void __qt_construct_" << cls->qualifiedCppName().replace("::", "_").replace("<", "_").replace(">", "_") << "_";
     if(constructorIndex>=0)
@@ -4607,7 +4595,7 @@ void CppImplGenerator::writeFinalConstructor(QTextStream &s, const MetaFunction
 
     const MetaClass *cls = java_class ? java_class : java_function->ownerClass();
 
-    QString java_function_signature = cls->fullQualifiedCppName() + "::" + java_function->signature();
+    QString java_function_signature = cls->fullQualifiedCppName() + "::" + java_function->originalSignature();
 
     s << "// " << java_function_signature << Qt::endl;
 
@@ -5009,7 +4997,7 @@ void CppImplGenerator::writeFinalFunction(QTextStream &s, const MetaFunction *ja
 
     const MetaClass *cls = java_class ? java_class : java_function->ownerClass();
 
-    QString java_function_signature = cls->fullQualifiedCppName() + "::" + java_function->signature();
+    QString java_function_signature = cls->fullQualifiedCppName() + "::" + (java_function->originalSignature().isEmpty() ? java_function->minimalSignature() : java_function->originalSignature());
 
     s << "// " << java_function_signature << Qt::endl;
 
@@ -5102,12 +5090,13 @@ void CppImplGenerator::writeFinalFunction(QTextStream &s, const MetaFunction *ja
                     s << INDENT << "QtJambiAPI::checkPointer(__jni_env, " << qt_object_name << ");" << Qt::endl;
                 }
                 if (java_function->isFinalInCpp() && !java_function->isProxyCall() && !java_function->wasPublic() && hasShell) {
+                    const QString& name = cls->typeEntry()->designatedInterface() ? cls->extractInterface()->name() : cls->name();
                     if(java_function->isStatic())
-                        qt_object_name = cls->name() + "_access";
+                        qt_object_name = name + "_access";
                     else if(java_function->isConstant())
-                        qt_object_name = QString("static_cast<const %1*>(%2)").arg(cls->name() + "_access",qt_object_name);
+                        qt_object_name = QString("static_cast<const %1*>(%2)").arg(name + "_access",qt_object_name);
                     else
-                        qt_object_name = QString("static_cast<%1*>(%2)").arg(cls->name() + "_access",qt_object_name);
+                        qt_object_name = QString("static_cast<%1*>(%2)").arg(name + "_access",qt_object_name);
                     s << INDENT;
                     if(return_type!="void")
                         s << "__java_return_value = ";
@@ -5117,14 +5106,15 @@ void CppImplGenerator::writeFinalFunction(QTextStream &s, const MetaFunction *ja
                         s << INDENT << "__qt_exceptionRaiser.raise(__jni_env);" << Qt::endl;
                     }
                 } else if (!java_function->isFinalInCpp() && !java_function->isStatic() && hasShell) {
+                    const QString& name = cls->typeEntry()->designatedInterface() ? cls->extractInterface()->name() : cls->name();
                     if(java_function->isStatic())
-                        qt_object_name = cls->name() + "_access";
+                        qt_object_name = name + "_access";
                     else if(java_function->isConstant())
-                        qt_object_name = QString("static_cast<const %1*>(%2)").arg(cls->name() + "_access",qt_object_name);
+                        qt_object_name = QString("static_cast<const %1*>(%2)").arg(name + "_access",qt_object_name);
                     else
-                        qt_object_name = QString("static_cast<%1*>(%2)").arg(cls->name() + "_access",qt_object_name);
+                        qt_object_name = QString("static_cast<%1*>(%2)").arg(name + "_access",qt_object_name);
                     s << INDENT;
-                    if(return_type!="void")
+                    if(return_type!="void" && !java_function->isSelfReturningFunction())
                         s << "__java_return_value = ";
                     writeFunctionCall(s, qt_object_name, java_function, "__qt_", Option(EnumAsInts | NoCasts | JNIProxyFunction | SkipRemovedArguments));
                     s << ";" << Qt::endl;
@@ -5147,7 +5137,7 @@ void CppImplGenerator::writeFinalFunction(QTextStream &s, const MetaFunction *ja
                     // Call the Qt function on the java object
                     s << INDENT;
 
-                    if ((function_type || !java_function->typeReplaced(0).isEmpty()) && java_function->argumentReplaced(0)!="this") {
+                    if ((function_type || !java_function->typeReplaced(0).isEmpty()) && !java_function->isSelfReturningFunction()) {
                         const QString qt_return_value = "__qt_return_value";
                         const QString java_return_value = "__java_return_value";
                         bool paren = false;
@@ -5187,7 +5177,7 @@ void CppImplGenerator::writeFinalFunction(QTextStream &s, const MetaFunction *ja
                             s << INDENT << "__qt_exceptionRaiser.raise(__jni_env);" << Qt::endl;
 
                         if(!noConversion){
-                            bool hasReturn = java_function->argumentReplaced(0).isEmpty() && java_function->typeReplaced(0) != "void";
+                            bool hasReturn = !java_function->isSelfReturningFunction() && java_function->typeReplaced(0) != "void";
                             if(hasReturn){
                                 writeQtToJava(s, function_type, qt_return_value, java_return_value,
                                               java_function, nullptr, 0, Option(EnumAsInts | NoTmpVariable),
@@ -5235,7 +5225,7 @@ void CppImplGenerator::writeFinalFunction(QTextStream &s, const MetaFunction *ja
                 s << INDENT << "JavaException::raiseQNoImplementationException(__jni_env, \"The method has no implementation on this platform.\" QTJAMBI_STACKTRACEINFO );" << Qt::endl;
                 s << "#endif // " << pps.join(" && ") << Qt::endl;
             }
-            if(java_function->argumentReplaced(0)=="this" && !java_function->isStatic()){
+            if(java_function->isSelfReturningFunction()){
                 if(!java_function->implementingClass()->typeEntry()->designatedInterface())
                     s << INDENT << "__java_return_value = __this;" << Qt::endl;
             }
@@ -5446,8 +5436,10 @@ void CppImplGenerator::writeFieldAccessors(QTextStream &s, const MetaField *java
                             s << shellClassName(setter->ownerClass()) + "::";
                         else if(setter->wasPublic())
                             s << "__qt_this->";
-                        else
-                            s << QString("static_cast<%1*>(__qt_this)->").arg(cls->name() + "_access");
+                        else{
+                            const QString& name = setter->ownerClass()->typeEntry()->designatedInterface() ? setter->ownerClass()->extractInterface()->name() : cls->name();
+                           s << QString("static_cast<%1*>(__qt_this)->").arg(name + "_access");
+                        }
                         s << setter->name() << marshalledArguments(setter)
                           << "(__jni_env";
                         if (!setter->isStatic()){
@@ -5602,8 +5594,10 @@ void CppImplGenerator::writeFieldAccessors(QTextStream &s, const MetaField *java
                             s << shellClassName(getter->ownerClass()) + "::";
                         else if(getter->wasPublic())
                             s << "__qt_this->";
-                        else
-                            s << QString("static_cast<%1*>(__qt_this)->").arg(cls->name() + "_access");
+                        else{
+                            const QString& name = getter->ownerClass()->typeEntry()->designatedInterface() ? getter->ownerClass()->extractInterface()->name() : cls->name();
+                            s << QString("static_cast<%1*>(__qt_this)->").arg(name + "_access");
+                        }
                         s << getter->name() << marshalledArguments(getter)
                           << "(__jni_env";
                         if (!setter->isStatic()){
@@ -6120,7 +6114,7 @@ bool CppImplGenerator::writeConversionRule(QTextStream &s,
                 }
                 MetaBuilder::decideUsagePattern(_java_type.get());
                 if(target_language==TS::NativeCode){
-                    if(_java_type->typeEntry()->isPrimitive()){
+                    if(_java_type->typeEntry()->isPrimitive() || _java_type->isQChar()){
                         if(_java_type->typeEntry()->targetLangName()=="int"){
                             if(qtjambi_scope.isEmpty()){
                                 s << INDENT << "JIntArrayPointer " << out_name << "(" << __jni_env << ", " << in_name;
@@ -6512,7 +6506,7 @@ bool CppImplGenerator::writeConversionRule(QTextStream &s,
                             s << INDENT << (argumentTypeArrayDeref ? "*" : "") << argumentTypeArrayLength->indexedName() << " = " << out_name << ".size();" << Qt::endl;
                     }
                 }else if(target_language==TS::ShellCode){
-                    if(_java_type->typeEntry()->isPrimitive()){
+                    if(_java_type->typeEntry()->isPrimitive() || _java_type->isQChar()){
                         if(_java_type->typeEntry()->targetLangName()=="int"){
                             if(qtjambi_scope.isEmpty()){
                                 if(java_type->isConstant()){
@@ -7378,92 +7372,28 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
     bool semiRequired = (option & NoTmpVariable) != NoTmpVariable || !java_name.isEmpty();
 
     if (java_type->isJObjectWrapper()) {
-        if((option & OptionalScope) == OptionalScope){
-            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    JObjectWrapper* _" << qt_name << " = new JObjectWrapper();" << Qt::endl;
-            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
-            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
-            s << INDENT << "}" << Qt::endl;
-            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<JObjectWrapper*>(" << qt_name << ") = ";
-        }else if((option & DirectReturn) == DirectReturn){
-            s << INDENT << "return ";
-        }else if((option & NoTmpVariable) == NoTmpVariable){
-            if(!qt_name.isEmpty())
-                s << INDENT << qt_name << " = ";
-        }else{
-            s << INDENT;
-            writeTypeInfo(s, java_type, SkipName); //ForceConstReference
-            s << ' ' << qt_name << " = ";
-        }
-        s << "qtjambi_cast<JObjectWrapper>(" << __jni_env << ", " << java_name << ")";
-    } else if (java_type->isJMapWrapper()) {
-        if((option & OptionalScope) == OptionalScope){
-            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    JMapWrapper* _" << qt_name << " = new JMapWrapper();" << Qt::endl;
-            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
-            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
-            s << INDENT << "}" << Qt::endl;
-            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<JMapWrapper*>(" << qt_name << ") = ";
-        }else if((option & DirectReturn) == DirectReturn){
-            s << INDENT << "return ";
-        }else if((option & NoTmpVariable) == NoTmpVariable){
-            if(!qt_name.isEmpty())
-                s << INDENT << qt_name << " = ";
-        }else{
-            s << INDENT;
-            writeTypeInfo(s, java_type, NoOption); //ForceConstReference
-            s << ' ' << qt_name << " = ";
-        }
-        s << "qtjambi_cast<JMapWrapper>(" << __jni_env << ", " << java_name << ")";
-    } else if (java_type->isJCollectionWrapper()) {
-        if((option & OptionalScope) == OptionalScope){
-            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    JCollectionWrapper* _" << qt_name << " = new JCollectionWrapper();" << Qt::endl;
-            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
-            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
-            s << INDENT << "}" << Qt::endl;
-            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<JCollectionWrapper*>(" << qt_name << ") = ";
-        }else if((option & DirectReturn) == DirectReturn){
-            s << INDENT << "return ";
-        }else if((option & NoTmpVariable) == NoTmpVariable){
-            if(!qt_name.isEmpty())
-                s << INDENT << qt_name << " = ";
-        }else{
-            s << INDENT;
-            writeTypeInfo(s, java_type, NoOption); //ForceConstReference
-            s << ' ' << qt_name << " = ";
-        }
-        s << "qtjambi_cast<JCollectionWrapper>(" << __jni_env << ", " << java_name << ")";
-    } else if (java_type->isJIteratorWrapper()) {
-        if((option & OptionalScope) == OptionalScope){
-            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    JIteratorWrapper* _" << qt_name << " = new JIteratorWrapper();" << Qt::endl;
-            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
-            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
-            s << INDENT << "}" << Qt::endl;
-            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<JIteratorWrapper*>(" << qt_name << ") = ";
-        }else if((option & DirectReturn) == DirectReturn){
-            s << INDENT << "return ";
-        }else if((option & NoTmpVariable) == NoTmpVariable){
-            if(!qt_name.isEmpty())
-                s << INDENT << qt_name << " = ";
+        QString wrapperType;
+        if (java_type->typeEntry()->isJMapWrapper()) {
+            wrapperType = "JMapWrapper";
+        } else if (java_type->typeEntry()->isJCollectionWrapper()) {
+            wrapperType = "JCollectionWrapper";
+        } else if (java_type->typeEntry()->isJIteratorWrapper()) {
+            wrapperType = "JIteratorWrapper";
+        } else if (java_type->typeEntry()->isJEnumWrapper()) {
+            wrapperType = "JEnumWrapper";
+        } else if (java_type->typeEntry()->isJQFlagsWrapper()) {
+            wrapperType = "JQFlagsWrapper";
         }else{
-            s << INDENT << "const JIteratorWrapper& " << qt_name << " = ";
+            wrapperType = "JObjectWrapper";
         }
-        s << "qtjambi_cast<JIteratorWrapper>(" << __jni_env << ", " << java_name << ")";
-    } else if (java_type->isJEnumWrapper()) {
         if((option & OptionalScope) == OptionalScope){
             s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    JEnumWrapper* _" << qt_name << " = new JEnumWrapper();" << Qt::endl;
+            s << INDENT << "    " << wrapperType << "* _" << qt_name << " = new " << wrapperType << "();" << Qt::endl;
             s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
             s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
             s << INDENT << "}" << Qt::endl;
             s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<JEnumWrapper*>(" << qt_name << ") = ";
+            s << INDENT << "*reinterpret_cast<" << wrapperType << "*>(" << qt_name << ") = ";
         }else if((option & DirectReturn) == DirectReturn){
             s << INDENT << "return ";
         }else if((option & NoTmpVariable) == NoTmpVariable){
@@ -7471,29 +7401,11 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
                 s << INDENT << qt_name << " = ";
         }else{
             s << INDENT;
-            writeTypeInfo(s, java_type, NoOption); //ForceConstReference
+            writeTypeInfo(s, java_type, SkipName); //ForceConstReference
             s << ' ' << qt_name << " = ";
         }
-        s << "qtjambi_cast<JEnumWrapper>(" << __jni_env << ", " << java_name << ")";
-    } else if (java_type->isJQFlagsWrapper()) {
-        if((option & OptionalScope) == OptionalScope){
-            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    JQFlagsWrapper* _" << qt_name << " = new JQFlagsWrapper();" << Qt::endl;
-            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
-            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
-            s << INDENT << "}" << Qt::endl;
-            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<JQFlagsWrapper*>(" << qt_name << ") = ";
-        }else if((option & DirectReturn) == DirectReturn){
-            s << INDENT << "return ";
-        }else if((option & NoTmpVariable) == NoTmpVariable){
-            if(!qt_name.isEmpty())
-                s << INDENT << qt_name << " = ";
-        }else{
-            s << INDENT << "const JQFlagsWrapper& " << qt_name << " = ";
-        }
-        s << "qtjambi_cast<JQFlagsWrapper>(" << __jni_env << ", " << java_name << ")";
-    } else if (java_type->isVariant()) {
+        s << "qtjambi_cast<" << wrapperType << ">(" << __jni_env << ", " << java_name << ")";
+    } else if (java_type->isQVariant()) {
         if((option & OptionalScope) == OptionalScope){
             s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
             s << INDENT << "    QVariant* _" << qt_name << " = new QVariant();" << Qt::endl;
@@ -7509,10 +7421,16 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
                 s << INDENT << qt_name << " = ";
         }else{
             s << INDENT;
-            writeTypeInfo(s, java_type, NoOption); //ForceConstReference
+            writeTypeInfo(s, java_type, java_type->indirections().isEmpty() && (java_type->isConstant() || java_type->getReferenceType()!=MetaType::Reference) ? ForceValueType : NoOption);
             s << ' ' << qt_name << " = ";
         }
-        s << "qtjambi_cast<QVariant>(" << __jni_env << ", " << java_name << ")";
+        s << "qtjambi_cast<";
+        writeTypeInfo(s, java_type, java_type->indirections().isEmpty() && (java_type->isConstant() || java_type->getReferenceType()!=MetaType::Reference) ? ForceValueType : NoOption);
+        s << ">(" << __jni_env << ", ";
+        if((java_type->isConstant() && !java_type->indirections().isEmpty())
+                || (!java_type->isConstant() && java_type->actualIndirections()>0))
+            s << qtjambi_scope << ", ";
+        s << java_name << ")";
     } else if (java_type->isArray()) {
         MetaType *elementType = java_type->arrayElementType();
         if(elementType->isPrimitive()){
@@ -7537,7 +7455,29 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
             }
         }
         semiRequired = false;
-    } else if (java_type->isTargetLangString()) {
+    } else if (java_type->isCharString()) {
+        if((option & OptionalScope) == OptionalScope){
+            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
+            s << INDENT << "    char** _" << qt_name << " = new char*(nullptr);" << Qt::endl;
+            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
+            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
+            s << INDENT << "}" << Qt::endl;
+            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
+            s << INDENT << "*reinterpret_cast<char**>(" << qt_name << ") = ";
+        }else if((option & DirectReturn) == DirectReturn){
+            s << INDENT << "return ";
+        }else if((option & NoTmpVariable) == NoTmpVariable){
+            if(!qt_name.isEmpty())
+                s << INDENT << qt_name << " = ";
+        }else{
+            s << INDENT;
+            writeTypeInfo(s, java_type, NoOption); //ForceConstReference
+            s << ' ' << qt_name << " = ";
+        }
+        s << "qtjambi_cast<";
+        writeTypeInfo(s, java_type, NoOption);
+        s << ">(" << __jni_env << ", " << qtjambi_scope << ", " << java_name << ")";
+    } else if (java_type->isQString()) {
         if((option & OptionalScope) == OptionalScope){
             s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
             s << INDENT << "    QString* _" << qt_name << " = new QString();" << Qt::endl;
@@ -7553,13 +7493,16 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
                 s << INDENT << qt_name << " = ";
         }else{
             s << INDENT;
-            writeTypeInfo(s, java_type, NoOption); //ForceConstReference
+            writeTypeInfo(s, java_type, java_type->indirections().isEmpty() && (java_type->isConstant() || java_type->getReferenceType()!=MetaType::Reference) ? ForceValueType : NoOption);
             s << ' ' << qt_name << " = ";
         }
         s << "qtjambi_cast<";
-        writeTypeInfo(s, java_type, ForceValueType);
-        s << ">(" << __jni_env << ", " << java_name << ")";
-    } else if (java_type->isTargetLangStringRef()) {
+        writeTypeInfo(s, java_type, java_type->indirections().isEmpty() && (java_type->isConstant() || java_type->getReferenceType()!=MetaType::Reference) ? ForceValueType : NoOption);
+        s << ">(" << __jni_env << ", ";
+        if(java_type->isConstant() && !java_type->indirections().isEmpty())
+            s << qtjambi_scope << ", ";
+        s << java_name << ")";
+    } else if (java_type->isQStringRef()) {
         if((option & DirectReturn) == DirectReturn){
             s << INDENT << "return ";
         }else if((option & NoTmpVariable) == NoTmpVariable){
@@ -7579,7 +7522,7 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
         }else{
             s << "qtjambi_cast<QStringRef>(" << __jni_env << ", " << qtjambi_scope << ", " << java_name << ")";
         }
-    } else if (java_type->isTargetLangLatin1String()) {
+    } else if (java_type->isQLatin1String()) {
         if((option & DirectReturn) == DirectReturn){
             s << INDENT << "return ";
         }else if((option & NoTmpVariable) == NoTmpVariable){
@@ -7599,7 +7542,7 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
         }else{
             s << "qtjambi_cast<QLatin1String>(" << __jni_env << ", " << qtjambi_scope << ", " << java_name << ")";
         }
-    } else if (java_type->isTargetLangLatin1StringView()) {
+    } else if (java_type->isQLatin1StringView()) {
         if((option & DirectReturn) == DirectReturn){
             s << INDENT << "return ";
         }else if((option & NoTmpVariable) == NoTmpVariable){
@@ -7619,7 +7562,7 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
         }else{
             s << "qtjambi_cast<QLatin1StringView>(" << __jni_env << ", " << qtjambi_scope << ", " << java_name << ")";
         }
-    } else if (java_type->isTargetLangStringView()) {
+    } else if (java_type->isQStringView()) {
         if((option & DirectReturn) == DirectReturn){
             s << INDENT << "return ";
         }else if((option & NoTmpVariable) == NoTmpVariable){
@@ -7639,7 +7582,7 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
         }else{
             s << "qtjambi_cast<QStringView>(" << __jni_env << ", " << qtjambi_scope << ", " << java_name << ")";
         }
-    } else if (java_type->isTargetLangAnyStringView()) {
+    } else if (java_type->isQAnyStringView()) {
         if(qtjambi_scope.isEmpty()){
             if((option & DirectReturn) == DirectReturn){
                 s << INDENT << "return ";
@@ -7694,7 +7637,7 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
                 s << "qtjambi_cast<QAnyStringView>(" << __jni_env << ", " << qtjambi_scope << ", " << java_name << ")";
             }
         }
-    } else if (java_type->isTargetLangUtf8StringView()) {
+    } else if (java_type->isQUtf8StringView()) {
         if((option & DirectReturn) == DirectReturn){
             s << INDENT << "return ";
         }else if((option & NoTmpVariable) == NoTmpVariable){
@@ -7714,7 +7657,7 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
         }else{
             s << "qtjambi_cast<QUtf8StringView>(" << __jni_env << ", " << qtjambi_scope << ", " << java_name << ")";
         }
-    } else if (java_type->isTargetLangChar()) {
+    } else if (java_type->isQChar()) {
         if((option & OptionalScope) == OptionalScope){
             s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
             s << INDENT << "    QChar* _" << qt_name << " = new QChar;" << Qt::endl;
@@ -7994,26 +7937,6 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
             semiRequired = false;
         }
 
-    } else if (java_type->typeEntry()->isQModelIndexType()) {
-        if((option & OptionalScope) == OptionalScope){
-            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    QModelIndex* _" << qt_name << " = new QModelIndex;" << Qt::endl;
-            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
-            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
-            s << INDENT << "}" << Qt::endl;
-            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<QModelIndex*>(" << qt_name << ") = ";
-        }else if((option & DirectReturn) == DirectReturn){
-            s << INDENT << "return ";
-        }else if((option & NoTmpVariable) == NoTmpVariable){
-            if(!qt_name.isEmpty())
-                s << INDENT << qt_name << " = ";
-        }else{
-            s << INDENT;
-            writeTypeInfo(s, java_type, NoOption); //ForceConstReference
-            s << ' ' << qt_name << " = ";
-        }
-        s << "qtjambi_cast<QModelIndex>(" << __jni_env << ", " << java_name << ")";
     } else if (java_type->typeEntry()->isQMetaObjectType()) {
         if((option & OptionalScope) == OptionalScope){
             if(java_type->indirections().size()==0 && java_type->getReferenceType()==MetaType::Reference){
@@ -8043,26 +7966,6 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
             else
                 s << "qtjambi_cast<const QMetaObject*>(" << __jni_env << ", " << java_name << ")";
         }
-    } else if (java_type->typeEntry()->isQMetaPropertyType()) {
-        if((option & OptionalScope) == OptionalScope){
-            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    QMetaProperty* _" << qt_name << " = new QMetaProperty;" << Qt::endl;
-            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
-            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
-            s << INDENT << "}" << Qt::endl;
-            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<QMetaProperty*>(" << qt_name << ") = ";
-        }else if((option & DirectReturn) == DirectReturn){
-            s << INDENT << "return ";
-        }else if((option & NoTmpVariable) == NoTmpVariable){
-            if(!qt_name.isEmpty())
-                s << INDENT << qt_name << " = ";
-        }else{
-            s << INDENT;
-            writeTypeInfo(s, java_type, SkipName); //ForceConstReference
-            s << ' ' << qt_name << " = ";
-        }
-        s << "qtjambi_cast<QMetaProperty>(" << __jni_env << ", " << java_name << ")";
     } else if (java_type->typeEntry()->isQMetaObjectConnectionType()) {
         if((option & OptionalScope) == OptionalScope){
             s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
@@ -8083,49 +7986,9 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
             s << ' ' << qt_name << " = ";
         }
         s << "qtjambi_cast<QMetaObject::Connection>(" << __jni_env << ", " << java_name << ")";
-    } else if (java_type->typeEntry()->isQMetaMethodType()) {
-        if((option & OptionalScope) == OptionalScope){
-            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    QMetaMethod* _" << qt_name << " = new QMetaMethod;" << Qt::endl;
-            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
-            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
-            s << INDENT << "}" << Qt::endl;
-            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<QMetaMethod*>(" << qt_name << ") = ";
-        }else if((option & DirectReturn) == DirectReturn){
-            s << INDENT << "return ";
-        }else if((option & NoTmpVariable) == NoTmpVariable){
-            if(!qt_name.isEmpty())
-                s << INDENT << qt_name << " = ";
-        }else{
-            s << INDENT;
-            writeTypeInfo(s, java_type, SkipName); //ForceConstReference
-            s << ' ' << qt_name << " = ";
-        }
-        s << "qtjambi_cast<QMetaMethod>(" << __jni_env << ", " << java_name << ")";
-    } else if (java_type->typeEntry()->isQMetaEnumType()) {
-        if((option & OptionalScope) == OptionalScope){
-            s << INDENT << "if(" << qtjambi_scope << " && !" << qt_name << "){" << Qt::endl;
-            s << INDENT << "    QMetaEnum* _" << qt_name << " = new QMetaEnum;" << Qt::endl;
-            s << INDENT << "    " << qt_name << " = _" << qt_name << ";" << Qt::endl;
-            s << INDENT << "    " << qtjambi_scope << "->addDeletion(_" << qt_name << ");" << Qt::endl;
-            s << INDENT << "}" << Qt::endl;
-            s << INDENT << "if(!" << qt_name << ")" << Qt::endl << INDENT << "    return false;" << Qt::endl;
-            s << INDENT << "*reinterpret_cast<QMetaEnum*>(" << qt_name << ") = ";
-        }else if((option & DirectReturn) == DirectReturn){
-            s << INDENT << "return ";
-        }else if((option & NoTmpVariable) == NoTmpVariable){
-            if(!qt_name.isEmpty())
-                s << INDENT << qt_name << " = ";
-        }else{
-            s << INDENT;
-            writeTypeInfo(s, java_type, NoOption); //ForceConstReference
-            s << ' ' << qt_name << " = ";
-        }
-        s << "qtjambi_cast<QMetaEnum>(" << __jni_env << ", " << java_name << ")";
     } else {
         const TypeEntry *type = java_type->typeEntry();
-        QString qualified_class_name = fixCppTypeName(type->qualifiedCppName());
+        QString qualified_class_name = type->qualifiedCppName();
         if(!java_type->instantiations().isEmpty()){
             qualified_class_name += "<";
             for(int i=0; i<java_type->instantiations().size(); ++i){
@@ -8186,8 +8049,9 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
                 } else if ((option & GlobalRefJObject) && type->jniName() == QLatin1String("jobject")) {
                     s << __jni_env << "->NewGlobalRef(" << java_name << ")";
                 } else {
+                    s << "static_cast<";
                     writeTypeInfo(s, java_type, Option(SkipName | ForceValueType));
-                    s << "(";
+                    s << ">(";
                     s << java_name;
                     s << ")";
                 }
@@ -8288,7 +8152,7 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
                     }
                 } else {
                     if ((option & UseNativeIds) == 0 || !java_type->typeEntry()->isNativeIdBased()){
-                        if(java_type->typeEntry()->qualifiedCppName()=="__GLsync"){
+                        if(java_type->typeEntry()->isComplex() && static_cast<const ComplexTypeEntry*>(java_type->typeEntry())->isGLsync()){
                             s << "QtJambiAPI::convertJavaObjectToNative<__GLsync>(" << __jni_env << ", " << java_name << ")";
                         }else{
                             s << "qtjambi_cast<";
@@ -8327,9 +8191,17 @@ bool CppImplGenerator::writeJavaToQt(QTextStream &s,
                 // Return values...
                 if(!java_type->isConstant() && java_type->getReferenceType()==MetaType::Reference){
                     if ((option & UseNativeIds) == 0 || !java_type->typeEntry()->isNativeIdBased()){
-                        s << "qtjambi_cast<";
-                        writeTypeInfo(s, java_type);
-                        s << ">(" << __jni_env << ", " << java_name << ")";
+                        if(java_type->typeEntry()==TypeDatabase::instance()->qvariantType()){
+                            s << "QtJambiAPI::convertJavaObjectToNativeReference<QVariant>(" << __jni_env << ", " << java_name << ")";
+                        }else if(java_type->typeEntry()==TypeDatabase::instance()->qstringType()){
+                            s << "QtJambiAPI::convertJavaObjectToNativeReference<QString>(" << __jni_env << ", " << java_name << ")";
+                        }else if(java_type->typeEntry()==TypeDatabase::instance()->qcharType()){
+                            s << "QtJambiAPI::convertJavaObjectToNativeReference<QChar>(" << __jni_env << ", " << java_name << ")";
+                        }else{
+                            s << "qtjambi_cast<";
+                            writeTypeInfo(s, java_type);
+                            s << ">(" << __jni_env << ", " << java_name << ")";
+                        }
                     }else{
                         if(java_type->typeEntry()->isInterface() || java_type->typeEntry()->designatedInterface() || java_type->typeEntry()->isFunctional()){
                             s << "QtJambiAPI::interfaceReferenceFromNativeId";
@@ -8610,21 +8482,6 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
         ReportHandler::warning(warn);
         return true;
     }
-    /*if (java_type->typeEntry()->isObject() && java_type->actualIndirections() == 0) {
-        QString functionName;
-        if(java_function){
-            functionName = java_function->implementingClass()->qualifiedCppName()+"::"+java_function->name();
-        }else if(java_functional){
-            if(java_functional->enclosingClass())
-                functionName = java_functional->enclosingClass()->name();
-            functionName += java_functional->name();
-        }else{
-            functionName = "unknown";
-        }
-        ReportHandler::warning(QString("Object type '%1' passed as value. Resulting code will not compile.  %2")
-                               .arg(java_type->cppSignature())
-                               .arg(functionName));
-    }*/
     if(java_type->isNativePointer()){
         QString functionName;
         if(java_function){
@@ -8637,8 +8494,7 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
             functionName = "unknown";
         }
         ReportHandler::debugFull(QString("native pointer pattern for '%1'  %2")
-                                 .arg(java_type->cppSignature())
-                                 .arg(functionName));
+                                 .arg(java_type->cppSignature(), functionName));
     }
 
     if (java_type->isArray()) { // jniTypeName(java_type)
@@ -8784,14 +8640,15 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
                     s << newType << "(" << qt_name << ")";
             }
         }
-    } else if (java_type->isTargetLangString()
-               || java_type->isTargetLangStringRef()
-               || java_type->isTargetLangStringView()
-               || java_type->isTargetLangAnyStringView()
-               || java_type->isTargetLangUtf8StringView()
-               || java_type->isTargetLangLatin1String()
-               || java_type->isTargetLangLatin1StringView()) {
-        if(java_type->isTargetLangString() && !java_type->typeEntry()->isQString()){
+    } else if (java_type->isQString()
+               || java_type->isCharString()
+               || java_type->isQStringRef()
+               || java_type->isQStringView()
+               || java_type->isQAnyStringView()
+               || java_type->isQUtf8StringView()
+               || java_type->isQLatin1String()
+               || java_type->isQLatin1StringView()) {
+        if(java_type->isQString() && !java_type->typeEntry()->isQString()){
             s << INDENT;
             if((option & DirectReturn) == DirectReturn){
                 s << "return ";
@@ -8801,7 +8658,10 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
             }else{
                 s << "jobject " << java_name << " = ";
             }
-            s << "QtJambiAPI::convertQStringToJavaObject(" << __jni_env << ", " << qt_name << ")";
+            s << "QtJambiAPI::convertQStringToJavaObject(" << __jni_env << ", ";
+            if(!java_type->isConstant() && java_type->indirections().isEmpty() && java_type->getReferenceType()==MetaType::Reference)
+                s << "&";
+            s << qt_name << ")";
         }else{
             s << INDENT;
             if((option & DirectReturn) == DirectReturn){
@@ -8814,8 +8674,8 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
             }
             s << "qtjambi_cast<jstring>(" << __jni_env << ", " << qt_name << ")";
         }
-    } else if (java_type->isTargetLangChar()) {
-        if(java_type->typeEntry()->isChar()){
+    } else if (java_type->isQChar()) {
+        if(java_type->typeEntry()->isQChar()){
             s << INDENT;
             if((option & DirectReturn) == DirectReturn){
                 s << "return ";
@@ -8925,15 +8785,7 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
             s << "jobject " << java_name << " = ";
         }
         if (java_type->isContainer()) {
-            QScopedPointer<MetaType> scopedPointer;
-            const MetaType *container_type = java_type;
-            if(java_type->indirections().size()==1){
-                scopedPointer.reset(container_type->copy());
-                container_type = scopedPointer.data();
-                scopedPointer->setIndirections(QList<bool>());
-                scopedPointer->setReferenceType(MetaType::Reference);
-            }
-            const ContainerTypeEntry *type = static_cast<const ContainerTypeEntry *>(container_type->typeEntry());
+            const ContainerTypeEntry *type = static_cast<const ContainerTypeEntry *>(java_type->typeEntry());
             if (type->type() == ContainerTypeEntry::ListContainer
                     || type->type() == ContainerTypeEntry::std_vector
                     || type->type() == ContainerTypeEntry::ByteArrayListContainer
@@ -8948,8 +8800,8 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
                 ) {
                 s << "qtjambi_cast<jobject>(" << __jni_env << ", ";
                 if(!qtjambi_scope.isEmpty()
-                        && !container_type->isConstant()
-                        && container_type->getReferenceType()==MetaType::Reference){
+                        && !java_type->isConstant()
+                        && java_type->getReferenceType()==MetaType::Reference){
                     if((option & OptionalScope) == OptionalScope)
                         s << "*";
                     s << qtjambi_scope << ", &";
@@ -8961,8 +8813,8 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
                        || type->type() == ContainerTypeEntry::HashContainer) {
                 s << "qtjambi_cast<jobject>(" << __jni_env << ", ";
                 if(!qtjambi_scope.isEmpty()
-                        && !container_type->isConstant()
-                        && container_type->getReferenceType()==MetaType::Reference){
+                        && !java_type->isConstant()
+                        && java_type->getReferenceType()==MetaType::Reference){
                     if((option & OptionalScope) == OptionalScope)
                         s << "*";
                     s << qtjambi_scope << ", &";
@@ -8982,20 +8834,15 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
                 ReportHandler::warning(QString("unable to generate container type %1, type=%2")
                                        .arg(java_type->name()).arg(type->type()));
             }
-        }else if (java_type->isJObjectWrapper()
-                   || java_type->isJMapWrapper()
-                   || java_type->isJCollectionWrapper()
-                   || java_type->isJEnumWrapper()
-                   || java_type->isJIteratorWrapper()
-                   || java_type->isJQFlagsWrapper()) {
-            s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-        } else if (java_type->isVariant()) {
-            s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-        } else if (java_type->isTargetLangEnum()) {
-            s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-        } else if (java_type->isTargetLangFlags()) {
-            //Q_ASSERT((option & EnumAsInts) == 0);
-            s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
+        } else if (java_type->isQVariant()) {
+            if(!java_type->typeEntry()->isQVariant()){
+                s << "QtJambiAPI::convertQVariantToJavaVariant(" << __jni_env << ", ";
+                if(!java_type->isConstant() && java_type->indirections().isEmpty() && java_type->getReferenceType()==MetaType::Reference)
+                    s << "&";
+                s << qt_name << ")";
+            }else{
+                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
+            }
         } else if (java_type->isFunctional()) {
             const FunctionalTypeEntry* funEntry = static_cast<const FunctionalTypeEntry*>(java_type->typeEntry());
             QString funName = funEntry->targetLangName();
@@ -9011,229 +8858,181 @@ bool CppImplGenerator::writeQtToJava(QTextStream &s,
                 s << qtjambi_scope << ", ";
             }
             s << qt_name << ")";
-        } else {
-            if (java_type->isQObject()) {
-                if(java_type->indirections().isEmpty() && java_type->getReferenceType()!=MetaType::NoReference)
+        }else if (java_type->isJObjectWrapper()
+                   || java_type->isTargetLangEnum()
+                   || java_type->isTargetLangFlags()
+                   || java_type->typeEntry()->isQMetaObjectType()
+                   || java_type->typeEntry()->isQMetaObjectConnectionType()) {
+            s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
+        } else if(java_type->typeEntry()->isComplex() && static_cast<const ComplexTypeEntry*>(java_type->typeEntry())->isGLsync()){
+            s << "QtJambiAPI::convertNativeToJavaObjectAsWrapper(" << __jni_env << ", static_cast<const void *>(" << (java_type->getReferenceType()==MetaType::Reference ? "&" : "")
+              << qt_name << "), Java::QtGui::GLsync::getClass(" << __jni_env << "))";
+        } else if (java_type->isQObject()) {
+            if(java_type->indirections().isEmpty() && java_type->getReferenceType()!=MetaType::NoReference)
+                s << "qtjambi_cast<jobject>(" << __jni_env << ", &" << qt_name << ")";
+            else
+                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
+        } else if (java_type->isNativePointer()) {
+            s << "QtJambiAPI::convertNativeToQNativePointer(" << __jni_env << ", ";
+            if (java_type->getReferenceType()==MetaType::Reference)
+                s << "&";
+            s << qt_name << ", " << nativePointerTypeString(java_type) << ", "
+            << java_type->actualIndirections() << ")";
+        } else if (java_type->isValue()) {
+//            if(static_cast<const ValueTypeEntry*>(java_type->typeEntry())->skipMetaTypeRegistration()){
+//                if(java_type->getReferenceType()==MetaType::NoReference){
+//                    s << "QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(" << __jni_env << ", new " << java_type->typeEntry()->qualifiedCppName() << "(std::move(" << qt_name << ")))";
+//                }else{
+//                    s << "QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(" << __jni_env << ", new " << java_type->typeEntry()->qualifiedCppName() << "(" << qt_name << "))";
+//                }
+//            }else{
+                if(!java_type->isConstant() && java_type->indirections().isEmpty() && java_type->getReferenceType()==MetaType::Reference)
                     s << "qtjambi_cast<jobject>(" << __jni_env << ", &" << qt_name << ")";
                 else
                     s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-            } else if (java_type->isNativePointer()) {
-                s << "QtJambiAPI::convertNativeToQNativePointer(" << __jni_env << ", ";
-                if (java_type->getReferenceType()==MetaType::Reference)
-                    s << "&";
-                s << qt_name << ", " << nativePointerTypeString(java_type) << ", "
-                << java_type->actualIndirections() << ")";
-            } else if (java_type->typeEntry()->isQModelIndexType()) {
-                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-            } else if (java_type->typeEntry()->isQMetaObjectType()) {
-                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-            } else if (java_type->typeEntry()->isQMetaObjectConnectionType()) {
-                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-            } else if (java_type->typeEntry()->isQMetaPropertyType()) {
-                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-            } else if (java_type->typeEntry()->isQMetaMethodType()) {
-                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-            } else if (java_type->typeEntry()->isQMetaEnumType()) {
-                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-            } else if (java_type->isValue()) {
-                if(static_cast<const ValueTypeEntry*>(java_type->typeEntry())->skipMetaTypeRegistration()){
-                    if(java_type->getReferenceType()==MetaType::NoReference){
-                        s << "[&]() -> jobject { jobject result = QtJambiAPI::convertNativeToJavaObject(" << __jni_env << ", new " << java_type->typeEntry()->qualifiedCppName() << "(std::move(" << qt_name << ")), false, false); QtJambiAPI::setJavaOwnership(" << __jni_env << ", result); return result; }()";
+//            }
+        } else if (java_type->isIterator()) {
+            const IteratorTypeEntry* iteratorType = static_cast<const IteratorTypeEntry*>(java_type->typeEntry());
+            bool found = false;
+            if(java_type->iteratorInstantiations().size()==2){
+                writeQAssociativeIteratorFunction(s, java_type,
+                                       java_type->iteratorInstantiations().at(0),
+                                       java_type->iteratorInstantiations().at(1),
+                                       qt_name, option, "", __jni_env, qtjambi_scope);
+                found = true;
+            }else if(java_type->iteratorInstantiations().size()==1){
+                writeQSequentialIteratorFunction(s, java_type,
+                                       java_type->iteratorInstantiations().at(0),
+                                       qt_name, option, "", __jni_env, qtjambi_scope);
+                found = true;
+            }
+            if(!found && java_function && java_function->declaringClass()){
+                if(MetaClass * iteratorClass = java_function->declaringClass()->findIterator(iteratorType)){
+                    if(iteratorClass->templateBaseClassInstantiations().size()==1){
+                        QScopedPointer<MetaType> copy(java_type->copy());
+                        copy->setConstant(false);
+                        copy->setReferenceType(MetaType::NoReference);
+                        copy->setIndirections(QList<bool>());
+                        if(iteratorClass->enclosingClass())
+                            copy->setTypeEntry(iteratorClass->enclosingClass()->typeEntry());
+                        if(java_function->declaringClass()->templateBaseClass())
+                            copy->setTypeEntry(java_function->declaringClass()->templateBaseClass()->typeEntry());
+                        copy->setInstantiations(iteratorClass->templateBaseClassInstantiations());
+                        copy->setArrayElementCount(0);
+                        copy->setArrayElementType(nullptr);
+                        copy->setForceBoxedPrimitives(true);
+                        MetaBuilder::decideUsagePattern(copy.data());
+                        writeQSequentialIteratorFunction(s, copy.data(), java_function->declaringClass()->templateBaseClassInstantiations().at(0), qt_name, option, iteratorType->iteratorName(), __jni_env, qtjambi_scope);
+                        found = true;
                     }else{
-                        s << "[&]() -> jobject { jobject result = QtJambiAPI::convertNativeToJavaObject(" << __jni_env << ", new " << java_type->typeEntry()->qualifiedCppName() << "(" << qt_name << "), false, false); QtJambiAPI::setJavaOwnership(" << __jni_env << ", result); return result; }()";
+                        for(const MetaFunction *function : iteratorClass->functions()){
+                            if(function->operatorType()==OperatorType::Times && function->type() && function->arguments().isEmpty() && function->isConstant()){
+                                writeQSequentialIteratorFunction(s, java_type, function->type(), qt_name, option, "", __jni_env, qtjambi_scope);
+                                found = true;
+                                break;
+                            }
+                        }
                     }
-                }else{
-                    const TypeEntry *entry = java_type->typeEntry();
-                    QString returned;
-                    QString package = entry->javaPackage();
-                    const ComplexTypeEntry *centry = entry->isComplex()
-                                                     ? static_cast<const ComplexTypeEntry *>(entry)
-                                                     : nullptr;
-
-                    if (!centry || centry->polymorphicIdValue().isEmpty()) {
-                        if(centry && (centry->isInterface() || centry->designatedInterface())){
-                            if(entry->isObject() && java_type->indirections().isEmpty() && java_type->getReferenceType()!=MetaType::NoReference)
-                                s << "qtjambi_cast<jobject>(" << __jni_env << ", &" << qt_name << ")";
-                            else
-                                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
+                }
+            }
+            if(!found && iteratorType->containerType()){
+                if(MetaClass * containerClass = m_classes.findClass(iteratorType->containerType()->qualifiedCppName())){
+                    if(containerClass->templateBaseClass() && containerClass->templateBaseClass()->typeEntry()->isContainer()){
+                        const ContainerTypeEntry* containerType = static_cast<const ContainerTypeEntry*>(containerClass->templateBaseClass()->typeEntry());
+                        if(containerType->type()==ContainerTypeEntry::MapContainer
+                            || containerType->type()==ContainerTypeEntry::MultiMapContainer
+                            || containerType->type()==ContainerTypeEntry::HashContainer
+                                || containerType->type()==ContainerTypeEntry::MultiHashContainer){
+                            if(containerClass->templateBaseClassInstantiations().size()==2){
+                                QScopedPointer<MetaType> copy(java_type->copy());
+                                copy->setConstant(false);
+                                copy->setReferenceType(MetaType::NoReference);
+                                copy->setIndirections(QList<bool>());
+                                copy->setTypeEntry(containerClass->templateBaseClass()->typeEntry());
+                                copy->setInstantiations(containerClass->templateBaseClassInstantiations());
+                                copy->setArrayElementCount(0);
+                                copy->setArrayElementType(nullptr);
+                                copy->setForceBoxedPrimitives(true);
+                                MetaBuilder::decideUsagePattern(copy.data());
+                                writeQAssociativeIteratorFunction(s, copy.data(),
+                                                       containerClass->templateBaseClassInstantiations().at(0),
+                                                       containerClass->templateBaseClassInstantiations().at(1),
+                                                       qt_name, option, iteratorType->iteratorName(), __jni_env, qtjambi_scope);
+                                found = true;
+                            }
                         }else{
-                            if(entry->qualifiedCppName()=="__GLsync"){
-                                s << "QtJambiAPI::convertNativeToJavaObject(" << __jni_env << ", static_cast<const void *>(" << (java_type->getReferenceType()==MetaType::Reference ? "&" : "") << qt_name << "), \"" << QString(package).replace(".", "/") << "/"
-                                        << entry->lookupName() << "\", false, false)";
-                            }else{
-                                if(entry->isObject() && java_type->indirections().isEmpty() && java_type->getReferenceType()!=MetaType::NoReference)
-                                    s << "qtjambi_cast<jobject>(" << __jni_env << ", &" << qt_name << ")";
-                                else
-                                    s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
+                            if(containerClass->templateBaseClassInstantiations().size()==1){
+                                QScopedPointer<MetaType> copy(java_type->copy());
+                                copy->setConstant(false);
+                                copy->setReferenceType(MetaType::NoReference);
+                                copy->setIndirections(QList<bool>());
+                                copy->setTypeEntry(containerClass->templateBaseClass()->typeEntry());
+                                copy->setInstantiations(containerClass->templateBaseClassInstantiations());
+                                copy->setArrayElementCount(0);
+                                copy->setArrayElementType(nullptr);
+                                copy->setForceBoxedPrimitives(true);
+                                MetaBuilder::decideUsagePattern(copy.data());
+                                writeQSequentialIteratorFunction(s, copy.data(), containerClass->templateBaseClassInstantiations().at(0), qt_name, option, iteratorType->iteratorName(), __jni_env, qtjambi_scope);
+                                found = true;
                             }
                         }
-                    } else {
-                        MetaClass *cls = classes().findClass(centry->qualifiedCppName());
-                        if (!cls) {
-                            qWarning("CppImplGenerator::fromObject(): class '%s' could not be resolved...",
-                                   qPrintable(centry->qualifiedCppName()));
-                        }
-
-                        while (cls!= nullptr && !cls->typeEntry()->isPolymorphicBase())
-                            cls = cls->baseClass();
-
-                        if (!cls) {//, " + entry->qualifiedCppName() + "
-                            ReportHandler::warning(QString("class '%1' has polymorphic id but does not inherit a polymorphic class")
-                                                   .arg(centry->qualifiedCppName()));
-                        }
-                        if(entry->isObject() && java_type->indirections().isEmpty() && java_type->getReferenceType()!=MetaType::NoReference)
-                            s << "qtjambi_cast<jobject>(" << __jni_env << ", &" << qt_name << ")";
-                        else
-                            s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
-                    }
-                }
-            } else if (java_type->isIterator()) {
-                const IteratorTypeEntry* iteratorType = static_cast<const IteratorTypeEntry*>(java_type->typeEntry());
-                bool found = false;
-                if(java_type->iteratorInstantiations().size()==2){
-                    writeQAssociativeIteratorFunction(s, java_type,
-                                           java_type->iteratorInstantiations().at(0),
-                                           java_type->iteratorInstantiations().at(1),
-                                           qt_name, option, "", __jni_env, qtjambi_scope);
-                    found = true;
-                }else if(java_type->iteratorInstantiations().size()==1){
-                    writeQSequentialIteratorFunction(s, java_type,
-                                           java_type->iteratorInstantiations().at(0),
-                                           qt_name, option, "", __jni_env, qtjambi_scope);
-                    found = true;
-                }
-                if(!found && java_function && java_function->declaringClass()){
-                    if(MetaClass * iteratorClass = java_function->declaringClass()->findIterator(iteratorType)){
-                        if(iteratorClass->templateBaseClassInstantiations().size()==1){
+                    }
+                }else{
+                    if(java_function
+                            && java_function->declaringClass()
+                            && java_type->originalTypeDescription()==java_function->declaringClass()->baseClassName()+"::"+iteratorType->iteratorName()){
+                        if(java_function->declaringClass()->templateBaseClassInstantiations().size()==1){
                             QScopedPointer<MetaType> copy(java_type->copy());
                             copy->setConstant(false);
                             copy->setReferenceType(MetaType::NoReference);
                             copy->setIndirections(QList<bool>());
-                            if(iteratorClass->enclosingClass())
-                                copy->setTypeEntry(iteratorClass->enclosingClass()->typeEntry());
                             if(java_function->declaringClass()->templateBaseClass())
                                 copy->setTypeEntry(java_function->declaringClass()->templateBaseClass()->typeEntry());
-                            copy->setInstantiations(iteratorClass->templateBaseClassInstantiations());
+                            copy->setInstantiations(java_function->declaringClass()->templateBaseClassInstantiations());
                             copy->setArrayElementCount(0);
                             copy->setArrayElementType(nullptr);
                             copy->setForceBoxedPrimitives(true);
                             MetaBuilder::decideUsagePattern(copy.data());
                             writeQSequentialIteratorFunction(s, copy.data(), java_function->declaringClass()->templateBaseClassInstantiations().at(0), qt_name, option, iteratorType->iteratorName(), __jni_env, qtjambi_scope);
                             found = true;
-                        }else{
-                            for(const MetaFunction *function : iteratorClass->functions()){
-                                if(function->originalName()=="operator*" && function->type() && function->arguments().isEmpty() && function->isConstant()){
-                                    writeQSequentialIteratorFunction(s, java_type, function->type(), qt_name, option, "", __jni_env, qtjambi_scope);
-                                    found = true;
-                                    break;
-                                }
-                            }
                         }
                     }
                 }
-                if(!found && iteratorType->containerType()){
-                    if(MetaClass * containerClass = m_classes.findClass(iteratorType->containerType()->qualifiedCppName())){
-                        if(containerClass->templateBaseClass() && containerClass->templateBaseClass()->typeEntry()->isContainer()){
-                            const ContainerTypeEntry* containerType = static_cast<const ContainerTypeEntry*>(containerClass->templateBaseClass()->typeEntry());
-                            if(containerType->type()==ContainerTypeEntry::MapContainer
-                                || containerType->type()==ContainerTypeEntry::MultiMapContainer
-                                || containerType->type()==ContainerTypeEntry::HashContainer
-                                    || containerType->type()==ContainerTypeEntry::MultiHashContainer){
-                                if(containerClass->templateBaseClassInstantiations().size()==2){
-                                    QScopedPointer<MetaType> copy(java_type->copy());
-                                    copy->setConstant(false);
-                                    copy->setReferenceType(MetaType::NoReference);
-                                    copy->setIndirections(QList<bool>());
-                                    copy->setTypeEntry(containerClass->templateBaseClass()->typeEntry());
-                                    copy->setInstantiations(containerClass->templateBaseClassInstantiations());
-                                    copy->setArrayElementCount(0);
-                                    copy->setArrayElementType(nullptr);
-                                    copy->setForceBoxedPrimitives(true);
-                                    MetaBuilder::decideUsagePattern(copy.data());
-                                    writeQAssociativeIteratorFunction(s, copy.data(),
-                                                           containerClass->templateBaseClassInstantiations().at(0),
-                                                           containerClass->templateBaseClassInstantiations().at(1),
-                                                           qt_name, option, iteratorType->iteratorName(), __jni_env, qtjambi_scope);
-                                    found = true;
-                                }
-                            }else{
-                                if(containerClass->templateBaseClassInstantiations().size()==1){
-                                    QScopedPointer<MetaType> copy(java_type->copy());
-                                    copy->setConstant(false);
-                                    copy->setReferenceType(MetaType::NoReference);
-                                    copy->setIndirections(QList<bool>());
-                                    copy->setTypeEntry(containerClass->templateBaseClass()->typeEntry());
-                                    copy->setInstantiations(containerClass->templateBaseClassInstantiations());
-                                    copy->setArrayElementCount(0);
-                                    copy->setArrayElementType(nullptr);
-                                    copy->setForceBoxedPrimitives(true);
-                                    MetaBuilder::decideUsagePattern(copy.data());
-                                    writeQSequentialIteratorFunction(s, copy.data(), containerClass->templateBaseClassInstantiations().at(0), qt_name, option, iteratorType->iteratorName(), __jni_env, qtjambi_scope);
-                                    found = true;
-                                }
+            }
+            if(!found){
+                if(MetaClass * iteratorClass = m_classes.findClass(iteratorType->qualifiedCppName(), MetaClassList::QualifiedCppName)){
+                    if(iteratorClass->typeAliasType()){
+                        QScopedPointer<MetaType> typeAliasType(iteratorClass->typeAliasType()->copy());
+                        if(typeAliasType->indirections().size()==1 && typeAliasType->getReferenceType()==MetaType::NoReference){
+                            QList<bool> indirections = typeAliasType->indirections();
+                            if(!indirections.isEmpty()){
+                                indirections.takeFirst();
+                                typeAliasType->setIndirections(indirections);
                             }
+                            typeAliasType->setReferenceType(MetaType::Reference);
+                            MetaBuilder::decideUsagePattern(typeAliasType.data());
                         }
+                        writeQSequentialIteratorFunction(s, java_type, typeAliasType.data(), qt_name, option, "", __jni_env, qtjambi_scope);
+                        found = true;
                     }else{
-                        if(java_function
-                                && java_function->declaringClass()
-                                && java_type->originalTypeDescription()==java_function->declaringClass()->baseClassName()+"::"+iteratorType->iteratorName()){
-                            if(java_function->declaringClass()->templateBaseClassInstantiations().size()==1){
-                                QScopedPointer<MetaType> copy(java_type->copy());
-                                copy->setConstant(false);
-                                copy->setReferenceType(MetaType::NoReference);
-                                copy->setIndirections(QList<bool>());
-                                if(java_function->declaringClass()->templateBaseClass())
-                                    copy->setTypeEntry(java_function->declaringClass()->templateBaseClass()->typeEntry());
-                                copy->setInstantiations(java_function->declaringClass()->templateBaseClassInstantiations());
-                                copy->setArrayElementCount(0);
-                                copy->setArrayElementType(nullptr);
-                                copy->setForceBoxedPrimitives(true);
-                                MetaBuilder::decideUsagePattern(copy.data());
-                                writeQSequentialIteratorFunction(s, copy.data(), java_function->declaringClass()->templateBaseClassInstantiations().at(0), qt_name, option, iteratorType->iteratorName(), __jni_env, qtjambi_scope);
+                        for(const MetaFunction *function : iteratorClass->functions()){
+                            if(function->operatorType()==OperatorType::Times && function->type() && function->arguments().isEmpty() && function->isConstant()){
+                                writeQSequentialIteratorFunction(s, java_type, function->type(), qt_name, option, "", __jni_env, qtjambi_scope);
                                 found = true;
+                                break;
                             }
                         }
                     }
                 }
-                if(!found){
-                    if(MetaClass * iteratorClass = m_classes.findClass(iteratorType->qualifiedCppName(), MetaClassList::QualifiedCppName)){
-                        if(iteratorClass->typeAliasType()){
-                            QScopedPointer<MetaType> typeAliasType(iteratorClass->typeAliasType()->copy());
-                            if(typeAliasType->indirections().size()==1 && typeAliasType->getReferenceType()==MetaType::NoReference){
-                                QList<bool> indirections = typeAliasType->indirections();
-                                if(!indirections.isEmpty()){
-                                    indirections.takeFirst();
-                                    typeAliasType->setIndirections(indirections);
-                                }
-                                typeAliasType->setReferenceType(MetaType::Reference);
-                                MetaBuilder::decideUsagePattern(typeAliasType.data());
-                            }
-                            writeQSequentialIteratorFunction(s, java_type, typeAliasType.data(), qt_name, option, "", __jni_env, qtjambi_scope);
-                            found = true;
-                        }else{
-                            for(const MetaFunction *function : iteratorClass->functions()){
-                                if(function->originalName()=="operator*" && function->type() && function->arguments().isEmpty() && function->isConstant()){
-                                    writeQSequentialIteratorFunction(s, java_type, function->type(), qt_name, option, "", __jni_env, qtjambi_scope);
-                                    found = true;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-                if(!found){
-                    s << "nullptr /""*unable to create iterator*""/";
-                }
-            } else if(java_type->typeEntry()->qualifiedCppName()=="__GLsync"){
-                s << "QtJambiAPI::convertNativeToJavaObject(" << __jni_env << ", static_cast<const void *>(" << (java_type->getReferenceType()==MetaType::Reference ? "&" : "")
-                  << qt_name << "), \"" << QString(java_type->typeEntry()->javaPackage()).replace(".", "/") << "/"
-                        << java_type->typeEntry()->lookupName() << "\", false, false)";
-            } else {
-                if(java_type->typeEntry()->isObject() && java_type->indirections().isEmpty() && java_type->getReferenceType()!=MetaType::NoReference)
-                    s << "qtjambi_cast<jobject>(" << __jni_env << ", &" << qt_name << ")";
-                else
-                    s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
             }
+            if(!found){
+                s << "nullptr /""*unable to create iterator*""/";
+            }
+        } else {
+            if(!java_type->isConstant() && java_type->indirections().isEmpty() && java_type->getReferenceType()==MetaType::Reference)
+                s << "qtjambi_cast<jobject>(" << __jni_env << ", &" << qt_name << ")";
+            else
+                s << "qtjambi_cast<jobject>(" << __jni_env << ", " << qt_name << ")";
         }
     }
     if(semiRequired){
@@ -9389,7 +9188,7 @@ void CppImplGenerator::writeJavaToQtContainer(QTextStream &s,
                     Q_ASSERT(qStringTypeEntry);
                     instantiation->setTypeEntry(qStringTypeEntry);
                     instantiation->setOriginalTypeDescription("QString");
-                    instantiation->setTypeUsagePattern(MetaType::StringPattern);
+                    instantiation->setTypeUsagePattern(MetaType::QStringPattern);
                 }
                 break;
             default:
@@ -10006,6 +9805,7 @@ void CppImplGenerator::writeFunctionCall(QTextStream &s, const QString &object_n
 
         if (prefix.isEmpty()
                 && !(option & JNIProxyFunction)
+                && !java_function->isInGlobalScope()
                 && !java_function->isStatic()
                 && !java_function->isAbstract()
                 && !java_function->implementingClass()->typeEntry()->isNativeInterface()
@@ -10016,149 +9816,265 @@ void CppImplGenerator::writeFunctionCall(QTextStream &s, const QString &object_n
 
         // Global scope stream operators need the arguments to be reordered (this ref at end)
         // so we special case them in order to simplify this code
-        bool stream_operator = java_function->originalName() == "operator<<"
-                                || java_function->originalName() == "operator>>";
-        if (java_function->isInGlobalScope() && stream_operator) {
-            if (!java_function->type())
-                s << "if (" << object_name << " != nullptr) ";
-            else
-                s << "(" << object_name << " != nullptr) ? ";
-            if(!prefix.isEmpty())
-                s << "::" << prefix;
-            s << function_name << templateParams << "(";
-            if (!stream_operator)
-                s << "*" << object_name << ", ";
+        if (!java_function->type()
+                && java_function->arguments().size()==1
+                && ((java_function->operatorType()==OperatorType::ShiftLeft && java_function->name()==QLatin1String("writeTo"))
+                || (java_function->operatorType()==OperatorType::ShiftRight && java_function->name()==QLatin1String("readFrom")))) {
             writeFunctionCallArguments(s, java_function, "__qt_", option);
-            if (stream_operator)
-                s << ", *" << object_name;
-            s << ")";
-            if (java_function->type()!= nullptr)
-                s << " : " << default_return_statement_qt(java_function->type(), AbstractGenerator::Option(option | AbstractGenerator::NoReturnStatement));
+            if(java_function->operatorType()==OperatorType::ShiftLeft)
+                s << " << (*" << object_name << ")";
+            else
+                s << " >> (*" << object_name << ")";
         } else {
-            bool noPar = false;
+            bool operatorCall = false;
             bool additionalClosingPar = false;
-            if(prefix.isEmpty() && !java_function->isStatic() && (extra_arguments.size() + java_function->arguments().size())<=1){
-                if(function_name=="operator++"){
-                    if((extra_arguments.size() + java_function->arguments().size())==0)
-                        s << "++(*" << object_name << ")";
-                    else if((extra_arguments.size() + java_function->arguments().size())==1){
-                        s << "(*" << object_name << ")++";
-                        return;
-                    }
-                    noPar = true;
-                }else if(function_name=="operator--"){
-                    if((extra_arguments.size() + java_function->arguments().size())==0)
-                        s << "--(*" << object_name << ")";
-                    else if((extra_arguments.size() + java_function->arguments().size())==1){
-                        s << "(*" << object_name << ")--";
-                        return;
-                    }
-                    noPar = true;
-                }else if(function_name=="operator*"){
-                    if((extra_arguments.size() + java_function->arguments().size())==0)
-                        s << "*(*" << object_name << ")";
-                    else
-                        s << "(*" << object_name << ") * ";
-                    noPar = true;
-                }else if(function_name=="operator+"){
+            bool additionalClosingBracket = false;
+            if(prefix.isEmpty()
+                    && !java_function->isExplicit()
+                    && !java_function->isStatic()){
+                operatorCall = true;
+                switch(java_function->operatorType()){
+                case OperatorType::Plus:
                     if((extra_arguments.size() + java_function->arguments().size())==0)
                         s << "+(*" << object_name << ")";
-                    else
+                    else if(java_function->arguments().size()==1)
                         s << "(*" << object_name << ") + ";
-                    noPar = true;
-                }else if(function_name=="operator-"){
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Minus:
                     if((extra_arguments.size() + java_function->arguments().size())==0)
                         s << "-(*" << object_name << ")";
-                    else
+                    else if(java_function->arguments().size()==1)
                         s << "(*" << object_name << ") - ";
-                    noPar = true;
-                }else if(function_name=="operator/"){
-                    s << "(*" << object_name << ") / ";
-                    noPar = true;
-                }else if(function_name=="operator<"){
-                    s << "(*" << object_name << ") < ";
-                    noPar = true;
-                }else if(function_name=="operator>"){
-                    s << "(*" << object_name << ") > ";
-                    noPar = true;
-                }else if(function_name=="operator<="){
-                    s << "(*" << object_name << ") <= ";
-                    noPar = true;
-                }else if(function_name=="operator<=>"){
-                    s << "(*" << object_name << ") <=> ";
-                    noPar = true;
-                }else if(function_name=="operator>="){
-                    s << "(*" << object_name << ") >= ";
-                    noPar = true;
-                }else if(function_name=="operator%"){
-                    s << "(*" << object_name << ") % ";
-                    noPar = true;
-                }else if(function_name=="operator^"){
-                    s << "(*" << object_name << ") ^ ";
-                    noPar = true;
-                }else if(function_name=="operator,"){
-                    s << "(*" << object_name << ") , ";
-                    noPar = true;
-                }else if(function_name=="operator~"){
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Times:
                     if((extra_arguments.size() + java_function->arguments().size())==0)
-                        s << "~(*" << object_name << ")";
-                    else s << "(*" << object_name << ") ~ ";
-                    noPar = true;
-                }else if(function_name=="operator!"){
-                        s << "!(*" << object_name << ")";
-                    noPar = true;
-                }else if(function_name=="operator&"){
+                        s << "*(*" << object_name << ")";
+                    else if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") * ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Div:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") / ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Rem:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") % ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::And:
                     if((extra_arguments.size() + java_function->arguments().size())==0)
                         s << "&(*" << object_name << ")";
-                    else
+                    else if(java_function->arguments().size()==1)
                         s << "(*" << object_name << ") & ";
-                    noPar = true;
-                }else if(function_name=="operator|"){
-                    s << "(*" << object_name << ") | ";
-                    noPar = true;
-                }else if(function_name=="operator&&"){
-                    s << "(*" << object_name << ") && ";
-                    noPar = true;
-                }else if(function_name=="operator||"){
-                    s << "(*" << object_name << ") || ";
-                    noPar = true;
-                }else if(function_name=="operator/="){
-                    s << "(*" << object_name << ") /= ";
-                    noPar = true;
-                }else if(function_name=="operator-="){
-                    s << "(*" << object_name << ") -= ";
-                    noPar = true;
-                }else if(function_name=="operator+="){
-                    s << "(*" << object_name << ") += ";
-                    noPar = true;
-                }else if(function_name=="operator*="){
-                    s << "(*" << object_name << ") *= ";
-                    noPar = true;
-                }else if(function_name=="operator~="){
-                    s << "(*" << object_name << ") ~= ";
-                    noPar = true;
-                }else if(function_name=="operator^="){
-                    s << "(*" << object_name << ") ^= ";
-                    noPar = true;
-                }else if(function_name=="operator|="){
-                    s << "(*" << object_name << ") |= ";
-                    noPar = true;
-                }else if(function_name=="operator%="){
-                    s << "(*" << object_name << ") %= ";
-                    noPar = true;
-                }else if(function_name=="operator&="){
-                    s << "(*" << object_name << ") &= ";
-                    noPar = true;
-                }else if(function_name=="operator=="){
-                    s << "(*" << object_name << ") == ";
-                    noPar = true;
-                }else if(function_name=="operator="){
-                    s << "((*" << object_name << ") = ";
-                    noPar = true;
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Or:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") | ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Xor:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") ^ ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Not:
+                    if((extra_arguments.size() + java_function->arguments().size())==0)
+                        s << "~(*" << object_name << ")";
+                    else if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") ~ ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::ShiftLeft:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") << ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::ShiftRight:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") >> ";
+                    else operatorCall = true;
+                    break;
+
+                // assigments
+                case OperatorType::Assign:
+                    if(java_function->arguments().size()==1){
+                        if(java_function->type()){
+                            s << "(";
+                            additionalClosingPar = true;
+                        }
+                        s << "(*" << object_name << ") = ";
+                    }else operatorCall = true;
+                    break;
+                case OperatorType::PlusAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") += ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::MinusAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") -= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::TimesAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") *= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::DivAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") /= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::RemAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") %= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::AndAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") &= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::OrAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") |= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::XorAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") ^= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::ShiftLeftAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") <<= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::ShiftRightAssign:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") >>= ";
+                    else operatorCall = true;
+                    break;
+
+                // Logical
+                case OperatorType::ExclusiveAnd:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") && ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::ExclusiveOr:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") || ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Negation:
+                    if(java_function->arguments().size()==0)
+                        s << "!(*" << object_name << ")";
+                    else operatorCall = true;
+                    break;
+
+                // incr/decr
+                case OperatorType::Inc:
+                    if((extra_arguments.size() + java_function->arguments().size())==0)
+                        if(java_function->type() && java_function->type()->getReferenceType()==MetaType::NoReference){
+                            s << "*" << object_name << ";" << Qt::endl
+                              << INDENT << "++__qt_return_value";
+                        }else{
+                            s << "++(*" << object_name << ")";
+                        }
+                    else if((extra_arguments.size() + java_function->arguments().size())==1){
+                        s << "(*" << object_name << ")++";
+                        return;
+                    }
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Dec:
+                    if((extra_arguments.size() + java_function->arguments().size())==0)
+                        if(java_function->type() && java_function->type()->getReferenceType()==MetaType::NoReference){
+                            s << "*" << object_name << ";" << Qt::endl
+                              << INDENT << "--__qt_return_value";
+                        }else{
+                            s << "--(*" << object_name << ")";
+                        }
+                    else if((extra_arguments.size() + java_function->arguments().size())==1){
+                        s << "(*" << object_name << ")--";
+                        return;
+                    }
+                    else operatorCall = true;
+                    break;
+
+                // compare
+                case OperatorType::Less:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") < ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Greater:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") > ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::LessOrEquals:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") <= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Compare:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") <=> ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::GreaterOrEquals:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") >= ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::NotEquals:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") != ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Equals:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") == ";
+                    else operatorCall = true;
+                    break;
+
+                // other
+                case OperatorType::Subscript:
+                    s << "(*" << object_name << ")[";
+                    additionalClosingBracket = true;
+                    break;
+                case OperatorType::PointerToMemberOfPointer:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ")->*";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::Comma:
+                    if(java_function->arguments().size()==1)
+                        s << "(*" << object_name << ") , ";
+                    else operatorCall = true;
+                    break;
+                case OperatorType::FunctionCall:
+                    s << "(*" << object_name << ")(";
                     additionalClosingPar = true;
+                    break;
+                case OperatorType::TypeCast:
+                    if(java_function->arguments().size()==0)
+                        s << "*" << object_name;
+                    else operatorCall = true;
+                    break;
+                default:
+                    operatorCall = false;
+                    break;
                 }
             }
-            if(!noPar){
+            if(!operatorCall){
                 if(java_function->isInGlobalScope()){
                     s << function_name << templateParams << "(";
                     if(!java_function->isStatic())
@@ -10178,19 +10094,42 @@ void CppImplGenerator::writeFunctionCall(QTextStream &s, const QString &object_n
                     s << "(";
                 }
             }
-            if(option & JNIProxyFunction)
-                writeFunctionCallArguments(s, java_function, {}, option);
-            else if(!java_function->arguments().isEmpty())
-                writeFunctionCallArguments(s, java_function, "__qt_", option);
-
-            // The extra arguments...
-            bool hasArgs = java_function->arguments().size() != 0;
-            for (int i = 0; i < extra_arguments.size(); ++i) {
-                if (i > 0 || hasArgs)
-                    s << ", ";
-                s << extra_arguments.at(i);
+            QString prefix;
+            if(!(option & JNIProxyFunction))
+                prefix = "__qt_";
+            if(additionalClosingBracket && !java_function->type() && !java_function->arguments().isEmpty()){
+                QList<const MetaArgument*> result;
+                const MetaArgumentList& arguments = java_function->arguments();
+                for (int i = 0; i < arguments.size(); ++i) {
+                    const MetaArgument *argument = arguments.at(i);
+                    if ((option & SkipRemovedArguments) == SkipRemovedArguments
+                            && java_function->argumentRemoved(argument->argumentIndex() + 1)!=ArgumentRemove_No) {
+                        if(!java_function->isConstructor()
+                                || ( !argument->originalDefaultValueExpression().isEmpty()
+                                     && java_function->conversionRule(TS::NativeCode, argument->argumentIndex() + 1).isEmpty()
+                                     && java_function->conversionRule(TS::TargetLangCode, argument->argumentIndex() + 1).isEmpty() )){
+                            continue;
+                        }
+                    }
+                    result << argument;
+                }
+                const MetaArgument* assignment = result.takeLast();
+                writeFunctionCallArguments(s, java_function, result, prefix, option);
+                s << "] = ";
+                writeFunctionCallArguments(s, java_function, {assignment}, prefix, option);
+            }else{
+                writeFunctionCallArguments(s, java_function, prefix, option);
+                // The extra arguments...
+                bool hasArgs = java_function->arguments().size() != 0;
+                for (int i = 0; i < extra_arguments.size(); ++i) {
+                    if (i > 0 || hasArgs)
+                        s << ", ";
+                    s << extra_arguments.at(i);
+                }
+                if(additionalClosingBracket)
+                    s << "]";
             }
-            if(!noPar || additionalClosingPar){
+            if(!operatorCall || additionalClosingPar){
                 s << ")";
             }
         }
@@ -10267,68 +10206,64 @@ void CppImplGenerator::writeFunctionCallArguments(QTextStream &s,
             if (written_arguments++ > 0) {
                 s << ", ";
             }
-            if(argument->type()->isNullPtr()){
-                s << "nullptr";
-            }else{
-                bool enum_as_int = (options & EnumAsInts)
-                                    && (argument->type()->typeEntry()->isEnum()
-                                            || argument->type()->typeEntry()->isFlags())
-                                    && argument->type()->indirections().isEmpty()
-                                    && argument->type()->getReferenceType()!=MetaType::RReference
-                                    && (argument->type()->getReferenceType()!=MetaType::Reference || argument->type()->isConstant());
-                bool enum_from_int = (options & EnumFromInt)
-                                    && (argument->type()->typeEntry()->isEnum()
-                                            || argument->type()->typeEntry()->isFlags())
-                                    && argument->type()->indirections().isEmpty()
-                                    && argument->type()->getReferenceType()!=MetaType::RReference
-                                    && (argument->type()->getReferenceType()!=MetaType::Reference || argument->type()->isConstant());
-                if (argument->type()->isEnum()) {
-                    MetaEnum *java_enum =
-                        m_classes.findEnum(static_cast<const EnumTypeEntry *>(argument->type()->typeEntry()));
-                    if (!java_enum) {
-                        ReportHandler::warning(QString("enum not found: '%1'")
-                                               .arg(argument->type()->typeEntry()->qualifiedCppName()));
-                    } else {
-                        enum_as_int |= !java_enum->isPublic();
-                    }
+            bool enum_as_int = (options & EnumAsInts)
+                                && (argument->type()->typeEntry()->isEnum()
+                                        || argument->type()->typeEntry()->isFlags())
+                                && argument->type()->indirections().isEmpty()
+                                && argument->type()->getReferenceType()!=MetaType::RReference
+                                && (argument->type()->getReferenceType()!=MetaType::Reference || argument->type()->isConstant());
+            bool enum_from_int = (options & EnumFromInt)
+                                && (argument->type()->typeEntry()->isEnum()
+                                        || argument->type()->typeEntry()->isFlags())
+                                && argument->type()->indirections().isEmpty()
+                                && argument->type()->getReferenceType()!=MetaType::RReference
+                                && (argument->type()->getReferenceType()!=MetaType::Reference || argument->type()->isConstant());
+            if (argument->type()->isEnum()) {
+                MetaEnum *java_enum =
+                    m_classes.findEnum(static_cast<const EnumTypeEntry *>(argument->type()->typeEntry()));
+                if (!java_enum) {
+                    ReportHandler::warning(QString("enum not found: '%1'")
+                                           .arg(argument->type()->typeEntry()->qualifiedCppName()));
+                } else {
+                    enum_as_int |= !java_enum->isPublic();
                 }
-                uint paren = 0;
-                if(enum_from_int && argument->type()->indirections().isEmpty()){
+            }
+            uint paren = 0;
+            if(enum_from_int && argument->type()->indirections().isEmpty()){
+                writeTypeInfo(s, argument->type(), Option(SkipName | ForceValueType));
+                s << "(";
+                paren++;
+            }else if ((!(options & NoCasts) && !enum_as_int) || ((options & ForceEnumCast) && argument->type()->isEnum())) {
+
+                // If the type in the signature is specified without template instantiation, but the
+                // class is actually a template class, then we have troubles.
+                if ( argument->type()->indirections().isEmpty()
+                     && (argument->type()->getReferenceType()!=MetaType::Reference || argument->type()->isConstant())
+                     && (
+                         ((options & NoEnumAsInts)==0 && (argument->type()->isEnum() || argument->type()->isFlags()))
+                      || argument->type()->isPrimitive()
+                      )
+                    ) {
+                    if(argument->type()->isPrimitive() && !hasConversionRule)
+                        s << "static_cast<";
                     writeTypeInfo(s, argument->type(), Option(SkipName | ForceValueType));
+                    if(argument->type()->isPrimitive() && !hasConversionRule)
+                        s << ">";
                     s << "(";
                     paren++;
-                }else if ((!(options & NoCasts) && !enum_as_int) || ((options & ForceEnumCast) && argument->type()->isEnum())) {
-
-                    // If the type in the signature is specified without template instantiation, but the
-                    // class is actually a template class, then we have troubles.
-                    if ( argument->type()->indirections().isEmpty()
-                         && (argument->type()->getReferenceType()!=MetaType::Reference || argument->type()->isConstant())
-                         && (
-                             ((options & NoEnumAsInts)==0 && (argument->type()->isEnum() || argument->type()->isFlags()))
-                          || argument->type()->isPrimitive()
-                          )
-                        ) {
-                        if(argument->type()->isPrimitive() && !hasConversionRule)
-                            s << "static_cast<";
-                        writeTypeInfo(s, argument->type(), Option(SkipName | ForceValueType));
-                        if(argument->type()->isPrimitive() && !hasConversionRule)
-                            s << ">";
-                        s << "(";
-                        paren++;
-                    }else if(argument->type()->getReferenceType()==MetaType::RReference){
-                        s << "std::move(";
-                        paren++;
-                    }
+                }else if(argument->type()->getReferenceType()==MetaType::RReference){
+                    s << "std::move(";
+                    paren++;
                 }
+            }
 
-                if (!argument->type()->isPrimitive()
-                        || java_function->hasConversionRule(TS::NativeCode, argument->argumentIndex() + 1)) {
-                    s << prefix;
-                }
-                s << argument->indexedName();
-                for(uint i=0; i<paren; ++i)
-                    s << ")";
+            if (!argument->type()->isPrimitive()
+                    || java_function->hasConversionRule(TS::NativeCode, argument->argumentIndex() + 1)) {
+                s << prefix;
             }
+            s << argument->indexedName();
+            for(uint i=0; i<paren; ++i)
+                s << ")";
         }
     }
 }
@@ -10459,13 +10394,13 @@ void CppImplGenerator::writeExtraIncludes(QTextStream &s, const MetaClass *java_
     });
     for(const MetaClass *cls : _classes){
         for(const Include& inc : cls->typeEntry()->extraIncludes()){
-            if(inc.inherited){
+            if(inc.type==Include::IncludePath && inc.inherited){
                 includes << inc;
             }
         }
         if(cls->typeEntry()->designatedInterface()){
             for(const Include& inc : cls->typeEntry()->designatedInterface()->extraIncludes()){
-                if(inc.inherited){
+                if(inc.type==Include::IncludePath && inc.inherited){
                     includes << inc;
                 }
             }
@@ -10593,7 +10528,7 @@ void CppImplGenerator::writeTypeConversion(QTextStream &s, const MetaFunction *f
     default: break;
     }
 
-    QString mangledTypeName = computeMangledTypeName(type);
+    const QString mangledTypeName = computeMangledTypeName(type);
     {
         s << INDENT << "infos << ParameterInfo(" << Qt::endl;
         {
@@ -10662,17 +10597,18 @@ void CppImplGenerator::writeTypeConversion(QTextStream &s, const MetaFunction *f
                         pps.append(function->declaringClass()->typeEntry()->ppCondition());
                         pps.removeDuplicates();
                     }
-                    if(javaToQtConverterInfos[function->ownerClass()->targetTypeSystem()].contains(mangledTypeName)){
-                        if(!pps.isEmpty()){
+                    QString tsId = priGenerator->subDirectoryForClass(function->declaringClass(), PriGenerator::CppDirectory);
+                    if(javaToQtConverterInfos[tsId].contains(mangledTypeName)){
+                        if(!type->typeEntry()->ppCondition().isEmpty()){
                             QString strg;
                             QTextStream stream(&strg);
-                            stream << "#if " << pps.join(" && ")
+                            stream << "#if " << type->typeEntry()->ppCondition()
                                    << Qt::endl
-                                   << QString("bool javaToQtConverter_%1(JNIEnv*, QtJambiScope*, const void*, jvalue*, bool);").arg(mangledTypeName)
-                                   << Qt::endl << "#endif // " << pps.join(" && ") << Qt::endl;
+                                   << QString("bool javaToQtConverter_%1(JNIEnv*, QtJambiScope*, const void*, jvalue*, bool); // declared in %2").arg(mangledTypeName, javaToQtConverterInfos[tsId][mangledTypeName]->qualifiedCppName())
+                                   << Qt::endl << "#endif // " << type->typeEntry()->ppCondition() << Qt::endl;
                             forwardDeclarations.insert(strg);
                         }else{
-                            forwardDeclarations.insert(QString("bool javaToQtConverter_%1(JNIEnv*, QtJambiScope*, const void*, jvalue*, bool);").arg(mangledTypeName));
+                            forwardDeclarations.insert(QString("bool javaToQtConverter_%1(JNIEnv*, QtJambiScope*, const void*, jvalue*, bool); // declared in %2").arg(mangledTypeName, javaToQtConverterInfos[tsId][mangledTypeName]->qualifiedCppName()));
                         }
                         s << INDENT << "&javaToQtConverter_" << mangledTypeName << "," << Qt::endl;
                     }else{
@@ -10844,13 +10780,13 @@ void CppImplGenerator::writeTypeConversion(QTextStream &s, const MetaFunction *f
                             }
                             s << Qt::endl << INDENT << "}," << Qt::endl;
                         }else{
-                            if(!pps.isEmpty()){
+                            if(!type->typeEntry()->ppCondition().isEmpty()){
                                 QString strg;
                                 QTextStream stream(&strg);
-                                stream << "#if " << pps.join(" && ")
+                                stream << "#if " << type->typeEntry()->ppCondition()
                                        << Qt::endl
                                        << QString("bool javaToQtConverter_%1(JNIEnv*, QtJambiScope*, const void*, jvalue*, bool);").arg(mangledTypeName)
-                                       << Qt::endl << "#endif // " << pps.join(" && ") << Qt::endl;
+                                       << Qt::endl << "#endif // " << type->typeEntry()->ppCondition() << Qt::endl;
                                 forwardDeclarations.insert(strg);
                             }else{
                                 forwardDeclarations.insert(QString("bool javaToQtConverter_%1(JNIEnv*, QtJambiScope*, const void*, jvalue*, bool);").arg(mangledTypeName));
@@ -10858,8 +10794,8 @@ void CppImplGenerator::writeTypeConversion(QTextStream &s, const MetaFunction *f
                             QString functionCode;
                             {
                                 QTextStream s(&functionCode);
-                                if(!pps.isEmpty())
-                                    s << "#if " << pps.join(" && ") << Qt::endl;
+                                if(!type->typeEntry()->ppCondition().isEmpty())
+                                    s << "#if " << type->typeEntry()->ppCondition() << Qt::endl;
                                 s << "bool javaToQtConverter_" << mangledTypeName << "(JNIEnv* env, QtJambiScope* scope, const void* in, jvalue* out, bool";
                                 if(type->typeEntry()->isPrimitive() && type->indirections().isEmpty()){
                                     s << " forceBoxedType";
@@ -10874,26 +10810,26 @@ void CppImplGenerator::writeTypeConversion(QTextStream &s, const MetaFunction *f
                                     }
                                 }
                                 s << Qt::endl << "}" << Qt::endl;
-                                if(!pps.isEmpty())
-                                    s << "#endif // " << pps.join(" && ") << Qt::endl;
+                                if(!type->typeEntry()->ppCondition().isEmpty())
+                                    s << "#endif // " << type->typeEntry()->ppCondition() << Qt::endl;
                             }
                             converterFunctions << functionCode;
                             s << INDENT << "&javaToQtConverter_" << mangledTypeName << "," << Qt::endl;
-                            javaToQtConverterInfos[function->ownerClass()->targetTypeSystem()].insert(mangledTypeName);
+                            javaToQtConverterInfos[tsId].insert(mangledTypeName, function->ownerClass());
                         }
                     }
 
-                    if(qtToJavaConverterInfos[function->ownerClass()->targetTypeSystem()].contains(mangledTypeName)){
-                        if(!pps.isEmpty()){
+                    if(qtToJavaConverterInfos[tsId].contains(mangledTypeName)){
+                        if(type->typeEntry()->ppCondition().isEmpty()){
+                            forwardDeclarations.insert(QString("bool qtToJavaConverter_%1(JNIEnv*, QtJambiScope*, const jvalue&, void* &, jValueType); // declared in %2").arg(mangledTypeName, qtToJavaConverterInfos[tsId][mangledTypeName]->qualifiedCppName()));
+                        }else{
                             QString strg;
                             QTextStream stream(&strg);
-                            stream << "#if " << pps.join(" && ")
+                            stream << "#if " << type->typeEntry()->ppCondition()
                                    << Qt::endl
-                                   << QString("bool qtToJavaConverter_%1(JNIEnv*, QtJambiScope*, const jvalue&, void* &, jValueType);").arg(mangledTypeName)
-                                   << Qt::endl << "#endif // " << pps.join(" && ") << Qt::endl;
+                                   << QString("bool qtToJavaConverter_%1(JNIEnv*, QtJambiScope*, const jvalue&, void* &, jValueType); // declared in %2").arg(mangledTypeName, qtToJavaConverterInfos[tsId][mangledTypeName]->qualifiedCppName())
+                                   << Qt::endl << "#endif // " << type->typeEntry()->ppCondition() << Qt::endl;
                             forwardDeclarations.insert(strg);
-                        }else{
-                            forwardDeclarations.insert(QString("bool qtToJavaConverter_%1(JNIEnv*, QtJambiScope*, const jvalue&, void* &, jValueType);").arg(mangledTypeName));
                         }
                         s << INDENT << "&qtToJavaConverter_" << mangledTypeName;
                     }else{
@@ -11020,22 +10956,22 @@ void CppImplGenerator::writeTypeConversion(QTextStream &s, const MetaFunction *f
                             }
                             s << Qt::endl << INDENT << "}";
                         }else{
-                            if(!pps.isEmpty()){
+                            if(type->typeEntry()->ppCondition().isEmpty()){
+                                forwardDeclarations.insert(QString("bool qtToJavaConverter_%1(JNIEnv*, QtJambiScope*, const jvalue&, void* &, jValueType);").arg(mangledTypeName));
+                            }else{
                                 QString strg;
                                 QTextStream stream(&strg);
-                                stream << "#if " << pps.join(" && ")
+                                stream << "#if " << type->typeEntry()->ppCondition()
                                        << Qt::endl
                                        << QString("bool qtToJavaConverter_%1(JNIEnv*, QtJambiScope*, const jvalue&, void* &, jValueType);").arg(mangledTypeName)
-                                       << Qt::endl << "#endif // " << pps.join(" && ") << Qt::endl;
+                                       << Qt::endl << "#endif // " << type->typeEntry()->ppCondition() << Qt::endl;
                                 forwardDeclarations.insert(strg);
-                            }else{
-                                forwardDeclarations.insert(QString("bool qtToJavaConverter_%1(JNIEnv*, QtJambiScope*, const jvalue&, void* &, jValueType);").arg(mangledTypeName));
                             }
                             QString functionCode;
                             {
                                 QTextStream s(&functionCode);
-                                if(!pps.isEmpty())
-                                    s << "#if " << pps.join(" && ") << Qt::endl;
+                                if(!type->typeEntry()->ppCondition().isEmpty())
+                                    s << "#if " << type->typeEntry()->ppCondition() << Qt::endl;
                                 s << "bool qtToJavaConverter_" << mangledTypeName << "(JNIEnv* env, QtJambiScope* scope, const jvalue& in, void* &out, jValueType";
                                 if(type->typeEntry()->isPrimitive() && type->indirections().isEmpty()){
                                     s << " valueType";
@@ -11050,12 +10986,12 @@ void CppImplGenerator::writeTypeConversion(QTextStream &s, const MetaFunction *f
                                     }
                                 }
                                 s << Qt::endl << "}" << Qt::endl;
-                                if(!pps.isEmpty())
-                                    s << "#endif //" << pps.join(" && ") << Qt::endl;
+                                if(!type->typeEntry()->ppCondition().isEmpty())
+                                    s << "#endif //" << type->typeEntry()->ppCondition() << Qt::endl;
                             }
                             converterFunctions << functionCode;
                             s << INDENT << "&qtToJavaConverter_" << mangledTypeName;
-                            qtToJavaConverterInfos[function->ownerClass()->targetTypeSystem()].insert(mangledTypeName);
+                            qtToJavaConverterInfos[tsId].insert(mangledTypeName, function->ownerClass());
                         }
                     }
                 }
@@ -11146,7 +11082,6 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *cls,
                     for(MetaClass *iface : cls->interfaces()){
                         const InterfaceTypeEntry *ientry = static_cast<const InterfaceTypeEntry *>(iface->typeEntry());
                         if(ientry->origin()==cls->typeEntry()){
-                            QString interfaceName = ientry->qualifiedTargetLangName().replace(".", "/");
                             if(cls->typeEntry()->isValue()){
                                 s << INDENT << "const std::type_info& typeId = registerInterfaceValueTypeInfo<" << qtName << ">(\"" << qtName << "\", \"" << javaTypeName << "\");" << Qt::endl;
                             }else{
@@ -11357,7 +11292,7 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *cls,
                                     int argumentCounter = 1;
                                     while(addedArguments.first.contains(argumentCounter)){
                                         const ArgumentModification& argumentMod = addedArguments.first[argumentCounter];
-                                        s2 << jni_signature(argumentMod.modified_type, JNISignatureFormat(NoModification | SlashesAndStuff));
+                                        s2 << jni_signature(annotationFreeTypeName(argumentMod.modified_type), JNISignatureFormat(NoModification | SlashesAndStuff));
                                         ++argumentCounter;
                                     }
                                     for(const MetaArgument *argument : defaultArgumentOverloads[i]) {
@@ -11406,18 +11341,18 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *cls,
                                                 if (modified_type.isEmpty())
                                                     s2 << jni_signature(argument->type(), JNISignatureFormat(NoModification | SlashesAndStuff));
                                                 else
-                                                    s2 << jni_signature(modified_type, JNISignatureFormat(NoModification | SlashesAndStuff));
+                                                    s2 << jni_signature(annotationFreeTypeName(modified_type), JNISignatureFormat(NoModification | SlashesAndStuff));
                                             }
                                         }
                                         ++argumentCounter;
                                         while(addedArguments.first.contains(argumentCounter)){
                                             const ArgumentModification& argumentMod = addedArguments.first[argumentCounter];
-                                            s2 << jni_signature(argumentMod.modified_type, JNISignatureFormat(NoModification | SlashesAndStuff));
+                                            s2 << jni_signature(annotationFreeTypeName(argumentMod.modified_type), JNISignatureFormat(NoModification | SlashesAndStuff));
                                             ++argumentCounter;
                                         }
                                     }
                                     for(const ArgumentModification& mod : addedArguments.second){
-                                        s2 << jni_signature(mod.modified_type, JNISignatureFormat(NoModification | SlashesAndStuff));
+                                        s2 << jni_signature(annotationFreeTypeName(mod.modified_type), JNISignatureFormat(NoModification | SlashesAndStuff));
                                     }
                                     if(args.isEmpty())
                                         s << "nullptr)";
@@ -11650,7 +11585,7 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *cls,
                                 s << INDENT << "[](int methodIndex) -> const char* {" << Qt::endl;
                                 {
                                     INDENTATION(INDENT)
-                                    for(QString line : renamedMethods.split("\n")){
+                                    for(const QString& line : renamedMethods.split("\n")){
                                         if(!line.startsWith("#"))
                                             s << INDENT;
                                         s << line << Qt::endl;
@@ -11672,7 +11607,7 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *cls,
                                 s << INDENT << "[](int methodIndex) -> const char* {" << Qt::endl;
                                 {
                                     INDENTATION(INDENT)
-                                    for(QString line : renamedMethods.split("\n")){
+                                    for(const QString& line : renamedMethods.split("\n")){
                                         if(!line.startsWith("#"))
                                             s << INDENT;
                                         s << line << Qt::endl;
@@ -11766,7 +11701,7 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *cls,
 
                             if (!hasDefaultConstructor && !emittedRegisterType_5 && !emittedRegisterType_6) {
                                 ReportHandler::warning(QString("Value type '%1' is missing a default constructor. "
-                                                               "The resulting C++ code will not compile. If possible, use <custom-constructor> tag to provide the constructors.").arg(cls->qualifiedCppName()));
+                                                               "If possible, use CustomConstructor{} element to specify default construction.").arg(cls->qualifiedCppName()));
                             }
                         }
 
@@ -11791,14 +11726,9 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *cls,
                             }
                         }
                     }
-                }else if(metaType.id()<QMetaType::HighestInternalId){
-                    usedTypeID = true;
-                    s << INDENT << "registerMetaTypeID(typeId, " << metaType.id() << ");" << Qt::endl;
-                    s << INDENT << "registerOperators<" << qtName << ">();" << Qt::endl;
                 }else{
                     usedTypeID = true;
-                    s << INDENT << "registerMetaTypeID(typeId, qMetaTypeId<" << qtName << ">());" << Qt::endl;
-                    s << INDENT << "registerOperators<" << qtName << ">();" << Qt::endl;
+                    s << INDENT << "registerMetaType<" << qtName << ">(\"" << qtName << "\");" << Qt::endl;
                 }
                 if(cls->instantiateShellClass()){
                     usedTypeID = true;
@@ -12157,18 +12087,21 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *cls,
             s << "}" << Qt::endl;
         }
     }
+    s << Qt::endl;
     if(!forwardDeclarations.isEmpty()){
-        s << Qt::endl;
         QList<QString> _forwardDeclarations = forwardDeclarations.values();
         std::sort(_forwardDeclarations.begin(), _forwardDeclarations.end());
         for(const QString& forwardDeclaration : _forwardDeclarations){
             s << forwardDeclaration << Qt::endl;
         }
+        s << Qt::endl;
     }
-    if(!converterFunctions.isEmpty())
+    if(!converterFunctions.isEmpty()){
+        std::sort(converterFunctions.begin(), converterFunctions.end());
+        for(const QString& converterFunction : converterFunctions){
+            s << converterFunction << Qt::endl;
+        }
         s << Qt::endl;
-    for(const QString& converterFunction : converterFunctions){
-        s << converterFunction << Qt::endl;
     }
     s << code;
 }
@@ -12202,10 +12135,10 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *owner, con
         s << Qt::endl << "#if " << enm->typeEntry()->ppCondition() << Qt::endl;
     }
     if(enm->isProtected() || !ownerIsPublic){
-        if(owner->isInterface()){
-            s << INDENT << owner->extractInterfaceImpl()->name() + "_access::__registerEnumTypeInfo_" << enm->name().replace("::", "_").replace("<", "_").replace(">", "_") << "();" << Qt::endl;
+        if(owner->typeEntry()->designatedInterface()){
+            s << INDENT << owner->extractInterface()->name() << "_access::__registerEnumTypeInfo_" << enm->name().replace("::", "_").replace("<", "_").replace(">", "_") << "();" << Qt::endl;
         }else{
-            s << INDENT << owner->name() + "_access::__registerEnumTypeInfo_" << enm->name().replace("::", "_").replace("<", "_").replace(">", "_") << "();" << Qt::endl;
+            s << INDENT << owner->name() << "_access::__registerEnumTypeInfo_" << enm->name().replace("::", "_").replace("<", "_").replace(">", "_") << "();" << Qt::endl;
         }
     }else{
         if(const FlagsTypeEntry * fentry = entry->flags()){
@@ -12225,7 +12158,7 @@ void CppImplGenerator::writeMetaInfo(QTextStream &s, const MetaClass *owner, con
                     return fentry->targetLangName();
                 }
             }();
-            QString qtFlagsAliasName = fentry->originalName();
+            QString qtFlagsAliasName = fentry->flagsTemplate();
             s << INDENT << "registerEnumTypeInfo" << (entry->isHiddenMetaObject() ? "NoMetaObject" : "") << "<" << qtEnumName << ">(\"" << qtEnumName << "\", \"" << javaEnumName << "\", \"" << qtFlagName << "\", \"" << qtFlagsAliasName << "\", \"" << javaFlagName << "\");" << Qt::endl;
         }else{
             s << INDENT << "registerEnumTypeInfo" << (entry->isHiddenMetaObject() ? "NoMetaObject" : "") << "<" << qtEnumName << ">(\"" << qtEnumName << "\", \"" << javaEnumName << "\");" << Qt::endl;
diff --git a/src/cpp/QtJambiGenerator/cppimplgenerator.h b/src/cpp/QtJambiGenerator/cppimplgenerator.h
index 3c0a29ca..946af012 100644
--- a/src/cpp/QtJambiGenerator/cppimplgenerator.h
+++ b/src/cpp/QtJambiGenerator/cppimplgenerator.h
@@ -52,8 +52,7 @@ class CppImplGenerator : public CppGenerator {
             StandardJNISignature = JNIExport | ReturnType | ExternC
         };
 
-        CppImplGenerator(PriGenerator *pri) : CppGenerator(pri) {
-        }
+        CppImplGenerator(PriGenerator *pri);
 
         void generateFake(const MetaClass *) override;
 
@@ -251,23 +250,14 @@ class CppImplGenerator : public CppGenerator {
         bool hasCustomDestructor(const MetaClass *java_class) const;
 
         QString jniReturnName(const MetaFunction *java_function) const;
-        bool shouldGenerate(const MetaClass *java_class) const override {
-            return /*(!java_class->isNamespace() || java_class->functionsInTargetLang().size() > 0)
-                   &&*/ !java_class->isInterface()
-                   && !java_class->typeEntry()->isVariant()
-                   && !java_class->typeEntry()->isIterator()
-                   && (java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp)
-                   && !java_class->isFake();
-        }
-        QString default_return_statement_qt(const MetaType *java_type,
-                                            AbstractGenerator::Option options = AbstractGenerator::NoOption);
-        void setContainerBaseClasses(const QMap<TypeSystemTypeEntry *,QSet<QString>>& containerBaseClasses) { m_containerBaseClasses = containerBaseClasses; }
+        bool shouldGenerate(const MetaClass *java_class) const override;
+        QString default_return_statement_qt(const MetaType *java_type, AbstractGenerator::Option options = AbstractGenerator::NoOption);
+        void setContainerBaseClasses(const QMap<TypeSystemTypeEntry *,QList<QPair<TypeInfo,bool>>>& containerBaseClasses);
     private:
         QByteArray callXxxMethod(const QString &name) const;
         QByteArray callXxxMethod(const MetaType *java_type) const;
-        QMap<QString,QSet<QString>> javaToQtConverterInfos;
-        QMap<QString,QSet<QString>> qtToJavaConverterInfos;
-        QMap<TypeSystemTypeEntry *,QSet<QString>> m_containerBaseClasses;
+        QMap<QString,QMap<QString,const MetaClass*>> javaToQtConverterInfos;
+        QMap<QString,QMap<QString,const MetaClass*>> qtToJavaConverterInfos;
 };
 
 #endif // CPPIMPLGENERATOR_H
diff --git a/src/cpp/QtJambiGenerator/docindex/docfunction.cpp b/src/cpp/QtJambiGenerator/docindex/docfunction.cpp
index f2d3cbc7..6e782e26 100644
--- a/src/cpp/QtJambiGenerator/docindex/docfunction.cpp
+++ b/src/cpp/QtJambiGenerator/docindex/docfunction.cpp
@@ -9,6 +9,13 @@ const QString& DocFunction::name() const {
     return m_name;
 }
 
+const QString& DocFunction::minimalSignature() const {
+    if(m_minimalSignature.isEmpty()){
+        m_minimalSignature = QLatin1String(QMetaObject::normalizedSignature(qPrintable(m_name + "(" + m_parameters.join(", ") + (m_const ? ") const" : ")"))));
+    }
+    return m_minimalSignature;
+}
+
 const QString& DocFunction::type() const {
     return m_type;
 }
diff --git a/src/cpp/QtJambiGenerator/docindex/docfunction.h b/src/cpp/QtJambiGenerator/docindex/docfunction.h
index 6b1da645..8f5a745a 100644
--- a/src/cpp/QtJambiGenerator/docindex/docfunction.h
+++ b/src/cpp/QtJambiGenerator/docindex/docfunction.h
@@ -9,6 +9,7 @@ class DocFunction: public DocElement
     DocFunction(QObject* parent);
 
     const QString& name() const;
+    const QString& minimalSignature() const;
     const QString& type() const;
     const QStringList& parameters() const;
     bool isConst() const;
@@ -25,6 +26,7 @@ class DocFunction: public DocElement
     QStringList m_parameters;
     bool m_const;
     bool m_static;
+    mutable QString m_minimalSignature;
 };
 
 #endif // DOCFUNCTION_H
diff --git a/src/cpp/QtJambiGenerator/generator.cpp b/src/cpp/QtJambiGenerator/generator.cpp
index e0fd94dc..1ee2363c 100644
--- a/src/cpp/QtJambiGenerator/generator.cpp
+++ b/src/cpp/QtJambiGenerator/generator.cpp
@@ -130,7 +130,8 @@ void messageHandler(QtMsgType type, const QMessageLogContext & /*ctxt*/, const Q
     case QtMsgType::QtWarningMsg:
     case QtMsgType::QtCriticalMsg:
     case QtMsgType::QtFatalMsg:
-        std::cerr << qPrintable(msg) << std::endl;
+        if(!msg.startsWith(QStringLiteral("Trying to construct an instance of an invalid type, type id:")))
+            std::cerr << qPrintable(msg) << std::endl;
         break;
     default: break;
     }
@@ -156,7 +157,9 @@ GeneratorApplication::GeneratorApplication(int& argc, char *argv[]) :
         m_noJava(false),
         m_noCppHeaders(false),
         m_noCppImpl(false),
+        m_noKotlinDelegates(false),
         m_noMetainfo(false),
+        m_nullness(true),
         m_astToXml(false),
         m_dumpObjectTree(false),
         m_database(*TypeDatabase::instance()),
@@ -187,6 +190,8 @@ void GeneratorApplication::parseArguments(){
     QCommandLineOption noNativeIDsOption("no-native-ids", "don't generate code using native ids infavor to object references");
     noNativeIDsOption.setFlags(QCommandLineOption::HiddenFromHelp);
     parser.addOption(noNativeIDsOption);
+    QCommandLineOption noNullnessOption("no-nullness", "don't generate nullness annotation");
+    parser.addOption(noNullnessOption);
     //QCommandLineOption noEclipseWarningsOption("no-java-suppress-warnings", "don't generate java code with eclipse warnings");
     //parser.addOption(noEclipseWarningsOption);
     QCommandLineOption debugLevelOption("debug-level", "level of debugging output [sparse|medium|full|types]", "level");
@@ -220,6 +225,8 @@ void GeneratorApplication::parseArguments(){
     parser.addOption(noCHOption);
     QCommandLineOption noCPOption("no-cpp-impl", "don't generate c++ implementation code");
     parser.addOption(noCPOption);
+    QCommandLineOption noKotlinDelegatesOption("no-kotlin-property-delegates", "don't generate Kotlin-compatible property delegates");
+    parser.addOption(noKotlinDelegatesOption);
     QCommandLineOption noMetaInfoOption("no-metainfo", "don't generate c++ metainfo code");
     parser.addOption(noMetaInfoOption);
     QCommandLineOption staticlibsOption("static", "comma-separated list of statically linked libraries", "libraries");
@@ -391,12 +398,15 @@ void GeneratorApplication::parseArguments(){
     v = parser.value(outputDirectoryOption);
     if(!v.isEmpty())
         m_outputDirectory = v;
-    QDir _outDir(m_outputDirectory);
+    QDir _outDir = m_outputDirectory.isEmpty() ? QDir::current() : QDir(m_outputDirectory);
+    _outDir.mkpath(".");
     v = parser.value(ppfileNameOption);
     if (!v.isEmpty()){
         m_preProcessorFileName = v;
-        if(!QFileInfo(m_preProcessorFileName).isAbsolute()){
+        if(!m_preProcessorFileName.contains('/') && !m_preProcessorFileName.contains('\\')){
             m_preProcessorFileName = _outDir.absoluteFilePath(m_preProcessorFileName);
+        }else if(!QFileInfo(m_preProcessorFileName).isAbsolute()){
+            m_preProcessorFileName = QFileInfo(m_preProcessorFileName).absoluteFilePath();
         }
     }
     /*
@@ -429,7 +439,9 @@ void GeneratorApplication::parseArguments(){
     m_noJava = parser.isSet(noJavaOption);
     m_noCppHeaders = parser.isSet(noCHOption);
     m_noCppImpl = parser.isSet(noCPOption);
+    m_noKotlinDelegates = parser.isSet(noKotlinDelegatesOption);
     m_noMetainfo = parser.isSet(noMetaInfoOption);
+    m_nullness = !parser.isSet(noNullnessOption);
 
     if(parser.isSet(qtjambiVersionOption)){
         v = parser.value(qtjambiVersionOption);
@@ -442,8 +454,8 @@ void GeneratorApplication::parseArguments(){
     if(parser.isSet(typesystemOption)){
         m_typesystemFileName = parser.value(typesystemOption);
         QFileInfo _typesystemFileName(m_typesystemFileName);
-        if(!_typesystemFileName.exists() && !_typesystemFileName.isAbsolute()){
-            m_typesystemFileName = _outDir.absoluteFilePath(m_typesystemFileName);
+        if(_typesystemFileName.exists()){
+            m_typesystemFileName = _typesystemFileName.absoluteFilePath();
         }
     }else{
         printf("No typesystem file specified. Taking default QtJambi typesystem.\n");
@@ -455,8 +467,8 @@ void GeneratorApplication::parseArguments(){
     if(positionalArguments.size()>0){
         m_headerFileName = positionalArguments.takeFirst();
         QFileInfo _fileName(m_headerFileName);
-        if(!_fileName.exists() && !_fileName.isAbsolute()){
-            m_headerFileName = _outDir.absoluteFilePath(m_headerFileName);
+        if(_fileName.exists()){
+            m_headerFileName = _fileName.absoluteFilePath();
         }
     }else{
         printf("No header file specified. Taking default header file to generate QtJambi sources.\n");
@@ -468,326 +480,347 @@ void GeneratorApplication::parseArguments(){
 void dumpMetaJavaClass(const MetaClass *cls);
 
 int GeneratorApplication::generate() {
-    //parse the type system file
-    QSemaphore versionAvailable;
-    QSemaphore docDirectoryAvailable;
-    QFuture<void> typeSystemFuture;
-    QFuture<const DocModel*> docModelFuture;
-    if (!m_astToXml) {
-        typeSystemFuture = QtConcurrent::run([this,&versionAvailable,&docDirectoryAvailable](){
-            versionAvailable.acquire(3);
-            if(m_docsDirectory.isEmpty()){
-                if(m_qtVersionMajor==QT_VERSION_MAJOR && m_qtVersionMinor==QT_VERSION_MINOR){
-    #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-                    m_docsDirectory = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
-    #else
-                    m_docsDirectory = QLibraryInfo::path(QLibraryInfo::DocumentationPath);
-    #endif
-                    printf("No docs directory specified. Taking Qt's documentation path instead: %s\n", qPrintable(m_docsDirectory));
-                }
-                docDirectoryAvailable.release();
-            }
-            ReportHandler::setContext("Typesystem");
-            m_database.setDefined([this](const QString& name)->bool{
-                for(const DefineUndefine& ddf : m_defineUndefineList){
-                    if(ddf.isSet() && ddf.name()==name){
-                        return true;
+    try{
+        //parse the type system file
+        QSemaphore versionAvailable;
+        QSemaphore docDirectoryAvailable;
+        QFuture<void> typeSystemFuture;
+        QFuture<const DocModel*> docModelFuture;
+        if (!m_astToXml) {
+            typeSystemFuture = QtConcurrent::run([this,&versionAvailable,&docDirectoryAvailable](){
+                versionAvailable.acquire(3);
+                if(m_docsDirectory.isEmpty()){
+                    if(m_qtVersionMajor==QT_VERSION_MAJOR && m_qtVersionMinor==QT_VERSION_MINOR){
+        #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+                        m_docsDirectory = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
+        #else
+                        m_docsDirectory = QLibraryInfo::path(QLibraryInfo::DocumentationPath);
+        #endif
+                        printf("No docs directory specified. Taking Qt's documentation path instead: %s\n", qPrintable(m_docsDirectory));
                     }
+                    docDirectoryAvailable.release();
                 }
-                return false;
-            });
-            m_database.initialize(m_typesystemFileName, m_importDirectories, m_typesystemDirectories, QVersionNumber(m_qtVersionMajor, m_qtVersionMinor, m_qtVersionPatch), m_generateTypeSystemQML.isEmpty());
-            analyzeDependencies();
-        });
-        if(!m_dumpObjectTree && m_generateTypeSystemQML.isEmpty()){
-            QThread* targetThread = QThread::currentThread();
-            if(m_docsDirectory.isEmpty()){
-                docModelFuture = QtConcurrent::run([&docDirectoryAvailable,targetThread,this]() -> const DocModel* {
-                    docDirectoryAvailable.acquire();
-                    QDir docsDirectory(m_docsDirectory);
-                    if(docsDirectory.exists()){
-                        DocIndexReader reader;
-                        return reader.readDocIndexes(docsDirectory, targetThread);
-                    }else return nullptr;
-                });
-            }else{
-                docModelFuture = QtConcurrent::run([this, targetThread]() -> const DocModel* {
-                    QDir docsDirectory(m_docsDirectory);
-                    if(docsDirectory.exists()){
-                        DocIndexReader reader;
-                        return reader.readDocIndexes(docsDirectory, targetThread);
-                    }else return nullptr;
+                ReportHandler::setContext("Typesystem");
+                m_database.setDefined([this](const QString& name)->bool{
+                    for(const DefineUndefine& ddf : m_defineUndefineList){
+                        if(ddf.isSet() && ddf.name()==name){
+                            return true;
+                        }
+                    }
+                    return false;
                 });
+                m_database.initialize(m_typesystemFileName, m_importDirectories, m_typesystemDirectories, QVersionNumber(m_qtVersionMajor, m_qtVersionMinor, m_qtVersionPatch), m_generateTypeSystemQML.isEmpty());
+                analyzeDependencies();
+            });
+            if(!m_dumpObjectTree && m_generateTypeSystemQML.isEmpty()){
+                QThread* targetThread = QThread::currentThread();
+                if(m_docsDirectory.isEmpty()){
+                    docModelFuture = QtConcurrent::run([&docDirectoryAvailable,targetThread,this]() -> const DocModel* {
+                        docDirectoryAvailable.acquire();
+                        QDir docsDirectory(m_docsDirectory);
+                        if(docsDirectory.exists()){
+                            DocIndexReader reader;
+                            return reader.readDocIndexes(docsDirectory, targetThread);
+                        }else return nullptr;
+                    });
+                }else{
+                    docModelFuture = QtConcurrent::run([this, targetThread]() -> const DocModel* {
+                        QDir docsDirectory(m_docsDirectory);
+                        if(docsDirectory.exists()){
+                            DocIndexReader reader;
+                            return reader.readDocIndexes(docsDirectory, targetThread);
+                        }else return nullptr;
+                    });
+                }
             }
         }
-    }
 
-    ReportHandler::setContext("Preprocessor");
-    rpp::MessageUtil::installMessageHandler(ReportHandler_message_handler);
-    Binder::installMessageHandler(ReportHandler_message_handler);
-
-    //removing file here for theoretical case of wanting to parse two master include files here
-    if(QFileInfo::exists(m_preProcessorFileName))
-        QFile::remove(m_preProcessorFileName);
-    QMap<QString, QString> features;
-    QSet<QString> undefFeatures;
-
-    std::function<void(std::string,std::string,const QFileInfo&,bool)> featureRegistry = [&features, &undefFeatures, &versionAvailable, this](std::string macro, std::string definition, const QFileInfo& file, bool isDefine){
-        QString _macro = QString::fromStdString(macro);
-        if(isDefine){
-            if(_macro.startsWith("QT_FEATURE_")){
-                QString _file = file.absoluteFilePath();
-                _macro = _macro.mid(11);
-                if(features.contains(_macro) && features[_macro]!=_file){
-                    if(!undefFeatures.remove(_macro))
-                        qWarning("Feature %s defined twice:\n%s\n%s", qPrintable(_macro), qPrintable(_file), qPrintable(features[_macro]));
-                }
-                features[_macro] = _file;
-            }else if(_macro=="QT_VERSION_MAJOR"){
-                QString _definition = QString::fromStdString(definition);
-                bool ok = false;
-                uint v = _definition.toUInt(&ok);
-                if(ok){
-                    m_qtVersionMajor = v;
-                    versionAvailable.release();
-                }
-            }else if(_macro=="QT_VERSION_MINOR"){
-                QString _definition = QString::fromStdString(definition);
-                bool ok = false;
-                uint v = _definition.toUInt(&ok);
-                if(ok){
-                    m_qtVersionMinor = v;
-                    versionAvailable.release();
+        ReportHandler::setContext("Preprocessor");
+        rpp::MessageUtil::installMessageHandler(ReportHandler_message_handler);
+        Binder::installMessageHandler(ReportHandler_message_handler);
+
+        //removing file here for theoretical case of wanting to parse two master include files here
+        if(QFileInfo::exists(m_preProcessorFileName))
+            QFile::remove(m_preProcessorFileName);
+        QMap<QString, QString> features;
+        QSet<QString> undefFeatures;
+
+        std::function<void(std::string,std::string,const QFileInfo&,bool)> featureRegistry = [&features, &undefFeatures, &versionAvailable, this](std::string macro, std::string definition, const QFileInfo& file, bool isDefine){
+            QString _macro = QString::fromStdString(macro);
+            if(isDefine){
+                if(_macro.startsWith("QT_FEATURE_")){
+                    QString _file = file.absoluteFilePath();
+                    _macro = _macro.mid(11);
+                    if(features.contains(_macro) && features[_macro]!=_file){
+                        if(!undefFeatures.remove(_macro)){
+                            QFileInfo file1(features[_macro]);
+                            QFileInfo file2(_file);
+                            QString filename = file1.fileName();
+                            if(!file2.absoluteFilePath().endsWith("/private/"+filename.replace(".h", "_p.h")))
+                                qWarning("Feature %s defined twice:\n%s\n%s", qPrintable(_macro), qPrintable(_file), qPrintable(features[_macro]));
+                        }
+                    }else{
+                        features[_macro] = _file;
+                    }
+                }else if(_macro=="QT_VERSION_MAJOR"){
+                    QString _definition = QString::fromStdString(definition);
+                    bool ok = false;
+                    uint v = _definition.toUInt(&ok);
+                    if(ok){
+                        m_qtVersionMajor = v;
+                        versionAvailable.release();
+                    }
+                }else if(_macro=="QT_VERSION_MINOR"){
+                    QString _definition = QString::fromStdString(definition);
+                    bool ok = false;
+                    uint v = _definition.toUInt(&ok);
+                    if(ok){
+                        m_qtVersionMinor = v;
+                        versionAvailable.release();
+                    }
+                }else if(_macro=="QT_VERSION_PATCH"){
+                    QString _definition = QString::fromStdString(definition);
+                    bool ok = false;
+                    uint v = _definition.toUInt(&ok);
+                    if(ok){
+                        m_qtVersionPatch = v;
+                        versionAvailable.release();
+                    }
                 }
-            }else if(_macro=="QT_VERSION_PATCH"){
-                QString _definition = QString::fromStdString(definition);
-                bool ok = false;
-                uint v = _definition.toUInt(&ok);
-                if(ok){
-                    m_qtVersionPatch = v;
-                    versionAvailable.release();
+            }else{
+                if(_macro.startsWith("QT_FEATURE_")){
+                    //QString _file = file.absoluteFilePath();
+                    _macro = _macro.mid(11);
+                    undefFeatures.insert(_macro);
                 }
             }
-        }else{
-            if(_macro.startsWith("QT_FEATURE_")){
-                //QString _file = file.absoluteFilePath();
-                _macro = _macro.mid(11);
-                undefFeatures.insert(_macro);
-            }
-        }
-    };
+        };
 
-    //preprocess using master include, preprocessed file and command line given include paths, if any
-    QByteArray preprocessorOutput;
-    {
-        QBuffer buffer(&preprocessorOutput);
-        buffer.open(QIODevice::Append | QIODevice::Text);
-        if(!m_preProcessorFileName.isEmpty()){
-            QFile f(m_preProcessorFileName);
-            if (!f.open(QIODevice::WriteOnly)) {
-                std::fprintf(stderr, "Failed to write preprocessed file: %s\n", qPrintable(m_preProcessorFileName));
+        //preprocess using master include, preprocessed file and command line given include paths, if any
+        QByteArray preprocessorOutput;
+        {
+            QBuffer buffer(&preprocessorOutput);
+            buffer.open(QIODevice::Append | QIODevice::Text);
+            bool result = preprocess(buffer, featureRegistry);
+            buffer.close();
+            if(!m_preProcessorFileName.isEmpty()){
+                QFile f(m_preProcessorFileName);
+                if (!f.open(QIODevice::WriteOnly)) {
+                    std::fprintf(stderr, "Failed to write preprocessed file: %s\n", qPrintable(m_preProcessorFileName));
+                }
+                f.write(preprocessorOutput);
+            }
+            if (!result) {
+                fprintf(stderr, "Preprocessor failed on file: '%s'\n", qPrintable(m_headerFileName));
+                return 1;
             }
-            f.write(preprocessorOutput);
-        }
-        bool result = preprocess(buffer, featureRegistry);
-        if (!result) {
-            fprintf(stderr, "Preprocessor failed on file: '%s'\n", qPrintable(m_headerFileName));
-            return 1;
         }
-    }
-    versionAvailable.release(3);
-
-    FileModelItem dom;
-    {
-        ReportHandler::setContext("Parser");
-        Control control;
-        Parser p(&control);
-        pool __pool;
-        TranslationUnitAST *ast = p.parse(preprocessorOutput, std::size_t(preprocessorOutput.size()), &__pool);
-        CodeModel model;
-        Binder binder(&model, p.location());
-        dom = binder.run(ast);
-        preprocessorOutput.clear();
-    }
-
-    //convert temp preprocessed file to xml
-    if (m_astToXml) {
-        astToXML(QDir(m_outputDirectory).filePath("ast.xml"), dom);
-        dom.reset();
-        return 0;
-    }else{
-        m_metaBuilder.setIncludePathsList(m_includeDirectories);
-        m_metaBuilder.setQtVersion(m_qtVersionMajor, m_qtVersionMinor, m_qtVersionPatch, m_qtjambiVersionPatch);
-        if (!m_outputDirectory.isNull())
-            m_metaBuilder.setOutputDirectory(m_outputDirectory);
-        m_metaBuilder.setFeatures(features);
-        m_metaBuilder.setGenerateTypeSystemQML(m_generateTypeSystemQML);
+        versionAvailable.release(3);
 
         try{
             typeSystemFuture.waitForFinished();
-        }catch(const TypesystemException& exn){
+        }catch(const std::exception& exn){
             fprintf(stderr, "%s\n", exn.what());
             return -1;
+        }catch(...){
+            fprintf(stderr, "An error has occurred\n");
+            return -1;
         }
         typeSystemFuture = {};
-        if(!m_generateTypeSystemQML.isEmpty()){
-            TypeDatabase::instance()->addType(new TypeSystemTypeEntry("generic"));
+
+        QMap<QString,QStringList> requiredFeatures;
+        FileModelItem dom;
+        {
+            ReportHandler::setContext("Parser");
+            Control control;
+            Parser p(&control, requiredFeatures);
+            pool __pool;
+            TranslationUnitAST *ast = p.parse(preprocessorOutput, std::size_t(preprocessorOutput.size()), &__pool);
+            CodeModelPtr model{new CodeModel};
+            Binder binder(m_qtVersionMajor, m_qtVersionMinor, m_qtVersionPatch, m_database, model, p.location());
+            binder.run(ast);
+            preprocessorOutput.clear();
+            dom = model->globalNamespace();
         }
 
-        m_metaBuilder.build(std::move(dom));
+        //convert temp preprocessed file to xml
+        if (m_astToXml) {
+            astToXML(QDir(m_outputDirectory).filePath("ast.xml"), dom);
+            dom.reset();
+            return 0;
+        }else{
+            m_metaBuilder.setRequiredFeatures(requiredFeatures);
+            m_metaBuilder.setIncludePathsList(m_includeDirectories);
+            m_metaBuilder.setQtVersion(m_qtVersionMajor, m_qtVersionMinor, m_qtVersionPatch, m_qtjambiVersionPatch);
+            if (!m_outputDirectory.isNull())
+                m_metaBuilder.setOutputDirectory(m_outputDirectory);
+            m_metaBuilder.setFeatures(features);
+            m_metaBuilder.setGenerateTypeSystemQML(m_generateTypeSystemQML);
+            if(!m_generateTypeSystemQML.isEmpty()){
+                TypeDatabase::instance()->addType(new TypeSystemTypeEntry("generic"));
+            }
+
+            m_metaBuilder.build(std::move(dom));
 
-        if (m_dumpObjectTree) {
-            for(MetaClass *cls : m_metaBuilder.classes()) {
-                dumpMetaJavaClass(cls);
+            if (m_dumpObjectTree) {
+                for(MetaClass *cls : m_metaBuilder.classes()) {
+                    dumpMetaJavaClass(cls);
+                }
+                return 0;
             }
-            return 0;
-        }
 
-        const DocModel* docModel = docModelFuture.result();
-        docModelFuture = {};
-        if(docModel){
-            m_metaBuilder.applyDocs(docModel);
-            if(!docModel->url().isEmpty()){
-                this->m_docsUrl = docModel->url();
-                if(!this->m_docsUrl.endsWith("/"))
-                    this->m_docsUrl += "/";
+            const DocModel* docModel = docModelFuture.result();
+            docModelFuture = {};
+            if(docModel){
+                m_metaBuilder.applyDocs(docModel);
+                if(!docModel->url().isEmpty()){
+                    this->m_docsUrl = docModel->url();
+                    if(!this->m_docsUrl.endsWith("/"))
+                        this->m_docsUrl += "/";
+                }
+                delete docModel;
             }
-            delete docModel;
-        }
 
 
-        // Code generation
-        QList<AbstractGenerator *> generators;
-        PriGenerator *priGenerator = new PriGenerator(&m_database);
-        JavaGenerator *java_generator = nullptr;
-        CppHeaderGenerator *cpp_header_generator = nullptr;
-        CppImplGenerator *cpp_impl_generator = nullptr;
-        MetaInfoGenerator *metainfo = nullptr;
-
-        QStringList contexts;
-        if (!m_noJava) {
-            java_generator = new JavaGenerator(&m_database);
-            java_generator->setTypeSystemByPackage(m_metaBuilder.typeSystemByPackage());
-            if (!m_javaOutputDirectory.isNull())
-                java_generator->setJavaOutputDirectory(m_javaOutputDirectory);
-            if (!m_outputDirectory.isNull())
-                java_generator->setLogOutputDirectory(m_outputDirectory);
-            java_generator->setDocsUrl(m_docsUrl);
-            generators << java_generator;
+            // Code generation
+            QList<AbstractGenerator *> generators;
+            PriGenerator *priGenerator = new PriGenerator(&m_database);
+            JavaGenerator *java_generator = nullptr;
+            CppHeaderGenerator *cpp_header_generator = nullptr;
+            CppImplGenerator *cpp_impl_generator = nullptr;
+            MetaInfoGenerator *metainfo = nullptr;
+
+            QStringList contexts;
+            if (!m_noJava) {
+                java_generator = new JavaGenerator(&m_database, m_nullness, m_noKotlinDelegates);
+                java_generator->setTypeSystemByPackage(m_metaBuilder.typeSystemByPackage());
+                if (!m_javaOutputDirectory.isNull())
+                    java_generator->setJavaOutputDirectory(m_javaOutputDirectory);
+                if (!m_outputDirectory.isNull())
+                    java_generator->setLogOutputDirectory(m_outputDirectory);
+                java_generator->setDocsUrl(m_docsUrl);
+                generators << java_generator;
+
+                contexts << "JavaGenerator";
+            }
 
-            contexts << "JavaGenerator";
-        }
+            if (!m_noCppHeaders) {
+                cpp_header_generator = new CppHeaderGenerator(priGenerator);
+                if (!m_cppOutputDirectory.isNull())
+                    cpp_header_generator->setCppOutputDirectory(m_cppOutputDirectory);
+                generators << cpp_header_generator;
+                contexts << "CppHeaderGenerator";
+            }
 
-        if (!m_noCppHeaders) {
-            cpp_header_generator = new CppHeaderGenerator(priGenerator);
-            if (!m_cppOutputDirectory.isNull())
-                cpp_header_generator->setCppOutputDirectory(m_cppOutputDirectory);
-            generators << cpp_header_generator;
-            contexts << "CppHeaderGenerator";
-        }
+            if (!m_noCppImpl) {
+                cpp_impl_generator = new CppImplGenerator(priGenerator);
+                if (!m_cppOutputDirectory.isNull())
+                    cpp_impl_generator->setCppOutputDirectory(m_cppOutputDirectory);
+                generators << cpp_impl_generator;
+                contexts << "CppImplGenerator";
+            }
 
-        if (!m_noCppImpl) {
-            cpp_impl_generator = new CppImplGenerator(priGenerator);
-            cpp_impl_generator->setContainerBaseClasses(m_metaBuilder.containerBaseClasses());
-            if (!m_cppOutputDirectory.isNull())
-                cpp_impl_generator->setCppOutputDirectory(m_cppOutputDirectory);
-            generators << cpp_impl_generator;
-            contexts << "CppImplGenerator";
-        }
+            if (!m_noMetainfo) {
+                metainfo = new MetaInfoGenerator(priGenerator);
+                metainfo->setStaticLibraries(m_staticLibraries);
+                if (!m_cppOutputDirectory.isNull())
+                    metainfo->setCppOutputDirectory(m_cppOutputDirectory);
+                if (!m_javaOutputDirectory.isNull())
+                    metainfo->setJavaOutputDirectory(m_javaOutputDirectory);
+                metainfo->setIncludeDirectories(m_includeDirectories);
+                generators << metainfo;
+                contexts << "MetaInfoGenerator";
+            }
 
-        if (!m_noMetainfo) {
-            metainfo = new MetaInfoGenerator(priGenerator);
-            metainfo->setStaticLibraries(m_staticLibraries);
             if (!m_cppOutputDirectory.isNull())
-                metainfo->setCppOutputDirectory(m_cppOutputDirectory);
-            if (!m_javaOutputDirectory.isNull())
-                metainfo->setJavaOutputDirectory(m_javaOutputDirectory);
-            metainfo->setIncludeDirectories(m_includeDirectories);
-            generators << metainfo;
-            contexts << "MetaInfoGenerator";
-        }
-
-        if (!m_cppOutputDirectory.isNull())
-            priGenerator->setCppOutputDirectory(m_cppOutputDirectory);
+                priGenerator->setCppOutputDirectory(m_cppOutputDirectory);
+
+            QList<QFuture<void>> generated;
+            for (int i = 0; i < generators.size(); ++i) {
+                AbstractGenerator *generator = generators.at(i);
+                generator->setQtVersion(m_qtVersionMajor, m_qtVersionMinor, m_qtVersionPatch, m_qtjambiVersionPatch);
+
+                if (generator->outputDirectory().isNull())
+                    generator->setOutputDirectory(m_outputDirectory);
+                generator->setClasses(m_metaBuilder.classes());
+                if (m_printStdout){
+                    ReportHandler::setContext(contexts.at(i));
+                    generator->printClasses();
+                }else{
+                    generated << QtConcurrent::run([](AbstractGenerator *generator, const QString& context){
+                                 ReportHandler::setContext(context);
+                                 generator->generate();
+                    }, generator, contexts.at(i));
+                }
+            }
+            while(!generated.isEmpty()){
+                generated.takeFirst().waitForFinished();
+            }
 
-        QList<QFuture<void>> generated;
-        for (int i = 0; i < generators.size(); ++i) {
-            AbstractGenerator *generator = generators.at(i);
-            generator->setQtVersion(m_qtVersionMajor, m_qtVersionMinor, m_qtVersionPatch, m_qtjambiVersionPatch);
+            if (metainfo && java_generator) {
+                ReportHandler::setContext("MetaInfoGenerator");
+                metainfo->writeLibraryInitializers();
+            }
 
-            if (generator->outputDirectory().isNull())
-                generator->setOutputDirectory(m_outputDirectory);
-            generator->setClasses(m_metaBuilder.classes());
+            ReportHandler::setContext("PriGenerator");
+            priGenerator->setQtVersion(m_qtVersionMajor, m_qtVersionMinor, m_qtVersionPatch, m_qtjambiVersionPatch);
+            if (priGenerator->outputDirectory().isNull())
+                priGenerator->setOutputDirectory(m_outputDirectory);
+            priGenerator->setClasses(m_metaBuilder.classes());
             if (m_printStdout){
-                ReportHandler::setContext(contexts.at(i));
-                generator->printClasses();
+                priGenerator->printClasses();
             }else{
-                generated << QtConcurrent::run([](AbstractGenerator *generator, const QString& context){
-                             ReportHandler::setContext(context);
-                             generator->generate();
-                }, generator, contexts.at(i));
+                priGenerator->generate();
             }
-        }
-        while(!generated.isEmpty()){
-            generated.takeFirst().waitForFinished();
-        }
 
-        if (metainfo && java_generator) {
-            metainfo->writeLibraryInitializers();
-        }
-
-        ReportHandler::setContext("PriGenerator");
-        priGenerator->setQtVersion(m_qtVersionMajor, m_qtVersionMinor, m_qtVersionPatch, m_qtjambiVersionPatch);
-        if (priGenerator->outputDirectory().isNull())
-            priGenerator->setOutputDirectory(m_outputDirectory);
-        priGenerator->setClasses(m_metaBuilder.classes());
-        if (m_printStdout){
-            priGenerator->printClasses();
-        }else{
-            priGenerator->generate();
-        }
-
-        QString res;
-        res = QString("Classes in typesystem: %1\n"
-                      "Generated:\n"
-                      "  - java......: %2 (%3)\n"
-                      "  - cpp-impl..: %4 (%5)\n"
-                      "  - cpp-h.....: %6 (%7)\n"
-                      "  - meta-info.: %8 (%9)\n"
-                      "  - pri.......: %10 (%11)\n"
-                     )
-              .arg(m_metaBuilder.classes().size())
-              .arg(java_generator ? java_generator->numGenerated() : 0)
-              .arg(java_generator ? java_generator->numGeneratedAndWritten() : 0)
-              .arg(cpp_impl_generator ? cpp_impl_generator->numGenerated() : 0)
-              .arg(cpp_impl_generator ? cpp_impl_generator->numGeneratedAndWritten() : 0)
-              .arg(cpp_header_generator ? cpp_header_generator->numGenerated() : 0)
-              .arg(cpp_header_generator ? cpp_header_generator->numGeneratedAndWritten() : 0)
-              .arg(metainfo ? metainfo->numGenerated() : 0)
-              .arg(metainfo ? metainfo->numGeneratedAndWritten() : 0)
-              .arg(priGenerator->numGenerated())
-              .arg(priGenerator->numGeneratedAndWritten());
-        printf("%s\n", qPrintable(res));
-        printf("Done, %d warnings (%d known issues)\n", int(ReportHandler::reportedWarnings().size()),
-               ReportHandler::suppressedCount());
-
-        QString fileName("reported_warnings.log");
-        QFile file(fileName);
-        if (!m_outputDirectory.isNull())
-            file.setFileName(QDir(m_outputDirectory).absoluteFilePath(fileName));
-        if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-            {
-                QTextStream s(&file);
-                for(const QString& w : ReportHandler::reportedWarnings()){
-                    if(!w.contains("Suppressed warning with no text specified"))
-                        s << w << Qt::endl;
+            QString res;
+            res = QString("Classes in typesystem: %1\n"
+                          "Generated:\n"
+                          "  - java......: %2 (%3)\n"
+                          "  - cpp-impl..: %4 (%5)\n"
+                          "  - cpp-h.....: %6 (%7)\n"
+                          "  - meta-info.: %8 (%9)\n"
+                          "  - pri.......: %10 (%11)\n"
+                         )
+                  .arg(m_metaBuilder.classes().size())
+                  .arg(java_generator ? java_generator->numGenerated() : 0)
+                  .arg(java_generator ? java_generator->numGeneratedAndWritten() : 0)
+                  .arg(cpp_impl_generator ? cpp_impl_generator->numGenerated() : 0)
+                  .arg(cpp_impl_generator ? cpp_impl_generator->numGeneratedAndWritten() : 0)
+                  .arg(cpp_header_generator ? cpp_header_generator->numGenerated() : 0)
+                  .arg(cpp_header_generator ? cpp_header_generator->numGeneratedAndWritten() : 0)
+                  .arg(metainfo ? metainfo->numGenerated() : 0)
+                  .arg(metainfo ? metainfo->numGeneratedAndWritten() : 0)
+                  .arg(priGenerator->numGenerated())
+                  .arg(priGenerator->numGeneratedAndWritten());
+            printf("%s\n", qPrintable(res));
+            printf("Done, %d warnings (%d known issues)\n", int(ReportHandler::reportedWarnings().size()),
+                   ReportHandler::suppressedCount());
+
+            QString fileName("reported_warnings.log");
+            QFile file(fileName);
+            if (!m_outputDirectory.isNull())
+                file.setFileName(QDir(m_outputDirectory).absoluteFilePath(fileName));
+            file.remove();
+            if(ReportHandler::reportedWarnings().size()){
+                if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+                    {
+                        QTextStream s(&file);
+                        for(const QString& w : ReportHandler::reportedWarnings()){
+                            if(!w.contains("Suppressed warning with no text specified"))
+                                s << w << Qt::endl;
+                        }
+                    }
+                    file.close();
                 }
             }
-            file.close();
         }
-    }
 
-    return 0;
+        return 0;
+    }catch(const std::exception& exn){
+        fprintf(stderr, "%s\n", exn.what());
+        return -1;
+    }
 }
 
 QStringList readDependencies(const QString& file){
@@ -865,6 +898,19 @@ void GeneratorApplication::analyzeDependencies()
     }
 }
 
+bool GeneratorApplication::nullness() const
+{
+    return m_nullness;
+}
+
+void GeneratorApplication::setNullability(bool newNullability)
+{
+    if (m_nullness == newNullability)
+        return;
+    m_nullness = newNullability;
+    emit nullnessChanged();
+}
+
 void GeneratorApplication::modifyCppDefine(const QString &arg, bool f_set) {
 //qDebug() << "modifyCppDefine():" << arg << ((f_set) ? " define" : " undef");
     QStringList list;
@@ -1227,8 +1273,8 @@ void dumpMetaJavaType(const MetaType *type) {
         if (type->isEnum()) printf(" enum");
         if (type->isQObject()) printf(" q_obj");
         if (type->isNativePointer()) printf(" n_ptr");
-        if (type->isTargetLangString()) printf(" java_string");
-        if (type->isTargetLangStringRef()) printf(" java_string");
+        if (type->isQString()) printf(" java_string");
+        if (type->isQStringRef()) printf(" java_string");
         if (type->isConstant()) printf(" const");
         if (type->isVolatile()) printf(" volatile");
         printf("]");
diff --git a/src/cpp/QtJambiGenerator/generator.h b/src/cpp/QtJambiGenerator/generator.h
index 105edb74..60035ecf 100644
--- a/src/cpp/QtJambiGenerator/generator.h
+++ b/src/cpp/QtJambiGenerator/generator.h
@@ -160,6 +160,9 @@ class GeneratorApplication : public QCoreApplication{
     QString generateTypeSystemQML() const;
     void setGenerateTypeSystemQML(const QString& newGenerateTypeSystemQML);
 
+    bool nullness() const;
+    void setNullability(bool newNullability);
+
 signals:
     void headerFileNameChanged();
 
@@ -205,6 +208,8 @@ class GeneratorApplication : public QCoreApplication{
 
     void generateTypeSystemQMLChanged();
 
+    void nullnessChanged();
+
 private:
     bool preprocess(QIODevice& target, const std::function<void(std::string,std::string,const QFileInfo&,bool)>& featureRegistry);
 
@@ -234,7 +239,9 @@ class GeneratorApplication : public QCoreApplication{
     bool m_noJava;
     bool m_noCppHeaders;
     bool m_noCppImpl;
+    bool m_noKotlinDelegates;
     bool m_noMetainfo;
+    bool m_nullness;
     bool m_astToXml;
     bool m_dumpObjectTree;
     QString m_generateTypeSystemQML;
@@ -263,6 +270,7 @@ class GeneratorApplication : public QCoreApplication{
     Q_PROPERTY(bool dumpObjectTree READ isDumpObjectTree WRITE setDumpObjectTree NOTIFY dumpObjectTreeChanged)
     Q_PROPERTY(bool useNativeIds READ useNativeIds WRITE setUseNativeIds NOTIFY useNativeIdsChanged)
     Q_PROPERTY(QString generateTypeSystemQML READ generateTypeSystemQML WRITE setGenerateTypeSystemQML NOTIFY generateTypeSystemQMLChanged)
+    Q_PROPERTY(bool nullness READ nullness WRITE setNullability NOTIFY nullnessChanged)
 };
 
 #endif
diff --git a/src/cpp/QtJambiGenerator/javagenerator.cpp b/src/cpp/QtJambiGenerator/javagenerator.cpp
index d2eef3d0..3e9a00c5 100644
--- a/src/cpp/QtJambiGenerator/javagenerator.cpp
+++ b/src/cpp/QtJambiGenerator/javagenerator.cpp
@@ -169,7 +169,7 @@ QString findComparableType(const MetaClass *cls){
     return comparableType;
 }
 
-JavaGenerator::JavaGenerator(TS::TypeDatabase* database) : m_database(database) {}
+JavaGenerator::JavaGenerator(TS::TypeDatabase* database, bool nullness, bool noKotlinDelegates) : m_database(database), m_nullness(nullness), m_noKotlinDelegates(noKotlinDelegates) {}
 
 QString JavaGenerator::fileNameForClass(const MetaClass *java_class) const {
     return QString("%1.java").arg(java_class->name());
@@ -220,7 +220,13 @@ void JavaGenerator::writeFieldAccessors(QTextStream &s, const MetaField *field,
                     && (
                         field->type()->isPrimitive()
                         || field->type()->isEnum()
-                        || field->type()->isTargetLangString()
+                        || field->type()->isQString()
+                        || field->type()->isQString()
+                        || field->type()->isCharString()
+                        || field->type()->isQStringRef()
+                        || field->type()->isQStringView()
+                        || field->type()->isQAnyStringView()
+                        || field->type()->isQUtf8StringView()
                         )){
                 QString comment;
                 QTextStream commentStream(&comment);
@@ -315,7 +321,7 @@ void JavaGenerator::registerPackage(QString pkgName, bool inclExported){
         pkgName = pkgName.mid(0, idx);
         m_currentPackages << pkgName;
         if(inclExported)
-            m_exportedPackages << pkgName;
+            m_exportedPackages.insert(pkgName);
     }
 }
 
@@ -336,6 +342,29 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
             if(java_type->iteratorInstantiations().size()==2){
                 s = "io.qt.core.QAssociativeConstIterator";
             }
+            if ((option & StrictNonNull)
+                    || !(option & NoNullness)) {
+                auto idx = s.indexOf('<');
+                QString package;
+                QString typeName = s;
+                if(idx>0){
+                    typeName = s.mid(0, idx);
+                }
+                idx = typeName.lastIndexOf('.');
+                QString nullness;
+                if(option & StrictNonNull){
+                    nullness = QStringLiteral("@StrictNonNull ");
+                }else{
+                    nullness = QStringLiteral("@NonNull ");
+                }
+                if(idx>0){
+                    typeName = s.mid(idx+1);
+                    package = s.mid(0, idx+1);
+                    s = package + nullness + typeName;
+                }else{
+                    s = nullness + s;
+                }
+            }
             s += "<";
             for(int i=0; i<java_type->iteratorInstantiations().size(); i++){
                 if(i>0)
@@ -359,6 +388,29 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
                     }
                 }
                 if(!containerClass->templateBaseClassInstantiations().isEmpty() && (option & SkipTemplateParameters)==0){
+                    if ((option & StrictNonNull)
+                            || !(option & NoNullness)) {
+                        auto idx = s.indexOf('<');
+                        QString package;
+                        QString typeName = s;
+                        if(idx>0){
+                            typeName = s.mid(0, idx);
+                        }
+                        idx = typeName.lastIndexOf('.');
+                        QString nullness;
+                        if(option & StrictNonNull){
+                            nullness = QStringLiteral("@StrictNonNull ");
+                        }else{
+                            nullness = QStringLiteral("@NonNull ");
+                        }
+                        if(idx>0){
+                            typeName = s.mid(idx+1);
+                            package = s.mid(0, idx+1);
+                            s = package + nullness + typeName;
+                        }else{
+                            s = nullness + s;
+                        }
+                    }
                     s += "<";
                     for(int i=0; i<containerClass->templateBaseClassInstantiations().size(); i++){
                         if(i>0)
@@ -373,6 +425,29 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
         if(!found){
             MetaClass * iteratorClass = m_classes.findClass(iteratorType->qualifiedCppName(), MetaClassList::QualifiedCppName);
             if(iteratorClass){
+                if ((option & StrictNonNull)
+                        || !(option & NoNullness)) {
+                    auto idx = s.indexOf('<');
+                    QString package;
+                    QString typeName = s;
+                    if(idx>0){
+                        typeName = s.mid(0, idx);
+                    }
+                    idx = typeName.lastIndexOf('.');
+                    QString nullness;
+                    if(option & StrictNonNull){
+                        nullness = QStringLiteral("@StrictNonNull ");
+                    }else{
+                        nullness = QStringLiteral("@NonNull ");
+                    }
+                    if(idx>0){
+                        typeName = s.mid(idx+1);
+                        package = s.mid(0, idx+1);
+                        s = package + nullness + typeName;
+                    }else{
+                        s = nullness + s;
+                    }
+                }
                 if(iteratorClass->typeAliasType()){
                     QScopedPointer<MetaType> typeAliasType(iteratorClass->typeAliasType()->copy());
                     if(typeAliasType->indirections().size()==1 && typeAliasType->getReferenceType()==MetaType::NoReference){
@@ -405,10 +480,30 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
         MetaType* instantiation = java_type->instantiations()[0]->copy();
         MetaBuilder::decideUsagePattern(instantiation);
         s = translateType(instantiation, context, Option((option & ~EnumAsInts & ~UseNativeIds & ~BoxedPrimitive) | NoSuppressExports | InitializerListAsArray));
+        if (option & StrictNonNull) {
+            s += QString("@StrictNonNull ");
+        }else if (!(option & NoNullness)) {
+            if(!java_type->typeEntry()->isPrimitive()
+                    && !java_type->typeEntry()->isQVariant()
+                    && !java_type->typeEntry()->isQChar()
+                    && !java_type->typeEntry()->isFunctional()
+                    && java_type->indirections().isEmpty()){
+                s += QString("@NonNull ");
+            }else if(!java_type->indirections().isEmpty()
+                     || java_type->typeEntry()->isFunctional()){
+                s += QString("@Nullable ");
+            }
+        }
         if(option & InitializerListAsArray)
             s += "[]";
         else
             s += " ...";
+    } else if (java_type->isCharString()) {
+        if (option & NoNullness) {
+            s = "java.lang.String";
+        }else{
+            s = "java.lang.@Nullable String";
+        }
     } else if (java_type->hasNativeId() && (option & UseNativeIds)) {
         s = "long";
     } else if (java_type->isArray()) {
@@ -421,35 +516,46 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
             switch(size){
             case 8:
                 if (option & BoxedPrimitive)
-                    s = "java.lang.Byte";
+                    s = "Byte";
                 else
                     s = "byte";
                 break;
             case 16:
                 if (option & BoxedPrimitive)
-                    s = "java.lang.Short";
+                    s = "Short";
                 else
                     s = "short";
                 break;
             case 32:
                 if (option & BoxedPrimitive)
-                    s = "java.lang.Integer";
+                    s = "Integer";
                 else
                     s = "int";
                 break;
             case 64:
                 if (option & BoxedPrimitive)
-                    s = "java.lang.Long";
+                    s = "Long";
                 else
                     s = "long";
                 break;
             default:
                 if (option & BoxedPrimitive)
-                    s = "java.lang.Integer";
+                    s = "Integer";
                 else
                     s = "int";
                 break;
             }
+            if (((option & StrictNonNull)
+                    || !(option & NoNullness))
+                    && (option & BoxedPrimitive)) {
+                if(option & StrictNonNull){
+                    s = QStringLiteral("java.lang.@QtPrimitiveType@StrictNonNull ") + s;
+                }else if(java_type->indirections().isEmpty()){
+                    s = QStringLiteral("java.lang.@QtPrimitiveType@NonNull ") + s;
+                }else{
+                    s = QStringLiteral("java.lang.@QtPrimitiveType@Nullable ") + s;
+                }
+            }
         }else{
             if (option & EnumAsInts)
                 switch(size){
@@ -472,15 +578,52 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
             else{
                 m_currentPackages << static_cast<const EnumTypeEntry *>(java_type->typeEntry())->javaPackage();
                 if((option & NoSuppressExports) == 0)
-                    m_exportedPackages << static_cast<const EnumTypeEntry *>(java_type->typeEntry())->javaPackage();
-                s = java_type->fullName();
+                    m_exportedPackages.insert(static_cast<const EnumTypeEntry *>(java_type->typeEntry())->javaPackage());
+                s = java_type->fullName().replace('$', '.');
+
+                if ((option & StrictNonNull)
+                        || !(option & NoNullness)) {
+                    auto idx = s.indexOf('<');
+                    QString package;
+                    QString typeName = s;
+                    if(idx>0){
+                        typeName = s.mid(0, idx);
+                    }
+                    idx = typeName.lastIndexOf('.');
+                    QString nullness;
+                    if(option & StrictNonNull){
+                        nullness = QStringLiteral("@StrictNonNull ");
+                    }else if(java_type->indirections().isEmpty()){
+                        nullness = QStringLiteral("@NonNull ");
+                    }else{
+                        nullness = QStringLiteral("@Nullable ");
+                    }
+                    if(idx>0){
+                        typeName = s.mid(idx+1);
+                        package = s.mid(0, idx+1);
+                        s = package + nullness + typeName;
+                    }else{
+                        s = nullness + s;
+                    }
+                }
             }
         }
     } else if (java_type->isFlags()) {
         if (static_cast<const FlagsTypeEntry *>(java_type->typeEntry())->forceInteger()) {
-            if (option & BoxedPrimitive)
-                s = "java.lang.Integer";
-            else
+            if (option & BoxedPrimitive){
+                if ((option & StrictNonNull)
+                        || !(option & NoNullness)) {
+                    if(option & StrictNonNull){
+                        s = QStringLiteral("java.lang.@QtPrimitiveType@StrictNonNull Integer");
+                    }else if(java_type->indirections().isEmpty()){
+                        s = QStringLiteral("java.lang.@QtPrimitiveType@NonNull Integer");
+                    }else{
+                        s = QStringLiteral("java.lang.@QtPrimitiveType@Nullable Integer");
+                    }
+                }else{
+                    s = "java.lang.@QtPrimitiveType@Nullable Integer";
+                }
+            }else
                 s = "int";
         } else {
             if (option & EnumAsInts)
@@ -488,17 +631,53 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
             else{
                 m_currentPackages << static_cast<const FlagsTypeEntry *>(java_type->typeEntry())->javaPackage();
                 if((option & NoSuppressExports) == 0)
-                    m_exportedPackages << static_cast<const FlagsTypeEntry *>(java_type->typeEntry())->javaPackage();
-                s = java_type->fullName();
+                    m_exportedPackages.insert(static_cast<const FlagsTypeEntry *>(java_type->typeEntry())->javaPackage());
+                s = java_type->fullName().replace('$', '.');
+                if ((option & StrictNonNull)
+                        || !(option & NoNullness)) {
+                    auto idx = s.indexOf('<');
+                    QString package;
+                    QString typeName = s;
+                    if(idx>0){
+                        typeName = s.mid(0, idx);
+                    }
+                    idx = typeName.lastIndexOf('.');
+                    QString nullness;
+                    if(option & StrictNonNull){
+                        nullness = QStringLiteral("@StrictNonNull ");
+                    }else if(java_type->indirections().isEmpty()){
+                        nullness = QStringLiteral("@NonNull ");
+                    }else{
+                        nullness = QStringLiteral("@Nullable ");
+                    }
+                    if(idx>0){
+                        typeName = s.mid(idx+1);
+                        package = s.mid(0, idx+1);
+                        s = package + nullness + typeName;
+                    }else{
+                        s = nullness + s;
+                    }
+                }
             }
         }
     } else {
         if (java_type->isPrimitive() && (option & BoxedPrimitive) ) {
             s = static_cast<const PrimitiveTypeEntry *>(java_type->typeEntry())->javaObjectFullName();
-
+            auto idx = s.lastIndexOf('.');
+            QString ann;
+            if (!(option & StrictNonNull)
+                    && (option & NoNullness)) {
+                ann = QStringLiteral("@QtPrimitiveType ");
+            }
+            if(idx>0){
+                QString typeName = s.mid(idx+1);
+                QString package = s.mid(0, idx+1);
+                s = package + ann + typeName;
+            }else{
+                s = ann + s;
+            }
         } else if (java_type->isNativePointer()) {
-            s = "io.qt.QNativePointer";
-
+            s = "QNativePointer";
         } else if (java_type->isContainer()) {
             const ContainerTypeEntry * container = static_cast<const ContainerTypeEntry *>(java_type->typeEntry());
             if(((option & CollectionAsCollection) != CollectionAsCollection)
@@ -537,10 +716,10 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
                             s += ", ";
                         if((option & CollectionAsCollection) == CollectionAsCollection
                                 && !args.at(i)->isPrimitive()
-                                && !args.at(i)->isString()
-                                && !args.at(i)->isTargetLangChar())
+                                && !args.at(i)->isJavaString()
+                                && !args.at(i)->isQChar())
                             s += "? extends ";
-                        s += translateType(args.at(i), context, Option(BoxedPrimitive | NoQCollectionContainers | InitializerListAsArray));
+                        s += translateType(args.at(i), context, Option((option & NoNullness) | BoxedPrimitive | NoQCollectionContainers | InitializerListAsArray));
                     }
                     s += '>';
                 }
@@ -595,9 +774,12 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
                         s = "java.util.Map";
                     }
                 }
+
+                QString plainType;
                 if((option & SkipTemplateParameters) == 0 && container->type()==ContainerTypeEntry::QModelRoleDataSpanContainer){
                     s += "<Integer,Object>";
                 }else if ((option & SkipTemplateParameters) == 0 && s!="io.qt.core.QStringList") {
+                    plainType = s;
                     s += '<';
                     const QList<const MetaType *>& args = java_type->instantiations();
                     auto argssize = args.size();
@@ -613,52 +795,52 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
                             s += "? extends java.util.List<";
                         if((option & CollectionAsCollection) == CollectionAsCollection
                                 && !args.at(i)->isPrimitive()
-                                && !args.at(i)->isString()
-                                && !args.at(i)->isTargetLangChar())
+                                && !args.at(i)->isJavaString()
+                                && !args.at(i)->isQChar())
                             s += "? extends ";
-                        s += translateType(args.at(i), context, Option(BoxedPrimitive | NoQCollectionContainers | InitializerListAsArray));
+                        s += translateType(args.at(i), context, Option((option & NoNullness) | BoxedPrimitive | NoQCollectionContainers | InitializerListAsArray));
                         if (isMultiMap)
                             s += ">";
                     }
                     s += '>';
                 }
-                if(s=="java.util.Optional<java.lang.Integer>"){
+                if(s.startsWith("java.util.Optional<java.lang.") && s.endsWith("Integer>")){
                     s = "java.util.OptionalInt";
-                }else if(s=="java.util.Optional<java.lang.Long>"){
+                }else if(s.startsWith("java.util.Optional<java.lang.") && s.endsWith("Long>")){
                     s = "java.util.OptionalLong";
-                }else if(s=="java.util.Optional<java.lang.Double>"){
+                }else if(s.startsWith("java.util.Optional<java.lang.") && s.endsWith("Double>")){
                     s = "java.util.OptionalDouble";
-                }else if(s=="io.qt.core.QPropertyBinding<java.lang.Boolean>"){
+                }else if(s.startsWith("io.qt.core.QPropertyBinding<java.lang.") && s.endsWith("Boolean>")){
                     s = "io.qt.core.QBooleanPropertyBinding";
-                }else if(s=="io.qt.core.QPropertyBinding<java.lang.Byte>"){
+                }else if(s.startsWith("io.qt.core.QPropertyBinding<java.lang.") && s.endsWith("Byte>")){
                     s = "io.qt.core.QBytePropertyBinding";
-                }else if(s=="io.qt.core.QPropertyBinding<java.lang.Short>"){
+                }else if(s.startsWith("io.qt.core.QPropertyBinding<java.lang.") && s.endsWith("Short>")){
                     s = "io.qt.core.QShortPropertyBinding";
-                }else if(s=="io.qt.core.QPropertyBinding<java.lang.Integer>"){
+                }else if(s.startsWith("io.qt.core.QPropertyBinding<java.lang.") && s.endsWith("Integer>")){
                     s = "io.qt.core.QIntPropertyBinding";
-                }else if(s=="io.qt.core.QPropertyBinding<java.lang.Long>"){
+                }else if(s.startsWith("io.qt.core.QPropertyBinding<java.lang.") && s.endsWith("Long>")){
                     s = "io.qt.core.QLongPropertyBinding";
-                }else if(s=="io.qt.core.QPropertyBinding<java.lang.Char>"){
+                }else if(s.startsWith("io.qt.core.QPropertyBinding<java.lang.") && s.endsWith("Char>")){
                     s = "io.qt.core.QCharPropertyBinding";
-                }else if(s=="io.qt.core.QPropertyBinding<java.lang.Float>"){
+                }else if(s.startsWith("io.qt.core.QPropertyBinding<java.lang.") && s.endsWith("Float>")){
                     s = "io.qt.core.QFloatPropertyBinding";
-                }else if(s=="io.qt.core.QPropertyBinding<java.lang.Double>"){
+                }else if(s.startsWith("io.qt.core.QPropertyBinding<java.lang.") && s.endsWith("Double>")){
                     s = "io.qt.core.QDoublePropertyBinding";
-                }else if(s=="io.qt.core.QBindable<java.lang.Boolean>"){
+                }else if(s.startsWith("io.qt.core.QBindable<java.lang.") && s.endsWith("Boolean>")){
                     s = "io.qt.core.QBooleanBindable";
-                }else if(s=="io.qt.core.QBindable<java.lang.Byte>"){
+                }else if(s.startsWith("io.qt.core.QBindable<java.lang.") && s.endsWith("Byte>")){
                     s = "io.qt.core.QByteBindable";
-                }else if(s=="io.qt.core.QBindable<java.lang.Short>"){
+                }else if(s.startsWith("io.qt.core.QBindable<java.lang.") && s.endsWith("Short>")){
                     s = "io.qt.core.QShortBindable";
-                }else if(s=="io.qt.core.QBindable<java.lang.Integer>"){
+                }else if(s.startsWith("io.qt.core.QBindable<java.lang.") && s.endsWith("Integer>")){
                     s = "io.qt.core.QIntBindable";
-                }else if(s=="io.qt.core.QBindable<java.lang.Long>"){
+                }else if(s.startsWith("io.qt.core.QBindable<java.lang.") && s.endsWith("Long>")){
                     s = "io.qt.core.QLongBindable";
-                }else if(s=="io.qt.core.QBindable<java.lang.Char>"){
+                }else if(s.startsWith("io.qt.core.QBindable<java.lang.") && s.endsWith("Char>")){
                     s = "io.qt.core.QCharBindable";
-                }else if(s=="io.qt.core.QBindable<java.lang.Float>"){
+                }else if(s.startsWith("io.qt.core.QBindable<java.lang.") && s.endsWith("Float>")){
                     s = "io.qt.core.QFloatBindable";
-                }else if(s=="io.qt.core.QBindable<java.lang.Double>"){
+                }else if(s.startsWith("io.qt.core.QBindable<java.lang.") && s.endsWith("Double>")){
                     s = "io.qt.core.QDoubleBindable";
                 }
             }
@@ -666,7 +848,9 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
             MetaType* instantiation = java_type->instantiations()[0]->copy();
             instantiation->setIndirections(QList<bool>(instantiation->indirections()) << false);
             MetaBuilder::decideUsagePattern(instantiation);
-            s = translateType(instantiation, context, Option((option & ~EnumAsInts) & ~UseNativeIds));
+            if(!instantiation->typeEntry()->isObject() && instantiation->typeUsagePattern()==MetaType::NativePointerPattern)
+                instantiation->setTypeUsagePattern(MetaType::ObjectPattern);
+            return translateType(instantiation, context, Option((option & ~EnumAsInts) & ~UseNativeIds));
         } else {
             const TypeEntry *type = java_type->typeEntry();
             if (type->designatedInterface())
@@ -675,15 +859,16 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
             if(!java_type->instantiations().isEmpty()){
                 s += '<';
                 const QList<const MetaType *>& args = java_type->instantiations();
+                Option loopOption = Option(option & NoNullness);
                 for (int i=0; i<args.size(); ++i) {
                     if (i != 0)
                         s += ", ";
                     if((option & CollectionAsCollection) == CollectionAsCollection
                             && !args.at(i)->isPrimitive()
-                            && !args.at(i)->isString()
-                            && !args.at(i)->isTargetLangChar())
+                            && !args.at(i)->isJavaString()
+                            && !args.at(i)->isQChar())
                         s += "? extends ";
-                    s += translateType(args.at(i), context, Option(BoxedPrimitive | NoQCollectionContainers | InitializerListAsArray));
+                    s += translateType(args.at(i), context, Option(loopOption | BoxedPrimitive | NoQCollectionContainers | InitializerListAsArray));
                 }
                 s += '>';
             }else if(type->type()==TypeEntry::JMapWrapperType){
@@ -729,6 +914,7 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
                     if(functional && !functional->javaFunctionalInterfaceParameterTypes().isEmpty()){
                         s += '<';
                         const QList<uint>& args = functional->javaFunctionalInterfaceParameterTypes();
+                        Option loopOption = Option(option & NoNullness);
                         for (int i=0; i<args.size(); ++i) {
                             if (i != 0)
                                 s += ", ";
@@ -736,9 +922,9 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
                             QString modifiedType = functional->typeReplaced(args[i]);
                             if(modifiedType.isEmpty()){
                                 if(args[i]==0){
-                                    s += translateType(functional->type(), context, Option(BoxedPrimitive | InitializerListAsArray | NoQCollectionContainers));
+                                    s += translateType(functional->type(), context, Option(loopOption | BoxedPrimitive | InitializerListAsArray | NoQCollectionContainers));
                                 }else{
-                                    s += translateType(functional->arguments()[args[i]-1]->type(), context, Option(BoxedPrimitive | InitializerListAsArray | NoQCollectionContainers));
+                                    s += translateType(functional->arguments()[args[i]-1]->type(), context, Option(loopOption | BoxedPrimitive | InitializerListAsArray | NoQCollectionContainers));
                                 }
                             }else{
                                 s += modifiedType;
@@ -758,15 +944,59 @@ QString JavaGenerator::translateType(const MetaType *java_type, const MetaClass
                 }
             }
         }
+        if(java_type && !java_type->isEnum() && !java_type->isFlags())
+            registerPackage(s, (option & NoSuppressExports) == 0);
+        s = s.replace('$', '.');
+        if ((option & StrictNonNull)
+                || (!(option & NoNullness)
+                    && (((!java_type->typeEntry()->isPrimitive() || (option & BoxedPrimitive))
+                         && !java_type->typeEntry()->isQVariant()
+                         && !java_type->typeEntry()->isQChar()
+                         && java_type->indirections().isEmpty())
+                        || !java_type->indirections().isEmpty()))) {
+            auto idx = s.indexOf('<');
+            QString package;
+            QString typeName = s;
+            if(idx>0){
+                typeName = s.mid(0, idx);
+            }
+            idx = typeName.lastIndexOf('.');
+            QString ann;
+            if((option & BoxedPrimitive) && java_type->typeEntry()->isPrimitive()){
+                if(java_type->typeEntry()->isVoid()){
+                    ann = QStringLiteral("@QtPrimitiveType ");
+                }else if(option & StrictNonNull){
+                    ann = QStringLiteral("@QtPrimitiveType@StrictNonNull ");
+                }else if(java_type->indirections().isEmpty()){
+                    ann = QStringLiteral("@QtPrimitiveType@NonNull ");
+                }else{
+                    ann = QStringLiteral("@QtPrimitiveType@Nullable ");
+                }
+            }else{
+                if(option & StrictNonNull){
+                    ann = QStringLiteral("@StrictNonNull ");
+                }else if(java_type->indirections().isEmpty() && !java_type->typeEntry()->isFunctional()){
+                    ann = QStringLiteral("@NonNull ");
+                }else{
+                    ann = QStringLiteral("@Nullable ");
+                }
+            }
+            if(idx>0){
+                typeName = s.mid(idx+1);
+                package = s.mid(0, idx+1);
+                s = package + ann + typeName;
+            }else{
+                s = ann + s;
+            }
+        }
     }
-    if(java_type && !java_type->isEnum() && !java_type->isFlags())
-        registerPackage(s, (option & NoSuppressExports) == 0);
-    return s.replace('$', '.');
+    return s;
 }
 
-QString JavaGenerator::argumentString(const MetaFunction *java_function,
-                                      const MetaArgument *java_argument,
-                                      Option options) {
+void JavaGenerator::writeFunctionArgument(QTextStream &s,
+                                  const MetaFunction *java_function,
+                                  const MetaArgument *java_argument,
+                                  Option options) {
     QString modified_type;
     if(java_function->argumentTypeArray(java_argument->argumentIndex() + 1)){
         options = Option(options & ~EnumAsInts);
@@ -779,10 +1009,11 @@ QString JavaGenerator::argumentString(const MetaFunction *java_function,
             cpy->setIndirections(indirections);
         }
         MetaBuilder::decideUsagePattern(cpy.get());
+        modified_type = translateType(cpy.get(), java_function->implementingClass(), Option((options & ~UseNativeIds) | NoSuppressExports));
         if(java_function->argumentTypeArrayVarArgs(java_argument->argumentIndex() + 1)){
-            modified_type = translateType(cpy.get(), java_function->implementingClass(), Option((options & ~UseNativeIds) | NoSuppressExports))+"...";
+            modified_type += "...";
         }else{
-            modified_type = translateType(cpy.get(), java_function->implementingClass(), Option((options & ~UseNativeIds) | NoSuppressExports))+"[]";
+            modified_type += "[]";
         }
     }else if(java_function->argumentTypeBuffer(java_argument->argumentIndex() + 1)){
         options = Option(options & ~EnumAsInts);
@@ -815,27 +1046,95 @@ QString JavaGenerator::argumentString(const MetaFunction *java_function,
         }
     }else {
         modified_type = java_function->typeReplaced(java_argument->argumentIndex() + 1);
+        if((options & SkipTemplateParameters) && modified_type.contains("<")){
+            auto idx = modified_type.indexOf('<');
+            modified_type = modified_type.mid(0, idx);
+        }
         if((options & InitializerListAsArray) && modified_type.endsWith("...")){
             modified_type = modified_type.replace("...", "[]");
         }
     }
     QString arg;
 
+    bool suppressWarning = false;
     if (modified_type.isEmpty()){
         if(java_argument->argumentIndex()<java_function->arguments().size()-1)
             options = Option(options | InitializerListAsArray);
-        arg = translateType(java_argument->type(), java_function->implementingClass(), Option(options));
-        if(arg=="io.qt.core.QString")
-            arg = "java.lang.CharSequence";
+        if(!(options & NoNullness) && java_argument->isNullPointerDisabled(java_function)){
+            options = Option(options | StrictNonNull);
+        }
+        if(isCharSequenceSubstitute(java_argument->type())){
+            if(options & NoNullness){
+                arg = "java.lang.CharSequence";
+            }else{
+                if(options & StrictNonNull){
+                    arg = "java.lang.@StrictNonNull CharSequence";
+                }else if(java_argument->type()->indirections().isEmpty()){
+                    arg = "java.lang.@NonNull CharSequence";
+                }else{
+                    arg = "java.lang.@Nullable CharSequence";
+                }
+            }
+        }else{
+            arg = translateType(java_argument->type(), java_function->implementingClass(), Option(options));
+        }
+
         if((options & SkipTemplateParameters) == 0 && java_argument->type()->typeEntry()->isComplex()){
             const ComplexTypeEntry* ctype = dynamic_cast<const ComplexTypeEntry*>(java_argument->type()->typeEntry());
             if(ctype->isGenericClass() && java_argument->type()->instantiations().isEmpty()){
-                arg = QString("@SuppressWarnings(\"rawtypes\") ") + arg;
+                suppressWarning = true;
             }
         }
     }else{
         registerPackage(modified_type);
-        arg = modified_type.replace('$', '.');
+        modified_type = modified_type.replace('$', '.');
+
+        if (!(options & NoNullness)) {
+            if(java_function->nullPointersDisabled(java_function->declaringClass(), java_argument->argumentIndex() + 1)){
+                if(modified_type.endsWith("[]")){
+                    modified_type = modified_type.mid(0, modified_type.length()-2) + " @StrictNonNull[]";
+                }else if(modified_type.endsWith("...")){
+                    modified_type = modified_type.mid(0, modified_type.length()-3) + " @StrictNonNull...";
+                }else{
+                    auto idx = modified_type.indexOf('<');
+                    QString package;
+                    QString typeName = modified_type;
+                    if(idx>0){
+                        typeName = modified_type.mid(0, idx);
+                    }
+                    idx = typeName.lastIndexOf('.');
+                    if(idx>0){
+                        typeName = modified_type.mid(idx+1);
+                        package = modified_type.mid(0, idx+1);
+                        modified_type = package + QString("@StrictNonNull ") + typeName;
+                    }else{
+                        modified_type = QString("@StrictNonNull ") + modified_type;
+                    }
+                }
+            }else if(modified_type=="java.lang.String" || modified_type=="String"){
+                if(java_argument->type()
+                        && java_argument->type()->typeEntry()->qualifiedCppName()=="char"
+                        && java_argument->type()->indirections().size()==1
+                        && !java_function->hasConversionRule(TS::Language::NativeCode, java_argument->argumentIndex() + 1)){
+                    auto idx = modified_type.indexOf('<');
+                    QString package;
+                    QString typeName = modified_type;
+                    if(idx>0){
+                        typeName = modified_type.mid(0, idx);
+                    }
+                    idx = typeName.lastIndexOf('.');
+                    QString ann = QString("@Nullable ");
+                    if(idx>0){
+                        typeName = modified_type.mid(idx+1);
+                        package = modified_type.mid(0, idx+1);
+                        modified_type = package + ann + typeName;
+                    }else{
+                        modified_type = ann + modified_type;
+                    }
+                }
+            }
+        }
+        arg = modified_type;
     }
     if ((options & SkipTemplateParameters) == SkipTemplateParameters) {
         auto idx = arg.indexOf("<");
@@ -843,19 +1142,14 @@ QString JavaGenerator::argumentString(const MetaFunction *java_function,
             arg = arg.left(idx);
     }
 
+    if(suppressWarning)
+        arg = QString("@SuppressWarnings(\"rawtypes\") ") + arg;
     if ((options & SkipName) == 0) {
         arg += " ";
         arg += java_argument->modifiedArgumentName();
     }
 
-    return arg;
-}
-
-void JavaGenerator::writeArgument(QTextStream &s,
-                                  const MetaFunction *java_function,
-                                  const MetaArgument *java_argument,
-                                  Option options) {
-    s << argumentString(java_function, java_argument, options);
+    s << arg;
 }
 
 
@@ -991,12 +1285,12 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
         s << INDENT << " */" << Qt::endl;
     }
     if(java_functional->typeEntry()->codeGeneration() & TypeEntry::GenerateNoShell){
-        s << INDENT << "public final class " << java_functional->name() << " extends io.qt.QtObject";
+        s << INDENT << "public final class " << java_functional->name() << " extends QtObject";
         if(!java_functional->javaFunctionalInterface().isEmpty())
             s << " implements ";
     }else{
         s << INDENT << "@FunctionalInterface" << Qt::endl
-          << INDENT << "public interface " << java_functional->name() << " extends io.qt.QtObjectInterface";
+          << INDENT << "public interface " << java_functional->name() << " extends QtObjectInterface";
         if(!java_functional->javaFunctionalInterface().isEmpty())
             s << ", ";
     }
@@ -1108,7 +1402,7 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
                     ++counter;
                 }
 
-                for(const QString& pkg : m_exportedPackages){
+                for(const QString& pkg : qAsConst(m_exportedPackages)){
                     if(pkg!=java_functional->package()
                             && !pkg.isEmpty()
                             && m_typeSystemByPackage[pkg]
@@ -1159,7 +1453,9 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
                                 continue;
                             if(needsComma)
                                 s << ", ";
-                            if(!java_functional->typeReplaced(arg->argumentIndex()+1).isEmpty()){
+                            if(!java_functional->typeReplaced(arg->argumentIndex()+1).isEmpty()
+                                    || java_functional->argumentTypeArray(arg->argumentIndex()+1)
+                                    || java_functional->argumentTypeBuffer(arg->argumentIndex()+1)){
                                 s << arg->modifiedArgumentName();
                             }else if (arg->type()->isTargetLangEnum() || arg->type()->isTargetLangFlags()) {
                                 s << arg->modifiedArgumentName() << ".value()";
@@ -1178,12 +1474,12 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
                     s << INDENT << "}" << Qt::endl << Qt::endl
                       << INDENT << "private native ";
                     if(returnArrayLengthIndex>=0){
-                        s << translateType(java_functional->type(), nullptr, Option(InitializerListAsArray | EnumAsInts | NoQCollectionContainers)) << "[]";
+                        s << translateType(java_functional->type(), nullptr, Option(NoNullness | InitializerListAsArray | EnumAsInts | NoQCollectionContainers)) << "[]";
                     }else{
                         if(!replacedReturnType.isEmpty())
                             s << replacedReturnType;
                         else
-                            s << translateType(java_functional->type(), nullptr, Option(InitializerListAsArray | EnumAsInts | NoQCollectionContainers));
+                            s << translateType(java_functional->type(), nullptr, Option(NoNullness | InitializerListAsArray | EnumAsInts | NoQCollectionContainers));
                     }
                     s << " ";
                     if(java_functional->typeEntry()->functionName().isEmpty())
@@ -1209,8 +1505,11 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
                             if(!replacedArgType.isEmpty()){
                                 registerPackage(replacedArgType);
                                 s << replacedArgType.replace('$', '.');
-                            }else
-                                s << translateType(arg->type(), nullptr, Option(InitializerListAsArray | CollectionAsCollection | UseNativeIds | EnumAsInts));
+                            }else if(java_functional->argumentTypeArray(arg->argumentIndex()+1)){
+                                s << translateType(arg->type(), nullptr, Option(NoNullness | InitializerListAsArray | CollectionAsCollection | EnumAsInts)) << "[]";
+                            }else{
+                                s << translateType(arg->type(), nullptr, Option(NoNullness | InitializerListAsArray | CollectionAsCollection | UseNativeIds | EnumAsInts));
+                            }
                         }
                         s << " " << arg->modifiedArgumentName();
                         hasArg = true;
@@ -1224,7 +1523,7 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
             s << INDENT << "/**" <<Qt::endl
               << INDENT << " * <p>Implementor class for interface {@link " << java_functional->name().replace("$", ".") << "}</p>" << Qt::endl
               << INDENT << " */" <<Qt::endl
-              << INDENT << "public static abstract class Impl extends io.qt.QtObject implements " << java_functional->name() << "{" << Qt::endl;
+              << INDENT << "public static abstract class Impl extends QtObject implements " << java_functional->name() << "{" << Qt::endl;
             {
                 INDENTATION(INDENT)
                 s << INDENT << "static {" << Qt::endl
@@ -1239,7 +1538,7 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
                   << INDENT << "    super(p);" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl
                   << INDENT << "private static native void initialize_native(" << java_functional->name() << " instance);" << Qt::endl << Qt::endl
-                  << INDENT << "@io.qt.NativeAccess" << Qt::endl
+                  << INDENT << "@NativeAccess" << Qt::endl
                   << INDENT << "private final static class ConcreteWrapper extends Impl {" << Qt::endl;
                 {
                     INDENTATION(INDENT)
@@ -1318,7 +1617,9 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
                                     continue;
                                 if(needsComma)
                                     s << ", ";
-                                if(!java_functional->typeReplaced(arg->argumentIndex()+1).isEmpty()){
+                                if(!java_functional->typeReplaced(arg->argumentIndex()+1).isEmpty()
+                                        || java_functional->argumentTypeArray(arg->argumentIndex()+1)
+                                        || java_functional->argumentTypeBuffer(arg->argumentIndex()+1)){
                                     s << arg->modifiedArgumentName();
                                 }else if (arg->type()->isTargetLangEnum() || arg->type()->isTargetLangFlags()) {
                                     s << arg->modifiedArgumentName() << ".value()";
@@ -1337,12 +1638,12 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
                         s << INDENT << "}" << Qt::endl << Qt::endl
                           << INDENT << "private native ";
                         if(returnArrayLengthIndex>=0){
-                            s << translateType(java_functional->type(), nullptr, Option(InitializerListAsArray | EnumAsInts | NoQCollectionContainers)) << "[]";
+                            s << translateType(java_functional->type(), nullptr, Option(NoNullness | InitializerListAsArray | EnumAsInts | NoQCollectionContainers)) << "[]";
                         }else{
                             if(!replacedReturnType.isEmpty())
                                 s << replacedReturnType;
                             else
-                                s << translateType(java_functional->type(), nullptr, Option(InitializerListAsArray | EnumAsInts | NoQCollectionContainers));
+                                s << translateType(java_functional->type(), nullptr, Option(NoNullness | InitializerListAsArray | EnumAsInts | NoQCollectionContainers));
                         }
                         s << " ";
                         if(java_functional->typeEntry()->functionName().isEmpty())
@@ -1362,14 +1663,17 @@ void JavaGenerator::writeFunctional(QTextStream &s, const MetaFunctional *java_f
                                 s << ", ";
                             int arrayLengthIndex = java_functional->argumentTypeArrayLengthIndex(arg->argumentIndex()+1);
                             if(arrayLengthIndex>=0){
-                                s << translateType(arg->type(), nullptr, Option(CollectionAsCollection)) << "[]";
+                                s << translateType(arg->type(), nullptr, Option(NoNullness | CollectionAsCollection)) << "[]";
                             }else{
                                 QString replacedArgType = java_functional->typeReplaced(arg->argumentIndex()+1);
                                 if(!replacedArgType.isEmpty()){
                                     registerPackage(replacedArgType);
                                     s << replacedArgType.replace('$', '.');
-                                }else
-                                    s << translateType(arg->type(), nullptr, Option(InitializerListAsArray | CollectionAsCollection | UseNativeIds | EnumAsInts));
+                                }else if(java_functional->argumentTypeArray(arg->argumentIndex()+1)){
+                                    s << translateType(arg->type(), nullptr, Option(NoNullness | InitializerListAsArray | CollectionAsCollection | EnumAsInts)) << "[]";
+                                }else{
+                                    s << translateType(arg->type(), nullptr, Option(NoNullness | InitializerListAsArray | CollectionAsCollection | UseNativeIds | EnumAsInts));
+                                }
                             }
                             s << " " << arg->modifiedArgumentName();
                             hasArg = true;
@@ -1501,10 +1805,10 @@ void JavaGenerator::writeEnum(QTextStream &s, const MetaEnum *java_enum) {
     // Check if enums in QObjects are declared in the meta object. If not
     if ((java_enum->enclosingClass()->isQObject() || java_enum->enclosingClass()->isQtNamespace())
             && !java_enum->isMetaEnum()) {
-        s << INDENT << "@io.qt.QtUnlistedEnum" << Qt::endl;
+        s << INDENT << "@QtUnlistedEnum" << Qt::endl;
     }
     if (entry->isExtensible()) {
-        s << INDENT << "@io.qt.QtExtensibleEnum" << Qt::endl;
+        s << INDENT << "@QtExtensibleEnum" << Qt::endl;
     }
     if (java_enum->isDeclDeprecated()) {
         s << INDENT << "@Deprecated" << Qt::endl;
@@ -1517,7 +1821,7 @@ void JavaGenerator::writeEnum(QTextStream &s, const MetaEnum *java_enum) {
         }
     }
     if(!rejected.isEmpty()){
-        s << INDENT << "@io.qt.QtRejectedEntries({" << rejected.join(", ") << "})" << Qt::endl;
+        s << INDENT << "@QtRejectedEntries({" << rejected.join(", ") << "})" << Qt::endl;
     }
 
     // Generates Java 1.5 type enums
@@ -1569,7 +1873,7 @@ void JavaGenerator::writeEnum(QTextStream &s, const MetaEnum *java_enum) {
         break;
     }
 
-    s  << " enum " << java_enum->name() << " implements io.qt."+enumInterface;
+    s  << " enum " << java_enum->name() << " implements "+enumInterface;
     if (!java_enum->typeEntry()->implements().isEmpty()) {
         s << ", " << java_enum->typeEntry()->implements();
     }
@@ -1718,7 +2022,7 @@ void JavaGenerator::writeEnum(QTextStream &s, const MetaEnum *java_enum) {
         s << INDENT << " * @param value" << Qt::endl;
         s << INDENT << " * @return enum entry" << Qt::endl;
         if (entry->isExtensible()) {
-            s << INDENT << " * @throws io.qt.QNoSuchEnumValueException if value not existent in the enum" << Qt::endl;
+            s << INDENT << " * @throws QNoSuchEnumValueException if value not existent in the enum" << Qt::endl;
         }
         s << INDENT << " */" << Qt::endl;
         s << INDENT << "public static " << java_enum->name() << " resolve(" << type << " value) {" << Qt::endl;
@@ -1794,7 +2098,7 @@ void JavaGenerator::writeEnum(QTextStream &s, const MetaEnum *java_enum) {
             if (entry->isExtensible()) {
                 s << "return QtJambi_LibraryUtilities.internal.resolveEnum(" << java_enum->name() << ".class, value, null);" << Qt::endl;
             } else {
-                s << "throw new io.qt.QNoSuchEnumValueException(value);" << Qt::endl;
+                s << "throw new QNoSuchEnumValueException(value);" << Qt::endl;
             }
             s << INDENT << "}" << Qt::endl;
         }
@@ -1805,7 +2109,7 @@ void JavaGenerator::writeEnum(QTextStream &s, const MetaEnum *java_enum) {
               << INDENT << " * @param value" << Qt::endl
               << INDENT << " * @param name" << Qt::endl
               << INDENT << " * @return enum entry" << Qt::endl
-              << INDENT << " * @throws io.qt.QNoSuchEnumValueException if value not existent in the enum or name does not match." << Qt::endl
+              << INDENT << " * @throws QNoSuchEnumValueException if value not existent in the enum or name does not match." << Qt::endl
               << INDENT << " */" << Qt::endl
               << INDENT << "public static " << java_enum->name() << " resolve(" << type << " value, String name) {" << Qt::endl;
             {
@@ -1870,7 +2174,7 @@ void JavaGenerator::writeEnum(QTextStream &s, const MetaEnum *java_enum) {
             s << INDENT << "/**" << Qt::endl
               << INDENT << " * QFlags type for enum {@link " << java_enum->name().replace("$",".") << "}" << Qt::endl
               << INDENT << " */" << Qt::endl
-              << INDENT << "public static final class " << flagsName << " extends io.qt.QFlags<" << java_enum->name().replace("$",".") << "> implements Comparable<" << flagsName << "> {" << Qt::endl
+              << INDENT << "public static final class " << flagsName << " extends QFlags<" << java_enum->name().replace("$",".") << "> implements Comparable<" << flagsName << "> {" << Qt::endl
               << INDENT << "    private static final long serialVersionUID = 0x" << QString::number(serialVersionUID, 16) << "L;" << Qt::endl;
             printExtraCode(linesPos1, s, true);
             s << INDENT << "    static {" << Qt::endl
@@ -1963,7 +2267,7 @@ void JavaGenerator::writePrivateNativeFunction(QTextStream &s, const MetaFunctio
     }
 
     writeFunctionAttributes(s, java_function, -1, include_attributes, exclude_attributes,
-                            Option(EnumAsInts | InitializerListAsArray
+                            Option(NoNullness | EnumAsInts | InitializerListAsArray
                             | ( (
                                   java_function->isEmptyFunction()
                                || java_function->isNormal()
@@ -2056,9 +2360,12 @@ void JavaGenerator::writePrivateNativeFunction(QTextStream &s, const MetaFunctio
             needsComma = true;
 
             if(java_function->isConstructor())
-                writeArgument(s, java_function, arg, Option(CollectionAsCollection | InitializerListAsArray));
-            else if (!arg->type()->hasNativeId() || !java_function->typeReplaced(arg->argumentIndex()+1).isEmpty())
-                writeArgument(s, java_function, arg, Option(EnumAsInts | UseNativeIds | CollectionAsCollection | InitializerListAsArray));
+                writeFunctionArgument(s, java_function, arg, Option(NoNullness | CollectionAsCollection | InitializerListAsArray));
+            else if (!arg->type()->hasNativeId()
+                     || !java_function->typeReplaced(arg->argumentIndex()+1).isEmpty()
+                     || java_function->argumentTypeArray(arg->argumentIndex()+1)
+                     || java_function->argumentTypeBuffer(arg->argumentIndex()+1))
+                writeFunctionArgument(s, java_function, arg, Option(NoNullness | EnumAsInts | UseNativeIds | CollectionAsCollection | InitializerListAsArray));
             else
                 s << "long " << arg->modifiedArgumentName();
         }
@@ -2083,8 +2390,8 @@ void JavaGenerator::writePrivateNativeFunction(QTextStream &s, const MetaFunctio
 
     // Make sure people don't call the private functions
     if (java_function->isEmptyFunction()) {
-        s << " throws io.qt.QNoImplementationException {" << Qt::endl
-          << INDENT << "    throw new io.qt.QNoImplementationException();" << Qt::endl
+        s << " throws QNoImplementationException {" << Qt::endl
+          << INDENT << "    throw new QNoImplementationException();" << Qt::endl
           << INDENT << "}" << Qt::endl;
     } else {
         QString throws = java_function->throws();
@@ -2197,10 +2504,10 @@ void JavaGenerator::writeInjectedCode(QTextStream &s, const MetaFunction *java_f
 
 void JavaGenerator::writeJavaCallThroughContents(QTextStream &s, const MetaFunction *java_function, uint attributes) {
 //    if((java_function->isAbstract() || !(java_function->originalAttributes() & AbstractMetaAttributes::Public)) && !java_function->implementingClass()->generateShellClass()){
-//        s << INDENT << "throw new io.qt.QNoImplementationException();" << Qt::endl;
+//        s << INDENT << "throw new QNoImplementationException();" << Qt::endl;
 //    }else
 //    if(java_function->isAbstract() && java_function->implementingClass()->hasUnimplmentablePureVirtualFunction()){
-//        s << INDENT << "throw new io.qt.QNoImplementationException();" << Qt::endl;
+//        s << INDENT << "throw new QNoImplementationException();" << Qt::endl;
 //    }else
     {
         const MetaArgumentList& arguments = java_function->arguments();
@@ -2218,10 +2525,8 @@ void JavaGenerator::writeJavaCallThroughContents(QTextStream &s, const MetaFunct
 
                 if (java_function->argumentRemoved(arg->argumentIndex() + 1)==ArgumentRemove_No) {
                     bool nonNull = false;
-                    if ( java_function->nullPointersDisabled(java_function->implementingClass(), i + 1)
-                            || (arg->type()->indirections().isEmpty() && arg->type()->isObject())
-                    ) {
-                        s << INDENT << "java.util.Objects.requireNonNull(" << arg->modifiedArgumentName() << ", \"Argument '" << arguments.at(i)->modifiedArgumentName() << "': null not expected.\");" << Qt::endl;
+                    if (arg->isNullPointerDisabled(java_function)){
+                        s << INDENT << "java.util.Objects.requireNonNull(" << arg->modifiedArgumentName() << ", \"Argument '" << arg->modifiedArgumentName() << "': null not expected.\");" << Qt::endl;
                         nonNull = true;
                     }
 
@@ -2381,8 +2686,8 @@ void JavaGenerator::writeJavaCallThroughContents(QTextStream &s, const MetaFunct
         QString new_return_type = java_function->typeReplaced(0);
         registerPackage(new_return_type);
         new_return_type = new_return_type.replace('$', '.');
-        bool has_return_type = new_return_type != "void"
-        && (!new_return_type.isEmpty() || return_type);
+        bool has_return_type = (new_return_type != "void"
+                                && (!new_return_type.isEmpty() || return_type)) || java_function->isSelfReturningFunction();
         TS::Ownership returnValueOwnership = java_function->ownership(java_function->implementingClass(), TS::TargetLangCode, 0).ownership;
         TS::Ownership thisOwnership = java_function->ownership(java_function->implementingClass(), TS::TargetLangCode, -1).ownership;
 
@@ -2396,7 +2701,7 @@ void JavaGenerator::writeJavaCallThroughContents(QTextStream &s, const MetaFunct
                                           || has_code_injections_at_the_end);
 
         s << INDENT;
-        if (has_return_type && java_function->argumentReplaced(0).isEmpty()) {
+        if (has_return_type && (java_function->argumentReplaced(0).isEmpty() || java_function->argumentReplaced(0)=="this")) {
             if (needs_return_variable) {
                 if (new_return_type.isEmpty())
                     s << translateType(return_type, java_function->implementingClass());
@@ -2457,9 +2762,10 @@ void JavaGenerator::writeJavaCallThroughContents(QTextStream &s, const MetaFunct
                     s << ", ";
                 needsComma = true;
 
-                if(java_function->isConstructor()){
-                    s << arg->modifiedArgumentName();
-                } else if(!java_function->typeReplaced(arg->argumentIndex()+1).isEmpty()){
+                if(java_function->isConstructor()
+                        || !java_function->typeReplaced(arg->argumentIndex()+1).isEmpty()
+                        || java_function->argumentTypeArray(arg->argumentIndex()+1)
+                        || java_function->argumentTypeBuffer(arg->argumentIndex()+1)){
                     s << arg->modifiedArgumentName();
                 }else if (type->isTargetLangEnum() || type->isTargetLangFlags()) {
                     s << arg->modifiedArgumentName() << ".value()";
@@ -2531,12 +2837,12 @@ void JavaGenerator::writeJavaCallThroughContents(QTextStream &s, const MetaFunct
                     writeFunctionCallForOwnership(s, java_function, returnValueOwnership, "__qt_return_value");
                 }
             }
-            if (!java_function->argumentReplaced(0).isEmpty()) {
+            if (!java_function->argumentReplaced(0).isEmpty() && java_function->argumentReplaced(0)!="this") {
                 s << INDENT << "return " << java_function->argumentReplaced(0) << ";" << Qt::endl;
             }else{
                 s << INDENT << "return __qt_return_value;" << Qt::endl;
             }
-        }else if (!java_function->argumentReplaced(0).isEmpty()) {
+        }else if (!java_function->argumentReplaced(0).isEmpty() && java_function->argumentReplaced(0)!="this") {
             s << INDENT << "return " << java_function->argumentReplaced(0) << ";" << Qt::endl;
         }
     }
@@ -2560,10 +2866,11 @@ void JavaGenerator::writeSignal(QTextStream &s, const MetaFunction *java_functio
     QList<QString> defaultValueArgumentType;
     QList<QString> defaultValueExpressions;
 
-    QString signalTypeName("Signal");
+    QString signalTypeName;
     if (java_function->isPrivateSignal()) {
-        signalTypeName = "PrivateSignal";
+        signalTypeName += "PrivateSignal";
     }else{
+        signalTypeName += "Signal";
         for (const MetaArgument* argument : arguments) {
             QString defaultValueExpression = argument->defaultValueExpression();
             if(!defaultValueExpression.isEmpty()){
@@ -2603,7 +2910,7 @@ void JavaGenerator::writeSignal(QTextStream &s, const MetaFunction *java_functio
         constructorCall += "<>";
         signalTypeName += "<";
         bool begin = true;
-        for (const MetaArgument* argument : arguments) {
+        for (const MetaArgument* argument : qAsConst(arguments)) {
             if (begin){
                 begin = false;
             }else{
@@ -2619,22 +2926,23 @@ void JavaGenerator::writeSignal(QTextStream &s, const MetaFunction *java_functio
                 registerPackage(modifiedType);
                 boxedType = modifiedType.replace('$', '.');
             }
+            QString typeAnnotation = QString("java.lang.@QtPrimitiveType@StrictNonNull ");
             if(boxedType=="java.lang.Integer"){
-                boxedType = "@io.qt.QtPrimitiveType Integer";
+                boxedType = typeAnnotation + "Integer";
             }else if(boxedType=="java.lang.Short"){
-                boxedType = "@io.qt.QtPrimitiveType Short";
+                boxedType = typeAnnotation + "Short";
             }else if(boxedType=="java.lang.Byte"){
-                boxedType = "@io.qt.QtPrimitiveType Byte";
+                boxedType = typeAnnotation + "Byte";
             }else if(boxedType=="java.lang.Long"){
-                boxedType = "@io.qt.QtPrimitiveType Long";
+                boxedType = typeAnnotation + "Long";
             }else if(boxedType=="java.lang.Double"){
-                boxedType = "@io.qt.QtPrimitiveType Double";
+                boxedType = typeAnnotation + "Double";
             }else if(boxedType=="java.lang.Float"){
-                boxedType = "@io.qt.QtPrimitiveType Float";
+                boxedType = typeAnnotation + "Float";
             }else if(boxedType=="java.lang.Boolean"){
-                boxedType = "@io.qt.QtPrimitiveType Boolean";
+                boxedType = typeAnnotation + "Boolean";
             }else if(boxedType=="java.lang.Character"){
-                boxedType = "@io.qt.QtPrimitiveType Character";
+                boxedType = typeAnnotation + "Character";
             }
             signalTypeName += boxedType;
         }
@@ -2726,6 +3034,8 @@ void JavaGenerator::writeSignal(QTextStream &s, const MetaFunction *java_functio
 
     writeFunctionAttributes(s, java_function, -1, include_attributes, exclude_attributes,
                             Option(SkipReturnType | InitializerListAsArray | NoQCollectionContainers));
+    if(m_nullness)
+        s << "@NonNull ";
     s << signalTypeName << " " << signalName << " = new " << constructorCall << "(" << signalDefaultArgumentExpressions << ");" << Qt::endl;
 }
 
@@ -2830,7 +3140,7 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                             QString unboxedType;
                             if (modifiedType.isEmpty()){
                                 boxedType += translateType(arg->type(), java_function->implementingClass(), Option(BoxedPrimitive | InitializerListAsArray));
-                                QString type = translateType(arg->type(), java_function->implementingClass(), Option(InitializerListAsArray));
+                                QString type = translateType(arg->type(), java_function->implementingClass(), Option(NoNullness | InitializerListAsArray));
                                 auto idx = type.indexOf('<');
                                 if(idx>0){
                                     type = type.mid(0, idx);
@@ -2845,7 +3155,7 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                             }else{
                                 registerPackage(modifiedType);
                                 boxedType += modifiedType.replace('$', '.');
-                                unboxedType += modifiedType.replace('$', '.');
+                                unboxedType += annotationFreeTypeName(modifiedType.replace('$', '.'));
                             }
                             signalObjectType += boxedType;
                             signalParameterClasses += unboxedType+".class";
@@ -2901,7 +3211,7 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
         }
         s << INDENT << "}" << Qt::endl << Qt::endl;
         QSet<qint64> writtenConnects;
-        for(QMap<qint64,int>::const_iterator it=argumentCountMap.begin(); it!=argumentCountMap.end(); it++){
+        for(QMap<qint64,int>::const_iterator it=argumentCountMap.cbegin(); it!=argumentCountMap.cend(); it++){
             QString parameters;
             QStringList parameterClasses;
             QStringList classes;
@@ -2910,7 +3220,7 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
             {
                 QTextStream s2(&annotations);
                 for(const QString& signalParameterClasses : signalParameterClassesList[it.key()]){
-                    s2 << "@io.qt.QtAllowedTypeSet({" << signalParameterClasses << "})" << Qt::endl << INDENT;
+                    s2 << "@QtAllowedTypeSet({" << signalParameterClasses << "})" << Qt::endl << INDENT;
                 }
             }
             if(it.key()>0){
@@ -2944,7 +3254,7 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                     }
                     s << INDENT << " * </ul>" << Qt::endl;
                 }
-                s << INDENT << " * <p>{@link io.qt.QNoSuchSignalException} is thrown otherwise.</p>" << Qt::endl << Qt::endl;
+                s << INDENT << " * <p>{@link QNoSuchSignalException} is thrown otherwise.</p>" << Qt::endl << Qt::endl;
                 for(int j=0; j<it.key(); j++){
                     s << INDENT << " * @param <" << QChar('A'+j) << "> signal parameter type"<< Qt::endl;
                 }
@@ -2952,20 +3262,23 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                     s << INDENT << " * @param type" << QString::number(j+1) << " value of type " << QChar('A'+j) << Qt::endl;
                 }
                 s << INDENT << " * @return overloaded signal" << Qt::endl
-                  << INDENT << " * @throws io.qt.QNoSuchSignalException if signal is not available" << Qt::endl;
+                  << INDENT << " * @throws QNoSuchSignalException if signal is not available" << Qt::endl;
             }
             s << INDENT << " */" << Qt::endl;
 
             if(signalTypesByArgs[it.key()].size()==1){
-                s << INDENT << annotations << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << signalTypesByArgs[it.key()].begin().operator *() << parameters << " overload(" << classes.join(", ") << ") throws io.qt.QNoSuchSignalException{" << Qt::endl
+                s << INDENT << annotations << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << signalTypesByArgs[it.key()].begin().operator *() << parameters << " overload(" << classes.join(", ") << ") throws QNoSuchSignalException{" << Qt::endl
                   << INDENT << "    return (" << signalTypesByArgs[it.key()].begin().operator *() << parameters << ")super.overload(" << vars.join(", ") << ");" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl;
             }else{
-                s << INDENT << annotations << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject.AbstractPrivateSignal" << it.key() << parameters << " overload(" << classes.join(", ") << ") throws io.qt.QNoSuchSignalException{" << Qt::endl
+                s << INDENT << annotations << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject.AbstractPrivateSignal" << it.key() << parameters << " overload(" << classes.join(", ") << ") throws QNoSuchSignalException{" << Qt::endl
                   << INDENT << "    return super.overload(" << vars.join(", ") << ");" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl;
             }
 
+            QString nonNull = m_nullness ? QStringLiteral("@NonNull ") : QString{};
+            QString snonNull = m_nullness ? QStringLiteral("@StrictNonNull ") : QString{};
+            QString arrayNonNull = m_nullness ? QStringLiteral(" @NonNull") : QString{};
             if(it.key()>0){
                 s << INDENT << "/**" << Qt::endl
                   << INDENT << " * Initializes a connection to the <i>slot</i>." << Qt::endl
@@ -2973,10 +3286,10 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                   << INDENT << " * @param slot the slot to be connected" << Qt::endl
                   << INDENT << " * @param connectionType type of connection" << Qt::endl
                   << INDENT << " * @return connection if successful or <code>null</code> otherwise" << Qt::endl
-                  << INDENT << " * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
-                  << INDENT << " * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>." << Qt::endl
+                  << INDENT << " * @throws QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
+                  << INDENT << " * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>." << Qt::endl
                   << INDENT << " */" << Qt::endl
-                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.Slot" << it.key() << parameters << " slot, io.qt.core.Qt.ConnectionType... connectionType) throws io.qt.QNoSuchSignalException{" << Qt::endl
+                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject." << nonNull << "Connection connect(io.qt.core.QMetaObject." << snonNull << "Slot" << it.key() << parameters << " slot, io.qt.core.Qt." << nonNull << "ConnectionType" << arrayNonNull << "... connectionType) throws QNoSuchSignalException{" << Qt::endl
                   << INDENT << "    return super.connect(slot, connectionType);" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl
                   << INDENT << "/**" << Qt::endl
@@ -2985,7 +3298,7 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                   << INDENT << " * @param slot the slot to be disconnected" << Qt::endl
                   << INDENT << " * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise." << Qt::endl
                   << INDENT << " */" << Qt::endl
-                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "boolean disconnect(io.qt.core.QMetaObject.Slot" << it.key() << parameters << " slot) {" << Qt::endl
+                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "boolean disconnect(io.qt.core.QMetaObject." << snonNull << "Slot" << it.key() << parameters << " slot) {" << Qt::endl
                   << INDENT << "    return super.disconnect(slot);" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl
                   << INDENT << "/**" << Qt::endl
@@ -2995,9 +3308,9 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                   << INDENT << " * @param signal The second signal. This will be emitted whenever this signal is emitted." << Qt::endl
                   << INDENT << " * @param connectionType One of the connection types defined in the Qt interface." << Qt::endl
                   << INDENT << " * @return connection if successful or <code>null</code> otherwise" << Qt::endl
-                  << INDENT << " * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
+                  << INDENT << " * @throws QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
                   << INDENT << " */" << Qt::endl
-                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.Connectable" << it.key() << parameters << " signal, io.qt.core.Qt.ConnectionType... connectionType) throws io.qt.QNoSuchSignalException{" << Qt::endl
+                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject." << nonNull << "Connection connect(io.qt.core.QMetaObject." << snonNull << "Connectable" << it.key() << parameters << " signal, io.qt.core.Qt." << nonNull << "ConnectionType" << arrayNonNull << "... connectionType) throws QNoSuchSignalException{" << Qt::endl
                   << INDENT << "    return super.connect((io.qt.core.QMetaObject.AbstractSignal)signal, connectionType);" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl
                   << INDENT << "/**" << Qt::endl
@@ -3007,7 +3320,7 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                   << INDENT << " * @param signal The second signal." << Qt::endl
                   << INDENT << " * @return <code>true</code> if the two signals were successfully disconnected, or <code>false</code> otherwise." << Qt::endl
                   << INDENT << " */" << Qt::endl
-                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "boolean disconnect(io.qt.core.QMetaObject.Connectable" << it.key() << parameters << " signal) {" << Qt::endl
+                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "boolean disconnect(io.qt.core.QMetaObject." << snonNull << "Connectable" << it.key() << parameters << " signal) {" << Qt::endl
                   << INDENT << "    return super.disconnect((io.qt.core.QMetaObject.AbstractSignal)signal);" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl
                   << INDENT << "/**" << Qt::endl
@@ -3017,9 +3330,9 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                   << INDENT << " * @param signal The second signal. This will be emitted whenever this signal is emitted." << Qt::endl
                   << INDENT << " * @param connectionType One of the connection types defined in the Qt interface." << Qt::endl
                   << INDENT << " * @return connection if successful or <code>null</code> otherwise" << Qt::endl
-                  << INDENT << " * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
+                  << INDENT << " * @throws QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
                   << INDENT << " */" << Qt::endl
-                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.AbstractPublicSignal" << it.key() << parameters << " signal, io.qt.core.Qt.ConnectionType... connectionType) throws io.qt.QNoSuchSignalException{" << Qt::endl
+                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject." << nonNull << "Connection connect(io.qt.core.QMetaObject." << snonNull << "AbstractPublicSignal" << it.key() << parameters << " signal, io.qt.core.Qt." << nonNull << "ConnectionType" << arrayNonNull << "... connectionType) throws QNoSuchSignalException{" << Qt::endl
                   << INDENT << "    return super.connect((io.qt.core.QMetaObject.AbstractSignal)signal, connectionType);" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl
                   << INDENT << "/**" << Qt::endl
@@ -3029,7 +3342,7 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                   << INDENT << " * @param signal The second signal." << Qt::endl
                   << INDENT << " * @return <code>true</code> if the two signals were successfully disconnected, or <code>false</code> otherwise." << Qt::endl
                   << INDENT << " */" << Qt::endl
-                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "boolean disconnect(io.qt.core.QMetaObject.AbstractPublicSignal" << it.key() << parameters << " signal) {" << Qt::endl
+                  << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "boolean disconnect(io.qt.core.QMetaObject." << snonNull << "AbstractPublicSignal" << it.key() << parameters << " signal) {" << Qt::endl
                   << INDENT << "    return super.disconnect((io.qt.core.QMetaObject.AbstractSignal)signal);" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl;
                 for(qint64 i = it.key()-1; i>0; --i){
@@ -3056,10 +3369,10 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                           << INDENT << " * @param slot the slot to be connected" << Qt::endl
                           << INDENT << " * @param connectionType type of connection" << Qt::endl
                           << INDENT << " * @return connection if successful or <code>null</code> otherwise" << Qt::endl
-                          << INDENT << " * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
-                          << INDENT << " * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>." << Qt::endl
+                          << INDENT << " * @throws QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
+                          << INDENT << " * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>." << Qt::endl
                           << INDENT << " */" << Qt::endl
-                          << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.Slot" << i << parameters << " slot, io.qt.core.Qt.ConnectionType... connectionType) throws io.qt.QNoSuchSignalException{" << Qt::endl
+                          << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject." << nonNull << "Connection connect(io.qt.core.QMetaObject.Slot" << i << parameters << " slot, io.qt.core.Qt." << nonNull << "ConnectionType" << arrayNonNull << "... connectionType) throws QNoSuchSignalException{" << Qt::endl
                           << INDENT << "    return super.connect(slot, connectionType);" << Qt::endl
                           << INDENT << "}" << Qt::endl << Qt::endl
                           << INDENT << "/**" << Qt::endl
@@ -3078,9 +3391,9 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
                           << INDENT << " * @param signal The second signal. This will be emitted whenever this signal is emitted." << Qt::endl
                           << INDENT << " * @param connectionType One of the connection types defined in the Qt interface." << Qt::endl
                           << INDENT << " * @return connection if successful or <code>null</code> otherwise" << Qt::endl
-                          << INDENT << " * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
+                          << INDENT << " * @throws QMisfittingSignatureException Raised if their signatures are incompatible." << Qt::endl
                           << INDENT << " */" << Qt::endl
-                          << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.AbstractPublicSignal" << i << parameters << " signal, io.qt.core.Qt.ConnectionType... connectionType) throws io.qt.QNoSuchSignalException{" << Qt::endl
+                          << INDENT << "public final " << parameters << (parameters.isEmpty() ? "" : " ") << "io.qt.core.QMetaObject." << nonNull << "Connection connect(io.qt.core.QMetaObject.AbstractPublicSignal" << i << parameters << " signal, io.qt.core.Qt." << nonNull << "ConnectionType" << arrayNonNull << "... connectionType) throws QNoSuchSignalException{" << Qt::endl
                           << INDENT << "    return super.connect((io.qt.core.QMetaObject.AbstractSignal)signal, connectionType);" << Qt::endl
                           << INDENT << "}" << Qt::endl << Qt::endl
                           << INDENT << "/**" << Qt::endl
@@ -3154,7 +3467,7 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
             QStringList classes;
             bool hasInstantiations = false;
             for(int i = 0; i < java_function->arguments().size(); i++){
-                QString type = translateType(java_function->arguments().at(i)->type(), java_function->implementingClass(), Option(InitializerListAsArray));
+                QString type = translateType(java_function->arguments().at(i)->type(), java_function->implementingClass(), Option(NoNullness | InitializerListAsArray));
                 auto idx = type.indexOf('<');
                 if(idx>0){
                     type = type.mid(0, idx);
@@ -3172,9 +3485,9 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
             QString sig = functionSignature(java_function,
                                             java_function->isPrivateSignal() ? MetaAttributes::Private : MetaAttributes::Public,
                                             ( java_function->isPrivateSignal() ? MetaAttributes::Public : 0 ) | MetaAttributes::Native,
-                                            Option(), -1, "emit");// << "public final void emit("
+                                            Option(NoSuppressExports), -1, "emit");// << "public final void emit("
             bool exp = false;
-            for(const QString& pkg : m_exportedPackages){
+            for(const QString& pkg : qAsConst(m_exportedPackages)){
                 if(pkg!=java_function->implementingClass()->package()
                         && !pkg.isEmpty()
                         && !pkg.startsWith("io.qt.internal")
@@ -3263,7 +3576,10 @@ void JavaGenerator::writeMultiSignal(QTextStream &s, const MetaFunctionList& sig
     }
     s << INDENT << " * </ul>" << Qt::endl
       << INDENT << " */" << Qt::endl
-      << INDENT << "public final MultiSignal_" << signalName << " " << signalName << " = new MultiSignal_" << signalName << "();" << Qt::endl << Qt::endl;
+      << INDENT << "public final ";
+    if(m_nullness)
+        s << "@NonNull ";
+    s << "MultiSignal_" << signalName << " " << signalName << " = new MultiSignal_" << signalName << "();" << Qt::endl << Qt::endl;
 }
 
 void JavaGenerator::retrieveModifications(const MetaFunction *java_function,
@@ -3365,7 +3681,15 @@ void JavaGenerator::writeReferenceCount(QTextStream &s, const ReferenceCount &re
     }else{
         return;
     }
-    bool nullPointersDisabled = argumentIndex>0 ? java_function->nullPointersDisabled(java_function->declaringClass(), argumentIndex) : false;
+    bool nullPointersDisabled = false;
+    if(argumentIndex>0){
+        for(const MetaArgument* argument : arguments){
+            if(argument->argumentIndex()==argumentIndex-1 && argument->isNullPointerDisabled(java_function)){
+                nullPointersDisabled = true;
+                break;
+            }
+        }
+    }
 
     QScopedPointer<Indentation> indentation;
     QString condition = refCount.condition;
@@ -3566,7 +3890,7 @@ void JavaGenerator::writeDeprecatedComment(QTextStream& commentStream, const Met
         commentStream << "@deprecated Use {@link ";
         commentStream << foundFun->declaringClass()->typeEntry()->qualifiedTargetLangName().replace("$", ".");
         commentStream << "#" << foundFun->name() << "(";
-        writeFunctionArguments(commentStream, foundFun, int(foundFun->arguments().size()), Option(SkipName | SkipTemplateParameters | NoSuppressExports));
+        writeFunctionArguments(commentStream, foundFun, int(foundFun->arguments().size()), Option(NoNullness | SkipName | SkipTemplateParameters | NoSuppressExports));
         commentStream << ")}";
         if(hasNull)
             commentStream << " with <code>null</code>";
@@ -3589,12 +3913,30 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
         return ;
     if (java_function->hasTemplateArgumentTypes())
         return;
+    if(!(option & NoNullness) && !m_nullness){
+        option = Option(option & NoNullness);
+    }
     setupForFunction(java_function, &included_attributes, &excluded_attributes, option);
     writeEnumOverload(s, java_function, included_attributes, excluded_attributes, option);
     if(!java_function->isSignal()){
         writeFunctionOverloads(s, java_function, included_attributes, excluded_attributes, option);
     }
 
+    {
+        QString javaSignature;
+        QTextStream s2(&javaSignature);
+        s2 << java_function->name();
+        s2 << "(";
+        writeFunctionArguments(s2, java_function, -1, Option(NoNullness | SkipTemplateParameters | InitializerListAsArray | SkipName));
+        s2 << ")";
+        s2.flush();
+        if(m_currentMethodSignatures.contains(javaSignature)){
+            ReportHandler::warning(QString("Duplicate Java method %1 in %2").arg(javaSignature).arg(java_function->ownerClass()->qualifiedCppName()));
+        }
+        m_currentMethodSignatures.insert(javaSignature);
+    }
+
+
     static QRegularExpression regExp("^(insert|set|take|add|remove|install|uninstall).*");
     if (regExp.match(java_function->name()).hasMatch()) {
         const MetaArgumentList& arguments = java_function->arguments();
@@ -3678,36 +4020,70 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
                              .replace("*/", "*&sol;")
                           << "::";
         }
-        if(!java_function->originalSignature().isEmpty()){
-            commentStream << QString(java_function->originalSignature())
-                             .replace("&", "&amp;")
-                             .replace("<", "&lt;")
-                             .replace(">", "&gt;")
-                             .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
-                             .replace("@", "&commat;")
-                             .replace("/*", "&sol;*")
-                             .replace("*/", "*&sol;")
-                          << "</a></p>" << Qt::endl;
-        }else if(!java_function->minimalSignature().isEmpty()){
-            commentStream << QString(java_function->minimalSignature())
-                             .replace("&", "&amp;")
-                             .replace("<", "&lt;")
-                             .replace(">", "&gt;")
-                             .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
-                             .replace("@", "&commat;")
-                             .replace("/*", "&sol;*")
-                             .replace("*/", "*&sol;")
-                          << "</a></p>" << Qt::endl;
-        }else{
-            commentStream << QString(java_function->name())
-                             .replace("&", "&amp;")
-                             .replace("<", "&lt;")
-                             .replace(">", "&gt;")
-                             .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
-                             .replace("@", "&commat;")
-                             .replace("/*", "&sol;*")
-                             .replace("*/", "*&sol;")
-                          << "(...)</a></p>" << Qt::endl;
+        if(java_function->functionTemplate()){
+            if(!java_function->functionTemplate()->originalSignature().isEmpty()){
+                commentStream << QString(java_function->functionTemplate()->originalSignature())
+                                 .replace("&", "&amp;")
+                                 .replace("<", "&lt;")
+                                 .replace(">", "&gt;")
+                                 .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
+                                 .replace("@", "&commat;")
+                                 .replace("/*", "&sol;*")
+                                 .replace("*/", "*&sol;")
+                              << "</a></p>" << Qt::endl;
+            }else if(!java_function->functionTemplate()->minimalSignature().isEmpty()){
+                commentStream << QString(java_function->functionTemplate()->minimalSignature())
+                                 .replace("&", "&amp;")
+                                 .replace("<", "&lt;")
+                                 .replace(">", "&gt;")
+                                 .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
+                                 .replace("@", "&commat;")
+                                 .replace("/*", "&sol;*")
+                                 .replace("*/", "*&sol;")
+                              << "</a></p>" << Qt::endl;
+            }else{
+                commentStream << QString(java_function->functionTemplate()->name())
+                                 .replace("&", "&amp;")
+                                 .replace("<", "&lt;")
+                                 .replace(">", "&gt;")
+                                 .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
+                                 .replace("@", "&commat;")
+                                 .replace("/*", "&sol;*")
+                                 .replace("*/", "*&sol;")
+                              << "(...)</a></p>" << Qt::endl;
+            }
+        }else {
+            if(!java_function->originalSignature().isEmpty()){
+                commentStream << QString(java_function->originalSignature())
+                                 .replace("&", "&amp;")
+                                 .replace("<", "&lt;")
+                                 .replace(">", "&gt;")
+                                 .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
+                                 .replace("@", "&commat;")
+                                 .replace("/*", "&sol;*")
+                                 .replace("*/", "*&sol;")
+                              << "</a></p>" << Qt::endl;
+            }else if(!java_function->minimalSignature().isEmpty()){
+                commentStream << QString(java_function->minimalSignature())
+                                 .replace("&", "&amp;")
+                                 .replace("<", "&lt;")
+                                 .replace(">", "&gt;")
+                                 .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
+                                 .replace("@", "&commat;")
+                                 .replace("/*", "&sol;*")
+                                 .replace("*/", "*&sol;")
+                              << "</a></p>" << Qt::endl;
+            }else{
+                commentStream << QString(java_function->name())
+                                 .replace("&", "&amp;")
+                                 .replace("<", "&lt;")
+                                 .replace(">", "&gt;")
+                                 .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
+                                 .replace("@", "&commat;")
+                                 .replace("/*", "&sol;*")
+                                 .replace("*/", "*&sol;")
+                              << "(...)</a></p>" << Qt::endl;
+            }
         }
     }
     if(java_function->isDeprecated() && !java_function->deprecatedComment().isEmpty()){
@@ -3725,57 +4101,60 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
     }
 
     const QPropertySpec *spec = java_function->propertySpec();
-    if (spec && java_function->modifiedName() == java_function->originalName()) {
+    if (spec) {
         if (java_function->isPropertyReader()) {
-            s << INDENT << "@io.qt.QtPropertyReader(name=\"" << spec->name() << "\")" << Qt::endl;
+            s << INDENT << "@QtPropertyReader(name=\"" << spec->name() << "\")" << Qt::endl;
             if (!spec->designable().isEmpty()){
-                s << INDENT << "@io.qt.QtPropertyDesignable";
+                s << INDENT << "@QtPropertyDesignable";
                 if(spec->designable()!="true")
                     s << "(\"" << spec->designable() << "\")";
                 s << Qt::endl;
             }
             if (!spec->scriptable().isEmpty()){
-                s << INDENT << "@io.qt.QtPropertyScriptable";
+                s << INDENT << "@QtPropertyScriptable";
                 if(spec->scriptable()!="true")
                     s << "(\"" << spec->scriptable() << "\")";
                 s << Qt::endl;
             }
             if (!spec->stored().isEmpty()){
-                s << INDENT << "@io.qt.QtPropertyStored";
+                s << INDENT << "@QtPropertyStored";
                 if(spec->stored()!="true")
                     s << "(\"" << spec->stored() << "\")";
                 s << Qt::endl;
             }
 //   This seams to be unnecessary in QtJambi
 //            if (!spec->revision().isEmpty())
-//                s << INDENT << "@io.qt.QtPropertyRevision(\"" << spec->revision() << "\")" << Qt::endl;
+//                s << INDENT << "@QtPropertyRevision(\"" << spec->revision() << "\")" << Qt::endl;
             if (!spec->user().isEmpty()){
-                s << INDENT << "@io.qt.QtPropertyUser";
+                s << INDENT << "@QtPropertyUser";
                 if(spec->user()!="true")
                     s << "(\"" << spec->user() << "\")";
                 s << Qt::endl;
             }
             if (spec->required())
-                s << INDENT << "@io.qt.QtPropertyRequired" << Qt::endl;
+                s << INDENT << "@QtPropertyRequired" << Qt::endl;
             if (spec->constant())
-                s << INDENT << "@io.qt.QtPropertyConstant" << Qt::endl;
+                s << INDENT << "@QtPropertyConstant" << Qt::endl;
         } else if (java_function->isPropertyWriter()) {
-            s << INDENT << "@io.qt.QtPropertyWriter(name=\"" << spec->name() << "\")" << Qt::endl;
+            s << INDENT << "@QtPropertyWriter(name=\"" << spec->name() << "\")" << Qt::endl;
         } else if (java_function->isPropertyResetter()) {
-            s << INDENT << "@io.qt.QtPropertyResetter(name=\"" << spec->name() << "\")" << Qt::endl;
+            s << INDENT << "@QtPropertyResetter(name=\"" << spec->name() << "\")" << Qt::endl;
         } else if (java_function->isPropertyBindable()) {
-            s << INDENT << "@io.qt.QtPropertyBindable(name=\"" << spec->name() << "\")" << Qt::endl;
+            s << INDENT << "@QtPropertyBindable(name=\"" << spec->name() << "\")" << Qt::endl;
         }
     }
 
     QString interfaceDefaultImpl;
     {
-        Option option = NoOption;
+        Option sigOption = NoOption;
+        if(!(option & NoNullness) && !m_nullness){
+            sigOption = Option(sigOption & NoNullness);
+        }
         if(java_function->ownerClass()->isInterface()
                 && !java_function->isProtected()
-                && (option & InFunctionComment)==0){
+                && (sigOption & InFunctionComment)==0){
             if(!java_function->isAbstract()){
-                option = DefaultFunction;
+                sigOption = DefaultFunction;
             }else{
                 for(const FunctionModification& mod : java_function->modifications(java_function->ownerClass())) {
                     if (mod.snips.count() > 0){
@@ -3812,7 +4191,7 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
                     }
                 }
                 if(!interfaceDefaultImpl.isEmpty()){
-                    option = DefaultFunction;
+                    sigOption = DefaultFunction;
                 }
             }
         }
@@ -3822,7 +4201,7 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
                     && !(attr & MetaAttributes::Private))
                 ReportHandler::warning(QString("Non-private operator function %1 in %2").arg(java_function->originalSignature()).arg(java_function->ownerClass()->qualifiedCppName()));
         }
-        s << functionSignature(java_function, included_attributes, excluded_attributes, option);
+        s << functionSignature(java_function, included_attributes, excluded_attributes, sigOption);
     }
 
     if(!interfaceDefaultImpl.isEmpty()){
@@ -3859,8 +4238,9 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
             // Lookup if there is a reference-count action required on the return value.
             MetaType *return_type = java_function->type();
             QString new_return_type = QString(java_function->typeReplaced(0)).replace('$', '.');
-            bool has_return_type = new_return_type != "void"
-            && (!new_return_type.isEmpty() || return_type);
+            bool has_return_type = (new_return_type != "void"
+                                    && (!new_return_type.isEmpty() || return_type))
+                    || java_function->isSelfReturningFunction();
             OwnershipRule ownershipRule = java_function->ownership(java_function->implementingClass(), TS::TargetLangCode, 0);
 
             bool has_code_injections_at_the_end = hasCodeInjections(java_function, {CodeSnip::End, CodeSnip::Position4, CodeSnip::Position3});
@@ -3870,7 +4250,7 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
                                               || has_argument_referenceCounts || referenceCounts[0].size() > 0 || has_code_injections_at_the_end);
 
             s << INDENT;
-            if (has_return_type && java_function->argumentReplaced(0).isEmpty()) {
+            if (has_return_type && (java_function->argumentReplaced(0).isEmpty() || java_function->argumentReplaced(0)=="this")) {
                 if (needs_return_variable) {
                     if (new_return_type.isEmpty())
                         s << translateType(return_type, java_function->implementingClass());
@@ -3909,7 +4289,9 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
                     if(needsComma)
                         s << ", ";
 
-                    if(!java_function->typeReplaced(arg->argumentIndex()+1).isEmpty()){
+                    if(!java_function->typeReplaced(arg->argumentIndex()+1).isEmpty()
+                            || java_function->argumentTypeArray(arg->argumentIndex()+1)
+                            || java_function->argumentTypeBuffer(arg->argumentIndex()+1)){
                         s << arg->modifiedArgumentName();
                     }else if (type->isTargetLangEnum() || type->isTargetLangFlags()) {
                         s << arg->modifiedArgumentName() << ".value()";
@@ -3945,7 +4327,7 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
                 }
             }
 
-            if (!java_function->argumentReplaced(0).isEmpty()) {
+            if (!java_function->argumentReplaced(0).isEmpty() && java_function->argumentReplaced(0)!="this") {
                 s << INDENT << "return " << java_function->argumentReplaced(0) << ";" << Qt::endl;
             }else{
                 // Then the return value
@@ -4028,7 +4410,7 @@ void JavaGenerator::writeFunction(QTextStream &s, const MetaFunction *java_funct
               << INDENT << Qt::endl;
         } else {
             if (java_function->isEmptyFunction()) {
-                s << " throws io.qt.QNoImplementationException ";
+                s << " throws QNoImplementationException ";
             }
             s << "{" << Qt::endl;
             {
@@ -4128,7 +4510,12 @@ void JavaGenerator::write_equals_parts(QTextStream &s, const MetaFunctionList &l
         else if(boxedType=="char")
             boxedType = "java.lang.Character";
 
-        if(type=="null"){
+        if(type=="java.lang.Void"){
+            s << INDENT << (first ? "if" : "else if") << " (other==null) {" << Qt::endl;
+            s << INDENT << "    return ";
+            if (prefix != 0) s << prefix;
+            s << f->name() << "((java.lang.Void)null);" << Qt::endl;
+        }else if(type=="null"){
             s << INDENT << (first ? "if" : "else if") << " (other==" << type;
             s << ") {" << Qt::endl;
             s << INDENT << "    return ";
@@ -4238,7 +4625,13 @@ static void write_compareto_parts(QTextStream &s, const MetaFunctionList &lst, i
             s << INDENT << "    return " << f->name() << "((" << type << ") other);" << Qt::endl
               << INDENT << "}" << Qt::endl;
         }else{
-            if(type=="null"){
+            if(type=="java.lang.Void"){
+                suppressNull = true;
+                s << INDENT << (first ? "if" : "else if") << " (other==null) {" << Qt::endl;
+                s << INDENT << "    if (" << f->name() << "((java.lang.Void)null)) return " << value << ";" << Qt::endl
+                  << INDENT << "    else return " << -value << ";" << Qt::endl
+                  << INDENT << "}" << Qt::endl;
+            }else if(type=="null"){
                 suppressNull = true;
                 s << INDENT << (first ? "if" : "else if") << " (other==" << type;
                 s << ") {" << Qt::endl;
@@ -4354,7 +4747,7 @@ void JavaGenerator::writeJavaLangObjectOverrideFunctions(QTextStream &s,
         }
         s << Qt::endl;
         s << INDENT << "@Override" << Qt::endl;
-        s << INDENT << "@io.qt.QtUninvokable" << Qt::endl;
+        s << INDENT << "@QtUninvokable" << Qt::endl;
         if(suppressRaw && suppressUnchecked)
             s << INDENT << "@SuppressWarnings({\"rawtypes\", \"unchecked\"})" << Qt::endl;
         else if(suppressRaw)
@@ -4390,7 +4783,7 @@ void JavaGenerator::writeJavaLangObjectOverrideFunctions(QTextStream &s,
             }else if (cls->hasHashFunction()) {
                 s << Qt::endl;
                 s << INDENT << "@Override" << Qt::endl;
-                s << INDENT << "@io.qt.QtUninvokable" << Qt::endl;
+                s << INDENT << "@QtUninvokable" << Qt::endl;
                 s << INDENT << "public boolean equals(Object other) {" << Qt::endl;
                 {
                     INDENTATION(INDENT)
@@ -4453,7 +4846,7 @@ void JavaGenerator::writeJavaLangObjectOverrideFunctions(QTextStream &s,
         QString comparableFunctionCode;
         {
             QTextStream s(&comparableFunctionCode);
-            s << INDENT << "@io.qt.QtUninvokable" << Qt::endl;
+            s << INDENT << "@QtUninvokable" << Qt::endl;
             s << INDENT << "public int compareTo(" << comparableType << " other) {" << Qt::endl;
             {
                 INDENTATION(INDENT)
@@ -4630,12 +5023,12 @@ void JavaGenerator::writeJavaLangObjectOverrideFunctions(QTextStream &s,
             }
             if(lines.isEmpty() && cls->hasHashFunction() && !cls->typeEntry()->isNativeIdBased() && !cls->typeEntry()->designatedInterface()){
                 s << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "@Override" << Qt::endl
                   << INDENT << "public native int hashCode();" << Qt::endl;
             }else{
                 s << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "@Override" << Qt::endl
                   << INDENT << "public int hashCode() {" << Qt::endl;
                 if(!lines.isEmpty()){
@@ -4656,13 +5049,13 @@ void JavaGenerator::writeJavaLangObjectOverrideFunctions(QTextStream &s,
                     s << ");" << Qt::endl
                       << INDENT << "}" << Qt::endl;
                     if(cls->typeEntry()->isNativeIdBased()){
-                        s << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                        s << INDENT << "@QtUninvokable" << Qt::endl
                           << INDENT << "private native static int hashCode_native(long __this_nativeId);" << Qt::endl;
                     }else if(cls->typeEntry()->designatedInterface()){
-                        s << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                        s << INDENT << "@QtUninvokable" << Qt::endl
                           << INDENT << "private native static int hashCode_native(" << cls->simpleName() << " __this);" << Qt::endl;
                     }else{
-                        s << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                        s << INDENT << "@QtUninvokable" << Qt::endl
                           << INDENT << "private native int hashCode_native();" << Qt::endl;
                     }
                 } else { // We have equals() but no qHash(), we return 0 from hashCode() to respect
@@ -4704,17 +5097,18 @@ void JavaGenerator::writeJavaLangObjectOverrideFunctions(QTextStream &s,
                 lines << codeSnip.code().split("\n");
             }
         }
+        QString nonNull = m_nullness ? QStringLiteral("@NonNull ") : QString{};
         if (!found) {
             if(lines.isEmpty() && !cls->typeEntry()->isNativeIdBased() && !cls->typeEntry()->designatedInterface()){
                 s << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "@Override" << Qt::endl
-                  << INDENT << "public native String toString();" << Qt::endl;
+                  << INDENT << "public native "  << nonNull << "String toString();" << Qt::endl;
             }else{
                 s << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "@Override" << Qt::endl
-                  << INDENT << "public String toString() {" << Qt::endl;
+                  << INDENT << "public "  << nonNull << "String toString() {" << Qt::endl;
                 if(!lines.isEmpty()){
                     INDENTATION(INDENT)
                     printExtraCode(lines, s);
@@ -4728,21 +5122,21 @@ void JavaGenerator::writeJavaLangObjectOverrideFunctions(QTextStream &s,
                 s << ");" << Qt::endl
                   << INDENT << "}" << Qt::endl;
                 if(cls->typeEntry()->isNativeIdBased()){
-                    s << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                    s << INDENT << "@QtUninvokable" << Qt::endl
                       << INDENT << "private native static String toString_native(long __this_nativeId);" << Qt::endl;
                 }else if(cls->typeEntry()->designatedInterface()){
-                    s << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                    s << INDENT << "@QtUninvokable" << Qt::endl
                       << INDENT << "private native static String toString_native(" << cls->simpleName() << " __this);" << Qt::endl;
                 }else{
-                    s << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                    s << INDENT << "@QtUninvokable" << Qt::endl
                       << INDENT << "private native String toString_native();" << Qt::endl;
                 }
             }
         }else if(!lines.isEmpty()){
             s << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "public String toString() {" << Qt::endl;
+              << INDENT << "public "  << nonNull << "String toString() {" << Qt::endl;
             {
                 INDENTATION(INDENT)
                 printExtraCode(lines, s);
@@ -4755,8 +5149,6 @@ void JavaGenerator::writeJavaLangObjectOverrideFunctions(QTextStream &s,
 
 void JavaGenerator::writeEnumOverload(QTextStream &s, const MetaFunction *java_function,
                                       uint include_attributes, uint exclude_attributes, Option _option) {
-    const MetaArgumentList& arguments = java_function->arguments();
-
     const MetaClass *decl_class = java_function->declaringClass();
     if ((java_function->implementingClass() != decl_class
          && java_function->implementingClass()->baseClass()
@@ -4780,100 +5172,177 @@ void JavaGenerator::writeEnumOverload(QTextStream &s, const MetaFunction *java_f
         option = Option(option | DefaultFunction);
     }
 
+    const MetaArgumentList& arguments = java_function->arguments();
     int generate_enum_overload = -1;
     for (int i = 0; i < arguments.size(); ++i)
         generate_enum_overload = arguments.at(i)->type()->isTargetLangFlags() ? i : -1;
 
     if (generate_enum_overload >= 0) {
-        const QPair<QMap<int,ArgumentModification>,QList<ArgumentModification>> addedArguments = java_function->addedArguments();
-        QString comment;
-        QTextStream commentStream(&comment);
-        if(java_function->isConstructor()){
-            commentStream << "<p>Overloaded constructor for {@link #";
-        }else{
-            commentStream << "<p>Overloaded function for {@link #";
-        }
-        commentStream << java_function->name();
-        commentStream << "(";
-
-        writeFunctionArguments(commentStream, java_function, int(arguments.size()), Option(option | NoSuppressExports | SkipName | SkipTemplateParameters));
-        commentStream << ")}.</p>" << Qt::endl;
-        if(java_function->isDeprecated() && !java_function->deprecatedComment().isEmpty()){
-            if(!comment.isEmpty())
-                commentStream << Qt::endl;
-            writeDeprecatedComment(commentStream, java_function);
-        }
-        if(!comment.trimmed().isEmpty() && (_option & InFunctionComment)==0){
-            s << INDENT << "/**" << Qt::endl;
-            commentStream.seek(0);
-            while(!commentStream.atEnd()){
-                s << INDENT << " * " << commentStream.readLine() << Qt::endl;
+        QList<Delegate> delegates = java_function->delegates();
+        delegates << Delegate{};
+        for(const Delegate& delegate : qAsConst(delegates)){
+            const QPair<QMap<int,ArgumentModification>,QList<ArgumentModification>> addedArguments = java_function->addedArguments();
+            // Write the ellipsis convenience argument
+            MetaArgument *affected_arg = arguments.at(generate_enum_overload);
+            const EnumTypeEntry *originator = static_cast<const FlagsTypeEntry *>(affected_arg->type()->typeEntry())->originator();
+            {
+                QString javaSignature;
+                QTextStream s2(&javaSignature);
+                if(delegate.name.isEmpty()){
+                    s2 << java_function->name();
+                }else{
+                    s2 << delegate.name;
+                }
+                s2 << "(";
+                if (generate_enum_overload > 0 || addedArguments.first.size() + addedArguments.second.size()>0) {
+                    writeFunctionArguments(s2, java_function, generate_enum_overload, Option(NoNullness | SkipTemplateParameters | InitializerListAsArray | SkipName));
+                    s2 << ", ";
+                }
+                s2 << originator->javaPackage().replace("$",".") << ".";
+                if(!originator->javaQualifier().isEmpty())
+                    s2 << originator->javaQualifier().replace("$",".") << ".";
+                s2 << originator->targetLangName().replace("$",".") << "[])";
+                s2.flush();
+                if(m_currentMethodSignatures.contains(javaSignature)){
+                    continue;
+                }
+                m_currentMethodSignatures.insert(javaSignature);
             }
-            s << INDENT << " */" << Qt::endl;
-        }
-
-        writeFunctionAttributes(s, java_function, generate_enum_overload >= 0 ? generate_enum_overload : -1, include_attributes, exclude_attributes, option);
-        s << java_function->name() << "(";
-        if (generate_enum_overload > 0 || addedArguments.first.size() + addedArguments.second.size()>0) {
-            writeFunctionArguments(s, java_function, generate_enum_overload);
-            s << ", ";
-        }
+            QString comment;
+            QTextStream commentStream(&comment);
+            if(!delegate.isDeprecated){
+                if(java_function->isConstructor()){
+                    commentStream << "<p>Overloaded constructor for {@link #";
+                }else{
+                    commentStream << "<p>Overloaded function for {@link #";
+                }
+                if(delegate.name.isEmpty())
+                    commentStream << java_function->name();
+                else
+                    commentStream << delegate.name;
+                commentStream << "(";
 
-        // Write the ellipsis convenience argument
-        MetaArgument *affected_arg = arguments.at(generate_enum_overload);
-        const EnumTypeEntry *originator = static_cast<const FlagsTypeEntry *>(affected_arg->type()->typeEntry())->originator();
+                writeFunctionArguments(commentStream, java_function, int(arguments.size()), Option(option | NoNullness | NoSuppressExports | SkipName | SkipTemplateParameters));
+                commentStream << ")}.</p>" << Qt::endl;
+            }
+            if(delegate.isDeprecated){
+                if(!comment.isEmpty())
+                    commentStream << Qt::endl;
+                commentStream << "@deprecated";
+                if(!java_function->isDeprecated()){
+                    commentStream << " Use {@link #" << java_function->name() << "(";
+                    writeFunctionArguments(commentStream, java_function, int(arguments.size()), Option(option | NoNullness | NoSuppressExports | SkipName | SkipTemplateParameters));
+                    commentStream << ")} instead." << Qt::endl;
+                }
+            }else if(delegate.name.isEmpty() && java_function->isDeprecated() && !java_function->deprecatedComment().isEmpty()){
+                if(!comment.isEmpty())
+                    commentStream << Qt::endl;
+                writeDeprecatedComment(commentStream, java_function);
+            }
+            if(!comment.trimmed().isEmpty() && (_option & InFunctionComment)==0){
+                s << INDENT << "/**" << Qt::endl;
+                commentStream.seek(0);
+                while(!commentStream.atEnd()){
+                    s << INDENT << " * " << commentStream.readLine() << Qt::endl;
+                }
+                s << INDENT << " */" << Qt::endl;
+            }
 
-        s << originator->javaPackage().replace("$",".");
-        if(!originator->javaQualifier().isEmpty())
-            s << "." << originator->javaQualifier().replace("$",".");
-        s << "." << originator->targetLangName().replace("$",".")
-          << " ... " << affected_arg->modifiedArgumentName() << ")";
-        QString throws = java_function->throws();
-        if(!throws.isEmpty()){
-            s << " throws " << throws << " ";
-        }
-        s << "{" << Qt::endl;
+            if(delegate.isDeprecated && !(java_function->isEmptyFunction()
+                                          || java_function->isDeprecated())){
+                s << INDENT << "@Deprecated" << Qt::endl;
+            }
+            if(delegate.isSelfReturning){
+                writeFunctionAttributes(s, java_function, generate_enum_overload >= 0 ? generate_enum_overload : -1, include_attributes, exclude_attributes, Option(SkipReturnType | option));
+                s << java_function->ownerClass()->typeEntry()->name() << " ";
+            }else{
+                writeFunctionAttributes(s, java_function, generate_enum_overload >= 0 ? generate_enum_overload : -1, include_attributes, exclude_attributes, option);
+            }
+            if(delegate.name.isEmpty()){
+                s << java_function->name();
+            }else{
+                s << delegate.name;
+            }
+            s << "(";
+            if (generate_enum_overload > 0 || addedArguments.first.size() + addedArguments.second.size()>0) {
+                writeFunctionArguments(s, java_function, generate_enum_overload);
+                s << ", ";
+            }
 
-        s << INDENT << "    ";
-        QString new_return_type = java_function->typeReplaced(0);
-        if (new_return_type != "void" && (!new_return_type.isEmpty() || java_function->type()))
-            s << "return ";
+            if(_option & NoNullness){
+                s << originator->javaPackage().replace("$",".") << ".";
+                if(!originator->javaQualifier().isEmpty())
+                    s << originator->javaQualifier().replace("$",".") << ".";
+                s << originator->targetLangName().replace("$",".") << "... ";
+            }else{
+                QString name = originator->javaPackage().replace("$",".") + ".";
+                if(!originator->javaQualifier().isEmpty())
+                    name += originator->javaQualifier().replace("$",".") + ".";
+                name += originator->targetLangName().replace("$",".");
+                auto idx = name.indexOf('<');
+                QString package;
+                QString typeName = name;
+                if(idx>0){
+                    typeName = name.mid(0, idx);
+                }
+                idx = typeName.lastIndexOf('.');
+                if(idx>0){
+                    typeName = name.mid(idx+1);
+                    package = name.mid(0, idx+1);
+                    s << package << "@NonNull " << typeName << " @NonNull... ";
+                }else{
+                    s << "@NonNull " << name << " @NonNull... ";
+                }
+            }
+            s << affected_arg->modifiedArgumentName() << ")";
+            QString throws = java_function->throws();
+            if(!throws.isEmpty()){
+                s << " throws " << throws << " ";
+            }
+            s << "{" << Qt::endl;
 
-        if (java_function->isConstructor()) {
-            s << "this";
-        } else {
-            /*if (java_function->isStatic())
-                s << java_function->implementingClass()->fullName().replace("$", ".") << ".";
-            else
-                s << "this.";*/
-            s << java_function->name();
-        }
+            s << INDENT << "    ";
+            QString new_return_type = java_function->typeReplaced(0);
+            if (new_return_type != "void" && (!new_return_type.isEmpty() || java_function->type()))
+                s << "return ";
 
-        s << "(";
-        int argumentCounter = 1;
-        while(addedArguments.first.contains(argumentCounter)){
-            const ArgumentModification& mod = addedArguments.first[argumentCounter];
-            s << mod.modified_name << ", ";
-            ++argumentCounter;
-        }
-        for (int i = 0; i < generate_enum_overload; ++i) {
-            MetaArgument *arg = arguments.at(i);
-            if(java_function->argumentRemoved(arg->argumentIndex()+1)==ArgumentRemove_No)
-                s << arg->modifiedArgumentName() << ", ";
-            ++argumentCounter;
+            if (java_function->isConstructor()) {
+                s << "this";
+            } else {
+                if(delegate.name.isEmpty())
+                    s << java_function->name();
+                else
+                    s << delegate.name;
+            }
+
+            s << "(";
+            int argumentCounter = 1;
             while(addedArguments.first.contains(argumentCounter)){
                 const ArgumentModification& mod = addedArguments.first[argumentCounter];
                 s << mod.modified_name << ", ";
                 ++argumentCounter;
             }
+            for (int i = 0; i < generate_enum_overload; ++i) {
+                MetaArgument *arg = arguments.at(i);
+                if(java_function->argumentRemoved(arg->argumentIndex()+1)==ArgumentRemove_No)
+                    s << arg->modifiedArgumentName() << ", ";
+                ++argumentCounter;
+                while(addedArguments.first.contains(argumentCounter)){
+                    const ArgumentModification& mod = addedArguments.first[argumentCounter];
+                    s << mod.modified_name << ", ";
+                    ++argumentCounter;
+                }
+            }
+            for(const ArgumentModification& mod : addedArguments.second){
+                s << mod.modified_name << ", ";
+            }
+            registerPackage(affected_arg->type()->fullName());
+            s << "new " << affected_arg->type()->fullName().replace('$', '.') << "(" << affected_arg->modifiedArgumentName() << "));" << Qt::endl
+              << INDENT << "}" << Qt::endl
+              << INDENT << Qt::endl;
+            if(delegate.isSelfReturning)
+                s << INDENT << "return this;" << Qt::endl;
         }
-        for(const ArgumentModification& mod : addedArguments.second){
-            s << mod.modified_name << ", ";
-        }
-        registerPackage(affected_arg->type()->fullName());
-        s << "new " << affected_arg->type()->fullName().replace('$', '.') << "(" << affected_arg->modifiedArgumentName() << "));" << Qt::endl
-          << INDENT << "}" << Qt::endl
-          << INDENT << Qt::endl;
     }
 }
 
@@ -4882,30 +5351,38 @@ void JavaGenerator::writeInstantiatedType(QTextStream &s, const MetaType *abstra
 
     const TypeEntry *type = abstractMetaType->typeEntry();
     /* avoid output like java.util.List<int>*/
-    if(forceBoxed){
+    if(forceBoxed && type->isPrimitive()){
         if(type->qualifiedTargetLangName()=="int"){
             s << "java.lang.Integer";
+            return;
         }else if(type->qualifiedTargetLangName()=="boolean"){
             s << "java.lang.Boolean";
+            return;
         }else if(type->qualifiedTargetLangName()=="short"){
             s << "java.lang.Short";
+            return;
         }else if(type->qualifiedTargetLangName()=="char"){
             s << "java.lang.Character";
+            return;
         }else if(type->qualifiedTargetLangName()=="byte"){
             s << "java.lang.Byte";
+            return;
         }else if(type->qualifiedTargetLangName()=="long"){
             s << "java.lang.Long";
+            return;
         }else if(type->qualifiedTargetLangName()=="double"){
             s << "java.lang.Double";
+            return;
         }else if(type->qualifiedTargetLangName()=="float"){
             s << "java.lang.Float";
-        }else if(type->designatedInterface()){
-            s << type->designatedInterface()->qualifiedTargetLangName().replace('$', '.');
-        }else{
-            s << type->qualifiedTargetLangName().replace('$', '.');
+            return;
         }
-    }else if(type->designatedInterface()){
+    }
+
+    if(type->designatedInterface()){
         s << type->designatedInterface()->qualifiedTargetLangName().replace('$', '.');
+    }else if(abstractMetaType->isCharString()){
+        s << "java.lang.String";
     }else if(type->isContainer()){
         const ContainerTypeEntry* ctype = static_cast<const ContainerTypeEntry*>(type);
         switch(ctype->type()){
@@ -4942,6 +5419,8 @@ void JavaGenerator::writeInstantiatedType(QTextStream &s, const MetaType *abstra
     }
 }
 
+QString upCaseFirst(const QString &str);
+
 void JavaGenerator::writeFunctionOverloads(QTextStream &s, const MetaFunction *java_function,
         uint include_attributes, uint exclude_attributes, Option _option, const QString& alternativeFunctionName) {
     const MetaArgumentList& arguments = java_function->arguments();
@@ -4960,7 +5439,7 @@ void JavaGenerator::writeFunctionOverloads(QTextStream &s, const MetaFunction *j
 
     // Figure out how many functions we need to write out,
     // One extra for each default argument.
-    QList<int> argumentCounts;
+    QList<int> _argumentCounts;
     uint excluded_attributes = MetaAttributes::Abstract
                                | MetaAttributes::Native
                                | exclude_attributes;
@@ -4972,180 +5451,167 @@ void JavaGenerator::writeFunctionOverloads(QTextStream &s, const MetaFunction *j
             if (arg->defaultValueExpression().isEmpty()){
                 break;
             }
-            argumentCounts << i;
+            _argumentCounts << i;
         }
     }
 
-    for (int i = 0; i < argumentCounts.size(); ++i) {
-        QString comment;
-        QTextStream commentStream(&comment);
-
-        int used_arguments = argumentCounts[i];
-
-        uint option = uint(_option);
-        if(!java_function->isEmptyFunction()
-                && !java_function->isNormal()
-                && !java_function->isSignal()){
-            option = option | SkipReturnType;
-        }
-        if(java_function->ownerClass()->isInterface() && (_option & InFunctionComment)==0){
-            option = option | DefaultFunction;
-        }
-        QString signature = functionSignature(java_function, included_attributes,
-                                              excluded_attributes,
-                                              Option(option),
-                                              used_arguments,
-                                              alternativeFunctionName);
-        {
-            if(java_function->isConstructor()){
-                commentStream << "<p>Overloaded constructor for {@link #";
-            }else{
-                commentStream << "<p>Overloaded function for {@link #";
+    QList<Delegate> delegates = java_function->delegates();
+    if(delegates.isEmpty() && !m_noKotlinDelegates){
+        if(java_function->attributes() & MetaAttributes::GetterFunction){
+            if(const MetaField * accessedField = java_function->accessedField()){
+                QString name = accessedField->name();
+                if(name.startsWith("m_")){
+                    name = name.mid(2);
+                }
+                const TS::FieldModificationList modifications = accessedField->modifications();
+                bool newNoKotlinGetter = false;
+                for(const FieldModification& modification : modifications) {
+                    if(!modification.renamedTo().isEmpty()){
+                        name = modification.renamedTo();
+                    }
+                    if(modification.isNoKotlinGetter())
+                        newNoKotlinGetter = true;
+                }
+                if(!newNoKotlinGetter){
+//                QString getName = ((accessedField->type()
+//                                   && accessedField->type()->isPrimitive()
+//                                   && accessedField->type()->typeEntry()->qualifiedTargetLangName()=="boolean") ? "is" : "get") + upCaseFirst(name);
+                    QString getName = "get" + upCaseFirst(name);
+                    if(java_function->name()!=getName){
+                        delegates << Delegate{getName, false, false, 0, {}};
+                    }
+                }
             }
-            if(alternativeFunctionName.isEmpty()){
-                commentStream << java_function->name();
-            }else{
-                commentStream << alternativeFunctionName;
-            }
-            commentStream << "(";
-            writeFunctionArguments(commentStream, java_function, int(arguments.size()), Option(SkipName | NoSuppressExports | SkipTemplateParameters));
-            commentStream << ")}";
-            bool useList = arguments.size()-used_arguments>1;
-            if(useList)
-                commentStream << "</p>" << Qt::endl << "<p>with: </p><ul>" << Qt::endl;
-            else
-                commentStream << Qt::endl << " with ";
-            for (int j = used_arguments; j < arguments.size(); ++j) {
-                auto arg = arguments.at(j);
-                if(useList)
-                    commentStream << "<li>";
-                commentStream << "<code>" << arg->argumentName() << " = ";
-                QString defaultExpr = arg->defaultValueExpression();
-                auto pos = defaultExpr.indexOf(".");
-                if (pos > 0) {
-                    QString someName = defaultExpr.left(pos);
-                    ComplexTypeEntry *ctype =
-                        m_database->findComplexType(someName);
-                    QString replacement;
-                    if (ctype && ctype->isVariant())
-                        replacement = "io.qt.QVariant.";
-                    else if (ctype)
-                        if(ctype->javaPackage().isEmpty())
-                            replacement = ctype->targetLangName() + ".";
-                        else
-                            replacement = ctype->javaPackage() + "." + ctype->targetLangName() + ".";
-                    else
-                        replacement = someName + ".";
-                    defaultExpr = defaultExpr.replace(someName + ".", replacement);
+        }else if(java_function->isPropertyReader() && java_function->propertySpec()){
+            bool noKotlinGetter = false;
+            const TS::FunctionModificationList modifications = java_function->modifications(java_function->declaringClass());
+            for(const FunctionModification& modification : modifications) {
+                if(modification.isNoKotlinGetter())
+                    noKotlinGetter = true;
+            }
+            if(!noKotlinGetter
+                    && java_function->type()
+                    && java_function->type()->isPrimitive()
+                    && java_function->type()->typeEntry()->targetLangName()=="boolean"
+                    && java_function->propertySpec()->name().startsWith("is")
+                    && java_function->propertySpec()->name()==java_function->name()){
+                noKotlinGetter = true;
+            }
+            if(!noKotlinGetter){
+                QString name;
+                if(java_function->propertySpec()->read()!=java_function->name()) {
+                    name = java_function->name();
+                }else{
+                    name = java_function->propertySpec()->name();
                 }
-                if (java_function->typeReplaced(arg->argumentIndex() + 1).isEmpty() && arg->type()->isFlags()) {
-                    defaultExpr = "new " + arg->type()->fullName().replace('$', '.') + "(" + defaultExpr + ")";
+                if(name!="get"+upCaseFirst(java_function->propertySpec()->name())){
+                    QString getName = "get" + upCaseFirst(name);
+                    if(java_function->name()!=getName){
+                        delegates << Delegate{getName, false, false, 0, {}};
+                    }
                 }
-                commentStream << defaultExpr
-                                 .replace("&", "&amp;")
-                                 .replace("<", "&lt;")
-                                 .replace(">", "&gt;")
-                                 .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
-                                 .replace("@", "&commat;")
-                                 .replace("/*", "&sol;*")
-                                 .replace("*/", "*&sol;");
-                commentStream << "</code>";
-                if(useList)
-                    commentStream << "</li>" << Qt::endl;
             }
-            if(useList)
-                commentStream << "</ul>" << Qt::endl;
-            else
-                commentStream << ".</p>" << Qt::endl;
         }
-
-        if(java_function->isDeprecated() && !java_function->deprecatedComment().isEmpty()){
-            if(!comment.isEmpty())
-                commentStream << Qt::endl;
-            writeDeprecatedComment(commentStream, java_function);
+    }
+    delegates << Delegate{};
+    for(const Delegate& delegate : qAsConst(delegates)){
+        QList<int> argumentCounts = _argumentCounts;
+        if(!delegate.name.isEmpty()){
+            argumentCounts << -1;
         }
+        for (int i = 0; i < argumentCounts.size(); ++i) {
 
-        if(!comment.trimmed().isEmpty() && (_option & InFunctionComment)==0 && !java_function->isPrivateSignal()){
-            s << INDENT << "/**" << Qt::endl;
-            commentStream.seek(0);
-            while(!commentStream.atEnd()){
-                s << INDENT << " * " << commentStream.readLine() << Qt::endl;
-            }
-            s << INDENT << " */" << Qt::endl;
-        }
-        s << signature << " {" << Qt::endl;
-        {
-            INDENTATION(INDENT)
-            QString new_return_type = java_function->typeReplaced(0);
-            s << INDENT;
-            if (new_return_type != "void" && (!new_return_type.isEmpty() || java_function->type()))
-                s << "return ";
-            if (java_function->isConstructor())
-                s << "this";
-            else{
-                if(alternativeFunctionName.isEmpty())
-                    s << java_function->name();
-                else
-                    s << alternativeFunctionName;
+            int used_arguments = argumentCounts[i];
+            {
+                QString javaSignature;
+                QTextStream s2(&javaSignature);
+                if(delegate.name.isEmpty()){
+                    s2 << java_function->name();
+                }else{
+                    s2 << delegate.name;
+                }
+                s2 << "(";
+                writeFunctionArguments(s2, java_function, used_arguments, Option(NoNullness | SkipTemplateParameters | InitializerListAsArray | SkipName));
+                s2 << ")";
+                s2.flush();
+                if(m_currentMethodSignatures.contains(javaSignature)){
+                    continue;
+                }
+                m_currentMethodSignatures.insert(javaSignature);
             }
-            s << "(";
+            QString comment;
+            QTextStream commentStream(&comment);
 
-            int written_arguments = 0;
-            const QPair<QMap<int,ArgumentModification>,QList<ArgumentModification>> addedArguments = java_function->addedArguments();
-            int argumentCounter = 1;
-            while(addedArguments.first.contains(argumentCounter)){
-                const ArgumentModification& argumentMod = addedArguments.first[argumentCounter];
-                if(written_arguments > 0)
-                    s << ", ";
-                s << argumentMod.modified_name;
-                ++argumentCounter;
-                ++written_arguments;
+            uint option = uint(_option);
+            if(!java_function->isEmptyFunction()
+                    && !java_function->isNormal()
+                    && !java_function->isSignal()){
+                option = option | SkipReturnType;
             }
-            for (int j = 0; j < arguments.size(); ++j) {
-                const MetaArgument* arg = arguments.at(j);
-                if (java_function->argumentRemoved(arg->argumentIndex() + 1)==ArgumentRemove_No) {
-                    if (written_arguments > 0)
-                        s << ", ";
-
-                    if (j < used_arguments) {
-                        s << arg->modifiedArgumentName();
-                    } else {
-                        QString defaultExpr = arg->defaultValueExpression();
-                        MetaType *arg_type = nullptr;
-                        QString modified_type = java_function->typeReplaced(arg->argumentIndex() + 1);
-                        if (modified_type.isEmpty()) {
-                            arg_type = arg->type();
-                            if (arg_type->isNativePointer()) {
-                                if(defaultExpr=="null"
-                                        && !java_function->argumentTypeArray(arg->argumentIndex() + 1)
-                                        && !java_function->argumentTypeBuffer(arg->argumentIndex() + 1))
-                                    s << "(io.qt.QNativePointer)";
-                            } else {
-                                const MetaType *abstractMetaType = arg->type();
-                                const TypeEntry *type = abstractMetaType->typeEntry();
-                                if (type->designatedInterface())
-                                    type = type->designatedInterface();
-                                if (!type->isEnum() && !type->isFlags()) {
-                                    if(defaultExpr=="null" || type->isPrimitive()){
-                                        s << "(";
-                                        writeInstantiatedType(s, abstractMetaType, false);
-                                        s << ")";
-                                    }
-                                }
-                            }
-                        } else {
-                            if(defaultExpr=="null")
-                                s << "(" << modified_type.replace('$', '.') << ")";
+            if(java_function->ownerClass()->isInterface() && (_option & InFunctionComment)==0){
+                option = option | DefaultFunction;
+            }
+            QString signature;
+            if(delegate.isSelfReturning){
+                signature = functionSignature(java_function, included_attributes,
+                                              excluded_attributes,
+                                              Option(SkipReturnType | option),
+                                              used_arguments,
+                                              java_function->ownerClass()->name()+" "+delegate.name);
+            }else{
+                signature = functionSignature(java_function, included_attributes,
+                                              excluded_attributes,
+                                              Option(option),
+                                              used_arguments,
+                                              delegate.name.isEmpty() ? alternativeFunctionName : delegate.name);
+            }
+            if(!delegate.isDeprecated || used_arguments!=-1){
+                if(java_function->isConstructor()){
+                    commentStream << "<p>Overloaded constructor for {@link #";
+                }else{
+                    if(delegate.name.isEmpty()){
+                        commentStream << "<p>Overloaded function for {@link #";
+                        if(alternativeFunctionName.isEmpty()){
+                            commentStream << java_function->name();
+                        }else{
+                            commentStream << alternativeFunctionName;
                         }
-
+                    }else if(used_arguments==-1){
+                        if(java_function->attributes() & MetaAttributes::GetterFunction
+                                || java_function->isPropertyReader()){
+                            commentStream << "<p>Kotlin property getter. In Java use {@link #";
+                        }else{
+                            commentStream << "<p>Delegate for {@link #";
+                        }
+                        commentStream << java_function->name();
+                    }else{
+                        commentStream << "<p>Overloaded function for {@link #";
+                        commentStream << delegate.name;
+                    }
+                }
+                commentStream << "(";
+                writeFunctionArguments(commentStream, java_function, int(arguments.size()), Option(NoNullness | SkipName | NoSuppressExports | SkipTemplateParameters));
+                commentStream << ")}";
+                if(used_arguments>=0){
+                    bool useList = arguments.size()-used_arguments>1;
+                    if(useList)
+                        commentStream << "</p>" << Qt::endl << "<p>with: </p><ul>" << Qt::endl;
+                    else
+                        commentStream << Qt::endl << " with ";
+                    for (int j = used_arguments; j < arguments.size(); ++j) {
+                        auto arg = arguments.at(j);
+                        if(useList)
+                            commentStream << "<li>";
+                        commentStream << "<code>" << arg->argumentName() << " = ";
+                        QString defaultExpr = arg->defaultValueExpression();
                         auto pos = defaultExpr.indexOf(".");
                         if (pos > 0) {
                             QString someName = defaultExpr.left(pos);
                             ComplexTypeEntry *ctype =
                                 m_database->findComplexType(someName);
                             QString replacement;
-                            if (ctype && ctype->isVariant())
-                                replacement = "io.qt.QVariant.";
+                            if (ctype && ctype->isQVariant())
+                                replacement = "QVariant.";
                             else if (ctype)
                                 if(ctype->javaPackage().isEmpty())
                                     replacement = ctype->targetLangName() + ".";
@@ -5155,16 +5621,87 @@ void JavaGenerator::writeFunctionOverloads(QTextStream &s, const MetaFunction *j
                                 replacement = someName + ".";
                             defaultExpr = defaultExpr.replace(someName + ".", replacement);
                         }
-
-                        if (arg_type && arg_type->isFlags()) {
-                            s << "new " << arg_type->fullName().replace('$', '.') << "(" << defaultExpr << ")";
-                        } else {
-                            s << defaultExpr;
+                        if (java_function->typeReplaced(arg->argumentIndex() + 1).isEmpty() && arg->type()->isFlags()) {
+                            defaultExpr = "new " + arg->type()->fullName().replace('$', '.') + "(" + defaultExpr + ")";
                         }
+                        commentStream << defaultExpr
+                                         .replace("&", "&amp;")
+                                         .replace("<", "&lt;")
+                                         .replace(">", "&gt;")
+                                         .replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
+                                         .replace("@", "&commat;")
+                                         .replace("/*", "&sol;*")
+                                         .replace("*/", "*&sol;");
+                        commentStream << "</code>";
+                        if(useList)
+                            commentStream << "</li>" << Qt::endl;
                     }
-                    ++written_arguments;
+                    if(useList)
+                        commentStream << "</ul>" << Qt::endl;
+                    else
+                        commentStream << ".</p>" << Qt::endl;
+                }else{
+                    if(java_function->attributes() & MetaAttributes::GetterFunction
+                            || java_function->isPropertyReader()){
+                        commentStream << " instead";
+                    }
+                    commentStream << ".</p>" << Qt::endl;
                 }
-                ++argumentCounter;
+            }
+
+            if(delegate.isDeprecated){
+                if(!comment.isEmpty())
+                    commentStream << Qt::endl;
+                commentStream << "@deprecated";
+                if(!java_function->isDeprecated()){
+                    commentStream << " Use {@link #" << java_function->name() << "(";
+                    writeFunctionArguments(commentStream, java_function, int(arguments.size()), Option(option | NoNullness | NoSuppressExports | SkipName | SkipTemplateParameters));
+                    commentStream << ")} instead." << Qt::endl;
+                }
+            }else if(java_function->isDeprecated() && !java_function->deprecatedComment().isEmpty()){
+                if(!comment.isEmpty())
+                    commentStream << Qt::endl;
+                writeDeprecatedComment(commentStream, java_function);
+            }
+
+            if(!comment.trimmed().isEmpty() && (_option & InFunctionComment)==0 && !java_function->isPrivateSignal()){
+                s << INDENT << "/**" << Qt::endl;
+                commentStream.seek(0);
+                while(!commentStream.atEnd()){
+                    s << INDENT << " * " << commentStream.readLine() << Qt::endl;
+                }
+                s << INDENT << " */" << Qt::endl;
+            }
+            if(java_function->isPropertyReader() && !signature.contains("@QtPropertyReader(")){
+                s << INDENT << "@QtPropertyReader(enabled=false)" << Qt::endl;
+            }
+            if(delegate.isDeprecated && !signature.contains("@Deprecated")){
+                s << INDENT << "@Deprecated" << Qt::endl;
+            }
+            s << signature << " {" << Qt::endl;
+            {
+                INDENTATION(INDENT)
+                QString new_return_type = java_function->typeReplaced(0);
+                s << INDENT;
+                if (new_return_type != "void" && (!new_return_type.isEmpty() || java_function->type()))
+                    s << "return ";
+                if (java_function->isConstructor())
+                    s << "this";
+                else{
+                    if(delegate.name.isEmpty() || used_arguments==-1){
+                        if(alternativeFunctionName.isEmpty())
+                            s << java_function->name();
+                        else
+                            s << alternativeFunctionName;
+                    }else{
+                        s << delegate.name;
+                    }
+                }
+                s << "(";
+
+                int written_arguments = 0;
+                const QPair<QMap<int,ArgumentModification>,QList<ArgumentModification>> addedArguments = java_function->addedArguments();
+                int argumentCounter = 1;
                 while(addedArguments.first.contains(argumentCounter)){
                     const ArgumentModification& argumentMod = addedArguments.first[argumentCounter];
                     if(written_arguments > 0)
@@ -5173,17 +5710,94 @@ void JavaGenerator::writeFunctionOverloads(QTextStream &s, const MetaFunction *j
                     ++argumentCounter;
                     ++written_arguments;
                 }
+                for (int j = 0; j < arguments.size(); ++j) {
+                    const MetaArgument* arg = arguments.at(j);
+                    if (java_function->argumentRemoved(arg->argumentIndex() + 1)==ArgumentRemove_No) {
+                        if (written_arguments > 0)
+                            s << ", ";
+
+                        if (used_arguments==-1 || j < used_arguments) {
+                            s << arg->modifiedArgumentName();
+                        } else {
+                            QString defaultExpr = arg->defaultValueExpression();
+                            MetaType *arg_type = nullptr;
+                            QString modified_type = java_function->typeReplaced(arg->argumentIndex() + 1);
+                            if (modified_type.isEmpty()) {
+                                arg_type = arg->type();
+                                if (arg_type->isNativePointer()) {
+                                    if(defaultExpr=="null"
+                                            && !java_function->argumentTypeArray(arg->argumentIndex() + 1)
+                                            && !java_function->argumentTypeBuffer(arg->argumentIndex() + 1))
+                                        s << "(QNativePointer)";
+                                } else {
+                                    const MetaType *abstractMetaType = arg->type();
+                                    const TypeEntry *type = abstractMetaType->typeEntry();
+                                    if (type->designatedInterface())
+                                        type = type->designatedInterface();
+                                    if (!type->isEnum() && !type->isFlags()) {
+                                        if(defaultExpr=="null" || type->isPrimitive()){
+                                            s << "(";
+                                            writeInstantiatedType(s, abstractMetaType, false);
+                                            if(java_function->argumentTypeArray(arg->argumentIndex() + 1))
+                                                s << "[]";
+                                            s << ")";
+                                        }
+                                    }
+                                }
+                            } else {
+                                if(defaultExpr=="null")
+                                    s << "(" << modified_type.replace('$', '.') << ")";
+                            }
+
+                            auto pos = defaultExpr.indexOf(".");
+                            if (pos > 0) {
+                                QString someName = defaultExpr.left(pos);
+                                ComplexTypeEntry *ctype =
+                                    m_database->findComplexType(someName);
+                                QString replacement;
+                                if (ctype && ctype->isQVariant())
+                                    replacement = "QVariant.";
+                                else if (ctype)
+                                    if(ctype->javaPackage().isEmpty())
+                                        replacement = ctype->targetLangName() + ".";
+                                    else
+                                        replacement = ctype->javaPackage() + "." + ctype->targetLangName() + ".";
+                                else
+                                    replacement = someName + ".";
+                                defaultExpr = defaultExpr.replace(someName + ".", replacement);
+                            }
+
+                            if (arg_type && arg_type->isFlags()) {
+                                s << "new " << arg_type->fullName().replace('$', '.') << "(" << defaultExpr << ")";
+                            } else {
+                                s << defaultExpr;
+                            }
+                        }
+                        ++written_arguments;
+                    }
+                    ++argumentCounter;
+                    while(addedArguments.first.contains(argumentCounter)){
+                        const ArgumentModification& argumentMod = addedArguments.first[argumentCounter];
+                        if(written_arguments > 0)
+                            s << ", ";
+                        s << argumentMod.modified_name;
+                        ++argumentCounter;
+                        ++written_arguments;
+                    }
+                }
+                for(const ArgumentModification& argumentMod : addedArguments.second){
+                    if(written_arguments > 0)
+                        s << ", ";
+                    ++written_arguments;
+                    s << argumentMod.modified_name;
+                }
+                s << ");" << Qt::endl;
+                if(delegate.isSelfReturning)
+                    s << INDENT << "return this;" << Qt::endl;
             }
-            for(const ArgumentModification& argumentMod : addedArguments.second){
-                if(written_arguments > 0)
-                    s << ", ";
-                ++written_arguments;
-                s << argumentMod.modified_name;
-            }
-            s << ");" << Qt::endl;
+            s << INDENT << "}" << Qt::endl
+              << INDENT << Qt::endl;
         }
-        s << INDENT << "}" << Qt::endl
-          << INDENT << Qt::endl;
     }
 }
 
@@ -5238,7 +5852,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
         return;
 
     {
-        MetaFunctionList inconsistentFunctions = java_class->cppInconsistentFunctions();
+        const MetaFunctionList inconsistentFunctions = java_class->cppInconsistentFunctions();
         if(!inconsistentFunctions.isEmpty()){
             for(MetaFunction* f : inconsistentFunctions)
                 m_inconsistent_functions << f;
@@ -5254,11 +5868,20 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
         s << INDENT << "package " << java_class->package() << ";" << Qt::endl << Qt::endl;
         m_currentPackages.clear();
 
+        QSet<QString> imports;
+        imports.insert("io.qt.*");
+        s << "import io.qt.*;" << Qt::endl;
         for(const Include &inc : java_class->typeEntry()->extraIncludes()) {
             if (inc.type == Include::TargetLangImport) {
-                s << inc.toString() << Qt::endl;
+                QString imp = inc.toString();
+                if(!imports.contains(imp)){
+                    imports.insert(imp);
+                    s << imp << Qt::endl;
+                }
             }
         }
+        if(!imports.isEmpty())
+            s << Qt::endl;
     }
 
     QString comment;
@@ -5290,7 +5913,11 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                 }else{
                     commentStream << "class ";
                 }
-                commentStream << (java_class->templateBaseClass() ? java_class->templateBaseClass()->qualifiedCppName().replace("<JObjectWrapper>", "<T>") : java_class->qualifiedCppName() )
+                commentStream << (
+//                                     java_class->templateBaseClass()
+//                                     ? java_class->templateBaseClass()->qualifiedCppName().replace("<JObjectWrapper>", "<T>")
+//                                     :
+                                       java_class->qualifiedCppName() )
                                  .replace("&", "&amp;")
                                  .replace("<", "&lt;")
                                  .replace(">", "&gt;")
@@ -5303,7 +5930,11 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                 commentStream << "<p>Java wrapper for Qt's "
                               << (java_class->typeEntry()->isNamespace() ? "namespace" : "class")
                               << " <a href=\"" << url << "\">"
-                              << (java_class->templateBaseClass() ? java_class->templateBaseClass()->qualifiedCppName().replace("<JObjectWrapper>", "<T>") : java_class->qualifiedCppName() )
+                              << (
+//                                     java_class->templateBaseClass()
+//                                     ? java_class->templateBaseClass()->qualifiedCppName().replace("<JObjectWrapper>", "<T>")
+//                                     :
+                                       java_class->qualifiedCppName() )
                                  .replace("&", "&amp;")
                                  .replace("<", "&lt;")
                                  .replace(">", "&gt;")
@@ -5441,7 +6072,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                         if (!sc.isEmpty())
                             s << " extends " << sc;
                         else
-                            s << " extends io.qt.QtObject";
+                            s << " extends QtObject";
                     }else{
                         s << " extends " << java_class->baseClass()->fullName().replace("$",".");
                     }
@@ -5450,10 +6081,10 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                     if (!sc.isEmpty())
                         s << " extends " << sc;
                     else
-                        s << " extends io.qt.QtObject";
+                        s << " extends QtObject";
                 }
             } else if (java_class->isInterface()) {
-                s << " extends io.qt.QtObjectInterface";
+                s << " extends QtObjectInterface";
             }
         }
 
@@ -5500,7 +6131,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
             } else {
                 s << "," << Qt::endl << INDENT << "            ";
             }
-            s << "java.lang.Iterable<" << translateType(iterableType, java_class, BoxedPrimitive)<< ">";
+            s << "java.lang.Iterable<" << translateType(iterableType, java_class, Option(BoxedPrimitive | (m_nullness ? NoOption : NoNullness)))<< ">";
         }
 
         if (java_class->hasCloneOperator()) {
@@ -5528,6 +6159,9 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
 
         s << Qt::endl << INDENT << "{" << Qt::endl;
 
+        QSet<QString> previousMethodSignatures;
+        m_currentMethodSignatures.swap(previousMethodSignatures);
+
         {
             INDENTATION(INDENT)
 
@@ -5547,7 +6181,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
             }
 
             // Define variables for reference count mechanism
-            if (!java_class->isInterface() && !java_class->isNamespace()) {
+            if (!java_class->isInterface() && (!java_class->isNamespace() || !java_class->typeEntry()->targetType().contains("interface"))) {
                 QMap<QString, int> variables;
                 //bool isWrapperClass = java_class->typeEntry()->lookupName().endsWith("$ConcreteWrapper");
                 for(MetaFunction *function : java_class->functions()) {
@@ -5591,7 +6225,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                         ReportHandler::warning(warn);
                     }
 
-                    s << INDENT << "@io.qt.QtPropertyMember(enabled=false)" << Qt::endl
+                    s << INDENT << "@QtPropertyMember(enabled=false)" << Qt::endl
                       << INDENT;
                     switch (access) {
                         case ReferenceCount::Private:
@@ -5624,7 +6258,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                     s << INDENT << Qt::endl;
             }
 
-            if(java_class->isNamespace()){
+            if(java_class->isNamespace() && !java_class->typeEntry()->targetType().contains("interface")){
                 s << INDENT << "private " << java_class->simpleName() << "() throws java.lang.InstantiationError { throw new java.lang.InstantiationError(\"Cannot instantiate namespace " << java_class->simpleName() << ".\"); }" << Qt::endl
                   << INDENT << Qt::endl;
             }
@@ -5634,20 +6268,20 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                     s << INDENT << "/**" << Qt::endl
                       << INDENT << " * This variable stores the meta-object for the class." << Qt::endl
                       << INDENT << " */" << Qt::endl
-                      << INDENT << "public static final io.qt.core.QMetaObject staticMetaObject = io.qt.core.QMetaObject.forType("
+                      << INDENT << "public static final io.qt.core.@NonNull QMetaObject staticMetaObject = io.qt.core.QMetaObject.forType("
                       << java_class->name().replace('$', '.') << ".class);" << Qt::endl
                       << INDENT << Qt::endl;
                 }
             }
 
             if (!java_class->isInterface() && (java_class->isAbstract() || force_abstract)) {
-                s << INDENT << "@io.qt.NativeAccess" << Qt::endl
+                s << INDENT << "@NativeAccess" << Qt::endl
                   << INDENT << "private static final class ConcreteWrapper extends " << java_class->name().replace('$', '.') << " {" << Qt::endl;
 
                 {
                     INDENTATION(INDENT)
                     s << INDENT << Qt::endl
-                      << INDENT << "@io.qt.NativeAccess" << Qt::endl
+                      << INDENT << "@NativeAccess" << Qt::endl
                       << INDENT << "private ConcreteWrapper(QPrivateConstructor p) { super(p); }" << Qt::endl;
 
                     MetaFunctionList functions = java_class->queryFunctions(MetaClass::NormalFunctions | MetaClass::AbstractFunctions | MetaClass::NonEmptyFunctions | MetaClass::NotRemovedFromTargetLang);
@@ -5744,12 +6378,12 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                   << INDENT << " * will indiscriminately throw an exception if called. If the" << Qt::endl
                   << INDENT << " * exception is ignored, any use of the constructed object will" << Qt::endl
                   << INDENT << " * cause an exception to occur." << Qt::endl << Qt::endl
-                  << INDENT << " * @throws io.qt.QClassCannotBeSubclassedException" << Qt::endl
+                  << INDENT << " * @throws QClassCannotBeSubclassedException" << Qt::endl
                   << INDENT << " **/" << Qt::endl
                   << INDENT << "@SuppressWarnings(\"unused\")" << Qt::endl
-                  << INDENT << "private " << java_class->simpleName() << "() throws io.qt.QClassCannotBeSubclassedException {" << Qt::endl
+                  << INDENT << "private " << java_class->simpleName() << "() throws QClassCannotBeSubclassedException {" << Qt::endl
                   << INDENT << "    super((QPrivateConstructor)null);" << Qt::endl
-                  << INDENT << "    throw new io.qt.QClassCannotBeSubclassedException(" << java_class->simpleName() << ".class);" << Qt::endl
+                  << INDENT << "    throw new QClassCannotBeSubclassedException(" << java_class->simpleName() << ".class);" << Qt::endl
                   << INDENT << "}" << Qt::endl << Qt::endl;
             }
 
@@ -5800,25 +6434,13 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                 writeFunction(s, function);
             }
 
-            // Just the private functions for abstract functions implemented in superclasses
-            /*
-            if (!java_class->isInterface() &&
-                    java_class->isAbstract() &&
-                    !java_class->hasUnimplmentablePureVirtualFunction()) {
-                java_funcs = java_class->queryFunctions(AbstractMetaClass::NormalFunctions |
-                                                        AbstractMetaClass::AbstractFunctions |
-                                                        AbstractMetaClass::NotRemovedFromTargetLang);
-                for(AbstractMetaFunction *java_function : java_funcs) {
-                    if (java_function->implementingClass() != java_class) {
-                        writePrivateNativeFunction(s, java_function);
-                    }
-                }
-            }*/
-
             if (iterableType) {
                 s << INDENT << Qt::endl
                   << INDENT << "@Override" << Qt::endl
-                  << INDENT << "public java.util.Iterator<" << translateType(iterableType, java_class, BoxedPrimitive) << "> iterator() {" << Qt::endl
+                  << INDENT << "public java.util.";
+                if(m_nullness)
+                    s << "@NonNull ";
+                s << "Iterator<" << translateType(iterableType, java_class, BoxedPrimitive) << "> iterator() {" << Qt::endl
                   << INDENT << "    return " << (isConst ? "constBegin" : "begin") << "().iterator();" << Qt::endl
                   << INDENT << "}" << Qt::endl
                   << INDENT << Qt::endl;
@@ -5844,7 +6466,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                   << INDENT << " * Constructor for internal use only." << Qt::endl
                   << INDENT << " * @param p expected to be <code>null</code>." << Qt::endl
                   << INDENT << " */" << Qt::endl
-                  << INDENT << "@io.qt.NativeAccess" << Qt::endl
+                  << INDENT << "@NativeAccess" << Qt::endl
                   << INDENT << "protected "<< java_class->simpleName() << "(QPrivateConstructor p) { super(p); } " << Qt::endl
                   << INDENT << Qt::endl;
                 if(java_class->isQObject() && java_class->hasStandardConstructor() && !java_class->hasUnimplmentablePureVirtualFunction()){
@@ -5852,7 +6474,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                       << INDENT << " * Constructor for internal use only." << Qt::endl
                       << INDENT << " * It is not allowed to call the declarative constructor from inside Java." << Qt::endl
                       << INDENT << " */" << Qt::endl
-                      << INDENT << "@io.qt.NativeAccess" << Qt::endl
+                      << INDENT << "@NativeAccess" << Qt::endl
                       << INDENT << "protected " << java_class->simpleName() << "(QDeclarativeConstructor constructor) {" << Qt::endl;
                     {
                         INDENTATION(INDENT)
@@ -5861,7 +6483,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                     }
                     s << INDENT << "} " << Qt::endl
                       << INDENT << Qt::endl
-                      << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                      << INDENT << "@QtUninvokable" << Qt::endl
                       << INDENT << "private static native void initialize_native(" << java_class->simpleName() << " instance, QDeclarativeConstructor constructor);" << Qt::endl
                       << INDENT << Qt::endl;
                 }
@@ -5883,7 +6505,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                 const InterfaceTypeEntry* itype = static_cast<const InterfaceTypeEntry*>(java_class->typeEntry());
                 MetaFunctionList nonPublicFunctions;
                 MetaFunctionList restrictedFunctions;
-                for(MetaFunction *java_function : java_funcs) {
+                for(MetaFunction *java_function : qAsConst(java_funcs)) {
                     if(java_function->declaringClass()==java_class){
                         if(!java_function->isStatic()
                                 && !java_function->isConstructor()
@@ -5909,10 +6531,10 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                         QString comment2;
                         QTextStream commentStream2(&comment2);
                         for (MetaFunction *function : nonPublicFunctions) {
-                            writeFunction(commentStream2, function, 0, 0, Option(InFunctionComment | NoSuppressExports));
+                            writeFunction(commentStream2, function, 0, 0, Option(NoNullness | InFunctionComment | NoSuppressExports));
                         }
                         for(const MetaField *field : nonPublicFields) {
-                            writeFieldAccessors(commentStream2, field, Option(InFunctionComment | NoSuppressExports));
+                            writeFieldAccessors(commentStream2, field, Option(NoNullness | InFunctionComment | NoSuppressExports));
                         }
                         commentStream2.seek(0);
                         commentStream << Qt::endl
@@ -5966,9 +6588,8 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                                     const MetaArgumentList& arguments = java_function->arguments();
 
                                     for (int i = 0; i < arguments.size(); ++i) {
-                                        if (java_function->nullPointersDisabled(java_function->implementingClass(), i + 1)) {
-                                            s << INDENT << "if (" << arguments.at(i)->modifiedArgumentName() << " == null)" << Qt::endl
-                                              << INDENT << "    throw new NullPointerException(\"Argument '" << arguments.at(i)->modifiedArgumentName() << "': null not expected.\");" << Qt::endl;
+                                        if (arguments[i]->isNullPointerDisabled(java_function)){
+                                            s << INDENT << "java.util.Objects.requireNonNull(" << arguments[i]->modifiedArgumentName() << ", \"Argument '" << arguments[i]->modifiedArgumentName() << "': null not expected.\");" << Qt::endl;
                                         }
                                     }
 
@@ -6001,8 +6622,8 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                                     // Lookup if there is a reference-count action required on the return value.
                                     MetaType *return_type = java_function->type();
                                     QString new_return_type = QString(java_function->typeReplaced(0)).replace('$', '.');
-                                    bool has_return_type = new_return_type != "void"
-                                    && (!new_return_type.isEmpty() || return_type);
+                                    bool has_return_type = (new_return_type != "void"
+                                                            && (!new_return_type.isEmpty() || return_type)) || java_function->isSelfReturningFunction();
                                     OwnershipRule ownershipRule = java_function->ownership(java_function->implementingClass(), TS::TargetLangCode, 0);
 
                                     bool has_code_injections_at_the_end = hasCodeInjections(java_function, {CodeSnip::End, CodeSnip::Position4, CodeSnip::Position3});
@@ -6012,7 +6633,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                                                                       || has_argument_referenceCounts || referenceCounts[0].size() > 0 || has_code_injections_at_the_end);
 
                                     s << INDENT;
-                                    if (has_return_type && java_function->argumentReplaced(0).isEmpty()) {
+                                    if (has_return_type && (java_function->argumentReplaced(0).isEmpty() || java_function->argumentReplaced(0)=="this")) {
                                         if (needs_return_variable) {
                                             if (new_return_type.isEmpty())
                                                 s << translateType(return_type, java_function->implementingClass());
@@ -6051,7 +6672,9 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                                                 s << ", ";
                                             needsComma = true;
 
-                                            if(!java_function->typeReplaced(arg->argumentIndex()+1).isEmpty()){
+                                            if(!java_function->typeReplaced(arg->argumentIndex()+1).isEmpty()
+                                                    || java_function->argumentTypeArray(arg->argumentIndex()+1)
+                                                    || java_function->argumentTypeBuffer(arg->argumentIndex()+1)){
                                                 s << arg->modifiedArgumentName();
                                             }else if (type->isTargetLangEnum() || type->isTargetLangFlags()) {
                                                 s << arg->modifiedArgumentName() << ".value()";
@@ -6087,7 +6710,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                                         }
                                     }
 
-                                    if (!java_function->argumentReplaced(0).isEmpty()) {
+                                    if (!java_function->argumentReplaced(0).isEmpty() && java_function->argumentReplaced(0)!="this") {
                                         s << INDENT << "return " << java_function->argumentReplaced(0) << ";" << Qt::endl;
                                     }else{
                                         // Then the return value
@@ -6164,7 +6787,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
                 QTextStream commentStream2(&comment2);
                 for(const QString& signature : privatePureVirtualFunctionSignatures){
                     commentStream2 << Qt::endl
-                                   << "@io.qt.QtPrivateOverride" << Qt::endl
+                                   << "@QtPrivateOverride" << Qt::endl
                                    << signature << " {...}" << Qt::endl;
                 }
                 commentStream2.seek(0);
@@ -6192,6 +6815,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
             }
         }
 
+        m_currentMethodSignatures.swap(previousMethodSignatures);
         s << INDENT << "}" << Qt::endl;
     }
 
@@ -6209,6 +6833,7 @@ void JavaGenerator::write(QTextStream &s, const MetaClass *java_class, int nesti
         s << INDENT << " */" << Qt::endl;
     }
     if(nesting_level==0){
+        m_currentPackages.removeDuplicates();
         m_packagesByTypeSystem[m_database->findTypeSystem(java_class->targetTypeSystem())].append(m_currentPackages);
     }
 
@@ -6222,7 +6847,7 @@ void JavaGenerator::writeIteratorFunctions(QTextStream &s, const MetaClass *java
         QString type = translateType(java_class->templateBaseClassInstantiations().at(0), java_class, BoxedPrimitive);
         s << Qt::endl
           << INDENT << "@Override" << Qt::endl
-          << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+          << INDENT << "@QtUninvokable" << Qt::endl
           << INDENT << "protected " << type << " value(){" << Qt::endl
           << INDENT << "    return _value();" << Qt::endl
           << INDENT << "}" << Qt::endl;
@@ -6231,7 +6856,7 @@ void JavaGenerator::writeIteratorFunctions(QTextStream &s, const MetaClass *java
              QString type = translateType(java_class->templateBaseClassInstantiations().at(0), java_class, BoxedPrimitive);
              s << Qt::endl
                << INDENT << "@Override" << Qt::endl
-               << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+               << INDENT << "@QtUninvokable" << Qt::endl
                << INDENT << "protected " << type << " key(){" << Qt::endl
                << INDENT << "    return _key();" << Qt::endl
                << INDENT << "}" << Qt::endl;
@@ -6240,7 +6865,7 @@ void JavaGenerator::writeIteratorFunctions(QTextStream &s, const MetaClass *java
              QString type = translateType(java_class->templateBaseClassInstantiations().at(1), java_class, BoxedPrimitive);
              s << Qt::endl
                << INDENT << "@Override" << Qt::endl
-               << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+               << INDENT << "@QtUninvokable" << Qt::endl
                << INDENT << "protected " << type << " value(){" << Qt::endl
                << INDENT << "    return _value();" << Qt::endl
                << INDENT << "}" << Qt::endl;
@@ -6255,7 +6880,7 @@ void JavaGenerator::writeCollectionFunctions(QTextStream &s, const MetaClass *ja
             QString primitiveType = java_class->templateBaseClassInstantiations().at(0)->typeEntry()->targetLangName();
             s << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean contains(Object e){" << Qt::endl
               << INDENT << "    return e instanceof " << boxedType << " ? contains((" << primitiveType << ")e) : false;" << Qt::endl
               << INDENT << "}" << Qt::endl
@@ -6264,7 +6889,7 @@ void JavaGenerator::writeCollectionFunctions(QTextStream &s, const MetaClass *ja
             if(boxedType!="java.lang.Object"){
                 s << Qt::endl
                   << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public boolean contains(Object e){" << Qt::endl
                   << INDENT << "    return e instanceof " << boxedType << " ? contains((" << boxedType << ")e) : false;" << Qt::endl
                   << INDENT << "}" << Qt::endl
@@ -6281,7 +6906,7 @@ void JavaGenerator::writeLinkedListFunctions(QTextStream &s, const MetaClass *ja
             QString primitiveType = java_class->templateBaseClassInstantiations().at(0)->typeEntry()->targetLangName();
             s
                 << INDENT << "@Override" << Qt::endl
-                << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                << INDENT << "@QtUninvokable" << Qt::endl
                 << INDENT << "public boolean add(" << boxedType << " e){" << Qt::endl
                 << INDENT << "    if(e!=null){" << Qt::endl
                 << INDENT << "        append((" << primitiveType << ")e);" << Qt::endl
@@ -6291,7 +6916,7 @@ void JavaGenerator::writeLinkedListFunctions(QTextStream &s, const MetaClass *ja
                 << INDENT << "}" << Qt::endl
                 << Qt::endl
                 << INDENT << "@Override" << Qt::endl
-                << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                << INDENT << "@QtUninvokable" << Qt::endl
                 << INDENT << "public boolean remove(Object e){" << Qt::endl
                 << INDENT << "    return e instanceof " << boxedType << " ? removeOne((" << primitiveType << ")e) : false;" << Qt::endl
                 << INDENT << "}" << Qt::endl
@@ -6299,7 +6924,7 @@ void JavaGenerator::writeLinkedListFunctions(QTextStream &s, const MetaClass *ja
         }else{
             s
                 << INDENT << "@Override" << Qt::endl
-                << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                << INDENT << "@QtUninvokable" << Qt::endl
                 << INDENT << "public boolean add(" << boxedType << " e){" << Qt::endl
                 << INDENT << "    if(e!=null){" << Qt::endl
                 << INDENT << "        append(e);" << Qt::endl
@@ -6309,7 +6934,7 @@ void JavaGenerator::writeLinkedListFunctions(QTextStream &s, const MetaClass *ja
                 << INDENT << "}" << Qt::endl
                 << Qt::endl
                 << INDENT << "@Override" << Qt::endl
-                << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                << INDENT << "@QtUninvokable" << Qt::endl
                 << INDENT << "public boolean remove(Object e){" << Qt::endl
                 << INDENT << "    return e instanceof " << boxedType << " ? removeOne((" << boxedType << ")e) : false;" << Qt::endl
                 << INDENT << "}" << Qt::endl
@@ -6326,7 +6951,7 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
             QString primitiveType = java_class->templateBaseClassInstantiations().at(0)->typeEntry()->targetLangName();
             s
                 << INDENT << "@Override" << Qt::endl
-                << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                << INDENT << "@QtUninvokable" << Qt::endl
                 << INDENT << "public boolean add(" << boxedType << " e){" << Qt::endl
                 << INDENT << "    if(e!=null){" << Qt::endl
                 << INDENT << "        append((" << primitiveType << ")e);" << Qt::endl
@@ -6336,20 +6961,20 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
                 << INDENT << "}" << Qt::endl
                 << Qt::endl
                 << INDENT << "@Override" << Qt::endl
-                << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                << INDENT << "@QtUninvokable" << Qt::endl
                 << INDENT << "public boolean remove(Object e){" << Qt::endl
                 << INDENT << "    return e instanceof " << boxedType << " ? removeOne((" << primitiveType << ")e) : false;" << Qt::endl
                 << INDENT << "}" << Qt::endl
                 << Qt::endl
                 << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public void add(int index, " << boxedType << " e){" << Qt::endl
               << INDENT << "    if(e!=null)" << Qt::endl
               << INDENT << "        insert(index, (" << primitiveType << ")e);" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public " << boxedType << " set(int index, " << boxedType << " e){" << Qt::endl
               << INDENT << "    if(e!=null){" << Qt::endl
               << INDENT << "        " << boxedType << " el = get(index);" << Qt::endl
@@ -6359,7 +6984,7 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public int indexOf(Object e){" << Qt::endl
               << INDENT << "    return e instanceof " << boxedType << " ? ";
             if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6,0,0)){
@@ -6370,7 +6995,7 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
             s << "((" << primitiveType << ")e) : -1;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public int lastIndexOf(Object e){" << Qt::endl
               << INDENT << "    return e instanceof " << boxedType << " ? ";
             if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6,0,0)){
@@ -6384,20 +7009,20 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
               << Qt::endl;
         }else{
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean add(" << boxedType << " e){" << Qt::endl
               << INDENT << "    append(e);" << Qt::endl
               << INDENT << "    return true;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public void add(int index, " << boxedType << " e){" << Qt::endl
               << INDENT << "        insert(index, e);" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public " << boxedType << " set(int index, " << boxedType << " e){" << Qt::endl
               << INDENT << "    if(e!=null){" << Qt::endl
               << INDENT << "        " << boxedType << " el = get(index);" << Qt::endl
@@ -6408,13 +7033,13 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
               << Qt::endl;
             if(boxedType!="java.lang.Object"){
                 s << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public boolean remove(Object e){" << Qt::endl
                   << INDENT << "    return e instanceof " << boxedType << " ? removeOne((" << boxedType << ")e) : false;" << Qt::endl
                   << INDENT << "}" << Qt::endl
                   << Qt::endl
                   << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public int indexOf(Object e){" << Qt::endl
                   << INDENT << "    return e instanceof " << boxedType << " ? ";
                 if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6,0,0)){
@@ -6426,7 +7051,7 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
                   << INDENT << "}" << Qt::endl
                   << Qt::endl
                   << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public int lastIndexOf(Object e){" << Qt::endl
                   << INDENT << "    return e instanceof " << boxedType << " ? ";
                 if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6,0,0)){
@@ -6443,7 +7068,7 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
                   << INDENT << "}" << Qt::endl
                   << Qt::endl
                   << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public int lastIndexOf(Object e){" << Qt::endl
                   << INDENT << "    return (int)lastLongIndexOf(e);" << Qt::endl
                   << INDENT << "}" << Qt::endl
@@ -6452,14 +7077,14 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
         }
         s << Qt::endl
           << INDENT << "@Override" << Qt::endl
-          << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+          << INDENT << "@QtUninvokable" << Qt::endl
           << INDENT << "public " << boxedType << " get(int index) {" << Qt::endl
           << INDENT << "    return at(index);" << Qt::endl
           << INDENT << "}" << Qt::endl
           << Qt::endl;
         if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6,0,0)){
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public final int size(){" << Qt::endl
               << INDENT << "    long size = longSize();" << Qt::endl
               << INDENT << "    if(size>Integer.MAX_VALUE)" << Qt::endl
@@ -6468,7 +7093,7 @@ void JavaGenerator::writeAbstractListFunctions(QTextStream &s, const MetaClass *
               << INDENT << "}" << Qt::endl
               << Qt::endl;
         }
-        s << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+        s << INDENT << "@QtUninvokable" << Qt::endl
           << INDENT << "protected final void removeAtIndex(int cursor){" << Qt::endl
           << INDENT << "    removeAt(cursor);" << Qt::endl
           << INDENT << "}" << Qt::endl
@@ -6484,7 +7109,7 @@ void JavaGenerator::writeQueueFunctions(QTextStream &s, const MetaClass *java_cl
             QString primitiveType = java_class->templateBaseClassInstantiations().at(0)->typeEntry()->targetLangName();
             s << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public void enqueue(" << boxedType << " e){" << Qt::endl
               << INDENT << "    if(e!=null)" << Qt::endl
               << INDENT << "        enqueue((" << primitiveType << ")e);" << Qt::endl
@@ -6494,13 +7119,13 @@ void JavaGenerator::writeQueueFunctions(QTextStream &s, const MetaClass *java_cl
         }
         s << Qt::endl
           << INDENT << "@Override" << Qt::endl
-          << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+          << INDENT << "@QtUninvokable" << Qt::endl
           << INDENT << "public " << boxedType << " peek() {" << Qt::endl
           << INDENT << "    return head();" << Qt::endl
           << INDENT << "}" << Qt::endl
           << Qt::endl
           << INDENT << "@Override" << Qt::endl
-          << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+          << INDENT << "@QtUninvokable" << Qt::endl
           << INDENT << "public " << boxedType << " poll() {" << Qt::endl
           << INDENT << "    return dequeue();" << Qt::endl
           << INDENT << "}" << Qt::endl
@@ -6519,7 +7144,7 @@ void JavaGenerator::writeSetFunctions(QTextStream &s, const MetaClass *java_clas
         if(java_class->templateBaseClassInstantiations().at(0)->typeEntry()->isPrimitive()){
             QString primitiveType = java_class->templateBaseClassInstantiations().at(0)->typeEntry()->targetLangName();
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean add(" << boxedType << " e){" << Qt::endl
               << INDENT << "    if(e!=null){" << Qt::endl
               << INDENT << "        insert((" << primitiveType << ")e);" << Qt::endl
@@ -6529,14 +7154,14 @@ void JavaGenerator::writeSetFunctions(QTextStream &s, const MetaClass *java_clas
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean remove(Object e){" << Qt::endl
               << INDENT << "    return e instanceof " << boxedType << " ? remove((" << primitiveType << ")e) : false;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl;
         }else{
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean add(" << boxedType << " e){" << Qt::endl
               << INDENT << "    insert(e);" << Qt::endl
               << INDENT << "    return true;" << Qt::endl
@@ -6544,7 +7169,7 @@ void JavaGenerator::writeSetFunctions(QTextStream &s, const MetaClass *java_clas
               << Qt::endl;
             if(boxedType!="java.lang.Object"){
                 s << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public boolean remove(Object e){" << Qt::endl
                   << INDENT << "    return e instanceof " << boxedType << " ? remove((" << boxedType << ")e) : false;" << Qt::endl
                   << INDENT << "}" << Qt::endl
@@ -6565,13 +7190,13 @@ void JavaGenerator::writeStackFunctions(QTextStream &s, const MetaClass *java_cl
         if(java_class->templateBaseClassInstantiations().at(0)->typeEntry()->isPrimitive()){
             QString primitiveType = java_class->templateBaseClassInstantiations().at(0)->typeEntry()->targetLangName();
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public " << boxedType << " pop(){" << Qt::endl
               << INDENT << "    return _pop();" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public void push(" << boxedType << " e){" << Qt::endl
               << INDENT << "    if(e!=null)" << Qt::endl
               << INDENT << "        push((" << primitiveType << ")e);" << Qt::endl
@@ -6581,13 +7206,13 @@ void JavaGenerator::writeStackFunctions(QTextStream &s, const MetaClass *java_cl
         }
         s << Qt::endl
           << INDENT << "@Override" << Qt::endl
-          << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+          << INDENT << "@QtUninvokable" << Qt::endl
           << INDENT << "public " << boxedType << " peekLast(){" << Qt::endl
           << INDENT << "    return last();" << Qt::endl
           << INDENT << "}" << Qt::endl
           << Qt::endl
           << INDENT << "@Override" << Qt::endl
-          << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+          << INDENT << "@QtUninvokable" << Qt::endl
           << INDENT << "public " << boxedType << " peekFirst(){" << Qt::endl
           << INDENT << "    return first();" << Qt::endl
           << INDENT << "}" << Qt::endl
@@ -6609,27 +7234,27 @@ void JavaGenerator::writeMapFunctions(QTextStream &s, const MetaClass *java_clas
             QString primitiveKeyType = java_class->templateBaseClassInstantiations().at(0)->typeEntry()->targetLangName();
             s << INDENT << "private static native boolean lessThan(" << primitiveKeyType << " key1, " << primitiveKeyType << " key2);" << Qt::endl
               << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public final " << boxedKeyType << " firstKey(){" << Qt::endl
               << INDENT << "    return _firstKey();" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public final " << boxedKeyType << " lastKey(){" << Qt::endl
               << INDENT << "    return _lastKey();" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "protected final io.qt.core.QAssociativeConstIterator<" << boxedKeyType << ", " << boxedValueType << "> find(" << boxedKeyType << " key){" << Qt::endl
               << INDENT << "    return find((" << primitiveKeyType << ")key);" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
-            << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+            << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "protected final io.qt.core.QAssociativeConstIterator<" << boxedKeyType << ", " << boxedValueType << "> lowerBound(" << boxedKeyType << " key){" << Qt::endl
               << INDENT << "    return lowerBound((" << primitiveKeyType << ")key);" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "protected final io.qt.core.QAssociativeConstIterator<" << boxedKeyType << ", " << boxedValueType << "> upperBound(" << boxedKeyType << " key){" << Qt::endl
               << INDENT << "    return upperBound((" << primitiveKeyType << ")key);" << Qt::endl
               << INDENT << "}" << Qt::endl
@@ -6663,27 +7288,27 @@ void JavaGenerator::writeMultiMapFunctions(QTextStream &s, const MetaClass *java
             QString boxedValueType = translateType(java_class->templateBaseClassInstantiations().at(1), java_class, BoxedPrimitive);
             s << INDENT << "private static native boolean lessThan(" << primitiveKeyType << " key1, " << primitiveKeyType << " key2);" << Qt::endl
               << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public final " << boxedKeyType << " firstKey(){" << Qt::endl
               << INDENT << "    return _firstKey();" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public final " << boxedKeyType << " lastKey(){" << Qt::endl
               << INDENT << "    return _lastKey();" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "protected final io.qt.core.QAssociativeConstIterator<" << boxedKeyType << ", " << boxedValueType << "> find(" << boxedKeyType << " key){" << Qt::endl
               << INDENT << "    return find((" << primitiveKeyType << ")key);" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
-            << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+            << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "protected final io.qt.core.QAssociativeConstIterator<" << boxedKeyType << ", " << boxedValueType << "> lowerBound(" << boxedKeyType << " key){" << Qt::endl
               << INDENT << "    return lowerBound((" << primitiveKeyType << ")key);" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "protected final io.qt.core.QAssociativeConstIterator<" << boxedKeyType << ", " << boxedValueType << "> upperBound(" << boxedKeyType << " key){" << Qt::endl
               << INDENT << "    return upperBound((" << primitiveKeyType << ")key);" << Qt::endl
               << INDENT << "}" << Qt::endl
@@ -6703,19 +7328,19 @@ void JavaGenerator::writeAbstractMapFunctions(QTextStream &s, const MetaClass *j
         if(java_class->templateBaseClassInstantiations().at(0)->isPrimitive()){
             QString primitiveKeyType = java_class->templateBaseClassInstantiations().at(0)->typeEntry()->targetLangName();
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean containsKey(Object key){" << Qt::endl
               << INDENT << "    return key instanceof " << boxedKeyType << " ? contains((" << primitiveKeyType << ")key) : false;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public " << boxedValueType << " get(Object key){" << Qt::endl
               << INDENT << "    return key instanceof " << boxedKeyType << " ? value((" << primitiveKeyType << ")key) : null;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public " << boxedValueType << " put(" << boxedKeyType << " key, " << boxedValueType << " value){" << Qt::endl
               << INDENT << "    if(key!=null){" << Qt::endl
               << INDENT << "        " << boxedValueType << " old = value((" << primitiveKeyType << ")key);" << Qt::endl
@@ -6725,7 +7350,7 @@ void JavaGenerator::writeAbstractMapFunctions(QTextStream &s, const MetaClass *j
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public " << boxedValueType << " remove(Object key){" << Qt::endl
               << INDENT << "    if(key instanceof " << boxedKeyType << ")" << Qt::endl
               << INDENT << "        return take((" << primitiveKeyType << ")key);" << Qt::endl
@@ -6735,14 +7360,14 @@ void JavaGenerator::writeAbstractMapFunctions(QTextStream &s, const MetaClass *j
             if(java_class->templateBaseClassInstantiations().at(1)->isPrimitive()){
                 QString primitiveValueType = java_class->templateBaseClassInstantiations().at(1)->typeEntry()->targetLangName();
                 s << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public boolean containsValue(Object value){" << Qt::endl
                   << INDENT << "    return value instanceof " << boxedValueType << " ? keys((" << primitiveValueType << ")value).isEmpty() : false;" << Qt::endl
                   << INDENT << "}" << Qt::endl
                   << Qt::endl;
             }else{
                 s << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public boolean containsValue(Object value){" << Qt::endl
                   << INDENT << "    return value instanceof " << boxedValueType << " ? keys((" << boxedValueType << ")value).isEmpty() : false;" << Qt::endl
                   << INDENT << "}" << Qt::endl
@@ -6750,19 +7375,19 @@ void JavaGenerator::writeAbstractMapFunctions(QTextStream &s, const MetaClass *j
             }
         }else{
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean containsKey(Object key){" << Qt::endl
               << INDENT << "    return key instanceof " << boxedKeyType << " || key==null ? contains((" << boxedKeyType << ")key) : false;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public " << boxedValueType << " get(Object key){" << Qt::endl
               << INDENT << "    return key instanceof " << boxedKeyType << " ? value((" << boxedKeyType << ")key) : null;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public " << boxedValueType << " put(" << boxedKeyType << " key, " << boxedValueType << " value){" << Qt::endl
               << INDENT << "    " << boxedValueType << " old = value(key);" << Qt::endl
               << INDENT << "    insert(key, value);" << Qt::endl
@@ -6770,7 +7395,7 @@ void JavaGenerator::writeAbstractMapFunctions(QTextStream &s, const MetaClass *j
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public " << boxedValueType << " remove(Object key){" << Qt::endl
               << INDENT << "    if(key instanceof " << boxedKeyType << " || key==null)" << Qt::endl
               << INDENT << "        return take((" << boxedKeyType << ")key);" << Qt::endl
@@ -6780,14 +7405,14 @@ void JavaGenerator::writeAbstractMapFunctions(QTextStream &s, const MetaClass *j
             if(java_class->templateBaseClassInstantiations().at(1)->isPrimitive()){
                 QString primitiveValueType = java_class->templateBaseClassInstantiations().at(1)->typeEntry()->targetLangName();
                 s << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public boolean containsValue(Object value){" << Qt::endl
                   << INDENT << "    return value instanceof " << boxedValueType << " ? keys((" << primitiveValueType << ")value).isEmpty() : false;" << Qt::endl
                   << INDENT << "}" << Qt::endl
                   << Qt::endl;
             }else{
                 s << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "public boolean containsValue(Object value){" << Qt::endl
                   << INDENT << "    return value instanceof " << boxedValueType << " ? keys((" << boxedValueType << ")value).isEmpty() : false;" << Qt::endl
                   << INDENT << "}" << Qt::endl
@@ -6796,7 +7421,7 @@ void JavaGenerator::writeAbstractMapFunctions(QTextStream &s, const MetaClass *j
         }
         if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6,0,0)){
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public final int size(){" << Qt::endl
               << INDENT << "    long size = longSize();" << Qt::endl
               << INDENT << "    if(size>Integer.MAX_VALUE)" << Qt::endl
@@ -6813,7 +7438,7 @@ void JavaGenerator::writeAbstractMultiMapFunctions(QTextStream &s, const MetaCla
         QString boxedKeyType = translateType(java_class->templateBaseClassInstantiations().at(0), java_class, BoxedPrimitive);
         QString boxedValueType = translateType(java_class->templateBaseClassInstantiations().at(1), java_class, BoxedPrimitive);
         s << INDENT << "@Override" << Qt::endl
-          << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+          << INDENT << "@QtUninvokable" << Qt::endl
           << INDENT << "public java.util.Collection<java.util.List<" << boxedValueType << ">> values() {" << Qt::endl
           << INDENT << "    java.util.List<java.util.List<" << boxedValueType << ">> result = new java.util.ArrayList<>();" << Qt::endl
           << INDENT << "    for(" << boxedKeyType << " key : keys()) {" << Qt::endl
@@ -6825,19 +7450,19 @@ void JavaGenerator::writeAbstractMultiMapFunctions(QTextStream &s, const MetaCla
         if(java_class->templateBaseClassInstantiations().at(0)->isPrimitive()){
             QString primitiveKeyType = java_class->templateBaseClassInstantiations().at(0)->typeEntry()->targetLangName();
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean containsKey(Object key){" << Qt::endl
               << INDENT << "    return key instanceof " << boxedKeyType << " ? contains((" << primitiveKeyType << ")key) : false;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public java.util.List<" << boxedValueType << "> get(Object key){" << Qt::endl
               << INDENT << "    return key instanceof " << boxedKeyType << " ? values((" << primitiveKeyType << ")key) : null;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public java.util.List<" << boxedValueType << "> put(" << boxedKeyType << " key, java.util.List<" << boxedValueType << "> values){" << Qt::endl
               << INDENT << "    if(key!=null){" << Qt::endl
               << INDENT << "        java.util.List<" << boxedValueType << "> old = values((" << primitiveKeyType << ")key);" << Qt::endl
@@ -6848,7 +7473,7 @@ void JavaGenerator::writeAbstractMultiMapFunctions(QTextStream &s, const MetaCla
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public java.util.List<" << boxedValueType << "> remove(Object key){" << Qt::endl
               << INDENT << "    if(key instanceof " << boxedKeyType << "){" << Qt::endl
               << INDENT << "        java.util.List<" << boxedValueType << "> old = values((" << primitiveKeyType << ")key);" << Qt::endl
@@ -6861,14 +7486,14 @@ void JavaGenerator::writeAbstractMultiMapFunctions(QTextStream &s, const MetaCla
                 if(java_class->templateBaseClassInstantiations().at(1)->isPrimitive()){
                     QString primitiveValueType = java_class->templateBaseClassInstantiations().at(1)->typeEntry()->targetLangName();
                     s << INDENT << "@Override" << Qt::endl
-                      << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                      << INDENT << "@QtUninvokable" << Qt::endl
                       << INDENT << "public boolean containsValue(Object value){" << Qt::endl
                       << INDENT << "    return value instanceof " << boxedValueType << " ? keys((" << primitiveValueType << ")value).isEmpty() : false;" << Qt::endl
                       << INDENT << "}" << Qt::endl
                       << Qt::endl;
                 }else{
                     s << INDENT << "@Override" << Qt::endl
-                      << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                      << INDENT << "@QtUninvokable" << Qt::endl
                       << INDENT << "public boolean containsValue(Object value){" << Qt::endl
                       << INDENT << "    return value instanceof " << boxedValueType << " ? keys((" << boxedValueType << ")value).isEmpty() : false;" << Qt::endl
                       << INDENT << "}" << Qt::endl
@@ -6877,19 +7502,19 @@ void JavaGenerator::writeAbstractMultiMapFunctions(QTextStream &s, const MetaCla
             }
         }else{
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean containsKey(Object key){" << Qt::endl
               << INDENT << "    return key instanceof " << boxedKeyType << " || key==null ? contains((" << boxedKeyType << ")key) : false;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public java.util.List<" << boxedValueType << "> get(Object key){" << Qt::endl
               << INDENT << "    return key instanceof " << boxedKeyType << " ? values((" << boxedKeyType << ")key) : null;" << Qt::endl
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public java.util.List<" << boxedValueType << "> put(" << boxedKeyType << " key, java.util.List<" << boxedValueType << "> values){" << Qt::endl
               << INDENT << "    java.util.List<" << boxedValueType << "> old = values(key);" << Qt::endl
               << INDENT << "    for(" << boxedValueType << " value : values)" << Qt::endl
@@ -6898,7 +7523,7 @@ void JavaGenerator::writeAbstractMultiMapFunctions(QTextStream &s, const MetaCla
               << INDENT << "}" << Qt::endl
               << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public java.util.List<" << boxedValueType << "> remove(Object key){" << Qt::endl
               << INDENT << "    if(key instanceof " << boxedKeyType << " || key==null){" << Qt::endl
               << INDENT << "        java.util.List<" << boxedValueType << "> old = values((" << boxedKeyType << ")key);" << Qt::endl
@@ -6911,14 +7536,14 @@ void JavaGenerator::writeAbstractMultiMapFunctions(QTextStream &s, const MetaCla
                 if(java_class->templateBaseClassInstantiations().at(1)->isPrimitive()){
                     QString primitiveValueType = java_class->templateBaseClassInstantiations().at(1)->typeEntry()->targetLangName();
                     s << INDENT << "@Override" << Qt::endl
-                      << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                      << INDENT << "@QtUninvokable" << Qt::endl
                       << INDENT << "public boolean containsValue(Object value){" << Qt::endl
                       << INDENT << "    return value instanceof " << boxedValueType << " ? keys((" << primitiveValueType << ")value).isEmpty() : false;" << Qt::endl
                       << INDENT << "}" << Qt::endl
                       << Qt::endl;
                 }else{
                     s << INDENT << "@Override" << Qt::endl
-                      << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                      << INDENT << "@QtUninvokable" << Qt::endl
                       << INDENT << "public boolean containsValue(Object value){" << Qt::endl
                       << INDENT << "    return value instanceof " << boxedValueType << " ? keys((" << boxedValueType << ")value).isEmpty() : false;" << Qt::endl
                       << INDENT << "}" << Qt::endl
@@ -6928,7 +7553,7 @@ void JavaGenerator::writeAbstractMultiMapFunctions(QTextStream &s, const MetaCla
         }
         if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6,0,0)){
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public boolean containsValue(Object value){" << Qt::endl
               << INDENT << "    if(value instanceof " << boxedValueType << "){" << Qt::endl
               << INDENT << "        for(" << boxedKeyType << " key : keys()) {" << Qt::endl
@@ -6940,7 +7565,7 @@ void JavaGenerator::writeAbstractMultiMapFunctions(QTextStream &s, const MetaCla
               << INDENT << "}" << Qt::endl
               << Qt::endl;
             s << INDENT << "@Override" << Qt::endl
-              << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+              << INDENT << "@QtUninvokable" << Qt::endl
               << INDENT << "public final int size(){" << Qt::endl
               << INDENT << "    long size = longSize();" << Qt::endl
               << INDENT << "    if(size>Integer.MAX_VALUE)" << Qt::endl
@@ -6972,7 +7597,7 @@ void JavaGenerator::generate() {
                     if(TypeSystemTypeEntry * relatedTypeSystem = m_typeSystemByPackage[pkg]){
                         if(typeSystemEntry->module()!=relatedTypeSystem->module() && !relatedTypeSystem->qtLibrary().isEmpty()){
                             if(relatedTypeSystem->requiredTypeSystems().contains(typeSystemEntry))
-                                TypesystemException::raise(QString("Cyclic dependency detected between modules %1 and %2.").arg(typeSystemEntry->module(), relatedTypeSystem->module()));
+                                ReportHandler::warning(QString("Cyclic dependency detected between modules %1 and %2.").arg(typeSystemEntry->module(), relatedTypeSystem->module()));
                             typeSystemEntry->addRequiredTypeSystem(relatedTypeSystem);
                         }
                     }
@@ -7038,8 +7663,8 @@ void JavaGenerator::generate() {
             }
 
             s << "Number of public or protected functions that return a " <<
-            "non-QObject object type, or that are virtual and take " <<
-            "a non-QObject object type argument: " <<
+            "non-QObject pointer/reference, or that are virtual and take " <<
+            "a non-QObject pointer/reference argument: " <<
             resettable_object_functions.size() << Qt::endl;
             for(const MetaFunction *f : resettable_object_functions) {
                 s << f->implementingClass()->qualifiedCppName() << " :: " << f->minimalSignature();
@@ -7125,7 +7750,7 @@ void JavaGenerator::generate() {
             s << "The following functions are inconsistent (virtual but declared final in java) ("
             << m_inconsistent_functions.size() << " functions) : " << Qt::endl;
 
-            for(const MetaFunction *f : m_inconsistent_functions) {
+            for(const MetaFunction *f : qAsConst(m_inconsistent_functions)) {
                 if(!f->isFinalInCpp()){
                     s << "virtual ";
                 }
@@ -7160,7 +7785,8 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
                 cpy->setIndirections(indirections);
             }
             MetaBuilder::decideUsagePattern(cpy.get());
-            modified_type = translateType(cpy.get(), java_function->implementingClass(), Option(options & ~UseNativeIds)).replace('$', '.')+"[]";
+            modified_type = translateType(cpy.get(), java_function->implementingClass(), Option(options & ~UseNativeIds)).replace('$', '.');
+            modified_type += "[]";
         }else if(java_function->type() && java_function->argumentTypeBuffer(0)){
             QScopedPointer<MetaType> cpy(java_function->type()->copy());
             cpy->setConstant(false);
@@ -7171,7 +7797,7 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
                 cpy->setIndirections(indirections);
             }
             MetaBuilder::decideUsagePattern(cpy.get());
-            modified_type = translateType(cpy.get(), java_function->implementingClass(), Option(options & ~UseNativeIds)).replace('$', '.');
+            modified_type = translateType(cpy.get(), java_function->implementingClass(), Option((options & ~UseNativeIds) | NoNullness));
             if(modified_type=="int"){
                 modified_type = "java.nio.IntBuffer";
             }else if(modified_type=="byte"){
@@ -7191,7 +7817,7 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
             }
         }else{
             modified_type = java_function->typeReplaced(0);
-            if(modified_type.isEmpty() && java_function->argumentReplaced(0)=="this"){
+            if(modified_type.isEmpty() && java_function->isSelfReturningFunction()){
                 Q_ASSERT(java_function->ownerClass());
                 modified_type = java_function->ownerClass()->typeEntry()->targetLangName();
             }
@@ -7202,8 +7828,55 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
             }
             returnType = translateType(java_function->type(), java_function->implementingClass(), Option(options | InitializerListAsArray));
         }else{
+            modified_type.replace('$', '.');
             registerPackage(modified_type);
-            returnType = modified_type.replace('$', '.');
+            if (!(options & NoNullness) && modified_type!="void") {
+                bool np = false;
+                if((np = java_function->nullPointersDisabled(java_function->declaringClass(), 0))
+                        || java_function->isSelfReturningFunction()){
+                    QString ann = np ? QString("@StrictNonNull") : QString("@NonNull");
+                    if(modified_type.endsWith("[]")){
+                        modified_type = modified_type.mid(0, modified_type.length()-2) + " " + ann + "[]";
+                    }else {
+                        auto idx = modified_type.indexOf('<');
+                        QString package;
+                        QString typeName = modified_type;
+                        if(idx>0){
+                            typeName = modified_type.mid(0, idx);
+                        }
+                        idx = typeName.lastIndexOf('.');
+                        if(idx>0){
+                            typeName = modified_type.mid(idx+1);
+                            package = modified_type.mid(0, idx+1);
+                            modified_type = package + ann + " " + typeName;
+                        }else{
+                            modified_type = ann + " " + modified_type;
+                        }
+                    }
+                }else if(modified_type=="java.lang.String" || modified_type=="String"){
+                    if(java_function->type()
+                            && java_function->type()->typeEntry()->qualifiedCppName()=="char"
+                            && java_function->type()->indirections().size()==1
+                            && !java_function->hasConversionRule(TS::Language::NativeCode, 0)){
+                        auto idx = modified_type.indexOf('<');
+                        QString package;
+                        QString typeName = modified_type;
+                        if(idx>0){
+                            typeName = modified_type.mid(0, idx);
+                        }
+                        idx = typeName.lastIndexOf('.');
+                        QString ann = QString("@Nullable ");
+                        if(idx>0){
+                            typeName = modified_type.mid(idx+1);
+                            package = modified_type.mid(0, idx+1);
+                            modified_type = package + ann + typeName;
+                        }else{
+                            modified_type = ann + modified_type;
+                        }
+                    }
+                }
+            }
+            returnType = modified_type;
         }
     }
 
@@ -7223,6 +7896,46 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
 
         // Does the function need to be considered for resetting the Java objects after use?
         bool resettableObject = false;
+        if(java_function->type()
+                && !java_function->isSelfReturningFunction()
+                && !java_function->argumentTypeArray(0)
+                && !java_function->argumentTypeBuffer(0)
+                && java_function->typeReplaced(0).isEmpty()
+                && java_function->ownership(java_function->declaringClass(),
+                                            TS::ShellCode, 0).ownership==TS::InvalidOwnership
+                && java_function->ownership(java_function->declaringClass(),
+                                            TS::NativeCode, 0).ownership==TS::InvalidOwnership
+                && java_function->ownership(java_function->declaringClass(),
+                                            TS::TargetLangCode, 0).ownership==TS::InvalidOwnership
+                && java_function->ownership(java_function->declaringClass(),
+                                            TS::NoLanguage, 0).ownership==TS::InvalidOwnership
+                && !java_function->resetObjectAfterUse(0)
+                && !java_function->hasConversionRule(TS::ShellCode, 0)
+                && !java_function->hasConversionRule(TS::NativeCode, 0)
+                && !m_factory_functions.contains(java_function)
+                && !java_function->type()->typeEntry()->isQMetaObjectType()
+                && (
+                       (java_function->type()->isObject()
+                         && java_function->type()->getReferenceType()==MetaType::Reference
+                         && (java_function->type()->typeEntry()->isObject() || !java_function->type()->isConstant()))
+                    || (java_function->type()->isValue()
+                         && !java_function->type()->isConstant()
+                         && java_function->type()->getReferenceType()==MetaType::Reference)
+                    || (java_function->type()->typeEntry()->isValue()
+                         && !java_function->type()->isConstant()
+                         && java_function->type()->getReferenceType()==MetaType::Reference)
+                    || (java_function->type()->typeEntry()->isContainer()
+                         && !java_function->type()->isConstant()
+                         && java_function->type()->getReferenceType()==MetaType::Reference)
+                    || (java_function->type()->isQVariant()
+                         && !java_function->type()->isConstant()
+                         && java_function->type()->actualIndirections()>0)
+                    || (java_function->type()->isJavaString()
+                         && !java_function->type()->isConstant()
+                         && java_function->type()->actualIndirections()>0)
+                    )){
+            resettableObject = true;
+        }
 
         if (!nativePointer && java_function->type() && !java_function->type()->isPointerContainer()) {
             for(const MetaType *type : java_function->type()->instantiations()) {
@@ -7246,12 +7959,32 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
                         if (resettableObject) break ;
 
                     } else if (!java_function->isFinalInTargetLang()
-                               && argument->type()->isObject()
+                               && ((argument->type()->isObject() && (argument->type()->typeEntry()->isObject() || !argument->type()->isConstant()))
+                                   || (argument->type()->isValue()
+                                        && !argument->type()->isConstant()
+                                        && argument->type()->actualIndirections()>0)
+                                   || (argument->type()->isContainer()
+                                        && !argument->type()->isConstant()
+                                        && argument->type()->actualIndirections()>0)
+                                   || (argument->type()->isQVariant()
+                                        && !argument->type()->isConstant()
+                                        && argument->type()->actualIndirections()>0)
+                                   || (argument->type()->isJavaString()
+                                        && !argument->type()->isConstant()
+                                        && argument->type()->actualIndirections()>0)
+                                   )
                                && !argument->type()->isQObject()
                                && !java_function->resetObjectAfterUse(argument->argumentIndex() + 1)
+                               && !java_function->hasConversionRule(TS::NativeCode, 0)
+                               && !java_function->hasConversionRule(TS::ShellCode, 0)
+                               && java_function->ownership(java_function->declaringClass(),
+                                        TS::ShellCode, argument->argumentIndex() + 1).ownership == TS::InvalidOwnership
                                && java_function->ownership(java_function->declaringClass(),
-                                        TS::ShellCode, argument->argumentIndex() + 1).ownership ==
-                                            TS::InvalidOwnership) {
+                                        TS::NativeCode, argument->argumentIndex() + 1).ownership == TS::InvalidOwnership
+                               && java_function->ownership(java_function->declaringClass(),
+                                        TS::TargetLangCode, argument->argumentIndex() + 1).ownership == TS::InvalidOwnership
+                               && java_function->ownership(java_function->declaringClass(),
+                                        TS::NoLanguage, argument->argumentIndex() + 1).ownership == TS::InvalidOwnership) {
                         resettableObject = true;
                         if (nativePointer) break ;
 
@@ -7314,7 +8047,7 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
             QString strg;
             QTextStream s(&strg);
             writeFunctionArguments(s, java_function, arg_count, options);
-            for(const QString& pkg : m_exportedPackages){
+            for(const QString& pkg : qAsConst(m_exportedPackages)){
                 if(pkg!=java_function->implementingClass()->package()
                         && !pkg.isEmpty()
                         && m_typeSystemByPackage[pkg]
@@ -7342,7 +8075,7 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
 
         const QPropertySpec *spec = java_function->propertySpec();
         if (spec && java_function->isPropertyNotify()) {
-            s << "    @io.qt.QtPropertyNotify(name=\"" << spec->name() << "\")" << Qt::endl;
+            s << "    @QtPropertyNotify(name=\"" << spec->name() << "\")" << Qt::endl;
         }
         if (!(options & InitializerListAsArray) && java_function->arguments().size()>0) {
             QString typeReplaced = java_function->typeReplaced(java_function->arguments().size());
@@ -7364,7 +8097,7 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
                 && !java_function->isSignal()
                 && !java_function->isStatic()
                 && java_function->isFinalInCpp() && (excluded_attributes & MetaAttributes::FinalInTargetLang)==MetaAttributes::FinalInTargetLang){
-            s << INDENT << "@io.qt.QtDeclaredFinal" << Qt::endl;
+            s << INDENT << "@QtDeclaredFinal" << Qt::endl;
         }
 
         if (!(attr & NoBlockedSlot)
@@ -7375,7 +8108,7 @@ void JavaGenerator::writeFunctionAttributes(QTextStream &s, const MetaFunction *
                 && !java_function->isSignal()
                 && !java_function->isStatic()
                 && !(included_attributes & MetaAttributes::Static))
-            s << INDENT << "@io.qt.QtUninvokable" << Qt::endl;
+            s << INDENT << "@QtUninvokable" << Qt::endl;
         s << INDENT;
         if (attr & MetaAttributes::Static && java_function->ownerClass()->typeEntry()->designatedInterface()) s << "private ";
         else if (attr & MetaAttributes::Public) s << "public ";
@@ -7478,7 +8211,18 @@ void JavaGenerator::writeFunctionArguments(QTextStream &s, const MetaFunction *j
         if(commaRequired)
             s << ", ";
         commaRequired = true;
-        s << QString(mod.modified_type).replace('$', '.') << " " << mod.modified_name;
+        QString argType = QString(mod.modified_type).replace('$', '.');
+        if((options & SkipTemplateParameters) && argType.contains("<")){
+            auto idx = argType.indexOf('<');
+            argType = argType.mid(0, idx);
+        }
+        if((options & InitializerListAsArray) && argType.endsWith("...")){
+            argType = argType.replace("...", "[]");
+        }
+        s << argType;
+        if ((options & SkipName) == 0) {
+            s << " " << mod.modified_name;
+        }
         ++argumentCounter;
     }
     for (int i = 0; i < argument_count; ++i) {
@@ -7486,7 +8230,7 @@ void JavaGenerator::writeFunctionArguments(QTextStream &s, const MetaFunction *j
         if (java_function->argumentRemoved(arg->argumentIndex() + 1)==ArgumentRemove_No) {
             if (commaRequired)
                 s << ", ";
-            writeArgument(s, java_function, arg, Option(options | CollectionAsCollection));
+            writeFunctionArgument(s, java_function, arg, Option(options | CollectionAsCollection));
             commaRequired = true;
         }
         ++argumentCounter;
@@ -7495,7 +8239,18 @@ void JavaGenerator::writeFunctionArguments(QTextStream &s, const MetaFunction *j
             if(commaRequired)
                 s << ", ";
             commaRequired = true;
-            s << QString(mod.modified_type).replace('$', '.') << " " << mod.modified_name;
+            QString argType = QString(mod.modified_type).replace('$', '.');
+            if((options & SkipTemplateParameters) && argType.contains("<")){
+                auto idx = argType.indexOf('<');
+                argType = argType.mid(0, idx);
+            }
+            if((options & InitializerListAsArray) && argType.endsWith("...")){
+                argType = argType.replace("...", "[]");
+            }
+            s << argType;
+            if ((options & SkipName) == 0) {
+                s << " " << mod.modified_name;
+            }
             ++argumentCounter;
         }
     }
@@ -7503,7 +8258,18 @@ void JavaGenerator::writeFunctionArguments(QTextStream &s, const MetaFunction *j
         if(commaRequired)
             s << ", ";
         commaRequired = true;
-        s << QString(argumentMod.modified_type).replace('$', '.') << " " << argumentMod.modified_name;
+        QString argType = QString(argumentMod.modified_type).replace('$', '.');
+        if((options & SkipTemplateParameters) && argType.contains("<")){
+            auto idx = argType.indexOf('<');
+            argType = argType.mid(0, idx);
+        }
+        if((options & InitializerListAsArray) && argType.endsWith("...")){
+            argType = argType.replace("...", "[]");
+        }
+        s << argType;
+        if ((options & SkipName) == 0) {
+            s << " " << argumentMod.modified_name;
+        }
     }
 }
 
@@ -7571,10 +8337,11 @@ void JavaGenerator::writeToStringFunction(QTextStream &s, const MetaClass *java_
                 lines << codeSnip.code().split("\n");
             }
         }
+        QString nonNull = m_nullness ? QStringLiteral("@NonNull ") : QString{};
         if (qevent && core) {
             s << Qt::endl
               << INDENT << "@Override" << Qt::endl
-              << INDENT << "public String toString() {" << Qt::endl;
+              << INDENT << "public " << nonNull << "String toString() {" << Qt::endl;
             if(!lines.isEmpty()){
                 printExtraCode(lines, s);
             }
@@ -7583,9 +8350,9 @@ void JavaGenerator::writeToStringFunction(QTextStream &s, const MetaClass *java_
         } else {
             if(lines.isEmpty() && !java_class->typeEntry()->isNativeIdBased() && !java_class->typeEntry()->designatedInterface()){
                 s << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "@Override" << Qt::endl
-                  << INDENT << "public native String toString();" << Qt::endl;
+                  << INDENT << "public native " << nonNull << "String toString();" << Qt::endl;
             }else{
                 QString name = java_class->name();
                 if(java_class->typeEntry() && java_class->typeEntry()->designatedInterface()){
@@ -7593,8 +8360,8 @@ void JavaGenerator::writeToStringFunction(QTextStream &s, const MetaClass *java_
                 }
                 s << Qt::endl
                   << INDENT << "@Override" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
-                  << INDENT << "public String toString() {" << Qt::endl;
+                  << INDENT << "@QtUninvokable" << Qt::endl
+                  << INDENT << "public " << nonNull << "String toString() {" << Qt::endl;
                 if(!lines.isEmpty()){
                     printExtraCode(lines, s);
                 }
@@ -7606,7 +8373,7 @@ void JavaGenerator::writeToStringFunction(QTextStream &s, const MetaClass *java_
                 }
                 s << ");" << Qt::endl
                   << INDENT << "}" << Qt::endl
-                  << INDENT << "@io.qt.QtUninvokable" << Qt::endl
+                  << INDENT << "@QtUninvokable" << Qt::endl
                   << INDENT << "private ";
                 if(java_class->typeEntry()->isNativeIdBased() || java_class->typeEntry()->designatedInterface())
                     s << "static ";
@@ -7624,6 +8391,7 @@ void JavaGenerator::writeToStringFunction(QTextStream &s, const MetaClass *java_
 
 void JavaGenerator::writeCloneFunction(QTextStream &s, const MetaClass *java_class) {
     s << INDENT << Qt::endl
+      << INDENT << "@QtUninvokable" << Qt::endl
       << INDENT << "@Override" << Qt::endl
       << INDENT << "public ";
     if(!java_class->typeEntry()->isNativeIdBased() && !java_class->typeEntry()->designatedInterface()){
@@ -7662,7 +8430,7 @@ void JavaGenerator::writeCloneFunction(QTextStream &s, const MetaClass *java_cla
         }
         s << ");" << Qt::endl
           << INDENT << "}" << Qt::endl
-          << INDENT << "private native " << java_class->simpleName();
+          << INDENT << "private static native " << java_class->simpleName();
         if(java_class->typeEntry()->isGenericClass()){
             if(java_class->templateBaseClass()){
                 QList<TypeEntry *> templateArguments = java_class->templateBaseClass()->templateArguments();
@@ -7762,7 +8530,9 @@ void JavaGenerator::generateFake(const MetaClass *fake_class) {
                 BufferedOutputStream s(QFileInfo(resolveOutputDirectory() + "/" + subDirectoryForClass(fake_class) + subDirectoryForPackage(enm->package()) + "/" + fileName));
                 s << INDENT << "package " << enm->package() << ";" << Qt::endl
                   << Qt::endl
-                  << INDENT << "public final class " << flagsName << " extends io.qt.QFlags<" << enm->name().replace("$",".") << "> {" << Qt::endl
+                  << "import io.qt.*;" << Qt::endl
+                  << Qt::endl
+                  << INDENT << "public final class " << flagsName << " extends QFlags<" << enm->name().replace("$",".") << "> {" << Qt::endl
                   << INDENT << "    private static final long serialVersionUID = 0x" << QString::number(serialVersionUID, 16) << "L;" << Qt::endl;
                 printExtraCode(linesPos1, s, true);
                 s << INDENT << "    static {" << Qt::endl
@@ -7816,10 +8586,18 @@ void JavaGenerator::write(QTextStream &s, const MetaFunctional *global_fun, int)
     ReportHandler::debugSparse("Generating functional: " + global_fun->fullName());
     s << INDENT << "package " << global_fun->package() << ";" << Qt::endl << Qt::endl;
 
+    QSet<QString> imports;
+    imports.insert("io.qt.*");
+    s << "import io.qt.*;" << Qt::endl;
+
     const QList<Include>& includes = global_fun->typeEntry()->extraIncludes();
     for(const Include &inc : includes) {
         if (inc.type == Include::TargetLangImport) {
-            s << inc.toString() << Qt::endl;
+            QString imp = inc.toString();
+            if(!imports.contains(imp)){
+                imports.insert(imp);
+                s << imp << Qt::endl;
+            }
         }
     }
 
@@ -7841,6 +8619,8 @@ void JavaGenerator::write(QTextStream &s, const MetaEnum *global_enum) {
     ReportHandler::debugSparse("Generating enum: " + global_enum->fullName());
     s << INDENT << "package " << global_enum->package() << ";" << Qt::endl << Qt::endl;
 
+    s << "import io.qt.*;" << Qt::endl;
+
     QString lines;
     {
         QTextStream s(&lines);
diff --git a/src/cpp/QtJambiGenerator/javagenerator.h b/src/cpp/QtJambiGenerator/javagenerator.h
index da5f87c9..b11e2a4d 100644
--- a/src/cpp/QtJambiGenerator/javagenerator.h
+++ b/src/cpp/QtJambiGenerator/javagenerator.h
@@ -51,157 +51,158 @@ class DocParser;
 using namespace TS;
 
 class JavaGenerator : public AbstractGenerator {
-    public:
-        JavaGenerator(TS::TypeDatabase* database);
-
-        QString translateType(const MetaType *java_type, const MetaClass *context, Option option = NoOption);
-
-        virtual void generateFake(const MetaClass *java_class) override;
-
-        void writeInjectedCode(QTextStream &s,
-                               const MetaFunction *java_function,
-                               CodeSnip::Position position);
-        bool hasCodeInjections(const MetaFunction *java_function,
-                               const QSet<CodeSnip::Position>& positions);
-        void writeArgument(QTextStream &s,
-                                  const MetaFunction *java_function,
-                                  const MetaArgument *java_argument,
-                                  Option options = Option::NoOption);
-        QString argumentString(const MetaFunction *java_function,
-                                      const MetaArgument *java_argument,
-                                      Option options = Option::NoOption);
-        void writeFunctional(QTextStream &s, const MetaFunctional *java_functional);
-        void writeEnum(QTextStream &s, const MetaEnum *java_enum);
-        void writeIntegerEnum(QTextStream &s, const uint size, const MetaEnum *java_enum);
-        void writeSignal(QTextStream &s, const MetaFunction *java_function);
-        void writeMultiSignal(QTextStream &s, const MetaFunctionList& signalList);
-        void writeFunction(QTextStream &s, const MetaFunction *java_function,
-                           uint included_attributes = 0, uint excluded_attributes = 0, Option option = NoOption);
-        void writeFieldAccessors(QTextStream &s, const MetaField *field, Option functionOptions = NoOption);
-        void write(QTextStream &s, const MetaClass *java_class, int nesting_level = 0) override;
-        void write(QTextStream &s, const MetaFunctional *java_class, int nesting_level = 0) override;
-
-        void writeFunctionOverloads(QTextStream &s, const MetaFunction *java_function,
-                                    uint included_attributes, uint excluded_attributes, Option option, const QString& alternativeFunctionName = QString());
-        void writeEnumOverload(QTextStream &s, const MetaFunction *java_function,
-                               uint include_attributes, uint exclude_attributes, Option option);
-        void writeExtraFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeExtraFunctions(QTextStream &s, const MetaFunctional *java_class, bool inInterface);
-        void writeToStringFunction(QTextStream &s, const MetaClass *java_class);
-        void writeCloneFunction(QTextStream &s, const MetaClass *java_class);
-        void writeFunctionAttributes(QTextStream &s, const MetaFunction *java_function, int arg_count = -1,
-                                     uint included_attributes = 0, uint excluded_attributes = 0,
-                                     Option options = NoOption);
-        void writeConstructorContents(QTextStream &s, const MetaFunction *java_function);
-        void writeFunctionArguments(QTextStream &s, const MetaFunction *java_function,
-                                    int count = -1, Option options = NoOption);
-        void writeJavaCallThroughContents(QTextStream &s, const MetaFunction *java_function, uint attributes = 0);
-        void writeOwnershipForContainer(QTextStream &s, const MetaFunction *java_function, TS::Ownership ownership, MetaType *type, const QString &arg_name);
-        void writeFunctionCallForOwnership(QTextStream &s, const MetaFunction *java_function, TS::Ownership owner, const QString& variable);
-        void writePrivateNativeFunction(QTextStream &s, const MetaFunction *java_function);
-        void writeJavaLangObjectOverrideFunctions(QTextStream &s, const MetaClass *cls);
-        void writeReferenceCount(QTextStream &s, const ReferenceCount &refCount, int argumentIndex, const MetaFunction *java_function, const QString &thisName = QLatin1String("this"));
-        void retrieveModifications(const MetaFunction *f, const MetaClass *java_class,
-                                   uint *exclude_attributes, uint *include_attributes, Option option = NoOption) const;
-        QString functionSignature(const MetaFunction *java_function,
-                                  uint included_attributes,
-                                  uint excluded_attributes,
-                                  Option option = NoOption,
-                                  int arg_count = -1,
-                                  const QString& alternativeFunctionName = QString());
-        void setupForFunction(const MetaFunction *java_function,
-                              uint *included_attributes, uint *excluded_attributes, Option option) const;
-
-        QString subDirectoryForClass(const MetaClass *java_class) const override;
-
-        QString subDirectoryForFunctional(const MetaFunctional * java_class) const override;
-
-        virtual QString fileNameForClass(const MetaClass *java_class) const override;
-
-        bool isComparable(const MetaClass *cls) const;
-
-        const MetaType * getIterableType(const MetaClass *cls, bool& isConst) const;
+public:
+    JavaGenerator(TS::TypeDatabase* database, bool nullness, bool noKotlinDelegates);
+
+    QString translateType(const MetaType *java_type, const MetaClass *context, Option option = NoOption);
+
+    virtual void generateFake(const MetaClass *java_class) override;
+
+    void writeInjectedCode(QTextStream &s,
+                           const MetaFunction *java_function,
+                           CodeSnip::Position position);
+    bool hasCodeInjections(const MetaFunction *java_function,
+                           const QSet<CodeSnip::Position>& positions);
+    void writeFunctionArgument(QTextStream &s,
+                              const MetaFunction *java_function,
+                              const MetaArgument *java_argument,
+                              Option options = Option::NoOption);
+    void writeFunctional(QTextStream &s, const MetaFunctional *java_functional);
+    void writeEnum(QTextStream &s, const MetaEnum *java_enum);
+    void writeIntegerEnum(QTextStream &s, const uint size, const MetaEnum *java_enum);
+    void writeSignal(QTextStream &s, const MetaFunction *java_function);
+    void writeMultiSignal(QTextStream &s, const MetaFunctionList& signalList);
+    void writeFunction(QTextStream &s, const MetaFunction *java_function,
+                       uint included_attributes = 0, uint excluded_attributes = 0, Option option = NoOption);
+    void writeFieldAccessors(QTextStream &s, const MetaField *field, Option functionOptions = NoOption);
+    void write(QTextStream &s, const MetaClass *java_class, int nesting_level = 0) override;
+    void write(QTextStream &s, const MetaFunctional *java_class, int nesting_level = 0) override;
+
+    void writeFunctionOverloads(QTextStream &s, const MetaFunction *java_function,
+                                uint included_attributes, uint excluded_attributes, Option option, const QString& alternativeFunctionName = QString());
+    void writeEnumOverload(QTextStream &s, const MetaFunction *java_function,
+                           uint include_attributes, uint exclude_attributes, Option option);
+    void writeExtraFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeExtraFunctions(QTextStream &s, const MetaFunctional *java_class, bool inInterface);
+    void writeToStringFunction(QTextStream &s, const MetaClass *java_class);
+    void writeCloneFunction(QTextStream &s, const MetaClass *java_class);
+    void writeFunctionAttributes(QTextStream &s, const MetaFunction *java_function, int arg_count = -1,
+                                 uint included_attributes = 0, uint excluded_attributes = 0,
+                                 Option options = NoOption);
+    void writeConstructorContents(QTextStream &s, const MetaFunction *java_function);
+    void writeFunctionArguments(QTextStream &s, const MetaFunction *java_function,
+                                int count = -1, Option options = NoOption);
+    void writeJavaCallThroughContents(QTextStream &s, const MetaFunction *java_function, uint attributes = 0);
+    void writeOwnershipForContainer(QTextStream &s, const MetaFunction *java_function, TS::Ownership ownership, MetaType *type, const QString &arg_name);
+    void writeFunctionCallForOwnership(QTextStream &s, const MetaFunction *java_function, TS::Ownership owner, const QString& variable);
+    void writePrivateNativeFunction(QTextStream &s, const MetaFunction *java_function);
+    void writeJavaLangObjectOverrideFunctions(QTextStream &s, const MetaClass *cls);
+    void writeReferenceCount(QTextStream &s, const ReferenceCount &refCount, int argumentIndex, const MetaFunction *java_function, const QString &thisName = QLatin1String("this"));
+    void retrieveModifications(const MetaFunction *f, const MetaClass *java_class,
+                               uint *exclude_attributes, uint *include_attributes, Option option = NoOption) const;
+    QString functionSignature(const MetaFunction *java_function,
+                              uint included_attributes,
+                              uint excluded_attributes,
+                              Option option = NoOption,
+                              int arg_count = -1,
+                              const QString& alternativeFunctionName = QString());
+    void setupForFunction(const MetaFunction *java_function,
+                          uint *included_attributes, uint *excluded_attributes, Option option) const;
+
+    QString subDirectoryForClass(const MetaClass *java_class) const override;
+
+    QString subDirectoryForFunctional(const MetaFunctional * java_class) const override;
+
+    virtual QString fileNameForClass(const MetaClass *java_class) const override;
+
+    bool isComparable(const MetaClass *cls) const;
+
+    const MetaType * getIterableType(const MetaClass *cls, bool& isConst) const;
 
 #if 0
-        void write1_dot_5_enum(QTextStream &s, const AbstractMetaEnum *java_enum);
+    void write1_dot_5_enum(QTextStream &s, const AbstractMetaEnum *java_enum);
 #endif
 
-        virtual bool shouldGenerate(const MetaClass *java_class) const override {
-            return java_class->enclosingClass()==nullptr // do not generate if enclosed class (in this case create static embedded class)
-                    && !java_class->typeEntry()->isIterator()
-                    && !java_class->isFake() && !java_class->typeEntry()->isVariant()
-                    && (java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateTargetLang);
-        }
-
-        bool shouldGenerate(const MetaFunctional *) const override { return false; }
-        void generate() override;
-
-        void writeIteratorFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeAbstractMapFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeAbstractMultiMapFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeAbstractListFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeMapFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeMultiMapFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeMultiHashFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeHashFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeCollectionFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeListFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeLinkedListFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeSetFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeQueueFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeStackFunctions(QTextStream &s, const MetaClass *java_class);
-        void writeVectorFunctions(QTextStream &s, const MetaClass *java_class);
-
-        /*virtual*/ QString resolveOutputDirectory() const override { return javaOutputDirectory(); }
-
-        QString javaOutputDirectory() const {
-            if (!m_java_out_dir.isNull())
-                return m_java_out_dir;
-            return outputDirectory() + QLatin1String("/java");
-        }
-        void setJavaOutputDirectory(const QString &javaOutDir) { m_java_out_dir = javaOutDir; }
-
-        QString logOutputDirectory() const {
-            if (!m_log_out_dir.isNull())
-                return m_log_out_dir;
-            return outputDirectory();
-        }
-        void setLogOutputDirectory(const QString &logOutDir) { m_log_out_dir = logOutDir; }
-
-        void setDocsUrl(const QString& _docsUrl){
-            docsUrl = _docsUrl;
-        }
-
-        void setTypeSystemByPackage(const QMap<QString,TypeSystemTypeEntry *>& typeSystemByPackage){
-            m_typeSystemByPackage = typeSystemByPackage;
-        }
-
-    private:
-        void printExtraCode(QStringList& lines, QTextStream &s, bool addFreeLine = false);
-        void write_equals_parts(QTextStream &s, const MetaFunctionList &lst, char prefix, bool& first, bool& suppressUnchecked, bool& suppressRaw);
-        QString subDirectoryForPackage(const QString &package) const { return QString(package).replace(".", "/"); }
-        void writeInstantiatedType(QTextStream &s, const MetaType *abstractMetaType, bool forceBoxed) const;
-        void write(QTextStream &s, const MetaEnum *global_enum);
-        void writeDeprecatedComment(QTextStream& commentStream, const MetaFunction *java_function);
-        void registerPackage(QString className, bool inclExported = true);
-    protected:
-        QString m_package_name;
-        QString m_java_out_dir;
-        QString m_log_out_dir;		// needed for *.log generation
-        QString docsUrl;
-        QList<const MetaFunction *> m_nativepointer_functions;
-        QList<const MetaFunction *> m_resettable_object_functions;
-        QList<const MetaFunction *> m_reference_count_candidate_functions;
-        QList<const MetaFunction *> m_factory_functions;
-        QList<const MetaFunction *> m_inconsistent_functions;
-        TS::TypeDatabase* m_database;
+    virtual bool shouldGenerate(const MetaClass *java_class) const override {
+        return java_class->enclosingClass()==nullptr // do not generate if enclosed class (in this case create static embedded class)
+                && !java_class->typeEntry()->isIterator()
+                && !java_class->isFake() && !java_class->typeEntry()->isQVariant()
+                && (java_class->typeEntry()->codeGeneration() & TypeEntry::GenerateTargetLang);
+    }
+
+    bool shouldGenerate(const MetaFunctional *) const override { return false; }
+    void generate() override;
+
+    void writeIteratorFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeAbstractMapFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeAbstractMultiMapFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeAbstractListFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeMapFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeMultiMapFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeMultiHashFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeHashFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeCollectionFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeListFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeLinkedListFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeSetFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeQueueFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeStackFunctions(QTextStream &s, const MetaClass *java_class);
+    void writeVectorFunctions(QTextStream &s, const MetaClass *java_class);
+
+    /*virtual*/ QString resolveOutputDirectory() const override { return javaOutputDirectory(); }
+
+    QString javaOutputDirectory() const {
+        if (!m_java_out_dir.isNull())
+            return m_java_out_dir;
+        return outputDirectory() + QLatin1String("/java");
+    }
+    void setJavaOutputDirectory(const QString &javaOutDir) { m_java_out_dir = javaOutDir; }
+
+    QString logOutputDirectory() const {
+        if (!m_log_out_dir.isNull())
+            return m_log_out_dir;
+        return outputDirectory();
+    }
+    void setLogOutputDirectory(const QString &logOutDir) { m_log_out_dir = logOutDir; }
+
+    void setDocsUrl(const QString& _docsUrl){
+        docsUrl = _docsUrl;
+    }
+
+    void setTypeSystemByPackage(const QMap<QString,TypeSystemTypeEntry *>& typeSystemByPackage){
+        m_typeSystemByPackage = typeSystemByPackage;
+    }
 
 private:
-        QList<QString> m_currentPackages;
-        QList<QString> m_exportedPackages;
-        QHash<TypeSystemTypeEntry *,QList<QString>> m_packagesByTypeSystem;
-        QMap<QString,TypeSystemTypeEntry *> m_typeSystemByPackage;
-        QNetworkAccessManager m_networkManager;
+    void printExtraCode(QStringList& lines, QTextStream &s, bool addFreeLine = false);
+    void write_equals_parts(QTextStream &s, const MetaFunctionList &lst, char prefix, bool& first, bool& suppressUnchecked, bool& suppressRaw);
+    QString subDirectoryForPackage(const QString &package) const { return QString(package).replace(".", "/"); }
+    void writeInstantiatedType(QTextStream &s, const MetaType *abstractMetaType, bool forceBoxed) const;
+    void write(QTextStream &s, const MetaEnum *global_enum);
+    void writeDeprecatedComment(QTextStream& commentStream, const MetaFunction *java_function);
+    void registerPackage(QString className, bool inclExported = true);
+protected:
+    QString m_package_name;
+    QString m_java_out_dir;
+    QString m_log_out_dir;		// needed for *.log generation
+    QString docsUrl;
+    QList<const MetaFunction *> m_nativepointer_functions;
+    QList<const MetaFunction *> m_resettable_object_functions;
+    QList<const MetaFunction *> m_reference_count_candidate_functions;
+    QList<const MetaFunction *> m_factory_functions;
+    QList<const MetaFunction *> m_inconsistent_functions;
+    TS::TypeDatabase* m_database;
+
+private:
+    QList<QString> m_currentPackages;
+    QSet<QString> m_exportedPackages;
+    QSet<QString> m_currentMethodSignatures;
+    QHash<TypeSystemTypeEntry *,QList<QString>> m_packagesByTypeSystem;
+    QMap<QString,TypeSystemTypeEntry *> m_typeSystemByPackage;
+    QNetworkAccessManager m_networkManager;
+    bool m_noKotlinDelegates;
+protected:
+    bool m_nullness;
 };
 
 #endif // JAVAGENERATOR_H
diff --git a/src/cpp/QtJambiGenerator/library.pro b/src/cpp/QtJambiGenerator/library.pro
index ae4acfb7..dcf35259 100644
--- a/src/cpp/QtJambiGenerator/library.pro
+++ b/src/cpp/QtJambiGenerator/library.pro
@@ -153,9 +153,9 @@ QML_IMPORT_MAJOR_VERSION = 1
 
 # These option changes are recommended since at least: win32-msvc.net
 win32-msvc* {
-    QMAKE_CXXFLAGS += -Zm500
-    QMAKE_CXXFLAGS -= -Zm200
-    QMAKE_CFLAGS -= -Zm200
+#    QMAKE_CXXFLAGS += -Zm500
+ #   QMAKE_CXXFLAGS -= -Zm200
+  #  QMAKE_CFLAGS -= -Zm200
     CONFIG += embed_manifest_dll force_embed_manifest
 }
 
diff --git a/src/cpp/QtJambiGenerator/metabuilder.cpp b/src/cpp/QtJambiGenerator/metabuilder.cpp
index 23350a81..0398078d 100644
--- a/src/cpp/QtJambiGenerator/metabuilder.cpp
+++ b/src/cpp/QtJambiGenerator/metabuilder.cpp
@@ -50,97 +50,6 @@ static QString strip_template_args(const QString &name) {
     return pos < 0 ? name : name.left(pos);
 }
 
-/**
- * Checks if operator is legit and returns returns
- * corresponding operator with prefix.
- *
- * For example for "+" return "operator_add"
- */
-MetaBuilder::RenamedOperator MetaBuilder::rename_operator(const QString &oper) {
-    QString op = oper.trimmed();
-    static const QMap<QString, QString> operator_names{
-        {"+", "add"},
-        {"-", "subtract"},
-        {"*", "multiply"},
-        {"/", "divide"},
-        {"%", "modulo"},
-        {"&", "and"},
-        {"|", "or"},
-        {"^", "xor"},
-        {"~", "negate"},
-        {"<<", "shift_left"},
-        {">>", "shift_right"},
-
-        // assigments
-        {"=", "assign"},
-        {"+=", "add_assign"},
-        {"-=", "subtract_assign"},
-        {"*=", "multiply_assign"},
-        {"/=", "divide_assign"},
-        {"%=", "modulo_assign"},
-        {"&=", "and_assign"},
-        {"|=", "or_assign"},
-        {"^=", "xor_assign"},
-        {"<<=", "shift_left_assign"},
-        {">>=", "shift_right_assign"},
-
-        // Logical
-        {"&&", "logical_and"},
-        {"||", "logical_or"},
-        {"!", "not"},
-
-        // incr/decr
-        {"++", "increment"},
-        {"--", "decrement"},
-
-        // compare
-        {"<", "less"},
-        {">", "greater"},
-        {"<=", "less_or_equal"},
-        {"<=>", "compare"},
-        {">=", "greater_or_equal"},
-        {"<<=", "shift_left_assign"},
-        {">>=", "shift_right_assign"},
-        {"!=", "not_equal"},
-        {"==", "equal"},
-
-        // other
-        {"[]", "subscript"},
-        {"->", "pointer"},
-        {"->.", "pointer_to_deref"},
-        {".", "deref"},
-        {".*", "deref_indirection"},
-        {",", "comma"},
-        {"()", "call"},
-        {"new", "cunstruct"},
-        {"delete", "destruct"}
-    };
-
-    if(op.startsWith("typename")){
-        return {{},nullptr,true};
-    }
-    if (!operator_names.contains(op)) {
-        TypeParser::Info typeInfo = TypeParser::parse(op);
-        QString cast_to_name = typeInfo.qualified_name.join("::");
-        TypeEntry *te = m_database->findType(cast_to_name);
-        if ((te && te->codeGeneration() == TypeEntry::GenerateNothing)
-                || m_database->isClassRejected(cast_to_name)) {
-            return {{},te,true};
-        } else if (te) {
-            return {{},te,false};
-        } else {
-            TypeAliasModelItem typeAlias = currentScope()->findTypeAlias(cast_to_name);
-            if(typeAlias && typeAlias->type().qualifiedName().join("::")!=cast_to_name){
-                return rename_operator(typeAlias->type().qualifiedName().join("::"));
-            }else{
-                return {{},nullptr,false};
-            }
-        }
-    }
-
-    return {QString("operator_%1").arg(operator_names.value(op)),nullptr,false};
-}
-
 const QString &MetaBuilder::generateTypeSystemQML() const
 {
     return m_generateTypeSystemQML;
@@ -182,61 +91,121 @@ MetaBuilder::~MetaBuilder() {
  */
 void MetaBuilder::checkFunctionModifications() {
     SingleTypeEntryHash entryHash = m_database->entries();
-    QList<TypeEntry *> entries = entryHash.values();
+    const QList<TypeEntry *> entries = entryHash.values();
     for(TypeEntry *entry : entries) {
-        if (!entry)
-            continue;
-        if (!entry->isComplex() || entry->codeGeneration() == TypeEntry::GenerateNothing)
+        if (!entry || entry->codeGeneration() == TypeEntry::GenerateNothing)
             continue;
+        if (entry->isTypeSystem()){
+            /*
+            TS::TypeSystemTypeEntry *tentry = static_cast<TS::TypeSystemTypeEntry *>(entry);
+            const FunctionModificationList& functionModifications = tentry->functionModifications();
+            MetaClass *clazz = nullptr;
+            for(const FunctionModification& modification : functionModifications) {
+                const QString& signature = modification.signature;
+
+                QString name = signature.trimmed();
+                if(!name.isEmpty()){
+                    name = name.mid(0, signature.indexOf("("));
+
+                    if (!clazz){
+                        clazz = m_meta_classes.findClass(centry->qualifiedCppName(), MetaClassList::QualifiedCppName);
+                        if (!clazz)
+                            break;
+                    }
 
-        ComplexTypeEntry *centry = static_cast<ComplexTypeEntry *>(entry);
+                    bool found = false;
+                    QStringList possibleSignatures;
+                    for(MetaFunction *function : clazz->functions()) {
+                        if (function->minimalSignature() == signature && function->implementingClass() == clazz) {
+                            found = true;
+                            break;
+                        }
+
+                        if (function->originalName() == name)
+                            possibleSignatures.append(function->minimalSignature() + " in " + function->implementingClass()->name());
+                    }
 
-        const FunctionModificationList& functionModifications = centry->functionModifications();
-        MetaClass *clazz = nullptr;
-        for(const FunctionModification& modification : functionModifications) {
-            const QString& signature = modification.signature;
+                    if(!found && clazz->typeEntry()->isInterface()){
+                        clazz = clazz->extractInterfaceImpl();
+                        for(MetaFunction *function : clazz->functions()) {
+                            if (function->minimalSignature() == signature && function->implementingClass() == clazz) {
+                                found = true;
+                                break;
+                            }
+                            if (function->originalName() == name)
+                                possibleSignatures.append(function->minimalSignature() + " in " + function->implementingClass()->name());
+                        }
+                    }
 
-            QString name = signature.trimmed();
-            if(!name.isEmpty()){
-                name = name.mid(0, signature.indexOf("("));
+                    if (!found && clazz->typeEntry()->codeGeneration()!=TypeEntry::GenerateNothing && modification.template_instantiations.isEmpty()) {
+                        QString warning
+                        = QString("signature '%1' for function modification in '%2' not found. Possible candidates: %3")
+                          .arg(signature, clazz->qualifiedCppName(), possibleSignatures.join(",\n    "));
 
-                if (!clazz){
-                    clazz = m_meta_classes.findClass(centry->qualifiedCppName(), MetaClassList::QualifiedCppName);
-                    if (!clazz)
-                        break;
+                        ReportHandler::warning(warning);
+                    }
                 }
+            }*/
+        }else if (entry->isComplex()){
+            ComplexTypeEntry *centry = static_cast<ComplexTypeEntry *>(entry);
+            const FunctionModificationList& functionModifications = centry->functionModifications();
+            MetaClass *clazz = nullptr;
+            for(const FunctionModification& modification : functionModifications) {
+                const QString& signature = modification.signature;
+
+                QString name = signature.trimmed();
+                if(!name.isEmpty()){
+                    name = name.mid(0, signature.indexOf("("));
+
+                    if (!clazz){
+                        clazz = m_meta_classes.findClass(centry->qualifiedCppName(), MetaClassList::QualifiedCppName);
+                        if (!clazz)
+                            break;
+                    }
 
-                const MetaFunctionList& functions = clazz->functions();
-                bool found = false;
-                QStringList possibleSignatures;
-                for(MetaFunction *function : functions) {
-                    if (function->minimalSignature() == signature && function->implementingClass() == clazz) {
-                        found = true;
-                        break;
+                    bool found = false;
+                    QStringList possibleSignatures;
+                    for(MetaFunction *function : clazz->functions()) {
+                        if (function->minimalSignature() == signature && function->implementingClass() == clazz) {
+                            found = true;
+                            break;
+                        }
+
+                        if (function->originalName() == name)
+                            possibleSignatures.append(function->minimalSignature() + " in " + function->implementingClass()->name());
                     }
 
-                    if (function->originalName() == name)
-                        possibleSignatures.append(function->minimalSignature() + " in " + function->implementingClass()->name());
-                }
+                    if(!found && clazz->typeEntry()->isInterface()){
+                        clazz = clazz->extractInterfaceImpl();
+                        for(MetaFunction *function : clazz->functions()) {
+                            if (function->minimalSignature() == signature && function->implementingClass() == clazz) {
+                                found = true;
+                                break;
+                            }
+                            if (function->originalName() == name)
+                                possibleSignatures.append(function->minimalSignature() + " in " + function->implementingClass()->name());
+                        }
+                    }
 
-                if (!found && clazz->typeEntry()->codeGeneration()!=TypeEntry::GenerateNothing && modification.template_instantiations.isEmpty()) {
-                    QString warning
-                    = QString("signature '%1' for function modification in '%2' not found. Possible candidates: %3")
-                      .arg(signature, clazz->qualifiedCppName(), possibleSignatures.join(",\n    "));
+                    if (!found && clazz->typeEntry()->codeGeneration()!=TypeEntry::GenerateNothing && modification.template_instantiations.isEmpty()) {
+                        QString warning
+                        = QString("signature '%1' for function modification in '%2' not found. Possible candidates: %3")
+                          .arg(signature, clazz->qualifiedCppName(), possibleSignatures.join(",\n    "));
 
-                    ReportHandler::warning(warning);
+                        ReportHandler::warning(warning);
+                    }
                 }
             }
         }
     }
 }
 
-MetaClass *MetaBuilder::argumentToClass(ArgumentModelItem argument, const QString &contextString) {
+MetaClass *MetaBuilder::argumentToClass(const MetaType* type) {
     MetaClass *returned = nullptr;
-    bool ok = false;
-    MetaType *type = translateType(argument->type(), &ok, contextString);
-    if (ok && type && type->typeEntry() && type->typeEntry()->isComplex()) {
+    if (type && type->typeEntry() && type->typeEntry()->isComplex()) {
         const TypeEntry *entry = type->typeEntry();
+        if(entry->designatedInterface())
+            entry = entry->designatedInterface();
         returned = m_meta_classes.findClass(entry->qualifiedCppName());
         if(!returned)
             returned = m_meta_classes.findClass(entry->name());
@@ -244,193 +213,98 @@ MetaClass *MetaBuilder::argumentToClass(ArgumentModelItem argument, const QStrin
             returned = m_templates.findClass(entry->qualifiedCppName());
         if(!returned)
             returned = m_templates.findClass(entry->name());
-    }else{
-        TypeParser::Info typeInfo = TypeParser::parse(argument->type().toString());
-        if(!typeInfo.template_instantiations.isEmpty())
-            returned = m_templates.findClass(typeInfo.qualified_name.join("::"));
     }
-    delete type;
     return returned;
 }
 
-/**
- * Checks the argument of a hash function and flags the type if it is a complex type
- */
-void MetaBuilder::registerHashFunction(FunctionModelItem function_item) {
-    if(function_item->isDeleted())
-        return;
-    ArgumentList arguments = function_item->arguments();
-    bool isWorkaround = false;
-    bool hasDefaultArgs = arguments.size() > 0;
-    for(int i=1; i<arguments.size(); i++){
-        if(arguments.at(i)->type().qualifiedName().join("::")=="QHashDummyValue"){
-            isWorkaround = true;
-            hasDefaultArgs = true;
-        }else{
-            hasDefaultArgs &= arguments.at(i)->defaultValue();
-        }
-    }
-    if (arguments.size() == 1 || hasDefaultArgs) {
-        if (MetaClass *cls = argumentToClass(arguments.at(0), "AbstractMetaBuilder::registerHashFunction")) {
-            for(auto& mod : cls->typeEntry()->functionModifications(QString("qHash(%1)").arg(cls->typeEntry()->qualifiedCppName()))){
-                if(mod.isRemoveModifier()){
-                    return;
-                }
-            }
-            QFileInfo info(function_item->fileName());
-            cls->typeEntry()->addExtraInclude(Include(Include::IncludePath, info.fileName()));
-
-            cls->setHasHashFunction(true);
-            cls->setNeedsHashWorkaround(isWorkaround);
-        }
+void MetaBuilder::addInclude(TS::ComplexTypeEntry * entry, const MetaType* includedType){
+    if(includedType->typeEntry()->isComplex()){
+        const ComplexTypeEntry *centry = static_cast<const ComplexTypeEntry *>(includedType->typeEntry());
+        if (entry && centry->include().isValid())
+            entry->addExtraInclude(centry->include());
+    }else if(includedType->isEnum()){
+        const EnumTypeEntry *eentry = static_cast<const EnumTypeEntry *>(includedType->typeEntry());
+        if (entry && eentry->include().isValid())
+            entry->addExtraInclude(eentry->include());
     }
-}
-
-/**
- * Check if a class has a debug stream operator that can be used as toString
- */
-void MetaBuilder::registerToStringCapability(FunctionModelItem function_item) {
-    if(function_item->isDeleted())
-        return;
-    ArgumentList arguments = function_item->arguments();
-    if (arguments.size() == 2) {
-        if (arguments.at(0)->type().toString() == "QDebug") {
-            ArgumentModelItem arg = arguments.at(1);
-            if (MetaClass *cls = argumentToClass(arg, "AbstractMetaBuilder::registerToStringCapability")) {
-                if (arg->type().indirections().size() < 2) {
-                    for(auto& mod : cls->typeEntry()->functionModifications(QString("operator<<(QDebug&,%1)").arg(arg->type().toString()))){
-                        if(mod.isRemoveModifier()){
-                            return;
-                        }
-                    }
-                    cls->setToStringCapability(function_item);
-                }
-            }
-        }
+    for(const MetaType* ins : includedType->instantiations()){
+        addInclude(entry, ins);
     }
 }
 
-void MetaBuilder::traverseCompareOperator(FunctionModelItem item) {
-    if(item->isDeleted())
-        return;
-    ArgumentList arguments = item->arguments();
-    if (arguments.size() == 2 && item->accessPolicy() == CodeModel::Public) {
-        MetaClass *comparer_class = argumentToClass(arguments.at(0), "AbstractMetaBuilder::traverseCompareOperator comparer_class");
-        MetaClass *compared_class = argumentToClass(arguments.at(1), "AbstractMetaBuilder::traverseCompareOperator compared_class");
-        if (comparer_class && compared_class) {
-            MetaClass *old_current_class = m_current_class;
-            m_current_class = comparer_class;
-
-            MetaFunction *meta_function = traverseFunction(item);
-            if (meta_function && !meta_function->isInvalid()) {
-                // Strip away first argument, since that is the containing object
-                MetaArgumentList arguments = meta_function->arguments();
-                arguments.pop_front();
-                meta_function->setArguments(arguments);
-                meta_function->setFunctionType(MetaFunction::GlobalScopeFunction);
-
-                meta_function->setOriginalAttributes(meta_function->attributes());
-                setupFunctionDefaults(meta_function, comparer_class);
-
-                FunctionModificationList mods = meta_function->modifications(comparer_class);
-                for(const FunctionModification& mod : mods) {
-                    if (mod.isRenameModifier())
-                        meta_function->setName(mod.renamedTo());
-                    if (mod.isAccessModifier()) {
-                        if (mod.isPrivate())
-                            meta_function->setVisibility(MetaAttributes::Private);
-                        else if (mod.isProtected())
-                            meta_function->setVisibility(MetaAttributes::Protected);
-                        else if (mod.isPublic())
-                            meta_function->setVisibility(MetaAttributes::Public);
-                        else if (mod.isFriendly())
-                            meta_function->setVisibility(MetaAttributes::Friendly);
-                    }
-                }
-
-                comparer_class->addFunction(meta_function);
-            } else if (meta_function) {
-                delete meta_function;
-            }
-
-            m_current_class = old_current_class;
+void MetaBuilder::addInclude(TS::TypeEntry * entry, QString fileName, bool extra){
+    QMap<QString,QString> requiredFeatures;
+    for(const QString& feature : _M_requiredFeatures[fileName]){
+        if(m_features && m_features->contains(feature)){
+            QFileInfo _info(m_features->value(feature));
+            requiredFeatures[feature] = _info.fileName();
+        }else{
+            requiredFeatures[feature] = "";
         }
     }
-}
-
-void MetaBuilder::traverseStreamOperator(FunctionModelItem item) {
-    if(item->isDeleted())
-        return;
-    ArgumentList arguments = item->arguments();
-    if (arguments.size() == 2 && item->accessPolicy() == CodeModel::Public) {
-        MetaClass *streamClass = argumentToClass(arguments.at(0), "AbstractMetaBuilder::traverseStreamOperator streamClass");
-        MetaClass *streamedClass = argumentToClass(arguments.at(1), "AbstractMetaBuilder::traverseStreamOperator streamedClass");
-
-        if (streamClass && streamedClass && !streamedClass->isNamespace()
-                && (streamClass->name() == "QDataStream" || streamClass->name() == "QTextStream")) {
-            MetaClass *old_current_class = m_current_class;
-            m_current_class = streamedClass;
-            MetaFunction *streamFunction = traverseFunction(item);
-
-            if (streamFunction && !streamFunction->isInvalid()) {
-                QString name = item->name();
-                streamFunction->setFunctionType(MetaFunction::GlobalScopeFunction);
-
-                if (name.endsWith("<<"))
-                    streamFunction->setName("writeTo");
-                else
-                    streamFunction->setName("readFrom");
-
-                // Strip away last argument, since that is the containing object
-                MetaArgumentList arguments = streamFunction->arguments();
-                arguments.removeLast();
-                streamFunction->setArguments(arguments);
-                streamFunction->setOriginalAttributes(streamFunction->attributes());
-
-                *streamFunction += MetaAttributes::Final;
-                *streamFunction += MetaAttributes::Public;
-                streamFunction->setType(nullptr);
-
-                setupFunctionDefaults(streamFunction, streamedClass);
-                streamedClass->addFunction(streamFunction);
-                streamedClass->typeEntry()->addExtraInclude(streamClass->typeEntry()->include());
-                FunctionModification mod;
-                mod.signature = streamFunction->minimalSignature();
-                mod.modifiers |= Modification::NonFinal;
-                m_current_class->typeEntry()->addFunctionModification(mod);
-                m_current_class = old_current_class;
+    QFileInfo file(QDir::fromNativeSeparators(fileName));
+    if(file.exists()){
+        fileName = file.canonicalFilePath();
+#ifdef Q_OS_MAC
+        QDir dir = file.dir();
+        if(QFileInfo(dir.absolutePath()).fileName()==QStringLiteral("Headers") && dir.cdUp()){
+            if(!QFileInfo(dir.absolutePath()).fileName().endsWith(".framework")){
+                if(dir.cdUp() && QFileInfo(dir.absolutePath()).fileName()==QStringLiteral("Versions") && dir.cdUp()){
+                }
+            }
+            QString moduleName = QFileInfo(dir.absolutePath()).fileName();
+            if(moduleName.endsWith(".framework")){
+                moduleName = moduleName.mid(0, moduleName.length()-10);
+                QString path = QString("%1/%2").arg(moduleName, file.fileName());
+                if(entry->isComplex()){
+                    if(extra)
+                        dynamic_cast<TS::ComplexTypeEntry*>(entry)->addExtraInclude(Include(Include::IncludePath, path, requiredFeatures));
+                    else
+                        dynamic_cast<TS::ComplexTypeEntry*>(entry)->setInclude(Include(Include::IncludePath, path, requiredFeatures));
+                }else if(entry->isEnum()){
+                    if(!extra)
+                        dynamic_cast<TS::EnumTypeEntry*>(entry)->setInclude(Include(Include::IncludePath, path, requiredFeatures));
+                }else if(entry->isFunctional()){
+                    if(extra)
+                        dynamic_cast<TS::FunctionalTypeEntry*>(entry)->addExtraInclude(Include(Include::IncludePath, path, requiredFeatures));
+                    else
+                        dynamic_cast<TS::FunctionalTypeEntry*>(entry)->setInclude(Include(Include::IncludePath, path, requiredFeatures));
+                }
+                fileName.clear();
             }
         }
+#endif
     }
-}
-
-void MetaBuilder::fixQObjectForScope(NamespaceModelItem scope) {
-    for(ClassModelItem cls : scope->classes()){
-        QString qualified_name = cls->qualifiedName().join("::");
-        TypeEntry *entry = m_database->findType(qualified_name);
-        if (entry && entry->isComplex()) {
-            if (isClass(qualified_name, "QObject")) {
-                static_cast<ComplexTypeEntry *>(entry)->setQObject(true);
-                if (isClass(qualified_name, "QWidget")) {
-                    static_cast<ComplexTypeEntry *>(entry)->setQWidget(true);
-                }else if (isClass(qualified_name, "QWindow")) {
-                    static_cast<ComplexTypeEntry *>(entry)->setQWindow(true);
-                }else if (isClass(qualified_name, "QCoreApplication")) {
-                    static_cast<ComplexTypeEntry *>(entry)->setQCoreApplication(true);
-                }else if (isClass(qualified_name, "QAction")) {
-                    static_cast<ComplexTypeEntry *>(entry)->setQAction(true);
+    if(!fileName.isEmpty()){
+        for(const QString& includePath : m_includePathsList){
+            QFileInfo f(includePath);
+            if(f.isDir()){
+                QString path = f.canonicalFilePath();
+                if(!path.endsWith("/"))
+                    path += "/";
+                if(fileName.startsWith(path)){
+                    path = fileName.mid(path.size());
+                    if(entry->isComplex()){
+                        if(extra)
+                            dynamic_cast<TS::ComplexTypeEntry*>(entry)->addExtraInclude(Include(Include::IncludePath, path, requiredFeatures));
+                        else
+                            dynamic_cast<TS::ComplexTypeEntry*>(entry)->setInclude(Include(Include::IncludePath, path, requiredFeatures));
+                    }else if(entry->isEnum()){
+                        if(!extra)
+                            dynamic_cast<TS::EnumTypeEntry*>(entry)->setInclude(Include(Include::IncludePath, path, requiredFeatures));
+                    }else if(entry->isFunctional()){
+                        if(extra)
+                            dynamic_cast<TS::FunctionalTypeEntry*>(entry)->addExtraInclude(Include(Include::IncludePath, path, requiredFeatures));
+                        else
+                            dynamic_cast<TS::FunctionalTypeEntry*>(entry)->setInclude(Include(Include::IncludePath, path, requiredFeatures));
+                    }
+                    break;
                 }
             }
         }
     }
-
-    for(const NamespaceModelItem& item : scope->namespaceMap().values()) {
-        if (scope != item)
-            fixQObjectForScope(item);
-    }
 }
 
-
 void MetaBuilder::sortLists() {
     std::sort(m_meta_classes.begin(), m_meta_classes.end(), [](MetaClass *a, MetaClass *b) -> bool {
                   return a->qualifiedCppName() < b->qualifiedCppName();
@@ -446,97 +320,97 @@ void MetaBuilder::sortLists() {
 void writeContent(QTextStream &stream,
                   QString indent,
                   const QList<ClassModelItem>& classes,
-                  const QMap<QString, EnumModelItem>& enumMap,
-                  const QMap<QString, TypeAliasModelItem>& typeAliasMap,
-                  const QMap<QString, VariableModelItem>& variableMap,
-                  const QMultiHash<QString, FunctionDefinitionModelItem>& functionDefinitionMap,
-                  const QMultiHash<QString, FunctionModelItem>& functionMap,
-                  const QMap<QString, NamespaceModelItem>& namespaceMap){
+                  const QList<EnumModelItem>& enums,
+                  const QList<TypeAliasModelItem>& typeAliases,
+                  const QList<VariableModelItem>& variables,
+                  const QList<FunctionDefinitionModelItem>& functionDefinitions,
+                  const QList<FunctionModelItem>& functions,
+                  const QList<NamespaceModelItem>& namespaces){
     {
         stream << Qt::endl;
         stream << indent << "Classes:" << Qt::endl;
         for(ClassModelItem cls : classes){
             stream << indent << "class " << cls->qualifiedName().join("::") << "{" << Qt::endl;
-            writeContent(stream, indent+"    ", cls->classes(), cls->enumMap(), cls->typeAliasMap(), cls->variableMap(), cls->functionDefinitionMap(), cls->functionMap(), QMap<QString, NamespaceModelItem>());
+            writeContent(stream, indent+"    ", cls->classes(), cls->enums(), cls->typeAliases(), cls->variables(), cls->functionDefinitions(), cls->functions(), {});
             stream << indent << "}" << Qt::endl;
         }
     }
     {
         QMap<QString, EnumModelItem> _map;
-        for(QMap<QString, EnumModelItem>::const_iterator i = enumMap.begin(); i!=enumMap.end(); i++){
-            _map.insert(i.key(), i.value());
+        for(const EnumModelItem& item : enums){
+            _map.insert(item->name(), item);
         }
         if(!_map.isEmpty()){
             stream << Qt::endl;
             stream << indent << "Enums:" << Qt::endl;
-            for(QMap<QString, EnumModelItem>::const_iterator i = _map.begin(); i!=_map.end(); i++){
+            for(QMap<QString, EnumModelItem>::const_iterator i = _map.cbegin(); i!=_map.cend(); i++){
                 stream << indent << i.key() << Qt::endl;
             }
         }
     }
     {
         QMap<QString, TypeAliasModelItem> _map;
-        for(QMap<QString, TypeAliasModelItem>::const_iterator i = typeAliasMap.begin(); i!=typeAliasMap.end(); i++){
-            _map.insert(i.key(), i.value());
+        for(const TypeAliasModelItem& item : typeAliases){
+            _map.insert(item->name(), item);
         }
         if(!_map.isEmpty()){
             stream << Qt::endl;
             stream << indent << "Type Aliases:" << Qt::endl;
-            for(QMap<QString, TypeAliasModelItem>::const_iterator i = _map.begin(); i!=_map.end(); i++){
+            for(QMap<QString, TypeAliasModelItem>::const_iterator i = _map.cbegin(); i!=_map.cend(); i++){
                 stream << indent << i.key() << Qt::endl;
             }
         }
     }
     {
         QMap<QString, VariableModelItem> _map;
-        for(QMap<QString, VariableModelItem>::const_iterator i = variableMap.begin(); i!=variableMap.end(); i++){
-            _map.insert(i.key(), i.value());
+        for(const VariableModelItem& item : variables){
+            _map.insert(item->name(), item);
         }
         if(!_map.isEmpty()){
             stream << Qt::endl;
             stream << indent << "Variables:" << Qt::endl;
-            for(QMap<QString, VariableModelItem>::const_iterator i = _map.begin(); i!=_map.end(); i++){
+            for(QMap<QString, VariableModelItem>::const_iterator i = _map.cbegin(); i!=_map.cend(); i++){
                 stream << indent << i.key() << Qt::endl;
             }
         }
     }
     {
         QMap<QString, FunctionDefinitionModelItem> _map;
-        for(QMultiHash<QString, FunctionDefinitionModelItem>::const_iterator i = functionDefinitionMap.begin(); i!=functionDefinitionMap.end(); i++){
-            _map.insert(i.key(), i.value());
+        for(const FunctionDefinitionModelItem& item : functionDefinitions){
+            _map.insert(item->name(), item);
         }
         if(!_map.isEmpty()){
             stream << Qt::endl;
             stream << indent << "Function Definitions:" << Qt::endl;
-            for(QMap<QString, FunctionDefinitionModelItem>::const_iterator i = _map.begin(); i!=_map.end(); i++){
+            for(QMap<QString, FunctionDefinitionModelItem>::const_iterator i = _map.cbegin(); i!=_map.cend(); i++){
                 stream << indent << i.key() << Qt::endl;
             }
         }
     }
     {
         QMap<QString, FunctionModelItem> _map;
-        for(QMultiHash<QString, FunctionModelItem>::const_iterator i = functionMap.begin(); i!=functionMap.end(); i++){
-            _map.insert(i.key(), i.value());
+        for(const FunctionModelItem& item : functions){
+            _map.insert(item->name(), item);
         }
         if(!_map.isEmpty()){
             stream << Qt::endl;
             stream << indent << "Functions:" << Qt::endl;
-            for(QMap<QString, FunctionModelItem>::const_iterator i = _map.begin(); i!=_map.end(); i++){
+            for(QMap<QString, FunctionModelItem>::const_iterator i = _map.cbegin(); i!=_map.cend(); i++){
                 stream << indent << i.key() << Qt::endl;
             }
         }
     }
     {
         QMap<QString, NamespaceModelItem> _map;
-        for(QMap<QString, NamespaceModelItem>::const_iterator i = namespaceMap.begin(); i!=namespaceMap.end(); i++){
-            _map.insert(i.key(), i.value());
+        for(const NamespaceModelItem& item : namespaces){
+            _map.insert(item->name(), item);
         }
         if(!_map.isEmpty()){
             stream << Qt::endl;
             stream << indent << "Namespaces:" << Qt::endl;
-            for(QMap<QString, NamespaceModelItem>::const_iterator i = _map.begin(); i!=_map.end(); i++){
+            for(QMap<QString, NamespaceModelItem>::const_iterator i = _map.cbegin(); i!=_map.cend(); i++){
                 stream << indent << "namespace " << i.key() << "{" << Qt::endl;
-                writeContent(stream, indent+"    ", i.value()->classes(), i.value()->enumMap(), i.value()->typeAliasMap(), i.value()->variableMap(), i.value()->functionDefinitionMap(), i.value()->functionMap(), i.value()->namespaceMap());
+                writeContent(stream, indent+"    ", i.value()->classes(), i.value()->enums(), i.value()->typeAliases(), i.value()->variables(), i.value()->functionDefinitions(), i.value()->functions(), i.value()->namespaces());
                 stream << indent << "}" << Qt::endl;
             }
         }
@@ -554,173 +428,49 @@ bool MetaBuilder::build(FileModelItem&& dom) {
         if (file2.open(QFile::WriteOnly)){
             QTextStream stream(&file2);
             stream.setCodec(QTextCodec::codecForName("UTF-8"));
-            writeContent(stream, "", m_dom->classes(), m_dom->enumMap(), m_dom->typeAliasMap(), m_dom->variableMap(), m_dom->functionDefinitionMap(), m_dom->functionMap(), m_dom->namespaceMap());
+            writeContent(stream, "", m_dom->classes(), m_dom->enums(), m_dom->typeAliases(), m_dom->variables(), m_dom->functionDefinitions(), m_dom->functions(), m_dom->namespaces());
             file2.close();
         }
     }
 #endif
-
-    // fix up QObject's in the type system..
-    fixQObjectForScope(model_dynamic_cast<NamespaceModelItem>(m_dom));
-
-#if 0
-    if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) < QT_VERSION_CHECK(6, 0, 0)){
-        ClassModelItem const_iterator = m_dom->findClass("QVector__const_iterator");
-        if(const_iterator){
-            m_dom->removeClass(const_iterator);
-            ClassModelItem qvec = m_dom->findClass("QVector");
-            if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6, 0, 0)){
-                qvec = m_dom->findClass("QList");
-            }
-            if(qvec){
-                const_iterator->setName("const_iterator");
-                qvec->addClass(const_iterator);
-            }
-        }
-    }
-    {
-        QStringList classNames;
-        classNames << "QMap<Key,T>"
-                   << "QMap"
-                   << "QMultiMap<Key,T>"
-                   << "QMultiMap"
-                   << "QHash<Key,T>"
-                   << "QHash"
-                   << "QMultiHash<Key,T>"
-                   << "QMultiHash"
-                   << "QSet<T>"
-                   << "QSet";
-        if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6, 0, 0)){
-            classNames << "QVector<T>"
-                       << "QVector"
-                       << "QList<T>"
-                       << "QList";
-        }
-//        QList<QString> key = m_dom->classes().keys();
-//        printf("%s\n", qPrintable(key.join("\n")));
-        for(const QString& className : classNames) {
-            if(ClassModelItem mapClass = m_dom->findClass(className)){
-                for(const FunctionModelItem& fct : mapClass->functionMap().values("insert")){
-                    if(fct->type().qualifiedName().join("::")=="iterator"
-                            || fct->type().qualifiedName().join("::").endsWith("::iterator")){
-                        TypeInfo type;
-                        type.setQualifiedName(QStringList()<<"void");
-                        fct->setType(type);
-                    }
-                }
-                if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6, 0, 0)){
-                    if(mapClass->name().startsWith("QMap") || mapClass->name().startsWith("QMultiMap")){
-                        for(const FunctionModelItem& fct : mapClass->functionMap().values("size")){
-                            if(fct->type().qualifiedName().join("::")=="size_type"
-                                    || fct->type().qualifiedName().join("::").endsWith("::size_type")){
-                                TypeInfo type;
-                                type.setQualifiedName(QStringList()<<"qsizetype");
-                                fct->setType(type);
-                            }
-                        }
-                    }else if(mapClass->name().startsWith("QList")){
-                        QList<FunctionModelItem> functions = mapClass->functionMap().values();
-                        for(const FunctionModelItem& fct : functions){
-                            if(fct->type().qualifiedName().join("::")=="const_reference"
-                                    || fct->type().qualifiedName().join("::").endsWith("::const_reference")){
-                                TypeInfo type;
-                                type.setQualifiedName(QStringList()<<"T");
-                                type.setConstant(true);
-                                type.setReferenceType(TypeInfo::Reference);
-                                fct->setType(type);
-                            }
-                            if(fct->type().qualifiedName().join("::")=="value_type"
-                                    || fct->type().qualifiedName().join("::").endsWith("::value_type")
-                                    || fct->type().qualifiedName().join("::")=="Type"
-                                    || fct->type().qualifiedName().join("::").endsWith("::Type")){
-                                TypeInfo type;
-                                type.setQualifiedName(QStringList()<<"T");
-                                fct->setType(type);
-                            }
-                            for(const ArgumentModelItem& argument : fct->arguments()){
-                                if(argument->type().qualifiedName().join("::")=="parameter_type"
-                                        || argument->type().qualifiedName().join("::").endsWith("::parameter_type")
-                                        || argument->type().qualifiedName().join("::")=="const_reference"
-                                        || argument->type().qualifiedName().join("::").endsWith("::const_reference")){
-                                    TypeInfo type;
-                                    type.setQualifiedName(QStringList()<<"T");
-                                    type.setConstant(true);
-                                    type.setReferenceType(TypeInfo::Reference);
-                                    argument->setType(type);
-                                }
-                            }
-                            if(fct->name()=="insert"){
-                                if(fct->templateParameters().size()==1){
-                                    fct->setTemplateParameters({});
-                                }
-                            }
-                            if(fct->name()=="fill"){
-                                if(fct->type().qualifiedName().join("::")=="QList<T>"){
-                                    TypeInfo type;
-                                    type.setQualifiedName(QStringList()<<"void");
-                                    fct->setType(type);
-                                }
-                                fct->setTemplateParameters({});
-                            }
-                        }
-                        for(const FunctionModelItem& fct : mapClass->functionMap().values("operator==")){
-                            if(fct->arguments().size()==2){
-                                if(fct->arguments()[0]->type().qualifiedName().join("::")=="QList"
-                                        && fct->arguments()[1]->type().qualifiedName().join("::")=="QList"){
-                                    const_cast<ArgumentList&>(fct->arguments()).removeFirst();
-                                    fct->setConstant(true);
-                                    fct->setStatic(false);
-                                    fct->setFriend(false);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-#endif
+    QList<PendingClass> pendingClasses;
+    QList<PendingFunctional> pendingFunctionals;
 
     // Start the generation...
     for(const ClassModelItem& cls : m_dom->classes()){
-        addAbstractMetaClass(traverseClass(cls));
+        MetaClass* meta_class = traverseClass(cls, pendingClasses, pendingFunctionals);
+        if(meta_class)
+            addClass(meta_class);
     }
 
-    for(QMap<QString, NamespaceModelItem>::const_iterator i = m_dom->namespaceMap().begin(); i!=m_dom->namespaceMap().end(); i++){
-        MetaClass *meta_class = traverseNamespace(i.value());
+    for(const NamespaceModelItem& ns : m_dom->namespaces()){
+        MetaClass *meta_class = traverseNamespace(ns, pendingClasses, pendingFunctionals);
         if (meta_class){
-            m_meta_classes << meta_class;
-            if(!meta_class->typeEntry()->isString()){
-                if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(meta_class->targetTypeSystem())){
-                    m_typeSystemByPackage[meta_class->package()] = ts;
-                }
-            }
+            addClass(meta_class);
+//            m_meta_classes << meta_class;
+//            if(!meta_class->typeEntry()->isString()){
+//                if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(meta_class->targetTypeSystem())){
+//                    m_typeSystemByPackage[meta_class->package()] = ts;
+//                }
+//            }
         }
     }
 
     QSet<QString> metaEnums;
-    for(auto& function_item : m_dom->functions()){
+    for(const FunctionModelItem& function_item : m_dom->functions()){
         if(function_item->name()==QStringLiteral("qt_getEnumMetaObject")
                 && function_item->arguments().size()==1){
             metaEnums << function_item->arguments()[0]->type().toString();
         }
     }
-    QMap<QString,QString> flagByEnums;
-    for(QMap<QString, TypeAliasModelItem>::const_iterator i = m_dom->typeAliasMap().begin(); i!=m_dom->typeAliasMap().end(); i++){
-        QString type = i.value()->type().toString();
-        if(type.startsWith("QFlags<") && type.endsWith(">")){
-            type = type.mid(7).chopped(1);
-            flagByEnums[type] = i.key();
-        }
-    }
 
     // Some trickery to support global-namespace enums...
     m_current_class = nullptr;
-    for(QMap<QString, EnumModelItem>::const_iterator i = m_dom->enumMap().begin(); i!=m_dom->enumMap().end(); i++){
-        MetaEnum *meta_enum = traverseEnum(i.value(), nullptr, metaEnums, flagByEnums);
+    for(const EnumModelItem& e : m_dom->enums()){
+        MetaEnum *meta_enum = traverseEnum(e, nullptr, metaEnums, m_dom->flagsMap());
 
         if (meta_enum) {
-            MetaClass *global = m_meta_classes.findClass(meta_enum->typeEntry()->targetTypeSystem() + "." + GLOBAL_PACKAGE);
+            MetaClass *global = m_globals[meta_enum->typeEntry()->targetTypeSystem()];
             if (!global) {
                 ComplexTypeEntry *gte = new GlobalTypeEntry(GLOBAL_PACKAGE);
                 gte->setTargetTypeSystem(meta_enum->typeEntry()->targetTypeSystem());
@@ -733,6 +483,7 @@ bool MetaBuilder::build(FileModelItem&& dom) {
                 *global += MetaAttributes::Fake;
 
                 m_meta_classes << global;
+                m_globals[meta_enum->typeEntry()->targetTypeSystem()] = global;
                 if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(global->targetTypeSystem())){
                     m_typeSystemByPackage[global->package()] = ts;
                 }
@@ -746,228 +497,15 @@ bool MetaBuilder::build(FileModelItem&& dom) {
 
     // Go through all typedefs to see if we have defined any
     // specific typedefs to be used as classes.
-    for(QMap<QString, TypeAliasModelItem>::const_iterator i = m_dom->typeAliasMap().begin(); i!=m_dom->typeAliasMap().end(); i++){
-        if(i.value()->type().qualifiedName().join("::").startsWith("std::function<")
-                || i.value()->type().qualifiedName().join("::").startsWith("qxp::function_ref<")
-                || i.value()->type().isFunctionPointer()){
-            MetaFunctional *fnl = traverseFunctional(i.value());
-            if(fnl)
-                addAbstractMetaFunctional(fnl);
+    for(const TypeAliasModelItem& tai : m_dom->typeAliases()){
+        if(tai->type().qualifiedName()==QStringList{"std","function"}
+                || tai->type().qualifiedName()==QStringList{"qxp","function_ref"}
+                || tai->type().isFunctionPointer()){
+            pendingFunctionals.append(PendingFunctional{tai, nullptr, m_scopes});
         }else{
-            MetaClass *cls = traverseTypeAlias(i.value());
+            MetaClass *cls = traverseTypeAlias(tai);
             if(cls){
-                addAbstractMetaClass(cls);
-            }
-        }
-    }
-
-    for(auto& function_item : m_dom->functions()){
-        if(function_item->name()==QStringLiteral("swap")
-                && function_item->arguments().size()==2){
-            continue;
-        }
-        if(function_item->name()==QStringLiteral("qHash")
-                && function_item->arguments().size()<=2){
-            continue;
-        }
-        if(function_item->name().startsWith(QStringLiteral("qRegisterNormalizedMetaType"))
-                || function_item->name()==QStringLiteral("operator!")
-                || function_item->name()==QStringLiteral("operator&")
-                || function_item->name()==QStringLiteral("operator*")
-                || function_item->name()==QStringLiteral("operator+")
-                || function_item->name()==QStringLiteral("operator-")
-                || function_item->name()==QStringLiteral("operator/")
-                || function_item->name()==QStringLiteral("operator<")
-                || function_item->name()==QStringLiteral("operator>")
-                || function_item->name()==QStringLiteral("operator|")
-                || function_item->name()==QStringLiteral("operator~")
-                || function_item->name()==QStringLiteral("operator^")
-                || function_item->name()==QStringLiteral("operator%")
-                || function_item->name()==QStringLiteral("operator!=")
-                || function_item->name()==QStringLiteral("operator&=")
-                || function_item->name()==QStringLiteral("operator*=")
-                || function_item->name()==QStringLiteral("operator+=")
-                || function_item->name()==QStringLiteral("operator-=")
-                || function_item->name()==QStringLiteral("operator/=")
-                || function_item->name()==QStringLiteral("operator|=")
-                || function_item->name()==QStringLiteral("operator<=")
-                || function_item->name()==QStringLiteral("operator>=")
-                || function_item->name()==QStringLiteral("operator%=")
-                || function_item->name()==QStringLiteral("operator<<")
-                || function_item->name()==QStringLiteral("operator>>")
-                || function_item->name()==QStringLiteral("operator<>")
-                || function_item->name()==QStringLiteral("operator==")
-                ){
-            continue;
-        }
-        QString _function_name = function_item->name();
-        QString originalSignature = function_item->name();
-        QStringList tparams;
-        for(const TemplateParameterModelItem& t : function_item->templateParameters()){
-            if(t->isVaradic())
-                tparams << t->name()+"...";
-            else
-                tparams << t->name();
-        }
-        if(!tparams.isEmpty()){
-            _function_name += "<" + tparams.join(", ") + ">";
-            originalSignature += "<" + tparams.join(",") + ">";
-        }
-        _function_name += "(";
-        originalSignature += "(";
-        int counter = 0;
-        for(const ArgumentModelItem& arg : function_item->arguments()){
-            if(arg->type().getReferenceType()==TypeInfo::NoReference
-                && arg->type().indirections().isEmpty()
-                && function_item->arguments().size()==1
-                && arg->type().toString()=="void"){
-                continue;
-            }
-            if(counter!=0){
-                _function_name += ", ";
-                originalSignature += ",";
-            }
-            _function_name += arg->type().toString();
-            originalSignature += arg->type().toString();
-            ++counter;
-        }
-        if(function_item->isVariadics())
-            _function_name += "...";
-        _function_name += ") ";
-        originalSignature += ")";
-        if(function_item->isConstant()){
-            _function_name += "const ";
-            originalSignature += "const";
-        }
-        if(function_item->referenceType()==TypeInfo::Reference){
-            _function_name += "& ";
-            originalSignature += "&";
-        }
-        _function_name += "-> ";
-        if(function_item->type().isConstant())
-            _function_name += "const ";
-        _function_name += function_item->type().qualifiedName().join("::");
-        for(bool i : function_item->type().indirections()){
-            if(i)
-                _function_name += " const";
-            _function_name += "*";
-        }
-        switch(function_item->type().getReferenceType()){
-        case TypeInfo::Reference:
-            _function_name += "&";
-            break;
-        case TypeInfo::RReference:
-            _function_name += "&&";
-            break;
-        default: break;
-        }
-        bool remove = m_database->isFunctionRejected("", function_item->name());
-        MetaClass *targetClass = nullptr;
-        FunctionModificationList functionModificationList;
-        if (!remove) {
-            QString _originalSignature = QString::fromUtf8(QMetaObject::normalizedSignature(qPrintable(originalSignature)));
-            for(const TypeSystemTypeEntry* ts : m_database->typeSystemsByQtLibrary().values()){
-                FunctionModificationList list = ts->functionModifications(originalSignature);
-                if(_originalSignature!=originalSignature)
-                    list << ts->functionModifications(_originalSignature);
-                for(const FunctionModification& mod : qAsConst(list)){
-                    if(mod.isRemoveModifier()){
-                        remove = true;
-                        break;
-                    }else if(!mod.targetType.isEmpty()){
-                        targetClass = m_meta_classes.findClass(ts->name() + "." + mod.targetType);
-                        if(!targetClass){
-                            ComplexTypeEntry *gte = m_database->findComplexType(mod.targetType);
-                            if(!gte){
-                                gte = new NamespaceTypeEntry(mod.targetType, true);
-                                gte->setTargetTypeSystem(ts->name());
-                                gte->setTargetLangPackage(ts->name());
-                                gte->setCodeGeneration(TypeEntry::GenerateAll);
-                            }
-                            targetClass = new MetaClass();
-                            targetClass->setTypeEntry(gte);
-                            *targetClass += MetaAttributes::Final;
-                            *targetClass += MetaAttributes::Public;
-                            m_meta_classes << targetClass;
-                        }
-                        functionModificationList << list;
-                        break;
-                    }
-                }
-                if(targetClass)
-                    break;
-            }
-        }
-        if(targetClass){
-            MetaClass *old_current_class = m_current_class;
-            m_current_class = targetClass;
-            MetaFunction *meta_function = traverseFunction(function_item);
-            if(meta_function){
-                meta_function->setFunctionType(MetaFunction::GlobalScopeFunction);
-                meta_function->setOriginalAttributes(meta_function->originalAttributes() | MetaAttributes::Public | MetaAttributes::Static);
-                *meta_function += MetaAttributes::Static;
-                *meta_function += MetaAttributes::Public;
-                meta_function->setDeclaringClass(targetClass);
-                meta_function->setOwnerClass(targetClass);
-                meta_function->setImplementingClass(targetClass);
-                if(meta_function->isInvalid()){
-                    targetClass->addInvalidFunction(meta_function);
-                }else{
-                    QString fileName = function_item->fileName();
-                    QFileInfo file(QDir::fromNativeSeparators(fileName));
-                    if(file.exists()){
-                        fileName = file.canonicalFilePath();
-#ifdef Q_OS_MAC
-                        QDir dir = file.dir();
-                        if(QFileInfo(dir.absolutePath()).fileName()==QStringLiteral("Headers") && dir.cdUp()){
-                            if(!QFileInfo(dir.absolutePath()).fileName().endsWith(".framework")){
-                                if(dir.cdUp() && QFileInfo(dir.absolutePath()).fileName()==QStringLiteral("Versions") && dir.cdUp()){
-                                }
-                            }
-                            QString moduleName = QFileInfo(dir.absolutePath()).fileName();
-                            if(moduleName.endsWith(".framework")){
-                                moduleName = moduleName.mid(0, moduleName.length()-10);
-                                targetClass->typeEntry()->addExtraInclude(Include(Include::IncludePath, QString("%1/%2").arg(moduleName, file.fileName())));
-                                fileName.clear();
-                            }
-                        }
-#endif
-                    }
-                    if(!fileName.isEmpty()){
-                        for(const QString& includePath : m_includePathsList){
-                            QFileInfo f(includePath);
-                            if(f.isDir()){
-                                QString path = f.canonicalFilePath();
-                                if(!path.endsWith("/"))
-                                    path += "/";
-                                if(fileName.startsWith(path)){
-                                    path = fileName.mid(path.size());
-                                    targetClass->typeEntry()->addExtraInclude(Include(Include::IncludePath, path));
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    targetClass->addFunction(meta_function);
-                    for(FunctionModification mod : functionModificationList){
-                        if(!mod.argument_mods.isEmpty()
-                                || !mod.template_instantiations.isEmpty()
-                                || !mod.association.isEmpty()
-                                || !mod.ppCondition.isEmpty()
-                                || mod.isCodeInjection()
-                                || !mod.throws.isEmpty()){
-                            mod.signature = meta_function->minimalSignature();
-                            targetClass->typeEntry()->addFunctionModification(mod);
-                        }
-                    }
-                }
-            }
-            m_current_class = old_current_class;
-        }else{
-            if(!function_item->templateParameters().isEmpty()){
-                m_rejected_template_functions.insert({_function_name, function_item->fileName()}, remove ? GenerationDisabled : IsGlobal);
-            }else{
-                m_rejected_functions.insert({_function_name, function_item->fileName()}, remove ? GenerationDisabled : IsGlobal);
+                addClass(cls);
             }
         }
     }
@@ -981,89 +519,93 @@ bool MetaBuilder::build(FileModelItem&& dom) {
         }
     }
 
+    QList<PendingHiddenBaseType> pendingHiddenBaseTypes;
+    QList<MetaClass *> pendingConstructorUsages;
     for(MetaClass *cls : qAsConst(m_meta_classes)) {
         if (!cls->isInterface() && !cls->isNamespace()) {
-            setupInheritance(cls);
+            setupInheritance(cls, pendingHiddenBaseTypes, pendingConstructorUsages);
         }else if(cls->isInterface()){
-            setupInheritance(cls->extractInterfaceImpl());
+            setupInheritance(cls->extractInterfaceImpl(), pendingHiddenBaseTypes, pendingConstructorUsages);
         }
-        setupTemplateInstantiations(cls);
     }
 
-    fixMissingIterator();
+    pendingClasses.append(PendingClass{model_dynamic_cast<ScopeModelItem>(m_dom), nullptr, m_scopes});
 
-    for(MetaClass *cls : qAsConst(m_meta_classes)) {
-        cls->fixFunctions([this](TypeEntry * etype) -> MetaArgument*{
-            MetaType* type = new MetaType();
-            type->setTypeEntry(etype);
-            type->setIndirections(QList<bool>() << false);
-            type->setTypeUsagePattern(MetaType::ObjectPattern);
-            MetaArgument* argument = new MetaArgument();
-            argument->setName("_this");
-            argument->setType(type);
-            return argument;
-        });
-
-        if (!cls->typeEntry()) {
-            ReportHandler::warning(QString("class '%1' does not have an entry in the type system")
-                                   .arg(cls->name()));
-        } else {
-            if (!cls->hasConstructors() && !cls->isFinalInCpp() && !cls->isInterface() && !cls->isNamespace())
-                cls->addDefaultConstructor();
+    {
+        QList<ScopeModelItem> previousScopes = m_scopes;
+        MetaClass* last_class = m_current_class;
+        for(const PendingFunctional& pf : qAsConst(pendingFunctionals)){
+            m_scopes = pf.scopes;
+            m_namespace_prefix = currentScope()->qualifiedName().join("::");
+            m_current_class = pf.metaClass;
+            MetaFunctional *fnl = traverseFunctional(pf.scope);
+            if(fnl){
+                if(pf.metaClass)
+                    pf.metaClass->addFunctional(fnl);
+                else
+                    addFunctional(fnl);
+            }
         }
-
-        if (cls->isAbstract() && !cls->isInterface()) {
-            cls->typeEntry()->setLookupName(cls->typeEntry()->targetLangName() + "$ConcreteWrapper");
+        for(const PendingClass& pc : qAsConst(pendingClasses)){
+            m_scopes = pc.scopes;
+            m_namespace_prefix = currentScope()->qualifiedName().join("::");
+            m_current_class = pc.metaClass;
+            traverseFunctions(pc.scope);
+            traverseFields(pc.scope);
         }
+        m_current_class = last_class;
+        pushScope(model_dynamic_cast<ScopeModelItem>(m_dom));
+        m_scopes = previousScopes;
+        m_namespace_prefix = currentScope()->qualifiedName().join("::");
     }
 
-    for(MetaClass *cls : qAsConst(m_meta_classes)) {
-        cls->fixUnimplmentablePureVirtualFunctions();
+    for(const PendingHiddenBaseType& p : qAsConst(pendingHiddenBaseTypes)) {
+        MetaClass *old_current_class = m_current_class;
+        m_current_class = p.subclass;
+        inheritHiddenBaseType(p.subclass, p.hidden_base_class, p.info, pendingConstructorUsages);
+        m_current_class = old_current_class;
     }
 
-    for(MetaClass *cls : qAsConst(m_meta_classes)) {
-        if(!cls->typeEntry()->extendType().isEmpty()){
-            if(MetaClass *extendedClass = m_meta_classes.findClass(cls->typeEntry()->extendType())){
-                for(MetaFunction* function : cls->functions()){
-                    function = function->copy();
-                    if(function->isConstructor()){
-                        function->setName(extendedClass->simpleName());
-                    }
-                    function->setImplementingClass(extendedClass);
-                    function->setDeclaringClass(extendedClass);
-                    function->setOwnerClass(extendedClass);
-                    extendedClass->addFunction(function);
-                    //add_extra_includes_for_function(extendedClass, function);
-                }
-                for(const Include& incl : cls->typeEntry()->extraIncludes()){
-                    extendedClass->typeEntry()->addExtraInclude(incl);
+    for(MetaClass *cls : qAsConst(pendingConstructorUsages)) {
+        if(cls->baseClass() && (cls->usingProtectedBaseConstructors() || cls->usingPublicBaseConstructors())){
+            for(const MetaFunction* fun : cls->baseClass()->functions()){
+                if(fun->isConstructor()){
+                    MetaFunction* constructor = fun->copy();
+                    constructor->setImplementingClass(cls);
+                    constructor->setDeclaringClass(cls);
+                    constructor->setName(cls->qualifiedCppName().split("::").last());
+                    constructor->setOriginalName(constructor->name());
+                    if(cls->usingPublicBaseConstructors()){
+                        constructor->setVisibility(MetaAttributes::Public);
+                    }else{
+                        constructor->setVisibility(MetaAttributes::Protected);
+                    }
+                    cls->addFunction(constructor);
                 }
-            }else{
-                ReportHandler::warning(QString("Unable to extend class '%1'.")
-                                       .arg(cls->typeEntry()->extendType()));
             }
         }
     }
 
-    QList<TypeEntry *> entries = m_database->entries().values();
+    fixMissingIterator();
+
+    for(MetaClass *cls : qAsConst(m_meta_classes)) {
+        fixFunctions(cls);
+    }
+
+    const QList<TypeEntry *> entries = m_database->entries().values();
     for(const TypeEntry *entry : entries) {
         if (entry->isPrimitive())
             continue;
 
         if ((entry->isValue() || entry->isObject())
                 && !entry->isString()
-                && !entry->isChar()
+                && !entry->isQChar()
                 && !entry->isContainer()
-//                && !entry->isIterator()
                 && !entry->isPointerContainer()
                 && !entry->isInitializerList()
-                && !entry->isQModelIndexType()
-                && !entry->isQMetaEnumType()
-                && !entry->isQMetaMethodType()
                 && !entry->isQMetaObjectType()
                 && !entry->isQMetaObjectConnectionType()
-                && !entry->isQMetaPropertyType()
-                && !entry->isVariant()
+                && !entry->isQVariant()
                 && !m_meta_classes.findClass(entry->qualifiedCppName(), MetaClassList::QualifiedCppName)) {
             ReportHandler::warning(QString("type '%1' is specified in typesystem, "
                                            "but not defined. This could potentially "
@@ -1072,27 +614,31 @@ bool MetaBuilder::build(FileModelItem&& dom) {
         }
 
         if (entry->isEnum()) {
-            QString pkg = entry->javaPackage();
-            QString name = (pkg.isEmpty() ? QString() : pkg + ".")
-                           + static_cast<const EnumTypeEntry *>(entry)->javaQualifier();
-            MetaClass *cls = m_meta_classes.findClass(name);
+            QString name;
+            MetaClass *cls;
+            if(static_cast<const EnumTypeEntry *>(entry)->javaQualifier().isEmpty()){
+                name = entry->targetTypeSystem() + "." + GLOBAL_PACKAGE;
+                cls = m_globals[entry->targetTypeSystem()];
+            }else{
+                QString pkg = entry->javaPackage();
+                name = (pkg.isEmpty() ? QString() : pkg + ".") + static_cast<const EnumTypeEntry *>(entry)->javaQualifier();
+                cls = m_meta_classes.findClass(name);
+            }
 
             if(!cls && static_cast<const EnumTypeEntry *>(entry)->javaQualifier().isEmpty()){
-                cls = m_meta_classes.findClass(entry->targetTypeSystem() + "." + GLOBAL_PACKAGE);
-                if (!cls) {
-                    ComplexTypeEntry *gte = new GlobalTypeEntry(GLOBAL_PACKAGE);
-                    gte->setTargetLangPackage(entry->targetTypeSystem());
-                    gte->setTargetTypeSystem(entry->targetTypeSystem());
-                    gte->setCodeGeneration(TypeEntry::GenerateNothing);
-                    cls = new MetaClass();
-                    cls->setTypeEntry(gte);
-                    *cls += MetaAttributes::Final;
-                    *cls += MetaAttributes::Public;
-                    *cls += MetaAttributes::Fake;
-                    m_meta_classes << cls;
-                    if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(cls->targetTypeSystem())){
-                        m_typeSystemByPackage[cls->package()] = ts;
-                    }
+                ComplexTypeEntry *gte = new GlobalTypeEntry(GLOBAL_PACKAGE);
+                gte->setTargetLangPackage(entry->targetTypeSystem());
+                gte->setTargetTypeSystem(entry->targetTypeSystem());
+                gte->setCodeGeneration(TypeEntry::GenerateNothing);
+                cls = new MetaClass();
+                cls->setTypeEntry(gte);
+                *cls += MetaAttributes::Final;
+                *cls += MetaAttributes::Public;
+                *cls += MetaAttributes::Fake;
+                m_meta_classes << cls;
+                m_globals[entry->targetTypeSystem()] = cls;
+                if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(cls->targetTypeSystem())){
+                    m_typeSystemByPackage[cls->package()] = ts;
                 }
             }
 
@@ -1111,41 +657,49 @@ bool MetaBuilder::build(FileModelItem&& dom) {
         }
 
         if (entry->isFunctional()) {
-            QString pkg = entry->javaPackage();
-            QString name = (pkg.isEmpty() ? QString() : pkg + ".")
-                           + static_cast<const FunctionalTypeEntry *>(entry)->javaQualifier();
-            MetaClass *cls = m_meta_classes.findClass(name);
+            QString name;
+            MetaClass *cls;
+            if(static_cast<const FunctionalTypeEntry *>(entry)->javaQualifier().isEmpty()){
+                name = entry->targetTypeSystem() + "." + GLOBAL_PACKAGE;
+                cls = m_globals[entry->targetTypeSystem()];
+            }else{
+                QString pkg = entry->javaPackage();
+                name = (pkg.isEmpty() ? QString() : pkg + ".") + static_cast<const FunctionalTypeEntry *>(entry)->javaQualifier();
+                cls = m_meta_classes.findClass(name);
+            }
 
             if(!cls && static_cast<const FunctionalTypeEntry *>(entry)->javaQualifier().isEmpty()){
-                cls = m_meta_classes.findClass(entry->targetTypeSystem() + "." + GLOBAL_PACKAGE);
-                if (!cls) {
-                    ComplexTypeEntry *gte = new GlobalTypeEntry(GLOBAL_PACKAGE);
-                    gte->setTargetLangPackage(entry->targetTypeSystem());
-                    gte->setTargetTypeSystem(entry->targetTypeSystem());
-                    gte->setCodeGeneration(TypeEntry::GenerateNothing);
-                    cls = new MetaClass();
-                    cls->setTypeEntry(gte);
-                    *cls += MetaAttributes::Final;
-                    *cls += MetaAttributes::Public;
-                    *cls += MetaAttributes::Fake;
-                    m_meta_classes << cls;
-                    if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(cls->targetTypeSystem())){
-                        m_typeSystemByPackage[cls->package()] = ts;
-                    }
+                ComplexTypeEntry *gte = new GlobalTypeEntry(GLOBAL_PACKAGE);
+                gte->setTargetLangPackage(entry->targetTypeSystem());
+                gte->setTargetTypeSystem(entry->targetTypeSystem());
+                gte->setCodeGeneration(TypeEntry::GenerateNothing);
+                cls = new MetaClass();
+                cls->setTypeEntry(gte);
+                *cls += MetaAttributes::Final;
+                *cls += MetaAttributes::Public;
+                *cls += MetaAttributes::Fake;
+                m_meta_classes << cls;
+                m_globals[entry->targetTypeSystem()] = cls;
+                if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(cls->targetTypeSystem())){
+                    m_typeSystemByPackage[cls->package()] = ts;
                 }
             }
 
             if(entry->codeGeneration()==TypeEntry::GenerateAll){
                 if (!cls) {
-                    ReportHandler::warning(QString("namespace '%1' for functional '%2' is not declared")
-                                           .arg(name).arg(entry->targetLangName()));
+                    ReportHandler::warning(QStringLiteral("namespace '%1' for functional '%2' is not declared")
+                                           .arg(name, entry->targetLangName()));
                 } else {
                     MetaFunctional *e = cls->findFunctional(entry->targetLangName());
+                    if (!e)
+                        e = cls->findFunctional(entry->name());
+                    if (!e)
+                        e = cls->findFunctional(entry->qualifiedCppName());
                     if (!e){
                         e = findFunctional(cls, static_cast<const FunctionalTypeEntry *>(entry));
                     }
                     if (!e)
-                        ReportHandler::warning(QString("function '%1' is specified in typesystem, "
+                        ReportHandler::warning(QStringLiteral("function '%1' is specified in typesystem, "
                                                        "but not declared")
                                                .arg(entry->qualifiedCppName()));
                 }
@@ -1153,44 +707,11 @@ bool MetaBuilder::build(FileModelItem&& dom) {
         }
     }
 
-    for(const FunctionModelItem& item : m_dom->findFunctions("qHash")) {
-        registerHashFunction(item);
-    }
+    figureOutEnumValues();
+    figureOutDefaultEnumArguments();
+    checkFunctionModifications();
 
-    for(const FunctionModelItem& item : m_dom->findFunctions("operator<<")) {
-        registerToStringCapability(item);
-    }
-
-    {
-        FunctionList list;
-        list << m_dom->findFunctions("operator==")
-             << m_dom->findFunctions("operator<=")
-             << m_dom->findFunctions("operator>=")
-             << m_dom->findFunctions("operator<")
-             << m_dom->findFunctions("operator>");
-        for(const FunctionModelItem& item : list) {
-            traverseCompareOperator(item);
-        }
-    }
-
-    {
-        FunctionList list;
-        list << m_dom->findFunctions("operator<<")
-             << m_dom->findFunctions("operator>>");
-        for(const FunctionModelItem& item : list) {
-            traverseStreamOperator(item);
-        }
-    }
-
-    for(QMap<QString, NamespaceModelItem>::const_iterator i = m_dom->namespaceMap().begin(); i!=m_dom->namespaceMap().end(); i++){
-        figureOutFunctionsInNamespace(i.value());
-    }
-
-    figureOutEnumValues();
-    figureOutDefaultEnumArguments();
-    checkFunctionModifications();
-
-    for(MetaClass *cls : m_templates) {
+    for(MetaClass *cls : qAsConst(m_templates)) {
         setupEquals(cls);
         setupComparable(cls);
         setupClonable(cls);
@@ -1204,6 +725,23 @@ bool MetaBuilder::build(FileModelItem&& dom) {
     }
     dumpLog();
     sortLists();
+    for(const QList<TypeEntry *>& entries : m_database->allEntries().values()){
+        for(const TypeEntry* te : entries){
+            if(te->isComplex()){
+                const ComplexTypeEntry *centry = static_cast<const ComplexTypeEntry *>(te);
+                if(!centry->polymorphicIdValue().isEmpty()){
+                    if(MetaClass *cls = classes().findClass(centry->qualifiedCppName())){
+                        while (cls!= nullptr && !cls->typeEntry()->isPolymorphicBase())
+                            cls = cls->baseClass();
+                        if (!cls) {
+                            ReportHandler::warning(QString("class '%1' has polymorphic id but does not inherit a polymorphic class")
+                                                   .arg(centry->qualifiedCppName()));
+                        }
+                    }
+                }
+            }
+        }
+    }
     return true;
 }
 
@@ -1212,7 +750,7 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
         QMap<QString, QSharedPointer<MetaType>> analyzedTypes;
         MetaFunctionalList meta_functionals = m_meta_functionals;
         const DocNamespace* globalNamespace = docModel->getNamespace("");
-        for(MetaClass *meta_class : m_meta_classes) {
+        for(MetaClass *meta_class : qAsConst(m_meta_classes)) {
             if(meta_class->isNamespace() || meta_class->isFake()){
                 const DocNamespace* ns = meta_class->isFake() ? globalNamespace : docModel->getNamespace(meta_class->qualifiedCppName());
                 if(!ns && !meta_class->isFake()){
@@ -1232,6 +770,12 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                     meta_class->setHref(ns->href());
                     meta_class->setBrief(ns->brief());
                 }
+                for(MetaFunction * meta_function : meta_class->functions()){
+                    for(int i=0; i<meta_function->arguments().size(); ++i){
+                        MetaArgument *argument = meta_function->arguments()[i];
+                        analyzedTypes[argument->type()->cppSignature()] = QSharedPointer<MetaType>(argument->type()->copy());
+                    }
+                }
                 for(MetaFunction * meta_function : meta_class->functions()){
                     QList<const DocFunction*> functions;
                     if(meta_function->functionType()==MetaFunction::GlobalScopeFunction){
@@ -1263,7 +807,7 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                         meta_function->setHref(functions[0]->href());
                         meta_function->setBrief(functions[0]->brief());
                     }else{
-                        for(const DocFunction* function : functions){
+                        for(const DocFunction* function : qAsConst(functions)){
                             if(meta_function->isConstant()==function->isConst()
                                     && (meta_function->isStatic()==function->isStatic() || meta_function->functionType()==MetaFunction::GlobalScopeFunction)
                                     && meta_function->arguments().size()==function->parameters().size()){
@@ -1278,47 +822,53 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                                             break;
                                         }
                                     }
-                                    QSharedPointer<MetaType> type = analyzedTypes[arg];
-                                    if(!type){
-                                        TypeInfo typeInfo = analyzeTypeInfo(meta_class, arg);
-                                        type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
-                                        if(!ok || !type){
-                                            QString qualifiedName = typeInfo.qualifiedName().join("::");
-                                            if(qualifiedName=="ushort"){
-                                                typeInfo.setQualifiedName({"unsigned short"});
-                                                type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
-                                            }else if(qualifiedName=="uint"){
-                                                typeInfo.setQualifiedName({"unsigned int"});
-                                                type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
-                                            }else if(qualifiedName=="uchar"){
-                                                typeInfo.setQualifiedName({"unsigned char"});
-                                                type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
-                                            }else if(qualifiedName=="ulonglong"){
-                                                typeInfo.setQualifiedName({"unsigned long long"});
-                                                type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
+                                    if(arg.endsWith(" &")){
+                                        arg.chop(2);
+                                        arg += "&";
+                                    }
+                                    if(argument->type()->cppSignature()!=arg){
+                                        QSharedPointer<MetaType> type = analyzedTypes[arg];
+                                        if(!type){
+                                            TypeInfo typeInfo = analyzeTypeInfo(meta_class, arg);
+                                            type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
+                                            if(!ok || !type){
+                                                QString qualifiedName = typeInfo.qualifiedName().join("::");
+                                                if(qualifiedName=="ushort"){
+                                                    typeInfo.setQualifiedName({"unsigned short"});
+                                                    type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
+                                                }else if(qualifiedName=="uint"){
+                                                    typeInfo.setQualifiedName({"unsigned int"});
+                                                    type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
+                                                }else if(qualifiedName=="uchar"){
+                                                    typeInfo.setQualifiedName({"unsigned char"});
+                                                    type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
+                                                }else if(qualifiedName=="ulonglong"){
+                                                    typeInfo.setQualifiedName({"unsigned long long"});
+                                                    type = QSharedPointer<MetaType>(translateType(typeInfo, &ok, ""));
+                                                }
                                             }
+                                            analyzedTypes[arg] = type;
                                         }
-                                        analyzedTypes[arg] = type;
-                                    }
-                                    if(ok && type){
-                                        if(type->isConstant()!=argument->type()->isConstant()
-                                                || type->getReferenceType()!=argument->type()->getReferenceType()
-                                                || type->indirections()!=argument->type()->indirections()){
-                                            ok = false;
-                                            break;
-                                        }else{
-                                            if(type->typeEntry()->isTemplateArgument()
-                                                    && argument->type()->typeEntry()->isTemplateArgument()){
-                                                if(type->typeEntry()->qualifiedCppName()!=argument->type()->typeEntry()->qualifiedCppName()){
+                                        if(ok && type){
+                                            if(type->isConstant()!=argument->type()->isConstant()
+                                                    || type->getReferenceType()!=argument->type()->getReferenceType()
+                                                    || type->indirections()!=argument->type()->indirections()){
+                                                ok = false;
+                                                break;
+                                            }else{
+                                                if(type->typeEntry()->isTemplateArgument()
+                                                        && argument->type()->typeEntry()->isTemplateArgument()){
+                                                    if(type->typeEntry()->qualifiedCppName()!=argument->type()->typeEntry()->qualifiedCppName()){
+                                                        ok = false;
+                                                        break;
+                                                    }
+                                                }else if(type->typeEntry()!=argument->type()->typeEntry()
+                                                        && !(type->typeEntry()->isQString() && argument->type()->typeEntry()==m_database->qstringType())
+                                                        && !(type->typeEntry()->isQVariant() && argument->type()->typeEntry()==m_database->qvariantType())
+                                                        && !(type->typeEntry()->isQChar() && argument->type()->typeEntry()==m_database->qcharType())){
                                                     ok = false;
                                                     break;
                                                 }
-                                            }else if(type->typeEntry()!=argument->type()->typeEntry()
-                                                    && !(type->typeEntry()->isQString() && argument->type()->typeEntry()==m_database->qstringType())
-                                                    && !(type->typeEntry()->isVariant() && argument->type()->typeEntry()==m_database->qvariantType())
-                                                    && !(type->typeEntry()->isChar() && argument->type()->typeEntry()==m_database->qcharType())){
-                                                ok = false;
-                                                break;
                                             }
                                         }
                                     }
@@ -1339,6 +889,10 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                                                 break;
                                             }
                                         }
+                                        if(arg.endsWith(" &")){
+                                            arg.chop(2);
+                                            arg += "&";
+                                        }
                                         QSharedPointer<MetaType> type = analyzedTypes[arg];
                                         if(!type){
                                             TypeInfo typeInfo = analyzeTypeInfo(meta_class, arg);
@@ -1370,8 +924,8 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                                             }else{
                                                 if(type->typeEntry()!=argument->type()->typeEntry()
                                                         && !(type->typeEntry()->isQString() && argument->type()->typeEntry()==m_database->qstringType())
-                                                        && !(type->typeEntry()->isVariant() && argument->type()->typeEntry()==m_database->qvariantType())
-                                                        && !(type->typeEntry()->isChar() && argument->type()->typeEntry()==m_database->qcharType())){
+                                                        && !(type->typeEntry()->isQVariant() && argument->type()->typeEntry()==m_database->qvariantType())
+                                                        && !(type->typeEntry()->isQChar() && argument->type()->typeEntry()==m_database->qcharType())){
                                                     ok = false;
                                                     break;
                                                 }
@@ -1386,6 +940,15 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                                 }
                             }
                         }
+                        if(meta_function->href().isEmpty()){
+                            for(const DocFunction* function : qAsConst(functions)){
+                                if(function->minimalSignature()==meta_function->minimalSignature()){
+                                    meta_function->setHref(function->href());
+                                    meta_function->setBrief(function->brief());
+                                    break;
+                                }
+                            }
+                        }
                     }
                 }
             }else{
@@ -1418,6 +981,12 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                 if(cls){
                     meta_class->setHref(cls->href());
                     meta_class->setBrief(cls->brief());
+                    for(MetaFunction * meta_function : meta_class->functions()){
+                        for(int i=0; i<meta_function->arguments().size(); ++i){
+                            MetaArgument *argument = meta_function->arguments()[i];
+                            analyzedTypes[argument->type()->cppSignature()] = QSharedPointer<MetaType>(argument->type()->copy());
+                        }
+                    }
                     for(MetaFunction * meta_function : meta_class->functions()){
                         const DocClass* _cls = cls;
                         if(meta_function->declaringClass()!=meta_class){
@@ -1459,7 +1028,7 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                         if(functions.size()==1){
                             meta_function->setHref(functions[0]->href());
                             meta_function->setBrief(functions[0]->brief());
-                        }else for(const DocFunction* function : functions){
+                        }else for(const DocFunction* function : qAsConst(functions)){
                             if(meta_function->isConstant()==function->isConst()
                                     && meta_function->isStatic()==function->isStatic()
                                     && meta_function->arguments().size()==function->parameters().size()){
@@ -1475,6 +1044,10 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                                                 break;
                                             }
                                         }
+                                        if(arg.endsWith(" &")){
+                                            arg.chop(2);
+                                            arg += "&";
+                                        }
                                         QSharedPointer<MetaType> type = analyzedTypes[arg];
                                         if(!type){
                                             TypeInfo typeInfo = analyzeTypeInfo(meta_class, arg);
@@ -1506,8 +1079,8 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                                             }else{
                                                 if(type->typeEntry()!=argument->type()->typeEntry()
                                                         && !(type->typeEntry()->isQString() && argument->type()->typeEntry()==m_database->qstringType())
-                                                        && !(type->typeEntry()->isVariant() && argument->type()->typeEntry()==m_database->qvariantType())
-                                                        && !(type->typeEntry()->isChar() && argument->type()->typeEntry()==m_database->qcharType())){
+                                                        && !(type->typeEntry()->isQVariant() && argument->type()->typeEntry()==m_database->qvariantType())
+                                                        && !(type->typeEntry()->isQChar() && argument->type()->typeEntry()==m_database->qcharType())){
                                                     ok = false;
                                                     break;
                                                 }
@@ -1528,6 +1101,15 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                                     meta_function->setBrief(prop->brief());
                                 }
                         }
+                        if(meta_function->href().isEmpty()){
+                            for(const DocFunction* function : qAsConst(functions)){
+                                if(function->minimalSignature()==meta_function->minimalSignature()){
+                                    meta_function->setHref(function->href());
+                                    meta_function->setBrief(function->brief());
+                                    break;
+                                }
+                            }
+                        }
                     }
 
                     for(MetaField * meta_field : meta_class->fields()){
@@ -1624,7 +1206,7 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                 meta_functionals << meta_class->functionals();
             }
         }
-        for(MetaFunctional *meta_class : meta_functionals) {
+        for(MetaFunctional *meta_class : qAsConst(meta_functionals)) {
             const DocClass* cls = docModel->getClass(meta_class->typeEntry()->qualifiedCppName());
             if(!cls){
                 QStringList qualifiedCppName = meta_class->typeEntry()->qualifiedCppName().split("::");
@@ -1700,7 +1282,7 @@ void MetaBuilder::applyDocs(const DocModel* docModel){
                 meta_class->setBrief(cls->brief());
             }
         }
-        for(MetaEnum* meta_enum : m_enums){
+        for(MetaEnum* meta_enum : qAsConst(m_enums)){
             if(meta_enum->href().isEmpty() && meta_enum->brief().isEmpty()){
                 const DocEnum* docEnum = docModel->getEnum(meta_enum->typeEntry()->qualifiedCppName());
                 if(!docEnum){
@@ -1742,7 +1324,7 @@ void analyzeFunctional(MetaFunctional* meta_functional, const QList<MetaArgument
     QString modifiedReturnType = meta_functional->typeReplaced(0);
     MetaType * type = meta_functional->type();
     if(type || (!modifiedReturnType.isEmpty() && modifiedReturnType!="void")){
-        if((type && type->isPrimitive() && modifiedReturnType.isEmpty())
+        if((type && (type->isPrimitive() || type->isQChar()) && modifiedReturnType.isEmpty())
                 || modifiedReturnType=="byte"
                 || modifiedReturnType=="int"
                 || modifiedReturnType=="long"
@@ -1773,15 +1355,24 @@ void analyzeFunctional(MetaFunctional* meta_functional, const QList<MetaArgument
                         meta_functional->setJavaFunctionalInterface("java.util.function.IntPredicate");
                     }else if(modifiedArgType=="long"){
                         meta_functional->setJavaFunctionalInterface("java.util.function.LongPredicate");
-                    }else if(modifiedArgType.isEmpty() && actualArguments[0]->type()->isPrimitive()){
-                        if(actualArguments[0]->type()->typeEntry()->qualifiedTargetLangName()=="double"){
-                            meta_functional->setJavaFunctionalInterface("java.util.function.DoublePredicate");
-                        }else if(actualArguments[0]->type()->typeEntry()->qualifiedTargetLangName()=="int"){
-                            meta_functional->setJavaFunctionalInterface("java.util.function.IntPredicate");
-                        }else if(actualArguments[0]->type()->typeEntry()->qualifiedTargetLangName()=="long"){
-                            meta_functional->setJavaFunctionalInterface("java.util.function.LongPredicate");
+                    }else if(modifiedArgType.isEmpty()){
+                        if(actualArguments[0]->type()->isPrimitive() || actualArguments[0]->type()->isQChar()){
+                            if(actualArguments[0]->type()->typeEntry()->qualifiedTargetLangName()=="double"){
+                                meta_functional->setJavaFunctionalInterface("java.util.function.DoublePredicate");
+                            }else if(actualArguments[0]->type()->typeEntry()->qualifiedTargetLangName()=="int"){
+                                meta_functional->setJavaFunctionalInterface("java.util.function.IntPredicate");
+                            }else if(actualArguments[0]->type()->typeEntry()->qualifiedTargetLangName()=="long"){
+                                meta_functional->setJavaFunctionalInterface("java.util.function.LongPredicate");
+                            }
+                        }else{
+                            meta_functional->setJavaFunctionalInterface("java.util.function.Predicate");
+                            meta_functional->setJavaFunctionalInterfaceParameterTypes({uint(actualArguments[0]->argumentIndex()+1)});
                         }
-                    }else{
+                    }else if(modifiedArgType!="char"
+                             && modifiedArgType!="boolean"
+                             && modifiedArgType!="byte"
+                             && modifiedArgType!="short"
+                             && modifiedArgType!="float"){
                         meta_functional->setJavaFunctionalInterface("java.util.function.Predicate");
                         meta_functional->setJavaFunctionalInterfaceParameterTypes({uint(actualArguments[0]->argumentIndex()+1)});
                     }
@@ -1804,7 +1395,7 @@ void analyzeFunctional(MetaFunctional* meta_functional, const QList<MetaArgument
                 case 0:
                     if(!oldFunctionName.isEmpty() && oldFunctionName!="getAsChar")
                         return;
-                    meta_functional->setJavaFunctionalInterface("io.qt.QtUtilities$CharSupplier");
+                    meta_functional->setJavaFunctionalInterface("QtUtilities$CharSupplier");
                     meta_functional->typeEntry()->setFunctionName("getAsChar");
                     break;
                 default:
@@ -1819,7 +1410,7 @@ void analyzeFunctional(MetaFunctional* meta_functional, const QList<MetaArgument
                     if(!oldFunctionName.isEmpty() && oldFunctionName!="getAsByte")
                         return;
                     meta_functional->typeEntry()->setFunctionName("getAsByte");
-                    meta_functional->setJavaFunctionalInterface("io.qt.QtUtilities$ByteSupplier");
+                    meta_functional->setJavaFunctionalInterface("QtUtilities$ByteSupplier");
                     break;
                 default:
                     if(!oldFunctionName.isEmpty() && oldFunctionName!="applyAsByte")
@@ -1833,7 +1424,7 @@ void analyzeFunctional(MetaFunctional* meta_functional, const QList<MetaArgument
                     if(!oldFunctionName.isEmpty() && oldFunctionName!="getAsShort")
                         return;
                     meta_functional->typeEntry()->setFunctionName("getAsShort");
-                    meta_functional->setJavaFunctionalInterface("io.qt.QtUtilities$ShortSupplier");
+                    meta_functional->setJavaFunctionalInterface("QtUtilities$ShortSupplier");
                     break;
                 default:
                     if(!oldFunctionName.isEmpty() && oldFunctionName!="applyAsShort")
@@ -1900,7 +1491,7 @@ void analyzeFunctional(MetaFunctional* meta_functional, const QList<MetaArgument
                     if(!oldFunctionName.isEmpty() && oldFunctionName!="getAsFloat")
                         return;
                     meta_functional->typeEntry()->setFunctionName("getAsFloat");
-                    meta_functional->setJavaFunctionalInterface("io.qt.QtUtilities$FloatSupplier");
+                    meta_functional->setJavaFunctionalInterface("QtUtilities$FloatSupplier");
                     break;
                 default:
                     if(!oldFunctionName.isEmpty() && oldFunctionName!="applyAsFloat")
@@ -2176,36 +1767,47 @@ MetaFunctional * MetaBuilder::findFunctional(MetaClass *cls, const FunctionalTyp
     if(!_using.isEmpty()){
         FunctionalTypeEntry *ftype = const_cast<FunctionalTypeEntry *>(fentry);
         if(ftype){
+            TypeInfo usingType = analyzeTypeInfo(cls, _using);
             bool is_qxp = false;
-            if((_using.startsWith("std::function<") || (is_qxp = _using.startsWith("qxp::function_ref<"))) && _using.endsWith(">")){
-                QString normalizedSignature = is_qxp ? "qxp::function_ref<" : "std::function<";
-                QString newUsing = is_qxp ? "qxp::function_ref<" : "std::function<";
+            if(usingType.qualifiedName()==QStringList{"std", "function"}
+                    || (is_qxp = usingType.qualifiedName()==QStringList{"qxp", "function_ref"})
+                    || usingType.isFunctionPointer()){
+                QString normalizedSignature = usingType.isFunctionPointer() ? "" : (is_qxp ? "qxp::function_ref<" : "std::function<");
+                QString newUsing = usingType.isFunctionPointer() ? "FunctionPointerPrivate::fn<" : (is_qxp ? "qxp::function_ref<" : "std::function<");
                 std::unique_ptr<MetaFunctional> meta_functional;
                 meta_functional.reset(new MetaFunctional());
                 meta_functional->setTypeEntry(ftype);
                 meta_functional->setBaseTypeName(fentry->targetLangName());
                 bool ok = false;
-                QString functionalReturnType = _using.mid(is_qxp ? 18 : 14).chopped(1);
-                QString functionalArguments = functionalReturnType;
-                auto idx = functionalReturnType.indexOf("(");
-                functionalReturnType = functionalReturnType.mid(0, idx).trimmed();
-                functionalArguments = functionalArguments.mid(idx+1).chopped(1).trimmed();
-                meta_functional->setFunctionPointer(false);
-                MetaType * type = translateType(analyzeTypeInfo(cls, functionalReturnType), &ok, QString("traverseFunctional %1").arg(fentry->name()));
+                meta_functional->setFunctionPointer(usingType.isFunctionPointer());
+                MetaType * type = translateType(usingType.functionalReturnType(), &ok, QString("traverseFunctional %1").arg(fentry->name()));
                 if(ok){
                     newUsing += type ? type->minimalSignature() : "void";
                     normalizedSignature += type ? type->normalizedSignature() : "void";
+                    if(type && type->typeEntry()->isComplex()){
+                        ftype->addExtraInclude(dynamic_cast<const ComplexTypeEntry*>(type->typeEntry())->include());
+                    }
+                    if(usingType.isFunctionPointer()){
+                        newUsing += ",";
+                        normalizedSignature += "(*)(";
+                    }else{
+                        newUsing += "(";
+                        normalizedSignature += "(";
+                    }
                     meta_functional->setType(type);
                     int counter = 0;
-                    newUsing += "(";
-                    normalizedSignature += "(";
                     QList<MetaArgument*> actualArguments;
-                    for(const QString& arg : functionalArguments.split(",")){
-                        MetaType * atype = translateType(analyzeTypeInfo(cls, arg), &ok, QString("traverseFunctional %1").arg(fentry->name()));
+                    for(const TypeInfo& arg : usingType.functionalArgumentTypes()){
+                        MetaType * atype = translateType(arg, &ok, QString("traverseFunctional %1").arg(fentry->name()));
                         if(ok){
+                            if(atype && atype->typeEntry()->isComplex()){
+                                ftype->addExtraInclude(dynamic_cast<const ComplexTypeEntry*>(atype->typeEntry())->include());
+                            }
                             MetaArgument* argument = new MetaArgument();
                             argument->setArgumentIndex(counter);
                             argument->setType(atype);
+                            if(counter<usingType.functionalArgumentNames().size())
+                                argument->setName(usingType.functionalArgumentNames()[counter]);
                             for(const ArgumentModification& mod : ftype->argumentModification()){
                                 if(mod.index==counter+1 && !mod.modified_name.isEmpty()){
                                     argument->setName(mod.modified_name);
@@ -2223,18 +1825,27 @@ MetaFunctional * MetaBuilder::findFunctional(MetaClass *cls, const FunctionalTyp
                             ++counter;
                         }
                     }
-                    newUsing += ")";
-                    normalizedSignature += ")";
                     analyzeFunctional(meta_functional.get(), actualArguments);
-                    newUsing += ">";
-                    normalizedSignature += ">";
+                    normalizedSignature += ")";
+                    if(!usingType.isFunctionPointer()){
+                        newUsing += ")>";
+                        normalizedSignature += ">";
+                    }else{
+                        newUsing += ">::type";
+                    }
                     e = meta_functional.release();
-                    cls->addFunctional(e);
-                    cls->addFunctionalByUsing(_using, e);
-                    cls->addFunctionalByUsing(QMetaObject::normalizedSignature(qPrintable(_using)), e);
-                    cls->addFunctionalByUsing(newUsing, e);
-                    cls->addFunctionalByUsing(QMetaObject::normalizedSignature(qPrintable(newUsing)), e);
-                    cls->addFunctionalByUsing(normalizedSignature, e);
+                    if(cls){
+                        cls->addFunctional(e);
+                        if(!usingType.isFunctionPointer()){
+                            cls->addFunctionalByUsing(_using, e);
+                            cls->addFunctionalByUsing(QMetaObject::normalizedSignature(qPrintable(_using)), e);
+                            cls->addFunctionalByUsing(QMetaObject::normalizedSignature(qPrintable(newUsing)), e);
+                        }
+                        cls->addFunctionalByUsing(newUsing, e);
+                        cls->addFunctionalByUsing(normalizedSignature, e);
+                    }else{
+                        addFunctional(e);
+                    }
                     ftype->setUsing(newUsing);
                     ftype->setNormalizedSignature(normalizedSignature);
                 }
@@ -2244,79 +1855,50 @@ MetaFunctional * MetaBuilder::findFunctional(MetaClass *cls, const FunctionalTyp
     return e;
 }
 
-TypeInfo MetaBuilder::analyzeTypeInfo(MetaClass *cls, QString strg){
-    TypeInfo result;
-    if(strg.startsWith("const ")){
-        result.setConstant(true);
-        strg = strg.mid(6);
-    }
-    if(strg.endsWith("&&")){
-        result.setReferenceType(TypeInfo::RReference);
-        strg.chop(2);
-    }
-    if(strg.endsWith("&")){
-        result.setReferenceType(TypeInfo::Reference);
-        strg.chop(1);
-    }
-    strg = strg.trimmed();
-    if(cls->findEnum(strg)){
-        result.setQualifiedName(cls->qualifiedCppName().split("::") << strg.split("::"));
-    }else if(m_meta_classes.findClass(cls->qualifiedCppName()+"::"+strg)){
-        result.setQualifiedName(cls->qualifiedCppName().split("::") << strg.split("::"));
-    }else if(m_meta_classes.findClass(strg)){
-        result.setQualifiedName(strg.split("::"));
-    }else{
-        result.setQualifiedName(strg.split("::"));
-    }
-    return result;
-}
-
-void MetaBuilder::figureOutFunctionsInNamespace(const NamespaceModelItem &item){
-    {
-        FunctionList hash_functions = item->findFunctions("qHash");
-        for(const FunctionModelItem& item : hash_functions) {
-            registerHashFunction(item);
-        }
-    }
-
-    {
-        FunctionList hash_functions = item->findFunctions("operator<<");
-        for(const FunctionModelItem& item : hash_functions) {
-            registerToStringCapability(item);
-        }
-    }
-
-    {
-        FunctionList compare_operators = item->findFunctions("operator==")
-                                         + item->findFunctions("operator<=")
-                                         + item->findFunctions("operator>=")
-                                         + item->findFunctions("operator<")
-                                         + item->findFunctions("operator>");
-        for(const FunctionModelItem& item : compare_operators) {
-            traverseCompareOperator(item);
+TypeInfo MetaBuilder::convertInfo(MetaClass *cls, const TypeParser::Info& ti){
+    TypeInfo info;
+    info.setConstant(ti.is_constant);
+    info.setVolatile(ti.is_volatile);
+    info.setReferenceType(TypeInfo::ReferenceType(ti.reference_type));
+    info.setArrayElements(ti.arrays);
+    info.setIndirections(ti.indirections);
+    info.setFunctionPointer(ti.is_functionPointer);
+    if(!ti.qualified_name.isEmpty()){
+        QString typeName = ti.qualified_name.join("::");
+        if(!cls){
+            info.setQualifiedName(ti.qualified_name);
+        }else if(cls->findEnum(typeName)){
+            info.setQualifiedName(cls->qualifiedCppName().split("::") << ti.qualified_name);
+        }else if(m_meta_classes.findClass(cls->qualifiedCppName()+"::"+typeName)){
+            info.setQualifiedName(cls->qualifiedCppName().split("::") << ti.qualified_name);
+        }else{
+            info.setQualifiedName(ti.qualified_name);
         }
     }
-
-    {
-        FunctionList stream_operators = item->findFunctions("operator<<") + item->findFunctions("operator>>");
-        for(const FunctionModelItem& item : stream_operators) {
-            traverseStreamOperator(item);
+    if(!ti.functionalReturnType.isEmpty()){
+        info.setFunctionalReturnType(convertInfo(cls, ti.functionalReturnType.first()));
+        QList<TypeInfo> functionalArgumentTypes;
+        for(const TypeParser::Info& ins : ti.functionalArgumentTypes){
+            functionalArgumentTypes << convertInfo(cls, ins);
         }
+        info.setFunctionalArgumentTypes(functionalArgumentTypes);
     }
-
-    for(QMap<QString, NamespaceModelItem>::const_iterator i = item->namespaceMap().begin(); i!=item->namespaceMap().end(); i++){
-        figureOutFunctionsInNamespace(i.value());
+    for(const TypeParser::Info& ins : ti.arguments){
+        info.addArgument(convertInfo(cls, ins));
     }
+    return info;
 }
 
+TypeInfo MetaBuilder::analyzeTypeInfo(MetaClass *cls, QString strg){
+    return convertInfo(cls, TypeParser::parse(strg));
+}
 
-void MetaBuilder::addAbstractMetaFunctional(MetaFunctional *cls) {
+void MetaBuilder::addFunctional(MetaFunctional *cls) {
     if (!cls)
         return;
     cls->setOriginalAttributes(cls->attributes());
     m_meta_functionals << cls;
-    QString pkg = cls->typeEntry()->javaPackage();
-    MetaClass *_cls = m_meta_classes.findClass(cls->typeEntry()->targetTypeSystem() + "." + GLOBAL_PACKAGE);
+    MetaClass *_cls = m_globals[cls->typeEntry()->targetTypeSystem()];
     if(!_cls){
         ComplexTypeEntry *gte = new GlobalTypeEntry(GLOBAL_PACKAGE);
         gte->setTargetLangPackage(cls->typeEntry()->targetTypeSystem());
@@ -2328,6 +1910,7 @@ void MetaBuilder::addAbstractMetaFunctional(MetaFunctional *cls) {
         *_cls += MetaAttributes::Public;
         *_cls += MetaAttributes::Fake;
         m_meta_classes << _cls;
+        m_globals[cls->typeEntry()->targetTypeSystem()] = _cls;
         if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(_cls->targetTypeSystem())){
             m_typeSystemByPackage[_cls->package()] = ts;
         }
@@ -2336,7 +1919,7 @@ void MetaBuilder::addAbstractMetaFunctional(MetaFunctional *cls) {
 }
 
 
-void MetaBuilder::addAbstractMetaClass(MetaClass *cls) {
+void MetaBuilder::addClass(MetaClass *cls) {
     if (!cls)
         return;
 
@@ -2355,6 +1938,13 @@ void MetaBuilder::addAbstractMetaClass(MetaClass *cls) {
                 return;
             }
         }
+        {
+            QString fullQualifiedName = cls->typeEntry()->isGlobal() ? cls->typeEntry()->targetLangName() : cls->fullQualifiedCppName();
+            if(m_classNames.contains(fullQualifiedName)){
+                //ReportHandler::warning("Duplicate class: "+fullQualifiedName);
+            }
+            m_classNames.insert(fullQualifiedName, {});
+        }
         m_meta_classes << cls;
         if(!cls->typeEntry()->isString())
             if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(cls->targetTypeSystem())){
@@ -2369,7 +1959,7 @@ void MetaBuilder::addAbstractMetaClass(MetaClass *cls) {
 }
 
 
-MetaClass *MetaBuilder::traverseNamespace(NamespaceModelItem namespace_item) {
+MetaClass *MetaBuilder::traverseNamespace(NamespaceModelItem namespace_item, QList<PendingClass>& pendingClasses, QList<PendingFunctional>& pendingFunctionals) {
     QString namespace_name = (!m_namespace_prefix.isEmpty() ? m_namespace_prefix + "::" : QString()) + namespace_item->name();
 
     NamespaceTypeEntry *type = m_database->findNamespaceType(namespace_name);
@@ -2385,42 +1975,39 @@ MetaClass *MetaBuilder::traverseNamespace(NamespaceModelItem namespace_item) {
         return nullptr;
     }
 
-    MetaClass *meta_class = new MetaClass();
-    meta_class->setTypeEntry(type);
+    MetaClass *meta_class = m_meta_classes.findClass(type->qualifiedCppName(), MetaClassList::QualifiedCppName);
+    if(meta_class && meta_class->typeEntry()!=type){
+        meta_class = nullptr;
+    }
 
-    *meta_class += MetaAttributes::Public;
+    bool isNewType = false;
+    if(!meta_class){
+        meta_class = new MetaClass();
+        meta_class->setTypeEntry(type);
+        *meta_class += MetaAttributes::Public;
+        isNewType = true;
+    }
 
     m_current_class = meta_class;
 
     ReportHandler::debugSparse(QString("namespace '%1.%2'")
-                               .arg(meta_class->package())
-                               .arg(namespace_item->name()));
+                               .arg(meta_class->package(), namespace_item->name()));
 
     QSet<QString> metaEnums;
-    for(auto& function_item : namespace_item->functions()){
+    for(const FunctionModelItem& function_item : namespace_item->functions()){
         if(function_item->name()==QStringLiteral("qt_getEnumMetaObject")
                 && function_item->arguments().size()==1){
             metaEnums << function_item->arguments()[0]->type().toString();
         }
     }
-    QMap<QString,QString> flagByEnums;
-    for(QMap<QString, TypeAliasModelItem>::const_iterator i = namespace_item->typeAliasMap().begin(); i!=namespace_item->typeAliasMap().end(); i++){
-        QString type = i.value()->type().toString();
-        if(type.startsWith("QFlags<") && type.endsWith(">")){
-            type = type.mid(7).chopped(1);
-            flagByEnums[type] = namespace_name+"::"+i.key();
-        }
-    }
-    traverseEnums(model_dynamic_cast<ScopeModelItem>(namespace_item), meta_class, metaEnums, flagByEnums);
-    traverseFunctions(model_dynamic_cast<ScopeModelItem>(namespace_item), meta_class);
-    traverseFields(model_dynamic_cast<ScopeModelItem>(namespace_item), meta_class);
+    traverseEnums(model_dynamic_cast<ScopeModelItem>(namespace_item), meta_class, metaEnums, namespace_item->flagsMap());
 //     traverseClasses(model_dynamic_cast<ScopeModelItem>(namespace_item));
 
     pushScope(model_dynamic_cast<ScopeModelItem>(namespace_item));
     m_namespace_prefix = currentScope()->qualifiedName().join("::");
 
-    for(ClassModelItem cls : namespace_item->classes()){
-        MetaClass *mjc = traverseClass(cls);
+    for(const ClassModelItem& cls : namespace_item->classes()){
+        MetaClass *mjc = traverseClass(cls, pendingClasses, pendingFunctionals);
         // the classes inside of a namespace are realized as static member classes
         // of the namespace representing java interface.
         if (mjc) {
@@ -2428,30 +2015,29 @@ MetaClass *MetaBuilder::traverseNamespace(NamespaceModelItem namespace_item) {
             if(isEnclosedClass){
                 meta_class->addEnclosedClass(mjc);
             }
-            m_meta_classes << mjc;
-            if(!mjc->typeEntry()->isString())
-                if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(mjc->targetTypeSystem())){
-                    m_typeSystemByPackage[mjc->package()] = ts;
-                }
-            if(mjc->isInterface()){
-                MetaClass *interfaceImpl = mjc->extractInterfaceImpl();
-                m_meta_classes << interfaceImpl;
-                ReportHandler::debugSparse(QString(" -> interface implementation class '%1'").arg(interfaceImpl->name()));
-            }
+            addClass(mjc);
+//            m_meta_classes << mjc;
+//            if(!mjc->typeEntry()->isString())
+//                if(TypeSystemTypeEntry* ts = m_database->findTypeSystem(mjc->targetTypeSystem())){
+//                    m_typeSystemByPackage[mjc->package()] = ts;
+//                }
+//            if(mjc->isInterface()){
+//                MetaClass *interfaceImpl = mjc->extractInterfaceImpl();
+//                m_meta_classes << interfaceImpl;
+//                ReportHandler::debugSparse(QString(" -> interface implementation class '%1'").arg(interfaceImpl->name()));
+//            }
         }
     }
 
     // Go through all typedefs to see if we have defined any
     // specific typedefs to be used as classes.
-    for(QMap<QString, TypeAliasModelItem>::const_iterator i = namespace_item->typeAliasMap().begin(); i!=namespace_item->typeAliasMap().end(); i++){
-        if(i.value()->type().qualifiedName().join("::").startsWith("std::function<")
-                || i.value()->type().qualifiedName().join("::").startsWith("qxp::function_ref<")
-                || i.value()->type().isFunctionPointer()){
-            MetaFunctional *fnl = traverseFunctional(i.value());
-            if(fnl)
-                meta_class->addFunctional(fnl);
+    for(const TypeAliasModelItem& tai : namespace_item->typeAliases()){
+        if(tai->type().qualifiedName()==QStringList{"std","function"}
+                || tai->type().qualifiedName()==QStringList{"qxp","function_ref"}
+                || tai->type().isFunctionPointer()){
+            pendingFunctionals.append(PendingFunctional{tai, meta_class, m_scopes});
         }else{
-            MetaClass *cls = traverseTypeAlias(i.value());
+            MetaClass *cls = traverseTypeAlias(tai);
             // the classes inside of a namespace are realized as static member classes
             // of the namespace representing java interface.
             if (cls) {
@@ -2475,8 +2061,8 @@ MetaClass *MetaBuilder::traverseNamespace(NamespaceModelItem namespace_item) {
 
 
     // Traverse namespaces recursively
-    for(QMap<QString, NamespaceModelItem>::const_iterator i = namespace_item->namespaceMap().begin(); i!=namespace_item->namespaceMap().end(); i++){
-        MetaClass *mjc = traverseNamespace(i.value());
+    for(const NamespaceModelItem& n : namespace_item->namespaces()){
+        MetaClass *mjc = traverseNamespace(n, pendingClasses, pendingFunctionals);
         // the namespace inside of a namespace are realized as static member interfaces
         // of the namespace representing java interface.
         if (mjc) {
@@ -2499,37 +2085,7 @@ MetaClass *MetaBuilder::traverseNamespace(NamespaceModelItem namespace_item) {
     m_namespace_prefix = currentScope()->qualifiedName().join("::");
 
     if (!type->include().isValid()) {
-        QFileInfo info(namespace_item->fileName());
-        QMap<QString,QString> requiredFeatures;
-        for(const QString& feature : namespace_item->requiredFeatures()){
-            if(m_features && m_features->contains(feature)){
-                QFileInfo _info(m_features->value(feature));
-                requiredFeatures[feature] = _info.fileName();
-            }else{
-                requiredFeatures[feature] = "";
-            }
-        }
-        if(info.path().endsWith("/private")){
-            QString path = info.path();
-            path.chop(8);
-            auto idx = path.lastIndexOf("/");
-            if(idx>0){
-                type->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-            }else{
-                type->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-            }
-        }else if(info.path().endsWith("/qpa")){
-            QString path = info.path();
-            path.chop(4);
-            auto idx = path.lastIndexOf("/");
-            if(idx>0){
-                type->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-            }else{
-                type->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-            }
-        }else{
-            type->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-        }
+        addInclude(type, namespace_item->fileName());
     }
     if(!namespace_item->requiredFeatures().isEmpty()){
         QStringList ppConditions;
@@ -2542,8 +2098,9 @@ MetaClass *MetaBuilder::traverseNamespace(NamespaceModelItem namespace_item) {
         ppConditions.removeDuplicates();
         type->setPPCondition(ppConditions.join(" && "));
     }
+    pendingClasses.append(PendingClass{model_dynamic_cast<ScopeModelItem>(namespace_item), meta_class, m_scopes});
 
-    return meta_class;
+    return isNewType ? meta_class : nullptr;
 }
 
 QVariant Operator::calculate(QVariant x) {
@@ -3118,7 +2675,7 @@ QVariant MetaBuilder::figureOutEnumValue(
                     bool found = false;
                     if (s.contains("::")) {
                         ownerTypeName = s.left(s.lastIndexOf("::"));
-                        MetaClass * ownerType = classes().findClass(ownerTypeName);
+                        ownerType = classes().findClass(ownerTypeName);
                         if(!ownerType){
                             if(ownerTypeName.contains("::")){
                                 QString _ownerTypeName = ownerTypeName.left(ownerTypeName.lastIndexOf("::"));
@@ -3133,7 +2690,7 @@ QVariant MetaBuilder::figureOutEnumValue(
                                     }
                                 }
                             }else{
-                                for(MetaClass *cls : m_meta_classes){
+                                for(MetaClass *cls : qAsConst(m_meta_classes)){
                                     if(cls->typeEntry()->isGlobal()){
                                         if(MetaEnum* target_meta_enum = cls->findEnum(ownerTypeName)){
                                             QVariant variant = figureOutEnumValue(target_meta_enum->typeEntry()->size(), ev->stringValue(), target_meta_enum->values().indexOf(ev), cls, target_meta_enum, nullptr, warnings);
@@ -3246,7 +2803,7 @@ QVariant MetaBuilder::figureOutEnumValue(
                     if (s.contains("::")) {
                         ownerTypeName = s.left(s.lastIndexOf("::"));
                         enumValueName = s.right(s.length()-s.lastIndexOf("::")-2);
-                        MetaClass * ownerType = classes().findClass(ownerTypeName);
+                        ownerType = classes().findClass(ownerTypeName);
                         if(!ownerType && ownerTypeName.contains("::")){
                             QString _ownerTypeName = ownerTypeName.left(ownerTypeName.lastIndexOf("::"));
                             enumValueName = ownerTypeName.right(ownerTypeName.length()-ownerTypeName.lastIndexOf("::")-2) + "::" + enumValueName;
@@ -3481,10 +3038,8 @@ void MetaBuilder::figureOutEnumValuesForClass(MetaClass *meta_class,
                         if (!currentRejected && !vRejected) {
                             ReportHandler::warning(
                                 QString("duplicate enum values: %1::%2, %3 and %4 are %5, already rejected: (%6)")
-                                .arg(meta_class->name())
-                                .arg(e->name())
-                                .arg(v->name())
-                                .arg(entries[v->value().value<qint64>()]->name())
+                                .arg(meta_class->name(), e->name(), v->name(),
+                                     entries[v->value().value<qint64>()]->name())
                                 .arg(v->value().value<qint64>())
                                 .arg(ete->enumValueRejections().join(", ")));
                             continue;
@@ -3507,8 +3062,7 @@ void MetaBuilder::figureOutEnumValuesForClass(MetaClass *meta_class,
                     if (!used) {
                         ReportHandler::warning(
                             QString::fromLatin1("Rejected enum has no alternative...: %1::%2\n")
-                            .arg(meta_class->name())
-                            .arg(reject->name()));
+                            .arg(meta_class->name(), reject->name()));
                         continue;
                     }
                     ete->addEnumValueRedirection(reject->name(), used->name());
@@ -3571,8 +3125,7 @@ void MetaBuilder::figureOutEnumValues() {
 
 void MetaBuilder::figureOutDefaultEnumArguments() {
     for(MetaClass *meta_class : qAsConst(m_meta_classes)) {
-        QString package = meta_class->typeEntry()->javaPackage();
-        MetaClass *global = m_meta_classes.findClass(meta_class->typeEntry()->targetTypeSystem() + "." + GLOBAL_PACKAGE);
+        MetaClass *global = m_globals[meta_class->typeEntry()->targetTypeSystem()];
 
         for(MetaFunction *meta_function : meta_class->functions()) {
             for(MetaArgument *arg : meta_function->arguments()) {
@@ -3741,9 +3294,7 @@ void MetaBuilder::figureOutDefaultEnumArguments() {
                                 if(value.userType()==QMetaType::QString){
                                     new_expr = value.toString();
                                     ReportHandler::warning(QString("possible compilation error in enum value %1 when parsing default value of '%2' in class '%3'")
-                                                           .arg(new_expr)
-                                                           .arg(meta_function->name())
-                                                           .arg(meta_function->implementingClass()->name()));
+                                                           .arg(new_expr, meta_function->name(), meta_function->implementingClass()->name()));
                                 }else{
                                     new_expr = QString::number(value.value<qint32>());
                                 }
@@ -3818,7 +3369,6 @@ void MetaBuilder::figureOutDefaultEnumArguments() {
 }
 
 MetaEnum *MetaBuilder::traverseEnum(EnumModelItem enum_item, MetaClass *enclosing, const QSet<QString> &metaEnums, const QMap<QString,QString>& flagByEnums) {
-    Q_UNUSED(flagByEnums)
     // Skipping private enums.
     QString qualified_name = enum_item->qualifiedName().join("::");
     if (enum_item->accessPolicy() == CodeModel::Private) {
@@ -3838,6 +3388,21 @@ MetaEnum *MetaBuilder::traverseEnum(EnumModelItem enum_item, MetaClass *enclosin
         return nullptr;
     }
 
+    if(!type_entry && enclosing && !enclosing->isFake()){
+        QStringList names = enum_item->qualifiedName();
+        std::unique_ptr<EnumTypeEntry> eentry;
+        if (names.size() == 1) {
+            eentry.reset(new EnumTypeEntry(QString(), qualified_name));
+        } else {
+            eentry.reset(new EnumTypeEntry(QStringList(names.mid(0, names.size() - 1)).join("::"), names.last()));
+        }
+        eentry->setCodeGeneration(enclosing->typeEntry()->codeGeneration());
+        eentry->setTargetLangPackage(enclosing->typeEntry()->javaPackage());
+        eentry->setTargetTypeSystem(enclosing->typeEntry()->targetTypeSystem());
+        ReportHandler::debugTypes("Adding to TypeDatabase(1): " + eentry->name());
+        m_database->addType(type_entry = eentry.release());
+    }
+
     if (!type_entry || !type_entry->isEnum()) {
         //QString context = m_current_class ? m_current_class->name() : QLatin1String("");
         ReportHandler::warning(QString("enum '%1' does not have a type entry or is not an enum")
@@ -3851,6 +3416,36 @@ MetaEnum *MetaBuilder::traverseEnum(EnumModelItem enum_item, MetaClass *enclosin
 
     MetaEnum *meta_enum = new MetaEnum();
     EnumTypeEntry * enumType = static_cast<EnumTypeEntry *>(type_entry);
+
+    QString enumName = qualified_name;
+    if(!flagByEnums.contains(enumName) && enum_item->qualifiedName().size()>1){
+        enumName = enum_item->qualifiedName().last();
+    }
+    if(flagByEnums.contains(enumName) && !enumType->forceNoFlags()){
+        QString flagsName = flagByEnums[enumName];
+        QString simpleFlagsName = flagsName;
+        if(enum_item->qualifiedName().size()>1){
+            QStringList scope = enum_item->qualifiedName();
+            scope.takeLast();
+            if(!flagsName.startsWith(scope.join("::"))){
+                scope << flagsName;
+                flagsName = scope.join("::");
+            }else{
+                simpleFlagsName = flagsName.split("::").last();
+            }
+        }
+        std::unique_ptr<FlagsTypeEntry> ftype(new FlagsTypeEntry(flagsName));
+        ftype->setOriginator(enumType);
+        ftype->setFlagsTemplate("QFlags<" + enumType->qualifiedCppName() + ">");
+        ftype->setCodeGeneration(enumType->codeGeneration());
+        ftype->setFlagsName(simpleFlagsName);
+        enumType->setFlags(ftype.get());
+        m_database->addFlagsType(ftype.get());
+        //qDebug()<<"Adding ftype"<<ftype->name();
+        ReportHandler::debugTypes("Adding to TypeDatabase(1): " + ftype->name());
+        m_database->addType(ftype.release());
+    }
+
     meta_enum->setTypeEntry(enumType);
 
     if (metaEnums.contains(qualified_name)
@@ -3859,8 +3454,8 @@ MetaEnum *MetaBuilder::traverseEnum(EnumModelItem enum_item, MetaClass *enclosin
     }else if(enumType->flags()){
         if (metaEnums.contains(enumType->flags()->qualifiedCppName())
                 || metaEnums.contains(enumType->flags()->name())
-                || metaEnums.contains(enumType->flags()->originalName())
-                || metaEnums.contains(enumType->flags()->originalName().split("::").last())) {
+                || metaEnums.contains(enumType->flags()->name().split("::").last())
+                || metaEnums.contains(enumType->flags()->flagsTemplate())) {
             meta_enum->setMetaEnum(true);
         }
     }
@@ -3934,37 +3529,7 @@ MetaEnum *MetaBuilder::traverseEnum(EnumModelItem enum_item, MetaClass *enclosin
     m_enums << meta_enum;
 
     if (!meta_enum->typeEntry()->include().isValid()) {
-        QFileInfo info(enum_item->fileName());
-        QMap<QString,QString> requiredFeatures;
-        for(const QString& feature : enum_item->requiredFeatures()){
-            if(m_features && m_features->contains(feature)){
-                QFileInfo _info(m_features->value(feature));
-                requiredFeatures[feature] = _info.fileName();
-            }else{
-                requiredFeatures[feature] = "";
-            }
-        }
-        if(info.path().endsWith("/private")){
-            QString path = info.path();
-            path.chop(8);
-            auto idx = path.lastIndexOf("/");
-            if(idx>0){
-                meta_enum->typeEntry()->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-            }else{
-                meta_enum->typeEntry()->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-            }
-        }else if(info.path().endsWith("/qpa")){
-            QString path = info.path();
-            path.chop(4);
-            auto idx = path.lastIndexOf("/");
-            if(idx>0){
-                meta_enum->typeEntry()->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-            }else{
-                meta_enum->typeEntry()->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-            }
-        }else{
-            meta_enum->typeEntry()->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-        }
+        addInclude(meta_enum->typeEntry(), enum_item->fileName());
     }
     if(!enum_item->requiredFeatures().isEmpty()){
         QStringList ppConditions;
@@ -3994,71 +3559,35 @@ MetaFunctional *MetaBuilder::traverseFunctional(TypeAliasModelItem item){
         meta_functional->setFunctionPointer(item->type().isFunctionPointer());
         QList<MetaArgument*> actualArguments;
         bool ok = false;
-        if(item->type().qualifiedName().join("::").startsWith("std::function<")
-                || item->type().qualifiedName().join("::").startsWith("qxp::function_ref<")){
-            MetaType * type = translateType(item->type().functionalReturnType(), &ok, QString("traverseFunctional %1").arg(item->type().qualifiedName().join("::")));
-            if(ok){
-                meta_functional->setType(type);
-                int counter = 0;
-                for(const TypeInfo& arg : item->type().functionalArgumentTypes()){
-                    MetaType * atype = translateType(arg, &ok, QString("traverseFunctional %1").arg(item->type().qualifiedName().join("::")));
-                    if(ok){
-                        MetaArgument* argument = new MetaArgument();
-                        argument->setArgumentIndex(counter);
-                        //argument->setName(arg.qualifiedName().join("::"));
-                        argument->setType(atype);
-                        for(const ArgumentModification& mod : ftype->argumentModification()){
-                            if(mod.index==counter+1 && !mod.modified_name.isEmpty()){
-                                argument->setName(mod.modified_name);
-                            }
-                        }
-                        meta_functional->addArgument(argument);
-                        if(!meta_functional->argumentRemoved(counter + 1))
-                            actualArguments << argument;
-                        ++counter;
-                    }else {
-                        m_rejected_functionals.insert({item->qualifiedName().join("::"), item->fileName()}, UnmatchedArgumentType);
-                        return nullptr;
-                    }
-                }
-            }else {
-                m_rejected_functionals.insert({item->qualifiedName().join("::"), item->fileName()}, UnmatchedReturnType);
-                return nullptr;
-            }
-        }else{
-            TypeInfo info = item->type();
-            info.setFunctionPointer(false);
-            info.setArgumentNames(QList<QString>());
-            info.setArguments(QList<TypeInfo>());
-            MetaType * type = translateType(info, &ok, QString("traverseFunctional %1").arg(info.qualifiedName().join("::")));
-            if(ok){
-                meta_functional->setType(type);
-                int counter = 0;
-                for(const TypeInfo& arg : item->type().arguments()){
-                    MetaType * atype = translateType(arg, &ok, QString("traverseFunctional %1").arg(item->type().qualifiedName().join("::")));
-                    if(ok){
-                        MetaArgument* argument = new MetaArgument();
-                        argument->setArgumentIndex(counter);
-                        argument->setType(atype);
-                        argument->setName(item->type().argumentNames()[counter]);
-                        for(const ArgumentModification& mod : ftype->argumentModification()){
-                            if(mod.index==counter+1 && !mod.modified_name.isEmpty()){
-                                argument->setName(mod.modified_name);
-                            }
+        MetaType * type = translateType(item->type().functionalReturnType(), &ok, QString("traverseFunctional %1").arg(item->type().qualifiedName().join("::")));
+        if(ok){
+            meta_functional->setType(type);
+            int counter = 0;
+            for(const TypeInfo& arg : item->type().functionalArgumentTypes()){
+                MetaType * atype = translateType(arg, &ok, QString("traverseFunctional %1").arg(item->type().qualifiedName().join("::")));
+                if(ok){
+                    MetaArgument* argument = new MetaArgument();
+                    argument->setArgumentIndex(counter);
+                    if(counter<item->type().functionalArgumentNames().size())
+                        argument->setName(item->type().functionalArgumentNames()[counter]);
+                    argument->setType(atype);
+                    for(const ArgumentModification& mod : ftype->argumentModification()){
+                        if(mod.index==counter+1 && !mod.modified_name.isEmpty()){
+                            argument->setName(mod.modified_name);
                         }
-                        meta_functional->addArgument(argument);
-                        if(!meta_functional->argumentRemoved(counter + 1))
-                            actualArguments << argument;
-                        ++counter;
-                    }else {
-                        m_rejected_functionals.insert({item->qualifiedName().join("::"), item->fileName()}, UnmatchedArgumentType);
-                        return nullptr;
                     }
+                    meta_functional->addArgument(argument);
+                    if(!meta_functional->argumentRemoved(counter + 1))
+                        actualArguments << argument;
+                    ++counter;
+                }else {
+                    m_rejected_functionals.insert({item->qualifiedName().join("::"), item->fileName()}, UnmatchedArgumentType);
+                    return nullptr;
                 }
-            }else {
-                m_rejected_functionals.insert({item->qualifiedName().join("::"), item->fileName()}, UnmatchedReturnType);
-                return nullptr;
             }
+        }else {
+            m_rejected_functionals.insert({item->qualifiedName().join("::"), item->fileName()}, UnmatchedReturnType);
+            return nullptr;
         }
         analyzeFunctional(meta_functional.get(), actualArguments);
     }else{
@@ -4072,8 +3601,6 @@ MetaFunctional *MetaBuilder::traverseFunctional(TypeAliasModelItem item){
 
 MetaClass *MetaBuilder::traverseTypeAlias(TypeAliasModelItem typeAlias) {
     QString class_name = strip_template_args(typeAlias->name());
-
-
     QString full_class_name = class_name;
     // we have an inner class
     if (m_current_class) {
@@ -4086,25 +3613,14 @@ MetaClass *MetaBuilder::traverseTypeAlias(TypeAliasModelItem typeAlias) {
     if (!type)
         return nullptr;
 
-    if (type->isObject()){
-        if(isClass(strip_template_args(typeAlias->type().qualifiedName().join("::")), "QObject")){
-            type->setQObject(true);
-            if(isClass(strip_template_args(typeAlias->type().qualifiedName().join("::")), "QWidget")){
-                type->setQWidget(true);
-            }else if(isClass(strip_template_args(typeAlias->type().qualifiedName().join("::")), "QWindow")){
-                type->setQWindow(true);
-            }else if(isClass(strip_template_args(typeAlias->type().qualifiedName().join("::")), "QCoreApplication")){
-                type->setQCoreApplication(true);
-            }else if(isClass(strip_template_args(typeAlias->type().qualifiedName().join("::")), "QAction")){
-                type->setQAction(true);
-            }
-        }
-    }
-
     MetaClass *meta_class = new MetaClass();
     meta_class->setTypeAlias(true);
     meta_class->setTypeEntry(type);
-    TypeEntry* typeAliasEntry = m_database->findType(typeAlias->type().qualifiedName().join("::"));
+    TypeInfo typeInfo = typeAlias->type();
+    typeInfo.setConstant(false);
+    typeInfo.setReferenceType(TypeInfo::NoReference);
+    typeInfo.setIndirections({});
+    TypeEntry* typeAliasEntry = m_database->findType(typeInfo.toString());
     if(typeAliasEntry){
         MetaType* typeAliasType = new MetaType();
         typeAliasType->setTypeEntry(typeAliasEntry);
@@ -4113,43 +3629,22 @@ MetaClass *MetaBuilder::traverseTypeAlias(TypeAliasModelItem typeAlias) {
         typeAliasType->setReferenceType(MetaType::ReferenceType(typeAlias->type().getReferenceType()));
         meta_class->setTypeAliasType(typeAliasType);
     }else{
-        meta_class->setBaseClassNames({{typeAlias->type().qualifiedName().join("::"), true}});
+        bool ok = false;
+        MetaType* typeAliasType = translateType(typeInfo, &ok, "traverseTypeAlias " + class_name);
+        if(typeAliasType){
+            typeAliasType->setTypeEntry(typeAliasEntry);
+            typeAliasType->setIndirections(typeAlias->type().indirections());
+            typeAliasType->setConstant(typeAlias->type().isConstant());
+            typeAliasType->setReferenceType(MetaType::ReferenceType(typeAlias->type().getReferenceType()));
+            meta_class->setTypeAliasType(typeAliasType);
+        }
+        meta_class->setBaseClassTypeInfo({{typeAlias->type(), true}});
     }
     *meta_class += MetaAttributes::Public;
 
     // Set the default include file name
     if (!type->include().isValid()) {
-        QFileInfo info(typeAlias->fileName());
-        QMap<QString,QString> requiredFeatures;
-        for(const QString& feature : typeAlias->requiredFeatures()){
-            if(m_features && m_features->contains(feature)){
-                QFileInfo _info(m_features->value(feature));
-                requiredFeatures[feature] = _info.fileName();
-            }else{
-                requiredFeatures[feature] = "";
-            }
-        }
-        if(info.path().endsWith("/private")){
-            QString path = info.path();
-            path.chop(8);
-            auto idx = path.lastIndexOf("/");
-            if(idx>0){
-                type->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-            }else{
-                type->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-            }
-        }else if(info.path().endsWith("/qpa")){
-            QString path = info.path();
-            path.chop(4);
-            auto idx = path.lastIndexOf("/");
-            if(idx>0){
-                type->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-            }else{
-                type->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-            }
-        }else{
-            type->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-        }
+        addInclude(type, typeAlias->fileName());
     }
     if(!typeAlias->requiredFeatures().isEmpty()){
         QStringList ppifs;
@@ -4162,12 +3657,11 @@ MetaClass *MetaBuilder::traverseTypeAlias(TypeAliasModelItem typeAlias) {
         ppifs.removeDuplicates();
         type->setPPCondition(ppifs.join(" && "));
     }
-
     return meta_class;
 }
 
-MetaClass *MetaBuilder::traverseClass(ClassModelItem class_item) {
-    QString class_name = strip_template_args(class_item->name());
+MetaClass *MetaBuilder::traverseClass(ClassModelItem class_item, QList<PendingClass>& pendingClasses, QList<PendingFunctional>& pendingFunctionals) {
+    QString class_name = class_item->name();
     QString full_class_name = class_name;
     // we have an inner class
     if (m_current_class) {
@@ -4179,9 +3673,9 @@ MetaClass *MetaBuilder::traverseClass(ClassModelItem class_item) {
     if(type){
         if(type->isQString() && m_database->qstringType()){
             type = m_database->qstringType();
-        }else if(type->isVariant() && m_database->qvariantType()){
+        }else if(type->isQVariant() && m_database->qvariantType()){
             type = m_database->qvariantType();
-        }else if(type->isChar() && m_database->qcharType()){
+        }else if(type->isQChar() && m_database->qcharType()){
             type = m_database->qcharType();
         }
     }
@@ -4204,22 +3698,28 @@ MetaClass *MetaBuilder::traverseClass(ClassModelItem class_item) {
     }
 
     if (reason != NoReason) {
+        if(class_item->isTemplate() && !class_item->templateInstantiations().isEmpty()){
+            QStringList targs;
+            for(const TypeInfo& ti : class_item->templateInstantiations()){
+                targs << ti.toString();
+            }
+            full_class_name += "<" + targs.join(",") + ">";
+        }
         m_rejected_classes.insert({full_class_name, class_item->fileName()}, reason);
         return nullptr;
     }
 
     if (type->isObject()) {
-        if(isClass(full_class_name, "QObject")){
+        if(full_class_name==QLatin1String("QObject")){
             type->setQObject(true);
-            if(isClass(full_class_name, "QWidget")){
-                type->setQWidget(true);
-            }else if(isClass(full_class_name, "QWindow")){
-                type->setQWindow(true);
-            }else if(isClass(full_class_name, "QCoreApplication")){
-                type->setQCoreApplication(true);
-            }else if(isClass(full_class_name, "QAction")){
-                type->setQAction(true);
-            }
+        }else if(full_class_name==QLatin1String("QWidget")){
+            type->setQWidget(true);
+        }else if(full_class_name==QLatin1String("QWindow")){
+            type->setQWindow(true);
+        }else if(full_class_name==QLatin1String("QCoreApplication")){
+            type->setQCoreApplication(true);
+        }else if(full_class_name==QLatin1String("QAction")){
+            type->setQAction(true);
         }
     }
 
@@ -4227,28 +3727,22 @@ MetaClass *MetaBuilder::traverseClass(ClassModelItem class_item) {
     meta_class->setTypeEntry(type);
     meta_class->setUsingProtectedBaseConstructors(class_item->usingBaseConstructors()==CodeModel::Protected);
     meta_class->setUsingPublicBaseConstructors(class_item->usingBaseConstructors()==CodeModel::Public);
-    QList<QPair<QString,bool>> baseClasses = class_item->baseClasses();
-    TypeSystemTypeEntry* ts = m_database->findTypeSystem(meta_class->targetTypeSystem());
-    for(int i=0; i<baseClasses.size(); ++i){
-        if(baseClasses[i].first.startsWith("QList<")
-                || baseClasses[i].first.startsWith("QSet<")
-                || baseClasses[i].first.startsWith("QMap<")
-                || baseClasses[i].first.startsWith("QLinkedList<")
-                || baseClasses[i].first.startsWith("QVector<")
-                || baseClasses[i].first.startsWith("QHash<")
-                || baseClasses[i].first.startsWith("QMultiMap<")
-                || baseClasses[i].first.startsWith("QMultiHash<")){
-            m_containerBaseClasses[ts] << baseClasses[i].first;
-        }
-        if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6, 0, 0)){
-            if(baseClasses[i].first=="QList<QString>"){
-                baseClasses[i].first = "QStringList";
-            }else if(baseClasses[i].first=="QByteArrayList"){
-                baseClasses[i].first = "QList<QByteArray>";
-            }
-        }
-    }
-    meta_class->setBaseClassNames(baseClasses);
+    QList<QPair<TypeInfo,bool>> baseClasses = class_item->baseClasses();
+    if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6, 0, 0)){
+        for(int i=0; i<baseClasses.size(); ++i){
+            QString baseClassName = baseClasses[i].first.toString();
+            if(baseClassName=="QList<QString>"){
+                baseClasses[i].first.setQualifiedName({QStringLiteral("QStringList")});
+                baseClasses[i].first.setArguments({});
+            }else if(baseClassName=="QByteArrayList"){
+                baseClasses[i].first.setQualifiedName({QStringLiteral("QList")});
+                TypeInfo arg;
+                arg.setQualifiedName({QStringLiteral("QByteArray")});
+                baseClasses[i].first.setArguments({arg});
+            }
+        }
+    }
+    meta_class->setBaseClassTypeInfo(baseClasses);
     meta_class->setHas_Q_GADGET(class_item->has_Q_GADGET());
     meta_class->setHas_Q_OBJECT(class_item->has_Q_OBJECT());
     *meta_class += MetaAttributes::Public;
@@ -4273,11 +3767,12 @@ MetaClass *MetaBuilder::traverseClass(ClassModelItem class_item) {
 
     const TemplateParameterList& template_parameters = class_item->templateParameters();
     QList<TypeEntry *> template_args;
-    template_args.clear();
+    //template_args.clear();
     for (int i = 0; i < template_parameters.size(); ++i) {
         const TemplateParameterModelItem &param = template_parameters.at(i);
         TemplateArgumentEntry *param_type = new TemplateArgumentEntry(param->name());
         param_type->setOrdinal(i);
+        param_type->setVariadic(param->isVaradic());
         template_args.append(param_type);
     }
     meta_class->setTemplateArguments(template_args);
@@ -4285,96 +3780,50 @@ MetaClass *MetaBuilder::traverseClass(ClassModelItem class_item) {
     // Inner classes
     {
         for(ClassModelItem ci : class_item->classes()) {
-            //if(!key.contains("<"))
-            {
-                MetaClass *cl = traverseClass(ci);
-                if (cl) {
-                    bool isEnclosedClass = cl->typeEntry()->targetLangName().startsWith(meta_class->typeEntry()->targetLangName()+"$");
-                    if(isEnclosedClass)
-                        meta_class->addEnclosedClass(cl);
-                    addAbstractMetaClass(cl);
+            MetaClass *cl = traverseClass(ci, pendingClasses, pendingFunctionals);
+            if (cl) {
+                bool isEnclosedClass = cl->typeEntry()->targetLangName().startsWith(meta_class->typeEntry()->targetLangName()+"$");
+                if(isEnclosedClass)
+                    meta_class->addEnclosedClass(cl);
+                addClass(cl);
 
-                }
             }
         }
     }
 
     // Go through all typedefs to see if we have defined any
     // specific typedefs to be used as classes.
-    for(QMap<QString, TypeAliasModelItem>::const_iterator i = class_item->typeAliasMap().begin(); i!=class_item->typeAliasMap().end(); i++){
-        TypeAliasModelItem tai = i.value();
-        if(tai->type().qualifiedName().join("::").startsWith("std::function<")
-                || tai->type().qualifiedName().join("::").startsWith("qxp::function_ref<")
+    for(const TypeAliasModelItem& tai : class_item->typeAliases()){
+        if(tai->type().qualifiedName()==QStringList{"std","function"}
+                || tai->type().qualifiedName()==QStringList{"qxp","function_ref"}
                 || tai->type().isFunctionPointer()){
-            MetaFunctional *fnl = traverseFunctional(tai);
-            if(fnl)
-                meta_class->addFunctional(fnl);
+            pendingFunctionals.append(PendingFunctional{tai, meta_class, m_scopes});
         }else{
             MetaClass *cls = traverseTypeAlias(tai);
             if (cls) {
                 meta_class->addEnclosedClass(cls);
-                addAbstractMetaClass(cls);
+                addClass(cls);
             }
         }
     }
 
     parseQ_Property(meta_class, class_item->propertyDeclarations());
 
-    traverseFunctions(model_dynamic_cast<ScopeModelItem>(class_item), meta_class);
-
     QSet<QString> metaEnums;
-    for(auto& function_item : class_item->functions()){
+    for(const FunctionModelItem& function_item : class_item->functions()){
         if(function_item->name()==QStringLiteral("qt_getEnumMetaObject")
                 && function_item->arguments().size()==1){
             metaEnums << function_item->arguments()[0]->type().toString();
         }
     }
-    QMap<QString,QString> flagByEnums;
-    for(QMap<QString, TypeAliasModelItem>::const_iterator i = class_item->typeAliasMap().begin(); i!=class_item->typeAliasMap().end(); i++){
-        QString type = i.value()->type().toString();
-        if(type.startsWith("QFlags<") && type.endsWith(">")){
-            type = type.mid(7).chopped(1);
-            flagByEnums[type] = full_class_name+"::"+i.key();
-        }
-    }
-    traverseEnums(model_dynamic_cast<ScopeModelItem>(class_item), meta_class, metaEnums, flagByEnums);
-    traverseFields(model_dynamic_cast<ScopeModelItem>(class_item), meta_class);
+    pendingClasses.append(PendingClass{model_dynamic_cast<ScopeModelItem>(class_item), meta_class, m_scopes});
+    traverseEnums(model_dynamic_cast<ScopeModelItem>(class_item), meta_class, metaEnums, class_item->flagsMap());
 
     m_current_class = old_current_class;
 
     // Set the default include file name
     if (!type->include().isValid()) {
-        QFileInfo info(class_item->fileName());
-        QMap<QString,QString> requiredFeatures;
-        for(const QString& feature : class_item->requiredFeatures()){
-            if(m_features && m_features->contains(feature)){
-                QFileInfo _info(m_features->value(feature));
-                requiredFeatures[feature] = _info.fileName();
-            }else{
-                requiredFeatures[feature] = "";
-            }
-        }
-        if(info.path().endsWith("/private")){
-            QString path = info.path();
-            path.chop(8);
-            auto idx = path.lastIndexOf("/");
-            if(idx>0){
-                type->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-            }else{
-                type->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-            }
-        }else if(info.path().endsWith("/qpa")){
-            QString path = info.path();
-            path.chop(4);
-            auto idx = path.lastIndexOf("/");
-            if(idx>0){
-                type->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-            }else{
-                type->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-            }
-        }else{
-            type->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-        }
+        addInclude(type, class_item->fileName());
     }
 
     if(!class_item->requiredFeatures().isEmpty()){
@@ -4415,37 +3864,7 @@ MetaClass *MetaBuilder::traverseClass(ClassModelItem class_item) {
 
                 // Set the default include file name
                 if (!instantiation->include().isValid()) {
-                    QFileInfo info(class_item->fileName());
-                    QMap<QString,QString> requiredFeatures;
-                    for(const QString& feature : class_item->requiredFeatures()){
-                        if(m_features && m_features->contains(feature)){
-                            QFileInfo _info(m_features->value(feature));
-                            requiredFeatures[feature] = _info.fileName();
-                        }else{
-                            requiredFeatures[feature] = "";
-                        }
-                    }
-                    if(info.path().endsWith("/private")){
-                        QString path = info.path();
-                        path.chop(8);
-                        auto idx = path.lastIndexOf("/");
-                        if(idx>0){
-                            instantiation->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-                        }else{
-                            instantiation->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-                        }
-                    }else if(info.path().endsWith("/qpa")){
-                        QString path = info.path();
-                        path.chop(4);
-                        auto idx = path.lastIndexOf("/");
-                        if(idx>0){
-                            instantiation->setInclude(Include(Include::IncludePath, info.filePath().mid(idx+1), requiredFeatures));
-                        }else{
-                            instantiation->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-                        }
-                    }else{
-                        instantiation->setInclude(Include(Include::IncludePath, info.fileName(), requiredFeatures));
-                    }
+                    addInclude(instantiation, class_item->fileName());
                 }
                 if(!class_item->requiredFeatures().isEmpty()){
                     QStringList ppifs;
@@ -4461,24 +3880,24 @@ MetaClass *MetaBuilder::traverseClass(ClassModelItem class_item) {
 
                 MetaClass *instantiation_meta_class = new MetaClass();
                 instantiation_meta_class->setTypeEntry(instantiation);
-                instantiation_meta_class->setBaseClassNames(instantiation_meta_class->baseClassNames());
+                instantiation_meta_class->setBaseClassTypeInfo(meta_class->baseClassTypeInfo());
                 instantiation_meta_class->setTemplateBaseClass(meta_class);
                 instantiation_meta_class->setAttributes(meta_class->attributes());
                 instantiation_meta_class->setOriginalAttributes(meta_class->originalAttributes());
-//                if(class_name=="StringResult")
-//                    class_name.back();
                 if(m_current_class)
                     m_current_class->addEnclosedClass(instantiation_meta_class);
-                addAbstractMetaClass(instantiation_meta_class);
+                addClass(instantiation_meta_class);
             }
         }
     }
     return meta_class;
 }
 
-MetaField *MetaBuilder::traverseField(VariableModelItem field, const MetaClass *cls) {
+MetaField *MetaBuilder::traverseField(VariableModelItem field) {
     const QString& field_name = field->name();
-    QString class_name = m_current_class->typeEntry()->qualifiedCppName();
+    QString class_name;
+    if(m_current_class)
+        class_name = m_current_class->typeEntry()->qualifiedCppName();
 
     //qDebug()<<"\n"<<field_name<<class_name;
 
@@ -4488,15 +3907,22 @@ MetaField *MetaBuilder::traverseField(VariableModelItem field, const MetaClass *
 
     if (field->accessPolicy() == CodeModel::Private)
         return nullptr;
+    if(field->isTemplate() && !field->templateInstantiations().isEmpty())
+        return nullptr;
 
     if (m_database->isFieldRejected(class_name, field_name)) {
-        m_rejected_fields.insert({class_name + "::" + field_name, field->fileName()}, GenerationDisabled);
+        if(field_name==QLatin1String("static_assert"))
+            return nullptr;
+        if(m_current_class)
+            m_rejected_fields.insert({class_name + "::" + field_name, field->fileName()}, GenerationDisabled);
+        else
+            m_rejected_fields.insert({field_name, field->fileName()}, GenerationDisabled);
         return nullptr;
     }
 
     MetaField *meta_field = new MetaField();
     meta_field->setName(field_name);
-    meta_field->setEnclosingClass(cls);
+    meta_field->setEnclosingClass(m_current_class);
 
     bool ok;
     const TypeInfo& field_type = field->type();
@@ -4504,11 +3930,12 @@ MetaField *MetaBuilder::traverseField(VariableModelItem field, const MetaClass *
     MetaType *meta_type = translateType(field_type, &ok, "traverseField " + class_name);
 
     if (!meta_type || !ok) {
-        QString error = QString("skipping field '%1::%2' with unmatched type '%3'")
-                        .arg(m_current_class->name())
-                        .arg(field_name)
-                        .arg(TypeInfo::resolveType(field_type, currentScope()->toItem()).qualifiedName().join("::"));
-        ReportHandler::warning(error);
+        if(m_current_class)
+            ReportHandler::warning(QString("skipping field '%1::%2' with unmatched type '%3'")
+                            .arg(m_current_class->name(), field_name, field_type.toString()));
+        else
+            ReportHandler::warning(QString("skipping field '%1' with unmatched type '%2' (%3)")
+                            .arg(field_name, field_type.toString(), field->fileName()));
         delete meta_field;
         return nullptr;
     }
@@ -4518,7 +3945,7 @@ MetaField *MetaBuilder::traverseField(VariableModelItem field, const MetaClass *
     uint attr = 0;
     if(field->isConstExpr())
         attr |= MetaAttributes::ConstExpr;
-    if (field->isStatic() || cls->isNamespace())
+    if (field->isStatic() || !m_current_class || m_current_class->isNamespace())
         attr |= MetaAttributes::Static;
 
     CodeModel::AccessPolicy policy = field->accessPolicy();
@@ -4533,33 +3960,26 @@ MetaField *MetaBuilder::traverseField(VariableModelItem field, const MetaClass *
     return meta_field;
 }
 
-void MetaBuilder::traverseFields(ScopeModelItem scope_item, MetaClass *meta_class) {
+void MetaBuilder::traverseFields(ScopeModelItem scope_item) {
     for(const VariableModelItem& field : scope_item->variables()) {
-        MetaField *meta_field = traverseField(field, meta_class);
+        MetaField *meta_field = traverseField(field);
 
         if (meta_field) {
             meta_field->setOriginalAttributes(meta_field->attributes());
-            meta_class->addField(meta_field);
+            if(m_current_class){
+                if(m_current_class->typeEntry()->designatedInterface()){
+                    m_current_class->extractInterface()->addField(meta_field);
+                }else{
+                    m_current_class->addField(meta_field);
+                }
+            }else{
+                m_rejected_fields.insert({meta_field->name(), field->fileName()}, IsGlobal);
+            }
         }
     }
 }
 
-void MetaBuilder::setupFunctionDefaults(MetaFunction *meta_function, MetaClass *meta_class) {
-    // Set the default value of the declaring class. This may be changed
-    // in fixFunctions later on
-    meta_function->setDeclaringClass(meta_class);
-
-    // Some of the queries below depend on the implementing class being set
-    // to function properly. Such as function modifications
-    meta_function->setImplementingClass(meta_class);
-
-    if (meta_function->originalName() == "operator=="){
-        if(!meta_function->wasPrivate())
-            meta_class->setHasEqualsOperator(true);
-    }
-}
-
-void MetaBuilder::traverseFunctions(ScopeModelItem scope_item, MetaClass *meta_class) {
+void MetaBuilder::traverseFunctions(ScopeModelItem scope_item) {
     // if there are just private constructors avoid generating the shell class
     bool hasPrivateConstructors = false;
     bool hasJustPrivateConstructors = false;
@@ -4573,164 +3993,1000 @@ void MetaBuilder::traverseFunctions(ScopeModelItem scope_item, MetaClass *meta_c
     QSet<QString> unimplementablePureVirtualFunctions;
 
     QList<MetaFunction *> rValueFunctions;
-    for(const FunctionModelItem& function : scope_item->functions()) {
-        MetaFunction *meta_function = traverseFunction(function);
+    QMap<QString,MetaFunction *> subscriptionFunctions;
+    QList<FunctionModelItem> functions;
+    QList<FunctionModelItem> templateInstantiations;
+    for(const FunctionModelItem& function_item : scope_item->functions()) {
+        if(function_item->isTemplate()){
+            if(function_item->templateParameters().isEmpty()
+                    || !function_item->templateInstantiations().isEmpty()){
+                templateInstantiations << function_item;
+            }else{
+                functions << function_item;
+            }
+        }else{
+            functions << function_item;
+        }
+    }
+    for(const FunctionModelItem& function_item : qAsConst(functions << templateInstantiations)) {
+        if(!m_current_class || m_current_class->isNamespace()){
+            if(function_item->name().startsWith(QStringLiteral("qRegisterNormalizedMetaType"))){
+                continue;
+            }
+        }
+        const ArgumentList& arguments = function_item->arguments();
+        QString function_name = function_item->name();
+        QString _function_name = function_name;
+        QStringList tparams;
+        if(function_item->isTemplate()){
+            for(const TypeInfo& ti : function_item->templateInstantiations()){
+                tparams << ti.toString();
+            }
+            for(TemplateParameterModelItem t : function_item->templateParameters()){
+                if(t->isVaradic())
+                    tparams << t->name()+"...";
+                else tparams << t->name();
+            }
+            _function_name += "<" + tparams.join(",") + ">";
+        }
+        _function_name += "(";
+        int counter = 0;
+        for(ArgumentModelItem arg : arguments){
+            if(arg->type().getReferenceType()==TypeInfo::NoReference
+                && arg->type().indirections().isEmpty()
+                && arguments.size()==1
+                && arg->type().toString()=="void"){
+                continue;
+            }
+            if(counter!=0){
+                _function_name += ",";
+            }
+            _function_name += arg->type().toString();
+            ++counter;
+        }
+        _function_name += ") ";
+        if(function_item->isConstant())
+            _function_name += "const ";
+        if(function_item->referenceType()==TypeInfo::Reference)
+            _function_name += "& ";
+        _function_name += "-> " + function_item->type().toString();
+        switch(function_item->referenceType()){
+        case TypeInfo::RReference:
+            _function_name += "&";
+            break;
+        default: break;
+        }
+        MetaFunction *meta_function = traverseFunction(function_item, _function_name, tparams);
 
         if (meta_function) {
-            if(function->isInline() && !meta_function->isConstructor() && !meta_function->originalSignature().isEmpty()){
-                for(MetaFunction *f : meta_class->queryFunctionsByName(meta_function->originalName())) {
-                    if(f->originalSignature()==meta_function->originalSignature()
-                            || f->minimalSignature()==meta_function->minimalSignature()){
-                        delete meta_function;
-                        meta_function = nullptr;
-                        break;
+            if(m_current_class){
+                if(function_item->isInline() && !meta_function->isConstructor() && !meta_function->originalSignature().isEmpty()){
+                    for(MetaFunction *f : m_current_class->queryFunctionsByName(meta_function->originalName())) {
+                        if(f->originalSignature()==meta_function->originalSignature()
+                                || f->minimalSignature()==meta_function->minimalSignature()){
+                            delete meta_function;
+                            meta_function = nullptr;
+                            break;
+                        }
                     }
+                    if(!meta_function)
+                        continue;
                 }
-                if(!meta_function)
-                    continue;
+            }else{
+                meta_function->setFunctionType(MetaFunction::GlobalScopeFunction);
             }
-            QList<FunctionModification> mods = meta_function->modifications(meta_class);
-            for (int i = 0; i < mods.size(); ++i) {
-                if (mods.at(i).isPrivateSignal()) {
-                    meta_function->setFunctionType(MetaFunction::PrivateSignalFunction);
+            bool isRemoved = false;
+            bool hasInstantiations = false;
+            MetaClass* targetClass = nullptr;
+            bool targetClassGlobalSet = false;
+            FunctionModificationList functionModificationList;
+            meta_function->setOriginalAttributes(meta_function->attributes());
+            if(!m_current_class || meta_function->isInGlobalScope()){
+                const QList<TypeSystemTypeEntry*> typeSystems = m_database->typeSystems();
+                for(const TypeSystemTypeEntry* ts : typeSystems){
+                    if(!ts->functionModifications().isEmpty()){
+                        FunctionModificationList list = meta_function->modifications(ts);
+                        for(const FunctionModification& mod : qAsConst(list)){
+                            if(mod.removal & TS::TargetLangCode){
+                                isRemoved = true;
+                            }
+                            if(function_item->isTemplate()){
+                                hasInstantiations |= !mod.template_instantiations.isEmpty();
+                            }
+                            if(!mod.targetType.isEmpty()){
+                                targetClassGlobalSet = true;
+                                targetClass = m_meta_classes.findClass(ts->name() + "." + mod.targetType);
+                                if(!targetClass){
+                                    ComplexTypeEntry *gte = m_database->findComplexType(mod.targetType);
+                                    if(!gte){
+                                        gte = new NamespaceTypeEntry(mod.targetType, true);
+                                        gte->setTargetTypeSystem(ts->name());
+                                        gte->setTargetLangPackage(ts->name());
+                                        gte->setCodeGeneration(TypeEntry::GenerateAll);
+                                    }
+                                    targetClass = new MetaClass();
+                                    targetClass->setTypeEntry(gte);
+                                    *targetClass += MetaAttributes::Final;
+                                    *targetClass += MetaAttributes::Public;
+                                    m_meta_classes << targetClass;
+                                }
+                                functionModificationList << list;
+                                break;
+                            }
+                        }
+                        if(targetClass)
+                            break;
+                    }
+                }
+                *meta_function += MetaAttributes::Static;
+                *meta_function += MetaAttributes::Public;
+            }else if(m_current_class->isNamespace()){
+                FunctionModificationList list = meta_function->modifications(m_current_class);
+                for(const FunctionModification& mod : qAsConst(list)){
+                    if(mod.removal & TS::TargetLangCode){
+                        isRemoved = true;
+                    }
+                    if(function_item->isTemplate()){
+                        hasInstantiations |= !mod.template_instantiations.isEmpty();
+                    }
+                    if(!mod.targetType.isEmpty()){
+                        targetClassGlobalSet = true;
+                        targetClass = m_meta_classes.findClass(m_current_class->typeEntry()->targetTypeSystem() + "." + mod.targetType);
+                        if(!targetClass){
+                            ComplexTypeEntry *gte = m_database->findComplexType(mod.targetType);
+                            if(!gte){
+                                gte = new NamespaceTypeEntry(mod.targetType, true);
+                                gte->setTargetTypeSystem(m_current_class->typeEntry()->targetTypeSystem());
+                                gte->setTargetLangPackage(m_current_class->typeEntry()->targetTypeSystem());
+                                gte->setCodeGeneration(TypeEntry::GenerateAll);
+                            }
+                            targetClass = new MetaClass();
+                            targetClass->setTypeEntry(gte);
+                            *targetClass += MetaAttributes::Final;
+                            *targetClass += MetaAttributes::Public;
+                            m_meta_classes << targetClass;
+                        }
+                        functionModificationList << list;
+                        break;
+                    }
+                }
+                if(targetClass)
+                    break;
+                *meta_function += MetaAttributes::Static;
+                *meta_function += MetaAttributes::Public;
+            }else{
+                for(const FunctionModification& mod : meta_function->modifications(m_current_class)){
+                    if (mod.isPrivateSignal()) {
+                        meta_function->setFunctionType(MetaFunction::PrivateSignalFunction);
+                    }
+                    if(mod.removal & TS::TargetLangCode){
+                        isRemoved = true;
+                    }
+                    if(function_item->isTemplate()){
+                        hasInstantiations |= !mod.template_instantiations.isEmpty();
+                    }
                 }
             }
 
-            meta_function->setOriginalAttributes(meta_function->attributes());
-            if (meta_class->isNamespace())
-                *meta_function += MetaAttributes::Static;
+            if(!targetClass && !meta_function->isInGlobalScope())
+                targetClass = m_current_class;
 
-            if (!meta_function->isInvalid()) {
-                if (QPropertySpec *read = meta_class->propertySpecForRead(meta_function->name())) {
+            if (!meta_function->isInvalid() && targetClass) {
+                if (QPropertySpec *read = targetClass->propertySpecForRead(meta_function->name())) {
                     //if (meta_function->type() && read->type() == meta_function->type()->typeEntry()) {
                         *meta_function += MetaAttributes::PropertyReader;
                         meta_function->setPropertySpec(read);
                     //}
-                } else if (QPropertySpec *write =
-                               meta_class->propertySpecForWrite(meta_function->name())) {
+                } else if (QPropertySpec *write = targetClass->propertySpecForWrite(meta_function->name())) {
                     //if (meta_function->arguments().at(0)->type() &&
                     //        write->type() == meta_function->arguments().at(0)->type()->typeEntry()) {
                         *meta_function += MetaAttributes::PropertyWriter;
                         meta_function->setPropertySpec(write);
                     //}
-                } else if (QPropertySpec *reset =
-                               meta_class->propertySpecForReset(meta_function->name())) {
+                } else if (QPropertySpec *reset = targetClass->propertySpecForReset(meta_function->name())) {
                     *meta_function += MetaAttributes::PropertyResetter;
                     meta_function->setPropertySpec(reset);
-                } else if (QPropertySpec *reset =
-                               meta_class->propertySpecForBindable(meta_function->name())) {
+                } else if (QPropertySpec *reset = targetClass->propertySpecForBindable(meta_function->name())) {
                     *meta_function += MetaAttributes::PropertyBindable;
                     meta_function->setPropertySpec(reset);
-                } else if (QPropertySpec *reset =
-                               meta_class->propertySpecForNotify(meta_function->name())) {
+                } else if (QPropertySpec *reset = targetClass->propertySpecForNotify(meta_function->name())) {
                     *meta_function += MetaAttributes::PropertyNotify;
                     meta_function->setPropertySpec(reset);
                 }
             }
 
-            if(meta_function->isDestructor()){
-                hasVirtualDestructor = function->isVirtual();
-                hasPrivateDestructor = meta_function->isPrivate();
-                hasPublicDestructor = meta_function->isPublic();
-            }else if(meta_function->isConstructor()){
-                hasPrivateConstructors |= meta_function->isInvalid() || meta_function->isPrivate();
-            }else if((/*meta_function->isPrivate() ||*/ meta_function->isInvalid()) && meta_function->isAbstract()){
-                unimplementablePureVirtualFunctions << meta_function->signature();
+            if(targetClass){
+                if(targetClassGlobalSet){
+                    if(targetClass->typeEntry()==m_database->qvariantType()){
+                        if(meta_function->type() && meta_function->type()->typeEntry()->isQVariant())
+                            meta_function->type()->setTypeEntry(m_database->qvariantType());
+                        for(MetaArgument* arg : meta_function->arguments()){
+                            if(arg->type()->typeEntry()->isQVariant())
+                                arg->type()->setTypeEntry(m_database->qvariantType());
+                        }
+                    }else if(targetClass->typeEntry()==m_database->qstringType()){
+                        if(meta_function->type() && meta_function->type()->typeEntry()->isQString())
+                            meta_function->type()->setTypeEntry(m_database->qstringType());
+                        for(MetaArgument* arg : meta_function->arguments()){
+                            if(arg->type()->typeEntry()->isQString())
+                                arg->type()->setTypeEntry(m_database->qstringType());
+                        }
+                    }else if(targetClass->typeEntry()==m_database->qcharType()){
+                        if(meta_function->type() && meta_function->type()->typeEntry()->isQChar())
+                            meta_function->type()->setTypeEntry(m_database->qcharType());
+                        for(MetaArgument* arg : meta_function->arguments()){
+                            if(arg->type()->typeEntry()->isQChar())
+                                arg->type()->setTypeEntry(m_database->qcharType());
+                        }
+                    }
+                }
+                if(meta_function->isDestructor()){
+                    hasVirtualDestructor = function_item->isVirtual() && !function_item->isDeleted();
+                    hasPrivateDestructor = meta_function->isPrivate() || function_item->isDeleted();
+                    hasPublicDestructor = meta_function->isPublic() && !function_item->isDeleted();
+                    if(function_item->isDeleted() || meta_function->isPrivate()){
+                        targetClass->typeEntry()->setDestructorPrivate();
+                    }else if(meta_function->isProtected()){
+                        targetClass->typeEntry()->setDestructorProtected();
+                    }
+                    if(function_item->isVirtual())
+                        targetClass->typeEntry()->setDestructorVirtual();
+                }else if(meta_function->isConstructor()){
+                    if(meta_function->isInvalid() || meta_function->isPrivate() || function_item->isDeleted()){
+                        if(!targetClass->typeEntry()->hasAnyConstructor(false))
+                            targetClass->typeEntry()->setHasAnyConstructor(false);
+                    }else{
+                        bool isDefaultConstructor = false;
+                        bool isCopyConstructor = false;
+                        bool isMoveConstructor = false;
+                        const MetaArgumentList& arguments = meta_function->arguments();
+                        if(arguments.isEmpty()){
+                            isDefaultConstructor = true;
+                        }else if(arguments.size()==1){
+                            MetaArgument* arg = arguments[0];
+                            if(arg->type()->typeEntry()==targetClass->typeEntry() && arg->type()->indirections().isEmpty()){
+                                if(arg->type()->isConstant() && arg->type()->getReferenceType()==MetaType::Reference){
+                                    isCopyConstructor = true;
+                                }else if(!arg->type()->isConstant() && arg->type()->getReferenceType()==MetaType::RReference){
+                                    isMoveConstructor = true;
+                                }
+                            }
+                        }else{
+                            isDefaultConstructor = true;
+                            for(MetaArgument* arg : arguments){
+                                if(arg->originalDefaultValueExpression().isEmpty()){
+                                    isDefaultConstructor = false;
+                                    break;
+                                }
+                            }
+                        }
+                        if(!targetClass->typeEntry()->hasAnyConstructor(true))
+                            targetClass->typeEntry()->setHasAnyConstructor(true);
+                        if(isDefaultConstructor)
+                            targetClass->typeEntry()->setHasDefaultConstructor(meta_function->isPublic());
+                        else if(isCopyConstructor)
+                            targetClass->typeEntry()->setHasCopyConstructor(meta_function->isPublic());
+                        else if(isMoveConstructor)
+                            targetClass->typeEntry()->setHasMoveConstructor(meta_function->isPublic());
+                    }
+                    hasPrivateConstructors |= meta_function->isInvalid() || meta_function->isPrivate() || function_item->isDeleted();
+                }else if((/*meta_function->isPrivate() ||*/ meta_function->isInvalid()) && meta_function->isAbstract()){
+                    ReportHandler::warning("Unimplementable pure virtual function: "+targetClass->qualifiedCppName()+"::"+_function_name);
+                    unimplementablePureVirtualFunctions << meta_function->signature();
+                }else if(!(meta_function->isInvalid() || meta_function->isPrivate() || function_item->isDeleted())){
+                    if(meta_function->operatorType()==OperatorType::Assign){
+                        bool isDefaultAssignment = false;
+                        bool isMoveAssignment = false;
+                        const MetaArgumentList& arguments = meta_function->arguments();
+                        if(arguments.size()==1){
+                            MetaArgument* arg = arguments[0];
+                            if(arg->type()->typeEntry()==targetClass->typeEntry() && arg->type()->indirections().isEmpty()){
+                                if(!arg->type()->isConstant() && arg->type()->getReferenceType()==MetaType::RReference){
+                                    isMoveAssignment = true;
+                                }else if(arg->type()->isConstant() && arg->type()->getReferenceType()==MetaType::Reference){
+                                    isDefaultAssignment = true;
+                                }
+                            }
+                        }
+                        if(isDefaultAssignment)
+                            targetClass->typeEntry()->setHasDefaultAssignment(meta_function->isPublic());
+                        else if(isMoveAssignment)
+                            targetClass->typeEntry()->setHasMoveAssignment(meta_function->isPublic());
+                    }else if((meta_function->operatorType()==OperatorType::Equals
+                                 || meta_function->operatorType()==OperatorType::NotEquals)
+                            && meta_function->arguments().size()==1){
+                        MetaArgument* arg = meta_function->arguments()[0];
+                        if(arg->type()->typeEntry()==targetClass->typeEntry() && arg->type()->indirections().isEmpty()
+                                && arg->type()->isConstant() && arg->type()->getReferenceType()==MetaType::Reference){
+                            targetClass->typeEntry()->setHasEquals();
+                        }
+                    }
+                    if(!meta_function->isFinalInCpp()){
+                        targetClass->typeEntry()->setHasVirtualFunctions();
+                        if(meta_function->isAbstract()){
+                            targetClass->typeEntry()->setHasPureVirtualFunctions(!meta_function->isPrivate());
+                        }
+                    }else{
+                        targetClass->typeEntry()->setHasFinalFunctions();
+                    }
+                }
             }
 
             if (!meta_function->isDestructor()
                     && !meta_function->isInvalid()
                     && (!meta_function->isConstructor() || !meta_function->isPrivate())) {
 
-                if (meta_class->typeEntry()->designatedInterface() && !meta_function->isPublic()
+                if (targetClass && targetClass->typeEntry()->designatedInterface() && !meta_function->isPublic()
                         && !meta_function->isPrivate()) {
                     QString warn = QString("non-public function '%1' in interface '%2'")
-                                   .arg(meta_function->name()).arg(meta_class->name());
+                                   .arg(meta_function->name(), targetClass->name());
                     ReportHandler::warning(warn);
 
 //                  don't make public! just skip protected methods in the interface
                     //meta_function->setVisibility(AbstractMetaClass::Public);
                 }
 
-                setupFunctionDefaults(meta_function, meta_class);
+                meta_function->setDeclaringClass(targetClass);
+                meta_function->setImplementingClass(targetClass);
 
-                /*if (meta_function->isSignal() && meta_class->hasSignal(meta_function)) { // overloaded signals are possible now
+                /*if (meta_function->isSignal() && targetClass->hasSignal(meta_function)) { // overloaded signals are possible now
                     QString warn = QString("signal '%1' in class '%2' is overloaded.")
-                                   .arg(meta_function->name()).arg(meta_class->name());
+                                   .arg(meta_function->name()).arg(targetClass->name());
                     ReportHandler::warning(warn);
                 }*/
 
-                if (meta_function->isSignal() && !meta_class->isQObject()) {
+                if (meta_function->isSignal() && targetClass && !targetClass->isQObject()) {
                     QString warn = QString("signal '%1' in non-QObject class '%2'")
-                                   .arg(meta_function->name(), meta_class->name());
+                                   .arg(meta_function->name(), targetClass->name());
                     ReportHandler::warning(warn);
                 }
                 if(meta_function->hasRReferences()
                         && !meta_function->isPrivate()
-                        && !meta_function->isRemovedFrom(meta_class, TS::TargetLangCode)){
+                        && !meta_function->isRemovedFrom(targetClass, TS::TargetLangCode)){
                     rValueFunctions << meta_function;
                 }
-                if(meta_class->typeEntry()->isNamespace()){
-                    QString fileName = function->fileName();
-                    for(const QString& includePath : m_includePathsList){
-                        QFileInfo f(includePath);
-                        if(f.isDir()){
-                            QString path = f.canonicalFilePath();
-                            if(!path.endsWith("/"))
-                                path += "/";
-                            if(fileName.startsWith(path)){
-                                path = fileName.mid(path.size());
-                                meta_class->typeEntry()->addExtraInclude(Include(Include::IncludePath, path));
-                                break;
+                if(targetClass && targetClass->typeEntry()->isNamespace()){
+                    addInclude(targetClass->typeEntry(), function_item->fileName(), true);
+                }
+                // convert operator[] to get and set method...
+                if(meta_function->operatorType()==OperatorType::Subscript
+                        && meta_function->name()=="operator_subscript"
+                        && meta_function->type()){
+                    subscriptionFunctions[meta_function->originalSignature()] = meta_function;
+                }
+
+                bool skip = function_item->isDeleted();
+                QString oldMinimalSignature;
+                if(!skip && (!targetClass
+                             || (targetClassGlobalSet && meta_function->operatorType()!=OperatorType::None)
+                             || (targetClass==m_current_class && m_current_class->isNamespace()))){
+                    if(meta_function->operatorType()!=OperatorType::None){
+                        const MetaArgumentList& arguments = meta_function->arguments();
+                        switch(meta_function->operatorType()){
+                        case OperatorType::ExclusiveAnd:
+                        case OperatorType::ExclusiveOr:
+                        case OperatorType::Negation:
+                        case OperatorType::Less:
+                        case OperatorType::Greater:
+                        case OperatorType::LessOrEquals:
+                        case OperatorType::Compare:
+                        case OperatorType::GreaterOrEquals:
+                        case OperatorType::NotEquals:
+                        case OperatorType::Equals:
+                            if(arguments.size()>=1 && arguments[0]->type()->getReferenceType()!=MetaType::RReference){
+                                if (MetaClass *cls = argumentToClass(arguments[0]->type())) {
+                                    if(m_current_class
+                                            && !targetClassGlobalSet
+                                            && !m_current_class->isNamespace()
+                                            && function_item->isFriend()
+                                            && cls!=m_current_class){
+                                        delete meta_function;
+                                        meta_function = nullptr;
+                                        continue;
+                                    }
+                                    meta_function->setFunctionType(MetaFunction::GlobalScopeFunction);
+                                    oldMinimalSignature = meta_function->minimalSignature();
+                                    // Strip away last argument, since that is the containing object
+                                    MetaArgumentList arguments = meta_function->arguments();
+                                    arguments.removeFirst();
+                                    if(cls->typeEntry()==m_database->qvariantType()){
+                                        if(meta_function->type() && meta_function->type()->typeEntry()->isQVariant())
+                                            meta_function->type()->setTypeEntry(m_database->qvariantType());
+                                        for(MetaArgument* arg : arguments){
+                                            if(arg->type()->typeEntry()->isQVariant())
+                                                arg->type()->setTypeEntry(m_database->qvariantType());
+                                        }
+                                    }else if(cls->typeEntry()==m_database->qstringType()){
+                                        if(meta_function->type() && meta_function->type()->typeEntry()->isQString())
+                                            meta_function->type()->setTypeEntry(m_database->qstringType());
+                                        for(MetaArgument* arg : arguments){
+                                            if(arg->type()->typeEntry()->isQString())
+                                                arg->type()->setTypeEntry(m_database->qstringType());
+                                        }
+                                    }else if(cls->typeEntry()==m_database->qcharType()){
+                                        if(meta_function->type() && meta_function->type()->typeEntry()->isQChar())
+                                            meta_function->type()->setTypeEntry(m_database->qcharType());
+                                        for(MetaArgument* arg : arguments){
+                                            if(arg->type()->typeEntry()->isQChar())
+                                                arg->type()->setTypeEntry(m_database->qcharType());
+                                        }
+                                    }
+                                    meta_function->setArguments(arguments);
+                                    meta_function->setOriginalAttributes(meta_function->attributes());
+
+                                    *meta_function += MetaAttributes::Final;
+                                    *meta_function += MetaAttributes::Public;
+                                    *meta_function -= MetaAttributes::Static;
+                                    targetClass = cls;
+
+                                    const MetaFunctionList otherFunctions = cls->queryFunctionsByName(meta_function->name());
+                                    bool skip = false;
+                                    for(MetaFunction *other : otherFunctions){
+                                        if(!other->isRemovedFrom(cls, TS::TargetLangCode)
+                                                && other->arguments().size()==arguments.size()){
+                                            skip = true;
+                                            for(auto l = other->arguments().size(), i = decltype(l)(0); i<l; ++i){
+                                                if(other->arguments()[i]->type()->typeEntry()!=arguments[i]->type()->typeEntry()
+                                                        || other->arguments()[i]->type()->indirections().size()!=arguments[i]->type()->indirections().size()){
+                                                    skip = false;
+                                                    break;
+                                                }
+                                            }
+                                            if(skip){
+                                                targetClass = nullptr;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    if(!skip && (meta_function->operatorType()==OperatorType::Equals
+                                                 || meta_function->operatorType()==OperatorType::NotEquals)
+                                            && arguments.size()==1){
+                                        MetaArgument* arg = arguments[0];
+                                        if(arg->type()->typeEntry()==cls->typeEntry() && arg->type()->indirections().isEmpty()
+                                                && arg->type()->isConstant() && arg->type()->getReferenceType()==MetaType::Reference){
+                                            cls->typeEntry()->setHasEquals();
+                                        }
+                                    }
+                                }
+                            }else if(!targetClassGlobalSet){
+                                targetClass = nullptr;
+                            }
+                            break;
+                        case OperatorType::ShiftRight:
+                        case OperatorType::ShiftLeft:
+                            if(arguments.size()==2){
+                                if(((arguments[0]->type()->getReferenceType()==MetaType::Reference
+                                     && !arguments[0]->type()->isConstant())
+                                    || (arguments[0]->type()->getReferenceType()==MetaType::NoReference
+                                        && !arguments[0]->type()->isConstant() && arguments[0]->type()->indirections().isEmpty()))
+                                        && meta_function->type()
+                                        && meta_function->type()->isConstant()==arguments[0]->type()->isConstant()
+                                        && meta_function->type()->getReferenceType()==arguments[0]->type()->getReferenceType()
+                                        && meta_function->type()->typeEntry()==arguments[0]->type()->typeEntry()){
+                                    if(meta_function->operatorType()==OperatorType::ShiftLeft && arguments[0]->type()->typeEntry()->qualifiedCppName()=="QDebug"){
+                                        if (MetaClass *cls = argumentToClass(arguments[1]->type())) {
+                                            if (arguments[1]->type()->actualIndirections()<=1) {
+                                                cls->setToStringCapability(meta_function);
+                                                addInclude(cls->typeEntry(), function_item->fileName(), true);
+                                            }
+                                        }
+                                        skip = true;
+                                        break;
+                                    }else if(arguments[0]->type()->getReferenceType()==MetaType::Reference
+                                             && (arguments[0]->type()->typeEntry()->qualifiedCppName()=="QDataStream"
+                                                || arguments[0]->type()->typeEntry()->qualifiedCppName()=="QTextStream")){
+                                        targetClass = nullptr;
+                                        if (MetaClass *cls = argumentToClass(arguments[1]->type())) {
+                                            meta_function->setFunctionType(MetaFunction::GlobalScopeFunction);
+                                            oldMinimalSignature = meta_function->minimalSignature();
+                                            meta_function->setName(meta_function->operatorType()==OperatorType::ShiftRight ? "readFrom" : "writeTo");
+                                            // Strip away last argument, since that is the containing object
+                                            MetaArgumentList arguments = meta_function->arguments();
+                                            arguments.removeLast();
+                                            meta_function->setArguments(arguments);
+                                            meta_function->setOriginalAttributes(meta_function->attributes());
+
+                                            *meta_function += MetaAttributes::Final;
+                                            *meta_function += MetaAttributes::Public;
+                                            *meta_function -= MetaAttributes::Static;
+                                            meta_function->setType(nullptr);
+
+                                            FunctionModification mod;
+                                            mod.signature = meta_function->minimalSignature();
+                                            mod.modifiers |= Modification::NonFinal;
+                                            cls->typeEntry()->addFunctionModification(mod);
+                                            targetClass = cls;
+                                        }
+                                        break;
+                                    }else{
+                                        if(arguments[0]->type()->getReferenceType()==MetaType::Reference && arguments[0]->type()->typeEntry()->isComplex()){
+                                            bool isRenamed = false;
+//                                            bool isRemoved = false;
+//                                            bool isReturnChanged = false;
+                                            for(const FunctionModification& mod : dynamic_cast<const TS::ComplexTypeEntry*>(arguments[0]->type()->typeEntry())->functionModifications(meta_function->minimalSignature())){
+                                                if (mod.isRenameModifier())
+                                                    isRenamed = true;
+//                                                if(mod.removal & TS::TargetLangCode)
+//                                                    isRemoved = true;
+//                                                for(const ArgumentModification& argumentModification : mod.argument_mods){
+//                                                    if(argumentModification.type==ArgumentModification::Default){
+//                                                        if(argumentModification.index==0)
+//                                                            isReturnChanged = true;
+//                                                    }
+//                                                }
+                                            }
+                                            if(!isRenamed){
+                                                if(meta_function->operatorType()==OperatorType::ShiftLeft){
+                                                    meta_function->setName("append");
+                                                }else{
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            Q_FALLTHROUGH();
+                        default:
+                            if(arguments.isEmpty() || (
+                                        arguments.size()>=1 && arguments[0]->type()->getReferenceType()!=MetaType::RReference
+                                        )){
+                                if (MetaClass *cls = argumentToClass(meta_function->type())) {
+                                    if(m_current_class
+                                            && !targetClassGlobalSet
+                                            && !m_current_class->isNamespace()
+                                            && function_item->isFriend()
+                                            && cls!=m_current_class){
+                                        delete meta_function;
+                                        meta_function = nullptr;
+                                        continue;
+                                    }
+                                    if(cls->typeEntry()==m_database->qvariantType()){
+                                        if(meta_function->type() && meta_function->type()->typeEntry()->isQVariant())
+                                            meta_function->type()->setTypeEntry(m_database->qvariantType());
+                                        for(MetaArgument* arg : arguments){
+                                            if(arg->type()->typeEntry()->isQVariant())
+                                                arg->type()->setTypeEntry(m_database->qvariantType());
+                                        }
+                                    }else if(cls->typeEntry()==m_database->qstringType()){
+                                        if(meta_function->type() && meta_function->type()->typeEntry()->isQString())
+                                            meta_function->type()->setTypeEntry(m_database->qstringType());
+                                        for(MetaArgument* arg : arguments){
+                                            if(arg->type()->typeEntry()->isQString())
+                                                arg->type()->setTypeEntry(m_database->qstringType());
+                                        }
+                                    }else if(cls->typeEntry()==m_database->qcharType()){
+                                        if(meta_function->type() && meta_function->type()->typeEntry()->isQChar())
+                                            meta_function->type()->setTypeEntry(m_database->qcharType());
+                                        for(MetaArgument* arg : arguments){
+                                            if(arg->type()->typeEntry()->isQChar())
+                                                arg->type()->setTypeEntry(m_database->qcharType());
+                                        }
+                                    }
+                                    if(arguments.isEmpty() || (
+                                                arguments.size()>=1 && arguments[0]->type()->typeEntry()==cls->typeEntry()
+                                                )){
+                                        meta_function->setFunctionType(MetaFunction::GlobalScopeFunction);
+                                        oldMinimalSignature = meta_function->minimalSignature();
+                                        // Strip away last argument, since that is the containing object
+                                        MetaArgumentList arguments = meta_function->arguments();
+                                        arguments.removeFirst();
+                                        meta_function->setArguments(arguments);
+                                        meta_function->setOriginalAttributes(meta_function->attributes());
+
+                                        *meta_function += MetaAttributes::Final;
+                                        *meta_function += MetaAttributes::Public;
+                                        *meta_function -= MetaAttributes::Static;
+                                        targetClass = cls;
+
+                                        MetaFunctionList otherFunctions = cls->queryFunctionsByName(meta_function->name());
+                                        if(cls->isInterface()){
+                                            if(MetaClass *ifaceImpl = cls->extractInterfaceImpl())
+                                                otherFunctions << ifaceImpl->queryFunctionsByName(meta_function->name());
+                                        }
+                                        bool skip = false;
+                                        for(MetaFunction *other : qAsConst(otherFunctions)){
+                                            if(!other->isRemovedFrom(cls, TS::TargetLangCode)
+                                                    && other->arguments().size()==arguments.size()){
+                                                skip = true;
+                                                for(auto l = other->arguments().size(), i = decltype(l)(0); i<l; ++i){
+                                                    if(other->arguments()[i]->type()->typeEntry()!=arguments[i]->type()->typeEntry()
+                                                            || other->arguments()[i]->type()->indirections().size()!=arguments[i]->type()->indirections().size()){
+                                                        skip = false;
+                                                        break;
+                                                    }
+                                                }
+                                                if(skip){
+                                                    targetClass = nullptr;
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    }else if(!targetClassGlobalSet){
+                                        targetClass = nullptr;
+                                    }
+                                }
+                            }
+                            break;
+                        }
+                    }else if(meta_function->originalName()==QStringLiteral("qHash")){
+                        const MetaArgumentList& arguments = meta_function->arguments();
+                        bool isWorkaround = false;
+                        bool hasDefaultArgs = arguments.size() > 0;
+                        for(int i=1; i<arguments.size(); i++){
+                            if(arguments.at(i)->type()->typeEntry()->qualifiedCppName()==QStringLiteral("QHashDummyValue")){
+                                isWorkaround = true;
+                                hasDefaultArgs = true;
+                            }else{
+                                hasDefaultArgs &= !arguments.at(i)->defaultValueExpression().isEmpty();
+                            }
+                        }
+                        if (arguments.size() == 1 || hasDefaultArgs || isWorkaround){
+                            if (MetaClass *cls = argumentToClass(arguments.at(0)->type())) {
+                                addInclude(cls->typeEntry(), function_item->fileName(), true);
+                                cls->typeEntry()->setHasHash();
+                                cls->setHasHashFunction(true);
+                                cls->setNeedsHashWorkaround(isWorkaround);
+                                cls->setQHashScope(m_current_class ? m_current_class->qualifiedCppName() : QString{});
+                                skip = true;
+                            }
+                        }
+                        if(!skip && !meta_function->templateParameters().isEmpty())
+                            skip = true;
+                    }else if(meta_function->originalName()==QStringLiteral("swap")){
+                        const MetaArgumentList& arguments = meta_function->arguments();
+                        if(arguments.size()==2
+                                && arguments[0]->type()->typeEntry()==arguments[1]->type()->typeEntry()
+                                && !arguments[0]->type()->isConstant()
+                                && !arguments[1]->type()->isConstant()
+                                && arguments[0]->type()->getReferenceType()==arguments[1]->type()->getReferenceType()
+                                && arguments[0]->type()->instantiations()==arguments[1]->type()->instantiations()
+                                && arguments[0]->type()->indirections().isEmpty()
+                                && arguments[1]->type()->indirections().isEmpty()){
+                            if (MetaClass *cls = argumentToClass(arguments.at(0)->type())) {
+                                MetaFunctionList swapFunctions = cls->queryFunctionsByName("swap");
+                                const TypeEntry* implEntry = nullptr;
+                                if(cls->isInterface()){
+                                    if(MetaClass *ifaceImpl = cls->extractInterfaceImpl()){
+                                        swapFunctions << ifaceImpl->queryFunctionsByName("swap");
+                                        implEntry = ifaceImpl->typeEntry();
+                                    }
+                                }
+                                bool skip = false;
+                                for(MetaFunction *other : qAsConst(swapFunctions)){
+                                    if(!other->isRemovedFrom(cls, TS::TargetLangCode)
+                                            && other->arguments().size()==1
+                                            && (other->arguments()[0]->type()->typeEntry()==cls->typeEntry()
+                                                || other->arguments()[0]->type()->typeEntry()==implEntry)){
+                                        skip = true;
+                                        break;
+                                    }
+                                }
+                                if(!skip){
+                                    meta_function->setFunctionType(MetaFunction::GlobalScopeFunction);
+                                    *meta_function += MetaAttributes::Final;
+                                    *meta_function += MetaAttributes::Public;
+                                    *meta_function -= MetaAttributes::Static;
+                                    oldMinimalSignature = meta_function->minimalSignature();
+                                    MetaArgumentList arguments = meta_function->arguments();
+                                    arguments.removeFirst();
+                                    meta_function->setArguments(arguments);
+                                    targetClass = cls;
+                                }else{
+                                    targetClass = nullptr;
+                                }
+                            }else if(!meta_function->templateParameters().isEmpty()){
+                                skip = true;
+                            }
+                        }
+                    }
+                }
+                if(!skip){
+                    if(targetClass){
+                        if(targetClass->typeEntry()->designatedInterface()){
+                            targetClass = targetClass->extractInterface();
+                        }
+
+                        if((targetClass->typeEntry()->codeGeneration() & TypeEntry::GenerateCode)
+                                && !function_item->isDeleted()
+                                && function_item->accessPolicy() != CodeModel::Private
+                                && function_item->isTemplate()
+                                && !hasInstantiations
+                                && !isRemoved
+                                && meta_function->operatorType()==OperatorType::None){
+                            bool skipWarning = false;
+                            MetaFunctionList functions = targetClass->queryFunctionsByOriginalName(function_item->name());
+                            MetaFunctionList foundTemplates;
+                            for(auto l=functions.size(), i = decltype(l)(0); i<l; ++i){
+                                if(functions[i]->arguments().size() && meta_function->arguments().size()){
+                                    if(functions[i]->isTemplate()){
+                                        foundTemplates << functions[i];
+                                    }
+                                }
+                            }
+                            if(function_item->templateInstantiations().isEmpty()){
+                                if(function_item->templateParameters().isEmpty()){
+                                    if(foundTemplates.size()==1){
+                                        if(foundTemplates[0]->isStatic()){
+                                            *meta_function += MetaAttributes::Static;
+                                        }
+                                    }
+                                    skipWarning = true;
+                                }else if(function_item->templateParameters().size()==1){
+                                    if(function_item->templateParameters()[0]->name().isEmpty()
+                                            && function_item->templateParameters()[0]->defaultValue()==QStringLiteral("void")){
+                                        // this is Q_WEAK_OVERLOAD
+                                        skipWarning = true;
+                                    }
+                                }else{
+                                    skipWarning = true;
+                                    for(auto l=function_item->templateParameters().size(), i = decltype(l)(0); i<l; ++i){
+                                        if(function_item->templateParameters()[0]->defaultValue().isEmpty()){
+                                            skipWarning = false;
+                                            break;
+                                        }
+                                    }
+                                }
+                            }else{
+                                if(foundTemplates.size()==1){
+                                    if(foundTemplates[0]->isStatic()){
+                                        *meta_function += MetaAttributes::Static;
+                                    }
+                                }
+                            }
+                            if(!skipWarning){
+//                                ReportHandler::warning(QString("Untreated template method %1::%2").arg(targetClass->qualifiedCppName(), meta_function->minimalSignature()));
+                            }
+                        }
+
+                        addInclude(targetClass->typeEntry(), function_item->fileName(), true);
+                        meta_function->setDeclaringClass(targetClass);
+                        meta_function->setImplementingClass(targetClass);
+                        if(targetClass->isNamespace())
+                            *meta_function += MetaAttributes::Static;
+                        if(meta_function->isTemplate() && targetClass->functionBySignature().contains(meta_function->minimalSignature())){
+                            delete meta_function;
+                            continue;
+                        }
+                        targetClass->addFunction(meta_function);
+
+                        for(FunctionModification mod : qAsConst(functionModificationList)){
+                            if(!mod.argument_mods.isEmpty()
+                                    || !mod.template_instantiations.isEmpty()
+                                    || !mod.association.isEmpty()
+                                    || !mod.ppCondition.isEmpty()
+                                    || mod.isCodeInjection()
+                                    || !mod.throws.isEmpty()){
+                                mod.signature = meta_function->minimalSignature();
+                                if(targetClass->typeEntry()->designatedInterface())
+                                    targetClass->typeEntry()->designatedInterface()->addFunctionModification(mod);
+                                else
+                                    targetClass->typeEntry()->addFunctionModification(mod);
+                            }
+                        }
+                        if(!oldMinimalSignature.isEmpty() && oldMinimalSignature!=meta_function->minimalSignature()){
+                            for(const FunctionModification& mod : targetClass->typeEntry()->functionModifications()){
+                                if (mod.signature == oldMinimalSignature) {
+                                    const_cast<QString&>(mod.signature) = meta_function->minimalSignature();
+                                }
+                            }
+                        }
+                    }else{
+                        if(function_item->functionType() == CodeModel::Signal
+                                || function_item->functionType() == CodeModel::PrivateSignal){
+                            m_rejected_signals.insert({_function_name, function_item->fileName()}, IsGlobal);
+                        }else if(!function_item->templateParameters().isEmpty()){
+                            m_rejected_template_functions.insert({_function_name, function_item->fileName()}, IsGlobal);
+                        }else{
+                            m_rejected_functions.insert({_function_name, function_item->fileName()}, IsGlobal);
+                        }
+                    }
+                }
+            }else if(!meta_function->isDestructor()
+                     && !meta_function->isConstructor()
+                     && meta_function->isInvalid()
+                     && !function_item->isDeleted()){
+                if(targetClass){
+                    if(targetClass->typeEntry()->designatedInterface() && !meta_function->isConstructor()){
+                        targetClass = targetClass->extractInterface();
+                    }else if(meta_function->isConstructor() && targetClass->typeEntry()->isInterface()){
+                        targetClass = targetClass->extractInterfaceImpl();
+                    }
+                    meta_function->setDeclaringClass(targetClass);
+                    meta_function->setImplementingClass(targetClass);
+                    targetClass->addInvalidFunction(meta_function);
+                }else{
+                    if(function_item->functionType() == CodeModel::Signal
+                            || function_item->functionType() == CodeModel::PrivateSignal){
+                        m_rejected_signals.insert({_function_name, function_item->fileName()}, IsGlobal);
+                    }else if(!function_item->templateParameters().isEmpty()){
+                        m_rejected_template_functions.insert({_function_name, function_item->fileName()}, IsGlobal);
+                    }else{
+                        m_rejected_functions.insert({_function_name, function_item->fileName()}, IsGlobal);
+                    }
+                }
+            }
+        }
+    }
+    if(m_current_class){
+        if(hasPrivateConstructors){
+            MetaFunctionList functions = m_current_class->queryFunctions(MetaClass::Constructors);
+            // do not generate derived class when only copy constructor is available
+            if(functions.isEmpty() || (functions.size()==1 && functions.at(0)->isCopyConstructor())){
+                hasJustPrivateConstructors = true;
+            }
+        }
+        // remove duplicates by rvalue
+        for(MetaFunction *meta_function : qAsConst(rValueFunctions)){
+            for(MetaFunction * other : m_current_class->functions()){
+                if(meta_function!=other
+                        && other->name()==meta_function->name()
+                        && other->arguments().size()==meta_function->arguments().size()){
+                    bool isSame = true;
+                    for(int i=0; i<meta_function->arguments().size(); ++i){
+                        if(other->arguments()[i]->type()->typeEntry()!=meta_function->arguments()[i]->type()->typeEntry()){
+                            isSame = false;
+                            break;
+                        }
+                    }
+                    if(isSame){
+                        FunctionModification mod;
+                        mod.removal = TS::All;
+                        mod.signature = meta_function->minimalSignature();
+                        m_current_class->typeEntry()->addFunctionModification(mod);
+                    }
+                }
+            }
+        }
+        QStringList treatedSubscriptions;
+        QStringList subscriptions = subscriptionFunctions.keys();
+        for(const QString& sig : qAsConst(subscriptions)){
+            if(MetaFunction *subscription = subscriptionFunctions.take(sig)){
+                treatedSubscriptions << sig;
+                MetaFunction * getter{nullptr};
+                MetaFunction * setter{nullptr};
+                bool addSetter = false;
+                bool addGetter = false;
+                if(subscription->isConstant()){
+                    QString sig2 = sig.mid(0, sig.length()-5).trimmed();
+                    getter = subscription;
+                    if(!treatedSubscriptions.contains(sig2)){
+                        setter = subscriptionFunctions.take(sig2);
+                        if(setter)
+                            treatedSubscriptions << sig2;
+                        if(!setter && (!getter->type()->isConstant() && getter->type()->getReferenceType()==MetaType::Reference)){
+                            //ReportHandler::warning("There is no function '"+m_current_class->qualifiedCppName()+"::"+sig2+"' in ['"+subscriptionFunctions.keys().join("', '")+"']. (Treated: ['"+treatedSubscriptions.join("', '")+"']) Making copy of "+m_current_class->qualifiedCppName()+"::"+sig);
+                            setter = subscription->copy();
+                            setter->setOriginalSignature(subscription->originalSignature());
+                            setter->setOriginalName(subscription->originalName());
+                            addSetter = true;
+                        }
+                    }
+                }else{
+                    QString sig2 = sig + "const";
+                    setter = subscription;
+                    if(!treatedSubscriptions.contains(sig2)){
+                        getter = subscriptionFunctions.take(sig2);
+                        if(getter)
+                            treatedSubscriptions << sig2;
+                        if(!getter){
+                            //ReportHandler::warning("There is no function '"+m_current_class->qualifiedCppName()+"::"+sig2+"' in ['"+subscriptionFunctions.keys().join("', '")+"']. (Treated: ['"+treatedSubscriptions.join("', '")+"']) Making copy of "+m_current_class->qualifiedCppName()+"::"+sig);
+                            getter = subscription->copy();
+                            getter->setOriginalSignature(subscription->originalSignature());
+                            getter->setOriginalName(subscription->originalName());
+                            addGetter = true;
+                        }
+                    }
+                }
+                if(getter){
+                    getter->setName("get");
+                    if(getter->type()->indirections().isEmpty()){
+                        if(getter->type()->typeEntry()->isPrimitive()){
+                            getter->type()->setReferenceType(MetaType::NoReference);
+                        }else{
+                            getter->type()->setConstant(true);
+                            if(getter->type()->typeEntry()==m_database->qstringType()){
+                                getter->type()->setTypeEntry(m_database->findType("QString"));
+                            }else if(getter->type()->typeEntry()==m_database->qvariantType()){
+                                getter->type()->setTypeEntry(m_database->findType("QVariant"));
+                            }else if(getter->type()->typeEntry()==m_database->qcharType()){
+                                getter->type()->setTypeEntry(m_database->findType("QChar"));
+                            }
+                        }
+                    }
+                    decideUsagePattern(getter->type());
+                    if(addGetter){
+                        if(m_current_class->typeEntry()->designatedInterface())
+                            m_current_class->extractInterface()->addFunction(getter);
+                        else
+                            m_current_class->addFunction(getter);
+                    }
+                }
+                if(setter){
+                    setter->setName("set");
+                    MetaType* type;
+                    if(getter && !addGetter){
+                        type = getter->type()->copy();
+                    }else{
+                        type = setter->type();
+                        if(type->indirections().isEmpty()){
+                            if(type->typeEntry()->isPrimitive()){
+                                type->setReferenceType(MetaType::NoReference);
+                            }else{
+                                type->setConstant(true);
+                                if(type->typeEntry()==m_database->qstringType()){
+                                    type->setTypeEntry(m_database->findType("QString"));
+                                }else if(type->typeEntry()==m_database->qvariantType()){
+                                    type->setTypeEntry(m_database->findType("QVariant"));
+                                }else if(type->typeEntry()==m_database->qcharType()){
+                                    type->setTypeEntry(m_database->findType("QChar"));
+                                }
+                            }
+                        }else{
+                            type->setReferenceType(MetaType::NoReference);
+                        }
+                    }
+                    decideUsagePattern(type);
+                    QString oldMinimalSignature = setter->minimalSignature();
+                    setter->setType(nullptr);
+                    MetaArgument* arg = new MetaArgument();
+                    arg->setArgumentIndex(setter->arguments().size());
+                    arg->setType(type);
+                    bool hasValue = false;
+                    for(const MetaArgument* other : setter->arguments()){
+                        if(other->argumentName()=="value"){
+                            hasValue = true;
+                            break;
+                        }
+                    }
+                    if(!hasValue)
+                        arg->setName("value");
+                    setter->addArgument(arg);
+                    if(oldMinimalSignature!=setter->minimalSignature()){
+                        for(const FunctionModification& mod : m_current_class->typeEntry()->functionModifications()){
+                            if (mod.signature == oldMinimalSignature) {
+                                const_cast<QString&>(mod.signature) = setter->minimalSignature();
                             }
                         }
                     }
+                    if(addSetter){
+                        if(m_current_class->typeEntry()->designatedInterface())
+                            m_current_class->extractInterface()->addFunction(setter);
+                        else
+                            m_current_class->addFunction(setter);
+                    }
                 }
-                meta_class->addFunction(meta_function);
-            }else if(!meta_function->isDestructor() &&
-                     !meta_function->isConstructor() &&
-                     meta_function->isInvalid()){
-                meta_class->addInvalidFunction(meta_function);
             }
         }
-    }
-    if(hasPrivateConstructors){
-        MetaFunctionList functions = meta_class->queryFunctions(MetaClass::Constructors);
-        // do not generate derived class when only copy constructor is available
-        if(functions.isEmpty() || (functions.size()==1 && functions.at(0)->isCopyConstructor())){
-            hasJustPrivateConstructors = true;
+        if(hasJustPrivateConstructors || hasPrivateDestructor){
+            *m_current_class += MetaAttributes::Final;
         }
-    }
-    // remove duplicates by rvalue
-    for(MetaFunction *meta_function : rValueFunctions){
-        for(MetaFunction * other : meta_class->functions()){
-            if(meta_function!=other
-                    && other->name()==meta_function->name()
-                    && other->arguments().size()==meta_function->arguments().size()){
-                bool isSame = true;
-                for(int i=0; i<meta_function->arguments().size(); ++i){
-                    if(other->arguments()[i]->type()->typeEntry()!=meta_function->arguments()[i]->type()->typeEntry()){
-                        isSame = false;
-                        break;
-                    }
-                }
-                if(isSame){
-                    FunctionModification mod;
-                    mod.removal = TS::All;
-                    mod.signature = meta_function->minimalSignature();
-                    meta_class->typeEntry()->addFunctionModification(mod);
-                }
+        m_current_class->setHasPublicDestructor(hasPublicDestructor);
+        m_current_class->setHasPrivateDestructor(hasPrivateDestructor);
+        m_current_class->setHasVirtualDestructor(hasVirtualDestructor);
+        m_current_class->setHasJustPrivateConstructors(hasJustPrivateConstructors);
+        m_current_class->setUnimplmentablePureVirtualFunctions(unimplementablePureVirtualFunctions);
+        if(m_current_class->isInterface()){
+            MetaClass *ifaceImpl = m_current_class->extractInterfaceImpl();
+            if(hasJustPrivateConstructors || hasPrivateDestructor){
+                *ifaceImpl += MetaAttributes::Final;
+            }
+            ifaceImpl->setHasPublicDestructor(hasPublicDestructor);
+            ifaceImpl->setHasPrivateDestructor(hasPrivateDestructor);
+            ifaceImpl->setHasVirtualDestructor(hasVirtualDestructor);
+            ifaceImpl->setHasJustPrivateConstructors(hasJustPrivateConstructors);
+            ifaceImpl->setUnimplmentablePureVirtualFunctions(unimplementablePureVirtualFunctions);
+        }else if(m_current_class->typeEntry()->designatedInterface()){
+            MetaClass *iface = m_current_class->extractInterface();
+            if(hasJustPrivateConstructors || hasPrivateDestructor){
+                *iface += MetaAttributes::Final;
             }
+            iface->setHasPublicDestructor(hasPublicDestructor);
+            iface->setHasPrivateDestructor(hasPrivateDestructor);
+            iface->setHasVirtualDestructor(hasVirtualDestructor);
+            iface->setHasJustPrivateConstructors(hasJustPrivateConstructors);
+            iface->setUnimplmentablePureVirtualFunctions(unimplementablePureVirtualFunctions);
         }
     }
-    if(hasJustPrivateConstructors || hasPrivateDestructor){
-        *meta_class += MetaAttributes::Final;
-    }
-    meta_class->setHasPublicDestructor(hasPublicDestructor);
-    meta_class->setHasPrivateDestructor(hasPrivateDestructor);
-    meta_class->setHasVirtualDestructor(hasVirtualDestructor);
-    meta_class->setHasJustPrivateConstructors(hasJustPrivateConstructors);
-    meta_class->setUnimplmentablePureVirtualFunctions(unimplementablePureVirtualFunctions);
 }
 
 MetaType* MetaBuilder::exchangeTemplateTypes(const MetaType* type, bool isReturn, const QMap<QString,MetaType*>& templateTypes){
@@ -4766,7 +5022,7 @@ MetaType* MetaBuilder::exchangeTemplateTypes(const MetaType* type, bool isReturn
     return const_cast<MetaType*>(type);
 }
 
-bool MetaBuilder::setupTemplateInstantiations(MetaClass *meta_class){
+bool MetaBuilder::setupFunctionTemplateInstantiations(MetaClass *meta_class){
     MetaFunctionList functions;
     for(MetaFunction *func : meta_class->functions()) {
         MetaTemplateParameterList templateParameters;
@@ -4778,7 +5034,7 @@ bool MetaBuilder::setupTemplateInstantiations(MetaClass *meta_class){
         if(!templateParameters.isEmpty() || (func->type() && func->type()->typeUsagePattern()==MetaType::AutoPattern)){
             QList<TemplateInstantiation> templateInstantiations = func->templateInstantiations(meta_class);
             if(!templateInstantiations.isEmpty()){
-                for(const TemplateInstantiation& template_instantiation : templateInstantiations){
+                for(const TemplateInstantiation& template_instantiation : qAsConst(templateInstantiations)){
                     // duplicate
                     std::unique_ptr<MetaFunction> func2;
                     func2.reset(func->copy());
@@ -4795,14 +5051,14 @@ bool MetaBuilder::setupTemplateInstantiations(MetaClass *meta_class){
                         MetaTemplateParameter* tparam = func2->templateParameters()[k];
                         if(tparam->type()->typeUsagePattern()==MetaType::TemplateArgumentPattern){
                             if(template_instantiation.arguments[k].name.isEmpty()){
-                                TypeInfo info;
-                                info.setQualifiedName(template_instantiation.arguments[k].type.split("::"));
-                                bool ok = false;
+                                TypeInfo info = analyzeTypeInfo(meta_class, template_instantiation.arguments[k].type);
                                 MetaClass * tmp_current_class = m_current_class;
                                 m_current_class = meta_class;
+                                bool ok = false;
                                 MetaType* ttype = translateType(info, &ok, QString("traverseTemplateInstantiation <%1>").arg(template_instantiation.arguments[k].type), true, true, false);
                                 m_current_class = tmp_current_class;
                                 if(ok && ttype){
+                                    decideUsagePattern(ttype);
                                     templateTypes[tparam->name()] = ttype;
                                     tparam->setName("");
                                     tparam->setType(ttype);
@@ -4824,14 +5080,14 @@ bool MetaBuilder::setupTemplateInstantiations(MetaClass *meta_class){
                         if(func2->type()->typeUsagePattern()==MetaType::AutoPattern){
                             if(template_instantiation.arguments.size() > func2->templateParameters().size()){
                                 QString arg = template_instantiation.arguments[func2->templateParameters().size()].type;
-                                TypeInfo info;
-                                info.setQualifiedName(arg.split("::"));
-                                bool ok = false;
+                                TypeInfo info = analyzeTypeInfo(meta_class, arg);
                                 MetaClass * tmp_current_class = m_current_class;
                                 m_current_class = meta_class;
+                                bool ok = false;
                                 MetaType* ttype = translateType(info, &ok, QString("traverseTemplateInstantiation <%1>").arg(arg), true, true, false);
                                 m_current_class = tmp_current_class;
                                 if(ok && ttype){
+                                    decideUsagePattern(ttype);
                                     func2->setType(ttype);
                                 }
                             }
@@ -4858,24 +5114,28 @@ bool MetaBuilder::setupTemplateInstantiations(MetaClass *meta_class){
                         ReportHandler::warning(QString("method %1::%2 returns auto").arg(func->implementingClass()->qualifiedCppName(), func->minimalSignature()));
                     }else{
                         func2->setFunctionTemplate(func);
-                        if(template_instantiation.isCodeInjection()
-                                || !template_instantiation.ppCondition.isEmpty()
-                                || !template_instantiation.throws.isEmpty()
-                                || !template_instantiation.association.isEmpty()
-                                || !template_instantiation.snips.isEmpty()
-                                || !template_instantiation.targetType.isEmpty()
-                                || !template_instantiation.argument_mods.isEmpty()){
-                            FunctionModification mod;
-                            AbstractFunctionModification& amod = mod;
-                            amod = template_instantiation;
-                            mod.signature = func2->minimalSignature();
-                            mod.removal = TS::NoLanguage;
-                            meta_class->typeEntry()->addFunctionModification(mod);
-                        }
                         func2->setDeclaringClass(meta_class);
                         func2->setOwnerClass(meta_class);
                         func2->setImplementingClass(meta_class);
-                        functions << func2.release();
+                        //if(!meta_class->hasFunction(func2.get()))
+                        {
+                            if(template_instantiation.isCodeInjection()
+                                    || !template_instantiation.ppCondition.isEmpty()
+                                    || !template_instantiation.throws.isEmpty()
+                                    || !template_instantiation.association.isEmpty()
+                                    || !template_instantiation.snips.isEmpty()
+                                    || !template_instantiation.targetType.isEmpty()
+                                    || !template_instantiation.argument_mods.isEmpty()){
+                                FunctionModification mod;
+                                AbstractFunctionModification& amod = mod;
+                                amod = template_instantiation;
+                                mod.template_instantiations.clear();
+                                mod.signature = func2->minimalSignature();
+                                mod.removal = TS::NoLanguage;
+                                meta_class->typeEntry()->addFunctionModification(mod);
+                            }
+                            functions << func2.release();
+                        }
                     }
                 }
             }else if(!func->hasTemplateTypes() && !(func->type() && func->type()->typeUsagePattern()==MetaType::AutoPattern)){
@@ -4889,8 +5149,7 @@ bool MetaBuilder::setupTemplateInstantiations(MetaClass *meta_class){
                 for(int k=0; k<func2->templateParameters().size(); k++){
                     MetaTemplateParameter* tparam = func2->templateParameters()[k];
                     if(tparam->type()->typeUsagePattern()==MetaType::TemplateArgumentPattern){
-                        TypeInfo info;
-                        info.setQualifiedName(tparam->defaultType().split("::"));
+                        TypeInfo info = analyzeTypeInfo(meta_class, tparam->defaultType());
                         bool ok = false;
                         MetaClass * tmp_current_class = m_current_class;
                         m_current_class = meta_class;
@@ -4917,11 +5176,20 @@ bool MetaBuilder::setupTemplateInstantiations(MetaClass *meta_class){
                         arg->setType(rtype);
                 }
                 functions << func2.release();
-            }else if(!func->hasTemplateArgumentTypes()){
+            }else if(func->hasTemplateArgumentTypes()){
+                if(func->isRemovedFromAllLanguages(meta_class))
+                    functions << func;
+                else if(!func->isPrivate()){
+                    if(!func->implementingClass() || (func->implementingClass()->typeEntry()->codeGeneration() & TypeEntry::GenerateCode)){
+                        if(func->functionType()==MetaFunction::GlobalScopeFunction)
+                            ReportHandler::warning(QString("Missing instantiations for template method %1").arg(func->minimalSignature()));
+                        else
+                            ReportHandler::warning(QString("Missing instantiations for template method %1::%2").arg(func->implementingClass()->qualifiedCppName(), func->minimalSignature()));
+                    }
+                }
+            }else{
                 if(func->isRemovedFromAllLanguages(meta_class))
                     functions << func;
-                else if(!func->isPrivate())
-                    ReportHandler::warning(QString("missing instantiations for template method %1::%2").arg(func->implementingClass()->qualifiedCppName(), func->minimalSignature()));
             }
         }else{
             functions << func;
@@ -4931,40 +5199,426 @@ bool MetaBuilder::setupTemplateInstantiations(MetaClass *meta_class){
     return true;
 }
 
-bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
+
+void MetaBuilder::fixFunctions(MetaClass * cls) {
+    if (m_functions_fixed.contains(cls))
+        return;
+    else
+        m_functions_fixed.insert(cls);
+
+    setupFunctionTemplateInstantiations(cls);
+    if(!cls->isInterface()){
+        for(MetaClass* interface : cls->interfaces()){
+            if(cls->typeEntry()->designatedInterface() && cls->extractInterface()==interface){
+                for(MetaFunction *function : interface->functions()) {
+                    MetaFunction *cpy = function->copy();
+                    cpy->setDeclaringClass(cls);
+                    cpy->setImplementingClass(cls);
+                    if(cpy->isConstructor()){
+                        cpy->setName(InterfaceTypeEntry::implName({}).mid(2));
+                    }
+                    cls->addFunction(cpy);
+                }
+                for(const MetaField *field : interface->fields()) {
+                    if (!field->wasPrivate()) {
+                        MetaField *new_field = field->copy();
+                        new_field->setEnclosingClass(cls);
+                        cls->addField(new_field);
+                    }
+                }
+            }else{
+                for(MetaFunction *function : interface->functions()) {
+                    if (!function->isConstructor() && !cls->hasFunction(function)) {
+                        MetaFunction *cpy = function->copy();
+
+                        // Setup that this function is an interface class.
+                        cpy->setInterfaceClass(interface);
+                        *cpy += MetaAttributes::InterfaceFunction;
+
+                        // Copy the modifications in interface into the implementing classes.
+                        FunctionModificationList mods = function->modifications(interface);
+                        for(const FunctionModification &mod : mods) {
+                            cls->typeEntry()->addFunctionModification(mod);
+                        }
+
+                        // It should be mostly safe to assume that when we implement an interface
+                        // we don't "pass on" pure virtual functions to our sublcasses...
+            //                 *cpy -= AbstractMetaAttributes::Abstract;
+
+                        cpy->setImplementingClass(cls);
+                        cls->addFunction(cpy);
+                    }
+                }
+                for(const MetaField *field : interface->fields()) {
+                    if (field->isPublic()) {
+                        MetaField *new_field = field->copy();
+                        new_field->setEnclosingClass(cls);
+                        cls->addField(new_field);
+                    }
+                }
+            }
+        }
+    }
+
+    MetaClass *interfaceImplClass{nullptr};
+    MetaClass *super_class = cls->baseClass();
+    MetaFunctionList funcs = cls->functions();
+
+//     printf("fix functions for %s\n", qPrintable(name()));
+
+    if (super_class)
+        fixFunctions(super_class);
+    int iface_idx = 0;
+
+    while (super_class || iface_idx < cls->interfaces().size()) {
+//         printf(" - base: %s\n", qPrintable(super_class->name()));
+
+        // Since we always traverse the complete hierarchy we are only
+        // interrested in what each super class implements, not what
+        // we may have propagated from their base classes again.
+        MetaFunctionList super_funcs;
+        if (super_class) {
+            bool pullDown = super_class->isPullProtectedMethodsDown();
+            // Super classes can never be final
+            if (super_class->isFinalInTargetLang()) {
+                ReportHandler::warning("Final class '" + super_class->name() + "' set to non-final, as it is extended by other classes");
+                *super_class -= MetaAttributes::FinalInTargetLang;
+                *super_class += MetaAttributes::PullProtectedMethodsDown;
+                pullDown = true;
+            }
+            if(pullDown){
+                // when a class cannot be subclassed from external but has subclasses inside Qt,
+                // the protected functions of the class must be pulled down to the subclasses.
+                super_funcs = super_class->queryFunctions(MetaClass::Protected | MetaClass::NormalFunctions);
+                for (int sfi = 0; sfi < super_funcs.size(); ++sfi) {
+                    MetaFunction *sf = super_funcs.at(sfi);
+                    if(!sf->isAbstract() && !sf->isConstructor() && !sf->isEmptyFunction() && !sf->isInvalid()){
+                        MetaFunction *sfcopy = sf->copy();
+                        sfcopy->setDeclaringClass(cls);
+                        cls->addFunction(sfcopy);
+                    }
+                }
+            }
+            super_funcs = super_class->queryFunctions(MetaClass::ClassImplements);
+        } else {
+            interfaceImplClass = cls->interfaces().at(iface_idx)->extractInterfaceImpl();
+            super_funcs = cls->interfaces().at(iface_idx)->queryFunctions(MetaClass::NormalFunctions);
+        }
+
+        QHash<MetaFunction *, FunctionModificationList> funcs_to_add;
+        for (int sfi = 0; sfi < super_funcs.size(); ++sfi) {
+            MetaFunction *sf = super_funcs.at(sfi);
+
+            if (sf->isRemovedFromAllLanguages(sf->implementingClass()))
+                continue;
+
+            // we generally don't care about private functions, but we have to get the ones that are
+            // virtual in case they override abstract functions.
+            bool add = (sf->isNormal() || sf->isSignal() || sf->isEmptyFunction());
+            for (int fi = 0; fi < funcs.size(); ++fi) {
+                MetaFunction *f = funcs.at(fi);
+                if (f->isRemovedFromAllLanguages(f->implementingClass()))
+                    continue;
+
+                const uint cmp = f->compareTo(sf);
+
+                if (cmp & MetaFunction::EqualModifiedName) {
+//                     printf("   - %s::%s similar to %s::%s %x vs %x\n",
+//                            qPrintable(sf->implementingClass()->typeEntry()->qualifiedCppName()),
+//                            qPrintable(sf->name()),
+//                            qPrintable(f->implementingClass()->typeEntry()->qualifiedCppName()),
+//                            qPrintable(f->name()),
+//                            sf->attributes(),
+//                            f->attributes());
+
+                    add = sf->isSignal();
+                    if (cmp & MetaFunction::EqualArguments) {
+
+//                         if (!(cmp & AbstractMetaFunction::EqualReturnType)) {
+//                             ReportHandler::warning(QString("%1::%2 and %3::%4 differ in retur type")
+//                                                    .arg(sf->implementingClass()->name())
+//                                                    .arg(sf->name())
+//                                                    .arg(f->implementingClass()->name())
+//                                                    .arg(f->name()));
+//                         }
+
+                        // Same function, propegate virtual...
+                        if (!(cmp & MetaFunction::EqualAttributes)) {
+                            if (!f->isEmptyFunction()) {
+                                if (!sf->isFinalInCpp() && f->isFinalInCpp() && !f->isDeclaredFinalInCpp()) {
+                                    *f -= MetaAttributes::FinalInCpp;
+                                    //                                 printf("   --- inherit virtual\n");
+                                }
+                                if (!sf->isFinalInTargetLang() && f->isFinalInTargetLang() && !f->isDeclaredFinalInCpp()) {
+                                    *f -= MetaAttributes::FinalInTargetLang;
+                                    //                                 printf("   --- inherit virtual\n");
+                                }
+                                if (!f->isFinalInTargetLang() && f->isPrivate() && !sf->isPrivate()) {
+                                    f->setFunctionType(MetaFunction::EmptyFunction);
+                                    f->setVisibility(MetaAttributes::Protected);
+                                    *f += MetaAttributes::FinalInTargetLang;
+                                    ReportHandler::warning(QString("private virtual function '%1' in '%2'")
+                                                           .arg(f->signature(), f->implementingClass()->name()));
+                                }
+                            }
+                        }
+
+                        if (f->visibility() != sf->visibility()) {
+                            QString warn = QString("visibility of function '%1' modified in class '%2'")
+                                           .arg(f->name(), cls->name());
+                            ReportHandler::warning(warn);
+
+                            // If new visibility is private, we can't
+                            // do anything. If it isn't, then we
+                            // prefer the parent class's visibility
+                            // setting for the function.
+                            if (!f->isPrivate() && !sf->isPrivate())
+                                f->setVisibility(sf->visibility());
+
+                            // Private overrides of abstract functions have to go into the class or
+                            // the subclasses will not compile as non-abstract classes.
+                            // But they don't need to be implemented, since they can never be called.
+                            if (f->isPrivate() && sf->isAbstract()) {
+                                f->setFunctionType(MetaFunction::EmptyFunction);
+                                f->setVisibility(sf->visibility());
+                                *f += MetaAttributes::FinalInTargetLang;
+                                *f += MetaAttributes::FinalInCpp;
+                            }
+                        }
+
+                        // Set the class which first declares this function, afawk
+                        f->setDeclaringClass(sf->declaringClass());
+
+                        if (sf->isFinalInTargetLang() && !sf->isPrivate() && !f->isPrivate() && !sf->isStatic() && !f->isStatic() && !f->isSignal()) {
+                            // Shadowed funcion, need to make base class
+                            // function non-virtual
+                            if (f->implementingClass() != sf->implementingClass() && f->implementingClass()->inheritsFrom(sf->implementingClass())) {
+
+                                // Check whether the superclass method has been redefined to non-final
+
+                                bool hasNonFinalModifier = false;
+                                bool isBaseImplPrivate = false;
+                                FunctionModificationList mods = sf->modifications(sf->implementingClass());
+                                for(const FunctionModification& mod : mods) {
+                                    if (mod.isNonFinal()) {
+                                        hasNonFinalModifier = true;
+                                        break;
+                                    } else if (mod.isPrivate()) {
+                                        isBaseImplPrivate = true;
+                                        break;
+                                    }
+                                }
+
+                                QPair<QMap<int,ArgumentModification>,QList<ArgumentModification>> addedArguments;
+                                if (!hasNonFinalModifier
+                                        && !isBaseImplPrivate
+                                        && ( addedArguments = f->addedArguments() ).first.isEmpty()
+                                        && addedArguments.second.isEmpty()
+                                        && (f->implementingClass()->typeEntry()->codeGeneration() & TypeEntry::GenerateTargetLang)
+                                        && (sf->implementingClass()->typeEntry()->codeGeneration() & TypeEntry::GenerateTargetLang)) {
+                                    ReportHandler::warning(QStringLiteral("Shadowing: %1::%2 and %3::%4; Java code will not compile")
+                                                           .arg(sf->implementingClass()->qualifiedCppName(),
+                                                                sf->signature(),
+                                                                f->implementingClass()->qualifiedCppName(),
+                                                                f->signature()));
+                                }
+                            }
+                        }
+
+                    }
+
+                    if (!f->isPrivate() && cmp & MetaFunction::EqualDefaultValueOverload) {
+                        const MetaArgumentList& arguments = f->arguments().size() < sf->arguments().size() ? sf->arguments() : f->arguments();
+
+                        for (int i = 0; i < arguments.size(); ++i)
+                            arguments[i]->setDefaultValueExpression(QString());
+                    }
+
+
+                    // Otherwise we have function shadowing and we can
+                    // skip the thing...
+                } else if (cmp & MetaFunction::EqualName && !sf->isSignal()) {
+
+                    // In the case of function shadowing where the function name has been altered to
+                    // avoid conflict, we don't copy in the original.
+                    add = false;
+                }
+
+                // this feature is necessary because
+                // Q_DECL_FINAL (meaning the shell must not override the method)
+                // is not yet recognized by generator.
+                // Example: Qt3D::QColorMask::copy(const Qt3D::QNode *) Q_DECL_FINAL
+
+                FunctionModificationList mods = f->modifications(cls);
+                for(const FunctionModification& mod : mods) {
+                    if (mod.isDeclaredFinal()) {
+                        *f += MetaAttributes::FinalInTargetLang;
+                        *f += MetaAttributes::FinalInCpp;
+//                        ReportHandler::warning(QString("final overriding method %1 in class %2").arg(f->signature()).arg(f->implementingClass()->qualifiedCppName()));
+                        break;
+                    }
+                }
+            }
+
+            if (add)
+                funcs_to_add[sf] = interfaceImplClass ? sf->modifications(interfaceImplClass) : FunctionModificationList{};
+        }
+
+        for(QHash<MetaFunction *, FunctionModificationList>::const_iterator i = funcs_to_add.cbegin(); i!=funcs_to_add.cend(); i++){
+            funcs << i.key()->copy();
+            if(cls->isInterface())
+                cls->extractInterfaceImpl()->typeEntry()->addFunctionModifications(i.value());
+            else
+                cls->typeEntry()->addFunctionModifications(i.value());
+        }
+
+        if (super_class)
+            super_class = super_class->baseClass();
+        else
+            iface_idx++;
+    }
+
+    bool hasPrivateConstructors = false;
+    bool hasPublicConstructors = false;
+    for(MetaFunction *func : funcs) {
+        FunctionModificationList mods = func->modifications(cls);
+        for(const FunctionModification &mod : mods) {
+            if (mod.isRenameModifier()) {
+                func->setName(mod.renamedTo());
+            }
+        }
+
+        // Make sure class is abstract if one of the functions is
+        if (func->isAbstract()) {
+            (*cls) += MetaAttributes::Abstract;
+            (*cls) -= MetaAttributes::Final;
+        }
+
+        if (func->isConstructor()) {
+            if (func->isPrivate())
+                hasPrivateConstructors = true;
+            else
+                hasPublicConstructors = true;
+        }
+    }
+
+    if (hasPrivateConstructors && !hasPublicConstructors) {
+        (*cls) += MetaAttributes::Abstract;
+        (*cls) -= MetaAttributes::Final;
+    }
+
+    for(MetaFunction *f1 : funcs) {
+        for(MetaFunction *f2 : funcs) {
+            if (f1 != f2) {
+                uint cmp = f1->compareTo(f2);
+                if ((cmp & MetaFunction::EqualName)
+                        && !f1->isFinalInCpp()
+                        && f2->isFinalInCpp()) {
+                    *f2 += MetaAttributes::FinalOverload;
+                }
+            }
+        }
+    }
+
+    cls->setFunctions(funcs);
+    for(MetaFunction *func : funcs) {
+        // Make sure that we include files for all classes that are in use
+
+        if (!func->isRemovedFrom(cls, TS::ShellCode)){
+            if(func->type()){
+                addInclude(cls->typeEntry(), func->type());
+            }
+            for(MetaArgument* arg : func->arguments()){
+                addInclude(cls->typeEntry(), arg->type());
+            }
+        }
+    }
+
+    if (!cls->typeEntry()) {
+        ReportHandler::warning(QString("class '%1' does not have an entry in the type system").arg(cls->name()));
+    } else {
+        if (!cls->hasConstructors() && !cls->isFinalInCpp() && !cls->isInterface() && !cls->isNamespace())
+            cls->addDefaultConstructor();
+    }
+
+    if (cls->isAbstract() && !cls->isInterface()) {
+        cls->typeEntry()->setLookupName(cls->typeEntry()->targetLangName() + "$ConcreteWrapper");
+    }
+    cls->fixUnimplmentablePureVirtualFunctions();
+    if(!cls->typeEntry()->extendType().isEmpty()){
+        if(MetaClass *extendedClass = m_meta_classes.findClass(cls->typeEntry()->extendType())){
+            for(MetaFunction* function : cls->functions()){
+                function = function->copy();
+                if(function->isConstructor()){
+                    function->setName(extendedClass->simpleName());
+                }
+                function->setImplementingClass(extendedClass);
+                function->setDeclaringClass(extendedClass);
+                function->setOwnerClass(extendedClass);
+                extendedClass->addFunction(function);
+                //add_extra_includes_for_function(extendedClass, function);
+            }
+            for(const Include& incl : cls->typeEntry()->extraIncludes()){
+                extendedClass->typeEntry()->addExtraInclude(incl);
+            }
+        }else{
+            ReportHandler::warning(QString("Unable to extend class '%1'.").arg(cls->typeEntry()->extendType()));
+        }
+    }
+}
+
+void MetaBuilder::setupInheritance(MetaClass *meta_class, QList<PendingHiddenBaseType>& pendingHiddenBaseTypes, QList<MetaClass *>& pendingConstructorUsages) {
     Q_ASSERT(!meta_class->isInterface());
 
     if (m_setup_inheritance_done.contains(meta_class))
-        return true;
+        return;
     m_setup_inheritance_done.insert(meta_class);
 
     if(meta_class->templateBaseClass() && meta_class->qualifiedCppName().endsWith(">")){
-        setupInheritance(const_cast<MetaClass *>(meta_class->templateBaseClass()));
-        TypeParser::Info info = TypeParser::parse(meta_class->qualifiedCppName());
-        MetaClass *old_current_class = m_current_class;
-        m_current_class = meta_class;
-        inheritHiddenBaseType(meta_class, meta_class->templateBaseClass(), info);
-        m_current_class = old_current_class;
-        return true;
+        setupInheritance(const_cast<MetaClass *>(meta_class->templateBaseClass()), pendingHiddenBaseTypes, pendingConstructorUsages);
+        TypeInfo info = analyzeTypeInfo(meta_class, meta_class->qualifiedCppName());
+        pendingHiddenBaseTypes.append(PendingHiddenBaseType{meta_class, meta_class->templateBaseClass(), info});
+        return;
     }
 
-    QStringList publicBaseClasses;
-    QStringList protectedBaseClasses;
-    for(const QPair<QString,bool>& pair : meta_class->baseClassNames()){
-        if(pair.second){
-            publicBaseClasses << pair.first;
-        }else{
-            protectedBaseClasses << pair.first;
+    QList<TypeInfo> publicBaseClasses;
+    QList<TypeInfo> protectedBaseClasses;
+
+    QStringList scope = meta_class->typeEntry()->qualifiedCppName().split("::");
+    scope.removeLast();
+
+    if(!scope.isEmpty()){
+        for (QPair<TypeInfo,bool> pair : meta_class->baseClassTypeInfo()) {
+            for (auto l = scope.size(); l >= 0; --l) {
+                QStringList prefix = l > 0 ? QStringList(scope.mid(0, l)) : QStringList();
+                TypeInfo baseClass = pair.first;
+                baseClass.setQualifiedName(prefix << baseClass.qualifiedName());
+                if(m_database->findType(baseClass.toString())){
+                    pair.first = baseClass;
+                    break;
+                }
+            }
+            if(pair.second){
+                publicBaseClasses << pair.first;
+            }else{
+                protectedBaseClasses << pair.first;
+            }
+        }
+    }else{
+        for(const QPair<TypeInfo,bool>& pair : meta_class->baseClassTypeInfo()){
+            if(pair.second){
+                publicBaseClasses << pair.first;
+            }else{
+                protectedBaseClasses << pair.first;
+            }
         }
     }
 
-    TypeDatabase *types = m_database;
-
     if(publicBaseClasses.isEmpty() && meta_class->typeAliasType()){
         const MetaType* typeAliasType = meta_class->typeAliasType();
         if(typeAliasType->typeEntry() && typeAliasType->typeEntry()->isAlias()){
             if(MetaClass *cls = m_meta_classes.findClass(typeAliasType->typeEntry()->qualifiedCppName())){
-                setupInheritance(cls);
+                setupInheritance(cls, pendingHiddenBaseTypes, pendingConstructorUsages);
                 if(cls->typeAliasType()){
                     MetaType* newTypeAliasType = cls->typeAliasType()->copy();
                     if(newTypeAliasType->indirections().isEmpty()
@@ -4983,18 +5637,15 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
         }
     }
 
-    QStringList scope = meta_class->typeEntry()->qualifiedCppName().split("::");
-    scope.removeLast();
     // we only support our own containers and ONLY if there is only one baseclass
-    if (publicBaseClasses.size() == 1 && publicBaseClasses.first().count('<') == 1) {
-        for (auto i = scope.size(); i >= 0; --i) {
-            QString prefix = i > 0 ? QStringList(scope.mid(0, i)).join("::") + "::" : QString();
-            QString complete_name = prefix + publicBaseClasses.first();
-            TypeParser::Info info = TypeParser::parse(complete_name);
-            QString base_name = info.qualified_name.join("::");
-            if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6, 0, 0) && base_name=="QVector"){
-                base_name = "QList";
-            }
+    if (publicBaseClasses.size() == 1 && publicBaseClasses.first().toString().count('<') == 1) {
+        QStringList base = publicBaseClasses.first().qualifiedName();
+        if(QT_VERSION_CHECK(m_qtVersionMajor,m_qtVersionMinor,m_qtVersionPatch) >= QT_VERSION_CHECK(6, 0, 0) && base==QStringList{"QVector"}){
+            base = QStringList{"QList"};
+        }
+        //for (auto i = scope.size(); i >= 0; --i)
+        {
+            QString base_name = base.join("::");
 
             MetaClass *templ = nullptr;
             for(MetaClass *c : m_templates) {
@@ -5008,46 +5659,29 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
                 templ = m_meta_classes.findClass(base_name);
 
             if (templ) {
-                setupInheritance(templ);
-                inheritHiddenBaseType(meta_class, templ, info);
-                return true;
+                setupInheritance(templ, pendingHiddenBaseTypes, pendingConstructorUsages);
+                pendingHiddenBaseTypes.append(PendingHiddenBaseType{meta_class, templ, publicBaseClasses.first()});
+                return;
             }
         }
 
         ReportHandler::warning(QString("template baseclass '%1' of '%2' is not known")
-                               .arg(publicBaseClasses.first())
-                               .arg(meta_class->name()));
-        return false;
-    }
-
-    if(!scope.isEmpty()){
-        for (int i = 0; i < publicBaseClasses.size(); ++i) {
-            for (auto l = scope.size(); l >= 0; --l) {
-                QString prefix = l > 0 ? QStringList(scope.mid(0, l)).join("::") + "::" : QString();
-                QString complete_name = prefix + publicBaseClasses.at(i);
-                TypeParser::Info info = TypeParser::parse(complete_name);
-                QString base_name = info.qualified_name.join("::");
-                if(types->findType(base_name)){
-                    publicBaseClasses.replace(i, base_name);
-                    continue;
-                }
-            }
-        }
+                               .arg(publicBaseClasses.first().toString(), meta_class->name()));
+        return;
     }
 
     int primary = -1;
     int primaries = 0;
     for (int i = 0; i < publicBaseClasses.size(); ++i) {
-        QString base_class_name = publicBaseClasses.at(i);
-        if (types->isClassRejected(base_class_name))
+        QString base_class_name = publicBaseClasses[i].toString();
+        if (m_database->isClassRejected(strip_template_args(base_class_name)))
             continue;
 
-        TypeParser::Info info = TypeParser::parse(base_class_name);
-        QString base_name = info.qualified_name.join("::");
-        TypeEntry *base_class_entry = types->findType(base_name);
+        QString base_name = publicBaseClasses[i].qualifiedName().join("::");
+        TypeEntry *base_class_entry = m_database->findType(base_name);
         if (!base_class_entry) {
             ReportHandler::warning(QString("class '%1' inherits from unknown base class '%2'")
-                                   .arg(meta_class->name()).arg(base_class_name));
+                                   .arg(meta_class->name(), base_class_name));
         }
 
         // true for primary base class
@@ -5063,36 +5697,32 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
                         }
                     }
                     bool ok = false;
-                    TypeInfo newInfo;
-                    newInfo.setArrayElements(info.arrays);
-                    newInfo.setIndirections({false});
-                    newInfo.setConstant(info.is_constant);
-                    newInfo.setFunctionPointer(false);
-                    newInfo.setQualifiedName({info.instantiationName()});
-                    newInfo.setReferenceType(TypeInfo::ReferenceType(info.reference_type));
-                    newInfo.setVolatile(info.is_volatile);
-                    MetaType* type = translateType(newInfo, &ok, QString("Inheritance %1 of %2").arg(base_class_name).arg(meta_class->name()));
-                    if(ok){
-                        MetaFunction * delegateFunction = new MetaFunction();
+                    MetaType* type = translateType(publicBaseClasses[i], &ok, QString("setupInheritance of %1").arg(meta_class->name()));
+                    if(!ok || !type){
+                        ReportHandler::warning(QString("class '%1' inherits from unknown base class '%2'")
+                                               .arg(meta_class->name(), publicBaseClasses[i].toString()));
+                    }else{
+                        type->setIndirections({false});
                         decideUsagePattern(type);
-                        delegateFunction->setType(type);
-                        delegateFunction->setName(delegate);
-                        delegateFunction->setOriginalName(delegate);
-                        delegateFunction->setFunctionType(MetaFunction::BaseClassDelegateFunction);
-                        delegateFunction->setOriginalAttributes(MetaAttributes::Final | MetaAttributes::Protected);
-                        *delegateFunction += MetaAttributes::Final;
-                        *delegateFunction += MetaAttributes::Public;
-                        *delegateFunction += MetaAttributes::Native;
-                        delegateFunction->setDeclaringClass(meta_class);
-                        delegateFunction->setImplementingClass(meta_class);
-                        meta_class->addFunction(delegateFunction);
                     }
+                    MetaFunction * delegateFunction = new MetaFunction();
+                    delegateFunction->setType(type);
+                    delegateFunction->setName(delegate);
+                    delegateFunction->setOriginalName(delegate);
+                    delegateFunction->setFunctionType(MetaFunction::BaseClassDelegateFunction);
+                    delegateFunction->setOriginalAttributes(MetaAttributes::Final | MetaAttributes::Protected);
+                    *delegateFunction += MetaAttributes::Final;
+                    *delegateFunction += MetaAttributes::Public;
+                    *delegateFunction += MetaAttributes::Native;
+                    delegateFunction->setDeclaringClass(meta_class);
+                    delegateFunction->setImplementingClass(meta_class);
+                    meta_class->addFunction(delegateFunction);
                 }else{
                     ReportHandler::warning(QString("class '%1' has multiple primary public base classes"
                                                    " '%2' and '%3'")
-                                           .arg(meta_class->name())
-                                           .arg(publicBaseClasses.at(primary))
-                                           .arg(base_class_name));
+                                           .arg(meta_class->name(),
+                                                publicBaseClasses.at(primary).toString(),
+                                                base_class_name));
                 }
             }else{
                 primaries++;
@@ -5101,16 +5731,15 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
         }
     }
     for (int i = 0; i < protectedBaseClasses.size(); ++i) {
-        QString base_class_name = protectedBaseClasses.at(i);
-        if (types->isClassRejected(base_class_name))
+        QString base_class_name = protectedBaseClasses[i].toString();
+        if (m_database->isClassRejected(strip_template_args(base_class_name)))
             continue;
 
-        TypeParser::Info info = TypeParser::parse(base_class_name);
-        QString base_name = info.qualified_name.join("::");
-        TypeEntry *base_class_entry = types->findType(base_name);
+        QString base_name = protectedBaseClasses[i].qualifiedName().join("::");
+        TypeEntry *base_class_entry = m_database->findType(base_name);
         if (!base_class_entry) {
             ReportHandler::warning(QString("class '%1' inherits from unknown base class '%2'")
-                                   .arg(meta_class->name()).arg(base_class_name));
+                                   .arg(meta_class->name(), base_class_name));
         }else {
             QString delegate;
             if(base_class_name.startsWith("Q")){
@@ -5122,18 +5751,11 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
                 delegate = meta_class->typeEntry()->delegatedBaseClasses()[base_class_name];
             }
             bool ok = false;
-            TypeInfo newInfo;
-            newInfo.setArrayElements(info.arrays);
-            newInfo.setIndirections({false});
-            newInfo.setConstant(info.is_constant);
-            newInfo.setFunctionPointer(false);
-            newInfo.setQualifiedName({info.instantiationName()});
-            newInfo.setReferenceType(TypeInfo::ReferenceType(info.reference_type));
-            newInfo.setVolatile(info.is_volatile);
-            MetaType* type = translateType(newInfo, &ok, QString("Inheritance %1 of %2").arg(base_class_name).arg(meta_class->name()));
+            MetaType* type = translateType(protectedBaseClasses[i], &ok, QString("Inheritance %1 of %2").arg(base_class_name, meta_class->name()));
             if(ok){
-                MetaFunction * delegateFunction = new MetaFunction();
+                type->setIndirections({false});
                 decideUsagePattern(type);
+                MetaFunction * delegateFunction = new MetaFunction();
                 delegateFunction->setType(type);
                 delegateFunction->setName(delegate);
                 delegateFunction->setOriginalName(delegate);
@@ -5150,22 +5772,22 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
     }
 
     if (primary >= 0) {
-        MetaClass *base_class = m_meta_classes.findClass(publicBaseClasses.at(primary));
+        MetaClass *base_class = m_meta_classes.findClass(publicBaseClasses.at(primary).toString());
         if (!base_class) {
             if(!meta_class->isTypeAlias()){
                 ReportHandler::warning(QString("unknown baseclass for '%1': '%2'")
-                                       .arg(meta_class->name())
-                                       .arg(publicBaseClasses.at(primary)));
+                                       .arg(meta_class->name(), publicBaseClasses.at(primary).toString()));
             }
-            return false;
+            return;
         }
         if(base_class->isInterface()){
-            setupInheritance(const_cast<MetaClass *>(base_class)->extractInterfaceImpl());
+            setupInheritance(const_cast<MetaClass *>(base_class)->extractInterfaceImpl(), pendingHiddenBaseTypes, pendingConstructorUsages);
             if(!meta_class->interfaces().contains(base_class))
                 meta_class->addInterface(base_class);
         }else{
-            setupInheritance(base_class);
+            setupInheritance(base_class, pendingHiddenBaseTypes, pendingConstructorUsages);
             meta_class->setBaseClass(base_class);
+            pendingConstructorUsages.append(base_class);
             if(meta_class->typeEntry()->designatedInterface()
                     && const_cast<MetaClass *>(meta_class)->extractInterface()
                     && base_class->typeEntry()->designatedInterface()
@@ -5175,27 +5797,21 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
             }
         }
 
-        /*
-        if(base_class->typeEntry()->codeGeneration()==TypeEntry::GenerateForSubclass){
-            inheritHiddenBaseType(meta_class, base_class, TypeParser::Info());
-        }*/
-
         if (meta_class->typeEntry()->designatedInterface() && base_class && !base_class->isInterface()) {
             ReportHandler::warning(QString("Interface type '%2' extending object type '%1'. This is not supported and the generated Java code will not compile.")
-                                   .arg(base_class->name())
-                                   .arg(meta_class->typeEntry()->designatedInterface()->name()));
+                                   .arg(base_class->name(), meta_class->typeEntry()->designatedInterface()->name()));
         }
 
     }
 
     for (int i = 0; i < publicBaseClasses.size(); ++i) {
-        if (types->isClassRejected(publicBaseClasses.at(i)))
+        if (m_database->isClassRejected(publicBaseClasses.at(i).toString()))
             continue;
 
         if (i != primary) {
-            if(MetaClass *base_class = m_meta_classes.findClass(publicBaseClasses.at(i), MetaClassList::QualifiedCppName)){
+            if(MetaClass *base_class = m_meta_classes.findClass(publicBaseClasses.at(i).toString(), MetaClassList::QualifiedCppName)){
                 if(base_class->isInterface()){
-                    setupInheritance(const_cast<MetaClass *>(base_class)->extractInterfaceImpl());
+                    setupInheritance(const_cast<MetaClass *>(base_class)->extractInterfaceImpl(), pendingHiddenBaseTypes, pendingConstructorUsages);
                     if(!meta_class->interfaces().contains(base_class)){
                         meta_class->addInterface(base_class);
                     }
@@ -5203,8 +5819,7 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
                     MetaClass *ifaceImpl = m_meta_classes.findClass(impl_name, MetaClassList::FullName);
                     if (!ifaceImpl) {
                         ReportHandler::warning(QString("unknown implementation for interface '%1': '%2'")
-                                               .arg(meta_class->name())
-                                               .arg(impl_name));
+                                               .arg(meta_class->name(), impl_name));
                         continue;
                     }
                     for(MetaClass *iface : ifaceImpl->interfaces()){
@@ -5213,13 +5828,13 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
                                 meta_class->addInterface(iface);
                         }else{
                             ReportHandler::warning(QString("inherited interface '%1' for class '%2' is not an interface type: '%3'")
-                                                   .arg(base_class->fullName())
-                                                   .arg(meta_class->name())
-                                                   .arg(iface->fullName()));
+                                                   .arg(base_class->fullName(),
+                                                        meta_class->name(),
+                                                        iface->fullName()));
                         }
                     }
                 }else{
-                    setupInheritance(base_class);
+                    setupInheritance(base_class, pendingHiddenBaseTypes, pendingConstructorUsages);
                     if(meta_class->typeEntry()->designatedInterface()
                             && const_cast<MetaClass *>(meta_class)->extractInterface()
                             && base_class->typeEntry()->designatedInterface()
@@ -5232,8 +5847,6 @@ bool MetaBuilder::setupInheritance(MetaClass *meta_class) {
             }
         }
     }
-
-    return true;
 }
 
 MetaClass * MetaBuilder::instantiateIterator(IteratorTypeEntry *iteratorTypeEntry, MetaClass *targetClass, const QList<const MetaType *>& template_types, const QHash<const TypeEntry *,const MetaType *>& template_types_by_name){
@@ -5257,7 +5870,7 @@ MetaClass * MetaBuilder::instantiateIterator(IteratorTypeEntry *iteratorTypeEntr
             for(const Include& inc : iteratorTypeEntry->extraIncludes()){
                 targetClass->typeEntry()->addExtraInclude(inc);
             }
-            IteratorTypeEntry * newIteratorTypeEntry = iteratorTypeEntry->clone(targetClass->typeEntry(), targetClass->baseClassNames().at(0).first);
+            IteratorTypeEntry * newIteratorTypeEntry = iteratorTypeEntry->clone(targetClass->typeEntry(), targetClass->baseClassTypeInfo().at(0).first.toString());
             m_database->addType(newIteratorTypeEntry);
             instantiationClass = new MetaClass();
             instantiationClass->setTypeEntry(newIteratorTypeEntry);
@@ -5280,7 +5893,7 @@ MetaClass * MetaBuilder::instantiateIterator(IteratorTypeEntry *iteratorTypeEntr
             instantiationClass->setTemplateBaseClassInstantiations(template_types);
             instantiationClass->setEnclosingClass(targetClass);
             targetClass->addEnclosedClass(instantiationClass);
-            addAbstractMetaClass(instantiationClass);
+            addClass(instantiationClass);
         }
     }
     return instantiationClass;
@@ -5301,86 +5914,60 @@ void MetaBuilder::traverseEnums(ScopeModelItem scope_item, MetaClass *meta_class
     }
 }
 
-MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
+MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item, const QString& _function_name, const QStringList& tparams) {
     if(function_item->referenceType()==TypeInfo::RReference)
         return nullptr;
+    if(function_item->isTemplate() && !function_item->templateInstantiations().isEmpty()){
+        //ReportHandler::warning(
+        //printf("Excluding template function '%s' from %s\n", qPrintable(m_current_class ? QString("%1::%2").arg(m_current_class->name(), _function_name) : _function_name), qPrintable(function_item->fileName()));
+        return nullptr;
+    }
     const ArgumentList& arguments = function_item->arguments();
     QString function_name = function_item->name();
-    if(function_name==QLatin1String("static_assert"))
-        return nullptr;
-    QString class_name = m_current_class->typeEntry()->qualifiedCppName();
-
-    QString _function_name = function_name;
-    QStringList tparams;
-    for(TemplateParameterModelItem t : function_item->templateParameters()){
-        tparams << t->name();
-    }
-    if(!tparams.isEmpty())
-        _function_name += "<" + tparams.join(", ") + ">";
-    _function_name += "(";
-    int counter = 0;
-    for(ArgumentModelItem arg : arguments){
-        if(arg->type().getReferenceType()==TypeInfo::NoReference
-            && arg->type().indirections().isEmpty()
-            && arguments.size()==1
-            && arg->type().toString()=="void"){
-            continue;
-        }
-        if(counter!=0){
-            _function_name += ", ";
-        }
-        if(arg->type().isConstant())
-            _function_name += "const ";
-        _function_name += arg->type().qualifiedName().join("::");
-        for(bool i : arg->type().indirections()){
-            if(i)
-                _function_name += " const";
-            _function_name += "*";
-        }
-        switch(arg->type().getReferenceType()){
-        case TypeInfo::Reference:
-            _function_name += "&";
-            break;
-        case TypeInfo::RReference:
-            _function_name += "&&";
-            break;
-        default: break;
+
+    QString class_name;
+    if(m_current_class)
+        class_name = m_current_class->typeEntry()->qualifiedCppName();
+
+    QString signature = _function_name.split("->")[0].trimmed();
+    QString _originalSignature = QString::fromUtf8(QMetaObject::normalizedSignature(qPrintable(signature)));
+    bool remove = m_database->isFunctionRejected(class_name, function_name);
+    if (!remove && !m_current_class) {
+        const QList<TypeSystemTypeEntry*> typeSystems = m_database->typeSystems();
+        for(const TypeSystemTypeEntry* ts : typeSystems){
+            FunctionModificationList list = ts->functionModifications(signature);
+            if(_originalSignature!=signature)
+                list << ts->functionModifications(_originalSignature);
+            for(const FunctionModification& mod : qAsConst(list)){
+                if(mod.isRemoveModifier()){
+                    remove = true;
+                    break;
+                }
+            }
+            if(remove)
+                break;
         }
-        ++counter;
-    }
-    _function_name += ") ";
-    if(function_item->isConstant())
-        _function_name += "const ";
-    if(function_item->referenceType()==TypeInfo::Reference)
-        _function_name += "& ";
-    _function_name += "-> ";
-    if(function_item->type().isConstant())
-        _function_name += "const ";
-    _function_name += function_item->type().qualifiedName().join("::");
-    for(bool i : function_item->type().indirections()){
-        if(i)
-            _function_name += " const";
-        _function_name += "*";
-    }
-    switch(function_item->type().getReferenceType()){
-    case TypeInfo::Reference:
-        _function_name += "&";
-        break;
-    case TypeInfo::RReference:
-        _function_name += "&&";
-        break;
-    default: break;
     }
 
-    if (m_database->isFunctionRejected(class_name, function_name)) {
-        if(function_item->accessPolicy() != CodeModel::Private && m_current_class->typeEntry()->codeGeneration()==TypeEntry::GenerateAll){
-            if(function_item->functionType() == CodeModel::Signal
-                    || function_item->functionType() == CodeModel::PrivateSignal){
-                m_rejected_signals.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
-            }else if(!function_item->templateParameters().isEmpty()){
-                m_rejected_template_functions.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+    if (remove) {
+        if(function_name==QLatin1String("static_assert"))
+            return nullptr;
+        if(m_current_class){
+            if(function_item->accessPolicy() != CodeModel::Private && m_current_class->typeEntry()->codeGeneration()==TypeEntry::GenerateAll){
+                if(function_item->functionType() == CodeModel::Signal
+                        || function_item->functionType() == CodeModel::PrivateSignal){
+                    m_rejected_signals.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+                }else if(!function_item->templateParameters().isEmpty()){
+                    m_rejected_template_functions.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+                }else{
+                    m_rejected_functions.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+                }
+            }
+        }else{
+            if(!function_item->templateParameters().isEmpty()){
+                m_rejected_template_functions.insert({_function_name, function_item->fileName()}, GenerationDisabled);
             }else{
-                m_rejected_functions.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+                m_rejected_functions.insert({_function_name, function_item->fileName()}, GenerationDisabled);
             }
         }
         return nullptr;
@@ -5391,26 +5978,12 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
              || function_item->functionType() == CodeModel::PrivateSignal
              || function_item->functionType() == CodeModel::Slot);
 
-    if (function_item->isFriend() && function_item->hasBody() && function_name=="qHash"){
-        ArgumentList arguments = function_item->arguments();
-        bool hasDefaultArgs = arguments.size() > 0;
-        for(int i=1; i<arguments.size(); i++){
-            hasDefaultArgs &= arguments.at(i)->defaultValue();
-        }
-        if (arguments.size() == 1 || hasDefaultArgs) {
-            if (m_current_class == argumentToClass(arguments.at(0), "AbstractMetaBuilder::registerHashFunction")) {
-                m_current_class->setHasHashFunction(true);
-            }
-        }
-        registerHashFunction(function_item);
-        return nullptr;
-    }
-
     if (function_item->isFriend() && !function_item->hasBody()/* && !isOperator*/)
         return nullptr;
 
     std::unique_ptr<MetaFunction> meta_function(new MetaFunction());
     meta_function->setConstant(function_item->isConstant());
+    meta_function->setTemplate(function_item->isTemplate());
     meta_function->setFunctionReferenceType(MetaType::ReferenceType(function_item->referenceType()));
 
     ReportHandler::debugMedium(QString(" - %2()").arg(function_name));
@@ -5455,6 +6028,7 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
     for(const TemplateParameterModelItem& p : function_item->templateParameters()){
         if(!p->ownerClass()){
             TemplateArgumentEntry* tae = new TemplateArgumentEntry(p->name());
+            tae->setVariadic(p->isVaradic());
             tae->setOrdinal(templateParameterCounter);
             MetaType *type = new MetaType();
             type->setTypeUsagePattern(MetaType::TemplateArgumentPattern);
@@ -5477,10 +6051,10 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
         stripped_class_name = stripped_class_name.mid(cc_pos + 2);
 
     TypeInfo function_type = function_item->type();
-    if (function_name.startsWith('~')) {
+    if (m_current_class && !m_current_class->isNamespace() && function_name.startsWith('~')) {
         meta_function->setFunctionType(MetaFunction::DestructorFunction);
         meta_function->setInvalid(true);
-    } else if (strip_template_args(function_name) == stripped_class_name) {
+    } else if (m_current_class && !m_current_class->isNamespace() && strip_template_args(function_name) == stripped_class_name) {
         meta_function->setFunctionType(MetaFunction::ConstructorFunction);
         meta_function->setExplicit(function_item->isExplicit());
         meta_function->setName(m_current_class->simpleName());
@@ -5497,34 +6071,70 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
         }
 
         if(!ok){
-            if(function_type.qualifiedName().isEmpty() && meta_function->originalName().startsWith("operator ")){
-                TypeParser::Info typeInfo = TypeParser::parse(meta_function->originalName().mid(9));
-                if(!typeInfo.qualified_name.isEmpty()){
-                    function_type.setQualifiedName(typeInfo.qualified_name);
-                }
-            }
-            type = translateType(function_type, &ok, QString("traverseFunction %1.%2").arg(class_name).arg(function_name));
-            if(type){
-                if(type->typeEntry()->isVariant() && m_current_class && m_current_class->typeEntry()==m_database->qvariantType()){
+            type = translateType(function_type, &ok, QString("traverseFunction %1.%2").arg(class_name, function_name));
+            if(type && m_current_class){
+                if(type->typeEntry()->isQVariant() && m_current_class->typeEntry()==m_database->qvariantType()){
                     type->setTypeEntry(m_database->qvariantType());
-                }else if(type->typeEntry()->isQString() && m_current_class && m_current_class->typeEntry()==m_database->qstringType()){
+                }else if(type->typeEntry()->isQString() && m_current_class->typeEntry()==m_database->qstringType()){
                     type->setTypeEntry(m_database->qstringType());
-                }else if(type->typeEntry()->isChar() && m_current_class && m_current_class->typeEntry()==m_database->qcharType()){
+                }else if(type->typeEntry()->isQChar() && m_current_class->typeEntry()==m_database->qcharType()){
                     type->setTypeEntry(m_database->qcharType());
                 }
             }
         }
 
+        if(!ok){
+            FunctionModificationList list;
+            if(m_current_class){
+                list = m_current_class->typeEntry()->functionModifications(signature);
+                if(_originalSignature!=signature)
+                    list << m_current_class->typeEntry()->functionModifications(_originalSignature);
+            }else{
+                const QList<TypeSystemTypeEntry*> typeSystems = m_database->typeSystems();
+                for(const TypeSystemTypeEntry* ts : typeSystems){
+                    if(!ts->functionModifications().isEmpty()){
+                        list << ts->functionModifications(signature);
+                        if(_originalSignature!=signature)
+                            list << ts->functionModifications(_originalSignature);
+                    }
+                }
+            }
+            for(const FunctionModification& mod : qAsConst(list)){
+                for(const ArgumentModification& amod : mod.argument_mods){
+                    if(amod.index==0 && !amod.modified_type.isEmpty()){
+                        TypeInfo _type = function_type;
+                        _type.setVolatile(false);
+                        _type.setConstant(false);
+                        _type.setReferenceType(TypeInfo::NoReference);
+                        UnknownTypeEntry* tae = new UnknownTypeEntry(_type.toString());
+                        type = new MetaType();
+                        if(function_type.isConstant())
+                            type->setConstant(true);
+                        if(function_type.isVolatile())
+                            type->setVolatile(true);
+                        type->setReferenceType(MetaType::ReferenceType(function_type.getReferenceType()));
+                        type->setTypeUsagePattern(MetaType::InvalidPattern);
+                        type->setOriginalTypeDescription(function_type.toString());
+                        type->setTypeEntry(tae);
+                        ok = true;
+                        break;
+                    }
+                }
+                if(ok)
+                    break;
+            }
+        }
+
         if (!ok) {
             if(function_item->accessPolicy() != CodeModel::Private
-                    && m_current_class->typeEntry()->codeGeneration()==TypeEntry::GenerateAll
+                    && m_current_class && m_current_class->typeEntry()->codeGeneration()==TypeEntry::GenerateAll
                     && !m_database->isClassRejected(function_item->type().qualifiedName().join("::"))){
                 if(function_item->functionType() == CodeModel::Signal
                         || function_item->functionType() == CodeModel::PrivateSignal){
                     ReportHandler::warning(QString("skipping signal '%1::%2', unmatched return type '%3'")
                                            .arg(class_name, function_item->name(), function_item->type().toString()));
                     m_rejected_signals[{class_name + "::" + _function_name, function_item->fileName()}] = UnmatchedReturnType;
-                }else if(!function_item->templateParameters().isEmpty()){
+                }else if(function_item->isTemplate()){
                     ReportHandler::warning(QString("skipping function '%1::%2<%3>', unmatched return type '%4'")
                                            .arg(class_name, function_item->name(), tparams.join(", "), function_item->type().toString()));
                     m_rejected_template_functions.insert({class_name + "::" + _function_name, function_item->fileName()}, UnmatchedReturnType);
@@ -5556,7 +6166,7 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
     FunctionModification mod;
     if(meta_function->functionType()!=MetaFunction::DestructorFunction
             && function_item->accessPolicy() != CodeModel::Private
-            && (m_database->isPixmapType(m_current_class->typeEntry())
+            && ((m_current_class && m_database->isPixmapType(m_current_class->typeEntry()))
                 || (meta_function->type() && m_database->isPixmapType(meta_function->type()->typeEntry())))){
         mod.modifiers = Modification::PixmapThreadAffine;
     }
@@ -5565,7 +6175,7 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
     for (int i = 0; i < arguments.size(); ++i) {
         ArgumentModelItem arg = arguments.at(i);
         bool ok = false;
-        MetaType *meta_type = nullptr;
+        MetaType *argumentType = nullptr;
         if(arg->type().getReferenceType()==TypeInfo::NoReference
                 && arg->type().indirections().isEmpty()
                 && arguments.size()==1
@@ -5578,38 +6188,83 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
         originalSignature += arg->type().toString();
 
         if(metaTemplateParameters.contains(arg->type().qualifiedName().join("::"))){
-            meta_type = metaTemplateParameters[arg->type().qualifiedName().join("::")]->type()->copy();
-            meta_type->setIndirections(arg->type().indirections());
-            meta_type->setConstant(arg->type().isConstant());
-            meta_type->setReferenceType(MetaType::ReferenceType(arg->type().getReferenceType()));
+            argumentType = metaTemplateParameters[arg->type().qualifiedName().join("::")]->type()->copy();
+            argumentType->setIndirections(arg->type().indirections());
+            argumentType->setConstant(arg->type().isConstant());
+            argumentType->setReferenceType(MetaType::ReferenceType(arg->type().getReferenceType()));
             ok = true;
         }
 
         if(!ok){
-            meta_type = translateType(arg->type(), &ok, QString("traverseFunction %1.%2 arg#%3").arg(class_name).arg(function_name).arg(i));
-            if(meta_type){
-                if(meta_type->typeEntry()->isVariant() && m_current_class && m_current_class->typeEntry()==m_database->qvariantType()){
-                    meta_type->setTypeEntry(m_database->qvariantType());
-                }else if(meta_type->typeEntry()->isQString() && m_current_class && m_current_class->typeEntry()==m_database->qstringType()){
-                    meta_type->setTypeEntry(m_database->qstringType());
-                }else if(meta_type->typeEntry()->isChar() && m_current_class && m_current_class->typeEntry()==m_database->qcharType()){
-                    meta_type->setTypeEntry(m_database->qcharType());
+            argumentType = translateType(arg->type(), &ok, QString("traverseFunction %1.%2 arg#%3").arg(class_name, function_name).arg(i));
+            if(argumentType && m_current_class){
+                if(argumentType->typeEntry()->isQVariant() && m_current_class->typeEntry()==m_database->qvariantType()){
+                    argumentType->setTypeEntry(m_database->qvariantType());
+                }else if(argumentType->typeEntry()->isQString() && m_current_class->typeEntry()==m_database->qstringType()){
+                    argumentType->setTypeEntry(m_database->qstringType());
+                }else if(argumentType->typeEntry()->isQChar() && m_current_class->typeEntry()==m_database->qcharType()){
+                    argumentType->setTypeEntry(m_database->qcharType());
                 }
             }
-            if (meta_type && ok && meta_type->typeEntry()->isEnum() && !meta_type->typeEntry()->qualifiedCppName().contains("::")) {
+            if (argumentType && ok && argumentType->typeEntry()->isEnum() && !argumentType->typeEntry()->qualifiedCppName().contains("::")) {
                 bool _ok = false;
                 TypeInfo typeInfo = arg->type();
-                typeInfo.setQualifiedName(QStringList() << m_current_class->typeEntry()->qualifiedCppName().split("::") << typeInfo.qualifiedName());
-                MetaType *_meta_type = translateType(typeInfo, &_ok, QString("traverseFunction %1.%2 arg#%3").arg(class_name).arg(function_name).arg(i));
+                if(m_current_class)
+                    typeInfo.setQualifiedName(QStringList() << m_current_class->typeEntry()->qualifiedCppName().split("::") << typeInfo.qualifiedName());
+                else
+                    typeInfo.setQualifiedName(QStringList() << typeInfo.qualifiedName());
+                MetaType *_meta_type = translateType(typeInfo, &_ok, QString("traverseFunction %1.%2 arg#%3").arg(class_name, function_name).arg(i));
                 if (_meta_type && _ok){
-                    meta_type = _meta_type;
+                    argumentType = _meta_type;
+                }
+            }
+        }
+        if(!ok){
+            FunctionModificationList list;
+            if(m_current_class){
+                list = m_current_class->typeEntry()->functionModifications(signature);
+                if(_originalSignature!=signature)
+                    list << m_current_class->typeEntry()->functionModifications(_originalSignature);
+            }else{
+                const QList<TypeSystemTypeEntry*> typeSystems = m_database->typeSystems();
+                for(const TypeSystemTypeEntry* ts : typeSystems){
+                    if(!ts->functionModifications().isEmpty()){
+                        list << ts->functionModifications(signature);
+                        if(_originalSignature!=signature)
+                            list << ts->functionModifications(_originalSignature);
+                    }
+                }
+            }
+            for(const FunctionModification& mod : qAsConst(list)){
+                for(const ArgumentModification& amod : mod.argument_mods){
+                    if(amod.index==i+1 && (!amod.modified_type.isEmpty() || amod.removed)){
+                        TypeInfo _type = arg->type();
+                        _type.setVolatile(false);
+                        _type.setConstant(false);
+                        _type.setReferenceType(TypeInfo::NoReference);
+                        UnknownTypeEntry* tae = new UnknownTypeEntry(_type.toString());
+                        argumentType = new MetaType();
+                        if(arg->type().isConstant())
+                            argumentType->setConstant(true);
+                        if(arg->type().isVolatile())
+                            argumentType->setVolatile(true);
+                        argumentType->setReferenceType(MetaType::ReferenceType(arg->type().getReferenceType()));
+                        argumentType->setOriginalTypeDescription(arg->type().toString());
+                        argumentType->setTypeUsagePattern(MetaType::InvalidPattern);
+                        argumentType->setTypeEntry(tae);
+                        ok = true;
+                        break;
+                    }
                 }
+                if(ok)
+                    break;
             }
         }
-        if (!meta_type || !ok) {
+        if (!argumentType || !ok) {
             if(arg->type().isVolatile())
-                meta_type = translateType(arg->type(), &ok, QString("traverseFunction %1.%2 arg#%3").arg(class_name).arg(function_name).arg(i));
+                argumentType = translateType(arg->type(), &ok, QString("traverseFunction %1.%2 arg#%3").arg(class_name, function_name).arg(i));
             if(function_item->accessPolicy() != CodeModel::Private
+                    && m_current_class
                     && m_current_class->typeEntry()->codeGeneration()==TypeEntry::GenerateAll
                     && !m_database->isClassRejected(arg->type().qualifiedName().join("::"))
                     && arg->type().qualifiedName().join("::")!=m_current_class->typeEntry()->qualifiedCppName()+"Private"){
@@ -5619,7 +6274,7 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
                                                    "unmatched parameter type '%3'")
                                            .arg(class_name, function_item->name(), arg->type().toString()));
                     m_rejected_signals[{class_name + "::" + _function_name, function_item->fileName()}] = UnmatchedArgumentType;
-                }else if(!function_item->templateParameters().isEmpty()){
+                }else if(function_item->isTemplate()){
                     ReportHandler::warning(QString("skipping function '%1::%2<%3>', "
                                                    "unmatched parameter type '%4'")
                                            .arg(class_name, function_item->name(), tparams.join(", "), arg->type().toString()));
@@ -5635,36 +6290,32 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
             return meta_function.release();
         }
 
-        if (function_item->isFriend() && function_item->hasBody() && i==0){
-            if(meta_type->typeEntry()==m_current_class->typeEntry()
-                    && meta_type->indirections().isEmpty()){
-                meta_function->setFunctionType(MetaFunction::GlobalScopeFunction);
-                meta_function->setOriginalAttributes(meta_function->attributes());
-                continue;
-            }else{
-                return nullptr;
-            }
-        }
+//        if (function_item->isFriend() && function_item->hasBody() && i==0){
+//            if(!(m_current_class && argumentType->typeEntry()==m_current_class->typeEntry()
+//                    && argumentType->indirections().isEmpty())){
+//                return nullptr;
+//            }
+//        }
 
         ArgumentModification argumentModification(int(meta_arguments.size()+1));
 
-        if(m_current_class->typeEntry()->isValue() &&
+        if(m_current_class && m_current_class->typeEntry()->isValue() &&
                 arguments.size()==1 &&
-                meta_type->getReferenceType()==MetaType::Reference &&
-                !meta_type->isConstant() &&
-                meta_type->typeEntry()==m_current_class->typeEntry() &&
+                argumentType->getReferenceType()==MetaType::Reference &&
+                !argumentType->isConstant() &&
+                argumentType->typeEntry()==m_current_class->typeEntry() &&
                 meta_function->name()=="swap"){
-            meta_type->setTypeUsagePattern(MetaType::ValuePattern);
+            argumentType->setTypeUsagePattern(MetaType::ValuePattern);
             argumentModification.no_null_pointers = true;
         }
-        if(m_database->isPixmapType(meta_type->typeEntry())){
+        if(m_database->isPixmapType(argumentType->typeEntry())){
             argumentModification.thread_affine = ThreadAffinity::Pixmap;
         }
         if(argumentModification.no_null_pointers || argumentModification.thread_affine!=ThreadAffinity::None){
             mod.argument_mods << argumentModification;
         }
         MetaArgument *meta_argument = new MetaArgument();
-        meta_argument->setType(meta_type);
+        meta_argument->setType(argumentType);
         meta_argument->setName(arg->name());
         meta_argument->setArgumentIndex(int(meta_arguments.size()));
         meta_arguments << meta_argument;
@@ -5675,133 +6326,331 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
     if(function_item->isConstant()){
         originalSignature += "const";
     }
-    if(!originalSignature.contains("std::function<") && !originalSignature.contains("qxp::function_ref<"))
+    if(!originalSignature.contains("std::function<") && !originalSignature.contains("qxp::function_ref<") && !originalSignature.contains("(*)"))
         meta_function->setOriginalSignature(QString::fromLatin1(QMetaObject::normalizedSignature(qPrintable(originalSignature))));
     else
         meta_function->setOriginalSignature(originalSignature);
     if (function_item->isFriend() && function_item->hasBody()){
         meta_function->setFunctionType(MetaFunction::GlobalScopeFunction);
         meta_function->setOriginalAttributes(meta_function->attributes());
-        if(!meta_function->hasModifications(m_current_class)){
-            QString function_name = meta_function->originalName();
-            if(function_name!="operator=="
-                    && function_name!="operator!="
-                    && function_name!="operator<="
-                    && function_name!="operator>="
-                    && function_name!="operator<"
-                    && function_name!="operator>"
-                    && function_name!="operator>>"
-                    && function_name!="operator<<")
-                ReportHandler::warning(QString("Mapping unmodified inline global friend of class %1: %2").arg(m_current_class->qualifiedCppName(), originalSignature));
-        }
     }
 
     bool isRemoved = false;
     bool isRenamed = false;
     bool isReturnChanged = false;
-    for(const FunctionModification& mod : m_current_class->typeEntry()->functionModifications(meta_function->minimalSignature())){
-        if(mod.removal & TS::TargetLangCode){
-            isRemoved = true;
-        }
-        if (mod.isRenameModifier())
-            isRenamed = true;
-        for(const ArgumentModification& argumentModification : mod.argument_mods){
-            if(argumentModification.type==ArgumentModification::Default){
-                if(argumentModification.index==0){
-                    isReturnChanged = true;
-                }
-                if(!argumentModification.modified_name.isEmpty() && argumentModification.index>0 && argumentModification.index<=meta_arguments.size()){
-                    meta_arguments[argumentModification.index-1]->setModifiedName(argumentModification.modified_name);
+    if(m_current_class){
+        for(const FunctionModification& mod : m_current_class->typeEntry()->functionModifications(meta_function->minimalSignature())){
+            if(mod.removal & TS::TargetLangCode){
+                isRemoved = true;
+            }
+            if (mod.isRenameModifier())
+                isRenamed = true;
+            for(const ArgumentModification& argumentModification : mod.argument_mods){
+                if(argumentModification.type==ArgumentModification::Default){
+                    if(argumentModification.index==0){
+                        isReturnChanged = true;
+                    }
+                    if(!argumentModification.modified_name.isEmpty() && argumentModification.index>0 && argumentModification.index<=meta_arguments.size()){
+                        meta_arguments[argumentModification.index-1]->setModifiedName(argumentModification.modified_name);
+                    }
                 }
             }
         }
     }
 
-    if (!isRemoved && meta_function->originalName().startsWith("operator")) {
-        if(meta_function->originalName()=="operator="
-                && !meta_function->isPrivate()
+    if (!isRemoved && function_item->operatorType()!=OperatorType::None) {
+        meta_function->setOperatorType(function_item->operatorType());
+        auto rejectFunction = [&](){
+            if(function_item->functionType() == CodeModel::Signal
+                    || function_item->functionType() == CodeModel::PrivateSignal){
+                m_rejected_signals.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+            }else if(!function_item->templateParameters().isEmpty()){
+                m_rejected_template_functions.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+            }else{
+                m_rejected_functions.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+            }
+        };
+        switch(function_item->operatorType()){
+        case OperatorType::Assign:
+            if(!meta_function->isPrivate()
                 && meta_arguments.size()==1
                 && meta_arguments[0]->type()->getReferenceType()==MetaType::RReference){
-            mod.removal = TS::All;
-        }else{
-            RenamedOperator renamedOperator = rename_operator(meta_function->originalName().mid(8));
-            if(isRenamed){
-                if(renamedOperator.castType){
-                    meta_function->type()->setTypeEntry(renamedOperator.castType);
-                    decideUsagePattern(meta_function->type());
-                }else if(!isReturnChanged
-                         && (  meta_function->originalName()=="operator="
-                            || meta_function->originalName()=="operator+="
-                            || meta_function->originalName()=="operator-="
-                            || meta_function->originalName()=="operator*="
-                            || meta_function->originalName()=="operator/="
-                            || meta_function->originalName()=="operator^="
-                            || meta_function->originalName()=="operator&="
-                            || meta_function->originalName()=="operator|="
-                            || meta_function->originalName()=="operator<<="
-                            || meta_function->originalName()=="operator>>="
-                             )
-                         && meta_function->type()
-                         && meta_function->type()->typeEntry()==m_current_class->typeEntry()
-                         && !meta_function->type()->isConstant()
-                         && meta_function->type()->getReferenceType()==MetaType::Reference){
-                    ArgumentModification argumentModification(0);
-                    argumentModification.modified_type = m_current_class->typeEntry()->qualifiedTargetLangName();
-                    argumentModification.replace_value = "this";
-                    mod.argument_mods << argumentModification;
-                }
+                mod.removal = TS::All;
             }else{
-                if(renamedOperator.newName.isEmpty()){
-                    if(renamedOperator.castType){
-                        meta_function->setName(QString("operator_cast_%1").arg(renamedOperator.castType->targetLangName().replace(".", "_").replace("$", "_")));
-                        meta_function->type()->setTypeEntry(renamedOperator.castType);
-                        decideUsagePattern(meta_function->type());
-                    }else{
-                        if(!renamedOperator.skip){
-                            ReportHandler::warning(QString("Operator type unknown: %1::%2").arg(m_current_class->qualifiedCppName()).arg(meta_function->originalSignature()));
+                if(!isRenamed)
+                    meta_function->setName("assign");
+                if(!isReturnChanged)
+                    meta_function->setType(nullptr);
+            }
+            break;
+        case OperatorType::TypeCast:
+            if(function_item->name().startsWith("operator typename")){
+                rejectFunction();
+                return nullptr;
+            }else{
+                if(meta_function->type()){
+                    meta_function->setExplicit(function_item->isExplicit());
+                    if(!isRenamed){
+                        QString targetLangName = meta_function->type()->typeEntry()->targetLangName();
+                        auto idx = targetLangName.lastIndexOf('.');
+                        if(idx>=0){
+                            targetLangName = targetLangName.mid(idx+1);
                         }
-                        if(function_item->functionType() == CodeModel::Signal
-                                || function_item->functionType() == CodeModel::PrivateSignal){
-                            m_rejected_signals.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
-                        }else if(!function_item->templateParameters().isEmpty()){
-                            m_rejected_template_functions.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+                        idx = targetLangName.lastIndexOf('$');
+                        if(idx>=0){
+                            targetLangName = targetLangName.mid(idx+1);
+                        }
+                        if(targetLangName.startsWith("Q")){
+                            targetLangName = targetLangName.mid(1);
+                        }
+                        if(targetLangName.size()>0){
+                            targetLangName[0] = targetLangName[0].toUpper();
+                            meta_function->setName("to" + targetLangName);
                         }else{
-                            m_rejected_functions.insert({class_name + "::" + _function_name, function_item->fileName()}, GenerationDisabled);
+                            meta_function->setName("cast");
                         }
-                        return nullptr;
                     }
                 }else{
-                    meta_function->setName(renamedOperator.newName);
-                    if(renamedOperator.castType){
-                        meta_function->type()->setTypeEntry(renamedOperator.castType);
-                        decideUsagePattern(meta_function->type());
-                    }else if(!isReturnChanged
-                             && (  meta_function->originalName()=="operator="
-                                || meta_function->originalName()=="operator+="
-                                || meta_function->originalName()=="operator-="
-                                || meta_function->originalName()=="operator*="
-                                || meta_function->originalName()=="operator/="
-                                || meta_function->originalName()=="operator^="
-                                || meta_function->originalName()=="operator&="
-                                || meta_function->originalName()=="operator|="
-                                || meta_function->originalName()=="operator<<="
-                                || meta_function->originalName()=="operator>>="
-                                 )
-                             && meta_function->type()
-                             && meta_function->type()->typeEntry()==m_current_class->typeEntry()
-                             && !meta_function->type()->isConstant()
-                             && meta_function->type()->getReferenceType()==MetaType::Reference){
-                            ArgumentModification argumentModification(0);
-                            argumentModification.modified_type = m_current_class->typeEntry()->qualifiedTargetLangName();
-                            argumentModification.replace_value = "this";
-                            mod.argument_mods << argumentModification;
-                        }
+                    if(m_current_class)
+                        ReportHandler::warning(QString("Operator type unknown: %1::%2").arg(m_current_class->qualifiedCppName(), meta_function->originalSignature()));
+                    else
+                        ReportHandler::warning(QString("Operator type unknown: %1").arg(meta_function->originalSignature()));
+                    rejectFunction();
+                    return nullptr;
+                }
+            }
+            break;
+        case OperatorType::PlusAssign:
+        case OperatorType::MinusAssign:
+        case OperatorType::TimesAssign:
+        case OperatorType::DivAssign:
+        case OperatorType::RemAssign:
+        case OperatorType::AndAssign:
+        case OperatorType::OrAssign:
+        case OperatorType::XorAssign:
+            if(!isRenamed){
+                switch(meta_function->operatorType()){
+                case OperatorType::PlusAssign:
+                    meta_function->setName("plusAssign"); break;
+                case OperatorType::MinusAssign:
+                    meta_function->setName("minusAssign"); break;
+                case OperatorType::TimesAssign:
+                    meta_function->setName("timesAssign"); break;
+                case OperatorType::DivAssign:
+                    meta_function->setName("divAssign"); break;
+                case OperatorType::RemAssign:
+                    meta_function->setName("remAssign"); break;
+                case OperatorType::AndAssign:
+                    meta_function->setName("andAssign"); break;
+                case OperatorType::OrAssign:
+                    meta_function->setName("orAssign"); break;
+                case OperatorType::XorAssign:
+                    meta_function->setName("xorAssign"); break;
+                default: break;
+                }
+            }
+            if(!isRenamed && !isReturnChanged)
+                meta_function->setType(nullptr);
+            break;
+        case OperatorType::ShiftLeft:
+            if(!isRenamed)
+                meta_function->setName("operator_shift_left");
+            break;
+        case OperatorType::ShiftRight:
+            if(!isRenamed)
+                meta_function->setName("operator_shift_right");
+            break;
+        case OperatorType::ShiftLeftAssign:
+            if(!isRenamed)
+                meta_function->setName("operator_shift_left_assign");
+            break;
+        case OperatorType::ShiftRightAssign:
+            if(!isRenamed)
+                meta_function->setName("operator_shift_right_assign");
+            break;
+        case OperatorType::Plus:
+            if(!isRenamed){
+                if(m_current_class==nullptr || m_current_class->isNamespace() || meta_function->isInGlobalScope()){
+                    if(meta_arguments.size()==1){
+                        meta_function->setName("unaryPlus");
+                    }else{
+                        meta_function->setName("plus");
+                    }
+                }else{
+                    if(meta_arguments.isEmpty()){
+                        meta_function->setName("unaryPlus");
+                    }else{
+                        meta_function->setName("plus");
+                    }
+                }
+            }
+            break;
+        case OperatorType::Minus:
+            if(!isRenamed){
+                if(m_current_class==nullptr || m_current_class->isNamespace() || meta_function->isInGlobalScope()){
+                    if(meta_arguments.size()==1){
+                        meta_function->setName("unaryMinus");
+                    }else{
+                        meta_function->setName("minus");
+                    }
+                }else{
+                    if(meta_arguments.isEmpty()){
+                        meta_function->setName("unaryMinus");
+                    }else{
+                        meta_function->setName("minus");
+                    }
+                }
+            }
+            break;
+        case OperatorType::Times:
+            if(!isRenamed){
+                if(m_current_class==nullptr || m_current_class->isNamespace() || meta_function->isInGlobalScope()){
+                    if(meta_arguments.size()==1){
+                        meta_function->setName("operator_indirection");
+                    }else{
+                        meta_function->setName("times");
+                    }
+                }else{
+                    if(meta_arguments.isEmpty()){
+                        meta_function->setName("operator_indirection");
+                    }else{
+                        meta_function->setName("times");
+                    }
+                }
+            }
+            break;
+        case OperatorType::Div:
+            if(!isRenamed)
+                meta_function->setName("div");
+            break;
+        case OperatorType::Rem:
+            if(!isRenamed)
+                meta_function->setName("rem");
+            break;
+        case OperatorType::And:
+            if(!isRenamed){
+                if(meta_arguments.isEmpty()){
+                    meta_function->setName("operator_address_of");
+                }else{
+                    meta_function->setName("operator_bitwise_and");
+                }
+            }
+            break;
+        case OperatorType::Or:
+            if(!isRenamed)
+                meta_function->setName("operator_bitwise_or");
+            break;
+        case OperatorType::Xor:
+            if(!isRenamed)
+                meta_function->setName("operator_bitwise_xor");
+            break;
+        case OperatorType::Not:
+            if(!isRenamed)
+                meta_function->setName("operator_bitwise_not");
+            break;
+        case OperatorType::ExclusiveAnd:
+            if(!isRenamed)
+                meta_function->setName("operator_logical_and");
+            break;
+        case OperatorType::ExclusiveOr:
+            if(!isRenamed)
+                meta_function->setName("operator_logical_or");
+            break;
+        case OperatorType::Negation:
+            if(!isRenamed){
+                if(meta_function->type() && meta_function->type()->typeEntry()->qualifiedTargetLangName()=="boolean"){
+                    meta_function->setName("not");
+                }else{
+                    meta_function->setName("operator_logical_not");
+                }
+            }
+            break;
+        case OperatorType::Inc:
+            if(!isRenamed){
+                if(meta_arguments.isEmpty()){
+                    meta_function->setName("inc");
+                    if(!isReturnChanged && meta_function->type())
+                        meta_function->type()->setReferenceType(MetaType::NoReference);
+                }else{
+                    meta_function->setName("operator_postfix_increment");
+                }
+            }
+            break;
+        case OperatorType::Dec:
+            if(!isRenamed){
+                if(meta_arguments.isEmpty()){
+                    meta_function->setName("dec");
+                    if(!isReturnChanged && meta_function->type())
+                        meta_function->type()->setReferenceType(MetaType::NoReference);
+                }else{
+                    meta_function->setName("operator_postfix_decrement");
                 }
             }
+            break;
+        case OperatorType::Less:
+            if(!isRenamed)
+                meta_function->setName("operator_less");
+            break;
+        case OperatorType::Greater:
+            if(!isRenamed)
+                meta_function->setName("operator_greater");
+            break;
+        case OperatorType::LessOrEquals:
+            if(!isRenamed)
+                meta_function->setName("operator_less_or_equal");
+            break;
+        case OperatorType::Compare:
+            if(!isRenamed)
+                meta_function->setName("compareTo");
+            break;
+        case OperatorType::GreaterOrEquals:
+            if(!isRenamed)
+                meta_function->setName("operator_greater_or_equal");
+            break;
+        case OperatorType::NotEquals:
+            if(!isRenamed)
+                meta_function->setName("operator_not_equal");
+            break;
+        case OperatorType::Equals:
+            if(!isRenamed)
+                meta_function->setName("operator_equal");
+            break;
+        case OperatorType::Subscript:
+            if(!isRenamed){
+                meta_function->setName("operator_subscript");
+            }
+            break;
+        case OperatorType::MemberOfPointer:
+            if(!isRenamed)
+                meta_function->setName("operator_member_of_pointer");
+            break;
+        case OperatorType::PointerToMemberOfPointer:
+            if(!isRenamed)
+                meta_function->setName("operator_pointer_to_member_of_pointer");
+            break;
+        case OperatorType::Comma:
+            if(!isRenamed)
+                meta_function->setName("operator_comma");
+            break;
+        case OperatorType::FunctionCall:
+            if(!isRenamed)
+                meta_function->setName("invoke");
+            break;
+        case OperatorType::New:
+            if(!isRenamed)
+                meta_function->setName("operator_new");
+            break;
+        case OperatorType::Delete:
+            if(!isRenamed)
+                meta_function->setName("operator_delete");
+            break;
+        default:
+            break;
         }
     }else if(meta_function->functionType()==MetaFunction::ConstructorFunction
              && !meta_function->isPrivate()
              && meta_arguments.size()==1
+             && m_current_class && !m_current_class->isNamespace()
              && meta_arguments[0]->type()->getReferenceType()==MetaType::RReference
              && meta_arguments[0]->type()->typeEntry()==m_current_class->typeEntry()){
         mod.removal = TS::All;
@@ -5809,7 +6658,8 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
 
     if(!mod.argument_mods.isEmpty() || mod.modifiers!=0 || mod.removal!=0){
         mod.signature = meta_function->minimalSignature();
-        m_current_class->typeEntry()->addFunctionModification(mod);
+        if(m_current_class && !function_item->isDeleted())
+            m_current_class->typeEntry()->addFunctionModification(mod);
     }
 
     // Find the correct default values
@@ -5852,9 +6702,21 @@ MetaFunction *MetaBuilder::traverseFunction(FunctionModelItem function_item) {
     return meta_function.release();
 }
 
+void removeDuplicates(QList<TypeInfo>& contexts){
+    QSet<QString> names;
+    for (int i = 0; i < contexts.size(); ++i) {
+        QString name = contexts[i].toString();
+        if(names.contains(name)){
+            contexts.takeAt(i);
+            --i;
+        }else{
+            names.insert(name);
+        }
+    }
+}
 
 // uncomment the qDebug()s in order to inspect internals of the function
-MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
+MetaType *MetaBuilder::translateType(TypeInfo typei,
         bool *ok,
         const QString &contextString,
         bool resolveType,
@@ -5864,7 +6726,10 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
     Q_ASSERT(ok);
     *ok = true;
 
-    if(prependScope && !m_database->isUniqueClassName(type_info.qualifiedName().join("::"))){
+    if(prependScope && typei.qualifiedName().size()>1 && typei.qualifiedName()[0].isEmpty()){
+        prependScope = false;
+    }
+    if(prependScope && !m_database->isUniqueClassName(typei.qualifiedName().join("::"))){
         // the generator must distinguish between QTransform (QtCore) and QTransform (Qt3DCore)
         // the generator must distinguish between QCamera (QtMultimedia) and QCamera (Qt3DCore)
         QStringList scopes;
@@ -5874,7 +6739,7 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
             scopes = currentScope()->qualifiedName();
         }
         while(!scopes.isEmpty()){
-            TypeInfo tmp_type_info = type_info;
+            TypeInfo tmp_type_info = typei;
             QStringList qualifiedName = tmp_type_info.qualifiedName();
             if(!qualifiedName.join("::").startsWith(scopes[0])){
                 for(auto i=scopes.size()-1; i>=0; i--){
@@ -5899,45 +6764,17 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
     // 1. Test the type info without resolving typedefs in case this is present in the
     //    type system
 
-    TypeInfo typei;
-    if (resolveType) {
-        bool ok;
-        MetaType *t = translateType(type_info, &ok, contextString, false, resolveScope, prependScope);
-        if (t && ok) {
-            //qDebug()<<"ResolveType ok (1. check)"<<t->fullName();
-            return t;
-        }
-    }
-
-    if (!resolveType)
-        typei = type_info;
-    else {
-        // Go through all parts of the current scope (including global namespace)
-        // to resolve typedefs. The parser does not properly resolve typedefs in
-        // the global scope when they are referenced from inside a namespace.
-        // This is a work around to fix this bug since fixing it in resolveType
-        // seemed non-trivial
-        auto i = m_scopes.size() - 1;
-        while (i >= 0) {
-            typei = TypeInfo::resolveType(type_info, m_scopes.at(i--)->toItem());
-            if (typei.qualifiedName().join("::") != type_info.qualifiedName().join("::"))
-                break;
-        }
-        //qDebug()<<"Resolved:"<<typei.toString();
-    }
-
-    if (typei.isFunctionPointer()) {
-        *ok = false;
-        if(prependScope)
-            ReportHandler::warning("isFunctionPointer: "+type_info.toString());
-        return nullptr;
-    }
-
-    TypeParser::Info typeInfo = TypeParser::parse(typei.toString());
+    //TypeParser::Info typeInfo = TypeParser::parse(typei.toString());
 
-    if (typeInfo.is_busted) {
+    if (typei.functionalReturnType()) {
+        TypeInfo type_pure = typei;
+        type_pure.setIndirections({});
+        type_pure.setConstant(false);
+        type_pure.setReferenceType(TypeInfo::NoReference);
+        type_pure.setVariadic(false);
+        type_pure.setVolatile(false);
+        QString qualifiedName = type_pure.toString();
         if(m_current_class){
-            QString qualifiedName = typei.qualifiedName().join("::");
             MetaFunctional* functional = m_current_class->functionalByUsing()[qualifiedName];
             if(!functional){
                 if(FunctionalTypeEntry * entry = m_database->findFunctionalTypeByUsing(m_current_class->qualifiedCppName(), qualifiedName)){
@@ -5950,15 +6787,33 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
                 meta_type->setIndirections(typei.indirections());
                 meta_type->setReferenceType(MetaType::ReferenceType(typei.getReferenceType()));
                 meta_type->setConstant(typei.isConstant());
-                meta_type->setOriginalTypeDescription(type_info.toString());
+                meta_type->setOriginalTypeDescription(typei.toString());
+                decideUsagePattern(meta_type);
+                return meta_type;
+            }
+        }else{
+            MetaFunctional* functional = nullptr;//m_current_class->functionalByUsing()[qualifiedName];
+            if(!functional){
+                if(FunctionalTypeEntry * entry = m_database->findFunctionalTypeByUsing({}, qualifiedName)){
+                    MetaClass* global = m_globals[entry->targetTypeSystem()];
+                    functional = findFunctional(global, entry);
+                }
+            }
+            if(functional){
+                MetaType *meta_type = new MetaType();
+                meta_type->setTypeEntry(functional->typeEntry());
+                meta_type->setIndirections(typei.indirections());
+                meta_type->setReferenceType(MetaType::ReferenceType(typei.getReferenceType()));
+                meta_type->setConstant(typei.isConstant());
+                meta_type->setOriginalTypeDescription(typei.toString());
                 decideUsagePattern(meta_type);
                 return meta_type;
             }
         }
-        *ok = false;
-        if(prependScope)
-            ReportHandler::warning("Type parser doesn't recognize the type " + typei.toString() + " (is_busted)");
-        return nullptr;
+        if(typei.isFunctionPointer()){
+            *ok = false;
+            return nullptr;
+        }
     }
 
     //qDebug()<<"TypeInfo is after 1. method:"<<typeInfo.toString();
@@ -5966,20 +6821,21 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
     // 2. Handle pointers specified as arrays with unspecified size
 
     bool array_of_unspecified_size = false;
-    if (typeInfo.arrays.size() > 0) {
+    if (typei.arrayElements().size() > 0) {
         array_of_unspecified_size = true;
-        for (int i = 0; i < typeInfo.arrays.size(); ++i)
-            array_of_unspecified_size = array_of_unspecified_size && typeInfo.arrays.at(i).isEmpty();
+        for (int i = 0; i < typei.arrayElements().size(); ++i)
+            array_of_unspecified_size = array_of_unspecified_size && typei.arrayElements().at(i).isEmpty();
 
         if (!array_of_unspecified_size) {
             TypeInfo newInfo;
             //newInfo.setArguments(typei.arguments());
-            newInfo.setIndirections(typeInfo.indirections);
-            newInfo.setConstant(typeInfo.is_constant);
-            newInfo.setFunctionPointer(false);
-            newInfo.setQualifiedName(typeInfo.qualified_name);
-            newInfo.setReferenceType(TypeInfo::ReferenceType(typeInfo.reference_type));
-            newInfo.setVolatile(typeInfo.is_volatile);
+            newInfo.setIndirections(typei.indirections());
+            newInfo.setConstant(typei.isConstant());
+            if(typei.isFunctionPointer())
+                newInfo.setFunctionPointer(true);
+            newInfo.setQualifiedName(typei.qualifiedName());
+            newInfo.setReferenceType(typei.getReferenceType());
+            newInfo.setVolatile(typei.isVolatile());
 
             MetaType *elementType = translateType(newInfo, ok, contextString, true, resolveScope, prependScope);
             if (!elementType || !ok) {
@@ -5988,8 +6844,8 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
                 return nullptr;
             }
 
-            for (auto i = typeInfo.arrays.size() - 1; i >= 0; --i) {
-                QString s = typeInfo.arrays.at(i);
+            for (auto i = typei.arrayElements().size() - 1; i >= 0; --i) {
+                QString s = typei.arrayElements().at(i);
                 bool ok;
 
                 int elems = s.toInt(&ok);
@@ -6011,16 +6867,18 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
             //qDebug()<<"Returning element type:"<<elementType->fullName();
             return elementType;
         }  else {
-            for(int i=0; i<typeInfo.arrays.size(); i++){
-                typeInfo.indirections << false;
+            for(int i=0; i<typei.arrayElements().size(); i++){
+                typei.setIndirections(QList<bool>() << typei.indirections() << false);
             }
         }
     }
 
-    QStringList qualifier_list = typeInfo.qualified_name;
+    QStringList qualifier_list = typei.qualifiedName();
+    if(qualifier_list.startsWith({}))
+        qualifier_list.takeFirst();
     if (qualifier_list.isEmpty()) {
         if(prependScope)
-            ReportHandler::warning(QString("horribly broken type '%1'").arg(type_info.toString()));
+            ReportHandler::warning(QString("horribly broken type '%1'").arg(typei.toString()));
         *ok = false;
         return nullptr;
     }
@@ -6029,14 +6887,14 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
     QString name = qualifier_list.takeLast();
 
     // 3. Special case 'void' type
-    if (name == "void" && typeInfo.indirections.size() == 0) {
+    if (name == "void" && typei.indirections().size() == 0) {
         //if(prependScope) qDebug()<<"Returning from name == \"void\" && typeInfo.indirections == 0";
         return nullptr;
     }
 
     // 4. Special case QFlags (include instantiation in name)
     if (qualified_name == "QFlags")
-        qualified_name = typeInfo.toString();
+        qualified_name = typei.toString();
 
     // 5. Try to find the type
     const TypeEntry *type = m_database->findType(qualified_name);
@@ -6045,15 +6903,15 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
 
     if(type && type->isComplex()
             && reinterpret_cast<const ComplexTypeEntry*>(type)->isTemplate()
-            && !typeInfo.template_instantiations.isEmpty()){
+            && !typei.arguments().isEmpty()){
         const ComplexTypeEntry* ctype = reinterpret_cast<const ComplexTypeEntry*>(type);
         QStringList templateArgs;
-        for(const TypeParser::Info &i : typeInfo.template_instantiations) {
+        for(const TypeInfo &i : typei.arguments()) {
             templateArgs << i.toString();
         }
         if(const ComplexTypeEntry* instantiation = ctype->instantiations()[templateArgs]){
             if(!instantiation->isGenericClass())
-                typeInfo.template_instantiations.clear();
+                typei.setArguments({});
             type = instantiation;
         }
     }
@@ -6061,7 +6919,7 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
             && (!m_current_class || m_current_class->typeEntry()!=type)
             && (type->codeGeneration()==TypeEntry::GenerateNothing
                 || type->codeGeneration()==TypeEntry::GenerateForSubclass)
-            && typeInfo.template_instantiations.size()==1 && typeInfo.template_instantiations[0].qualified_name.join("::")=="void"
+            && typei.arguments().size()==1 && typei.arguments()[0].qualifiedName().join("::")=="void"
             && qualified_name.startsWith("Q") && !qualified_name.startsWith("Qt")){
         if(const TypeEntry *_type = m_database->findType(qualified_name = QLatin1String("QVoid")+qualified_name.mid(1))){
             backup_type = type;
@@ -6079,6 +6937,8 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
     // 7. No? Try looking it up as a container type
     if (!type)
         type = m_database->findContainerType(name);
+    if (!type)
+        type = m_database->findFunctionalType(name);
 
     // 8. No? Try looking it up as a pointer container type
     if (!type)
@@ -6107,77 +6967,79 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
         }
     }
 
-    ClassModelItem containing_class = m_dom->findClass(qualifier_list.join("::"));
-
-    // 9. Try finding the type by prefixing it with
-    //     all baseclasses of the containing class
     bool isClassRejected = m_database->isClassRejected(qualified_name);
-    if (!type && !isClassRejected && containing_class && resolveScope) {
-        QStringList contexts;
-        QSet<QString> visitedContexts;
-        for(const QPair<QString,bool>& p : containing_class->baseClasses())
-            contexts.append(p.first);
-        contexts.removeDuplicates();
-
-        // qDebug() << "9."<< contexts;
+    if (!type){
+        ClassModelItem containing_class = m_dom->findClass(qualifier_list.join("::"));
+
+        // 9. Try finding the type by prefixing it with
+        //     all baseclasses of the containing class
+        if (!type && !isClassRejected && containing_class && resolveScope) {
+            QList<TypeInfo> contexts;
+            QSet<QString> visitedContexts;
+            for(const QPair<TypeInfo,bool>& p : containing_class->baseClasses())
+                contexts.append(p.first);
+            removeDuplicates(contexts);
 
-        TypeInfo info = typei;
-        while (!contexts.isEmpty() && !type) {
-            //type = m_database->findType(contexts.at(0) + "::" + qualified_name);
+            // qDebug() << "9."<< contexts;
 
-            QString base = contexts.at(0);
-            if(!visitedContexts.contains(base)){
-                visitedContexts.insert(base);
-                bool ok;
-                if(!name.startsWith(contexts.at(0))){
-                    info.setQualifiedName(QStringList() << contexts.at(0) << name.split("::"));
-                    if(!visitedNames.contains(info.qualifiedName().join("::"))){
-                        visitedNames.insert(info.qualifiedName().join("::"));
-                        //   qDebug()<< "whiling in 9. type," << info.toString();
-                        MetaType *t = translateType(info, &ok, contextString, true, false, prependScope);
-                        if (t && ok) {
-                            //     qDebug()<<"Returning ok from t != 0 && ok"<<t->fullName();
-                            return t;
-                        }
-                    }
-                }
+            TypeInfo info = typei;
+            while (!contexts.isEmpty() && !type) {
+                //type = m_database->findType(contexts.at(0) + "::" + qualified_name);
 
-                //10. Try if the type is in a base class
-                //e.g. MimeType is QWebPluginFactory::MimeType and called by QWebPluginFactory::Plugin
-                QStringList parts = base.split("::");
-                while (parts.size() > 1) {
-                    parts.removeLast();
-                    if(!name.startsWith(parts.join("::"))){
-                        info.setQualifiedName(QStringList() << parts << name.split("::"));
+                QString base = contexts.at(0).qualifiedName().join("::");
+                if(!visitedContexts.contains(base)){
+                    visitedContexts.insert(base);
+                    bool ok;
+                    if(!name.startsWith(base)){
+                        info.setQualifiedName(QStringList() << contexts.at(0).qualifiedName() << name.split("::"));
                         if(!visitedNames.contains(info.qualifiedName().join("::"))){
                             visitedNames.insert(info.qualifiedName().join("::"));
+                            //   qDebug()<< "whiling in 9. type," << info.toString();
                             MetaType *t = translateType(info, &ok, contextString, true, false, prependScope);
                             if (t && ok) {
-                                //       qDebug()<<"Returning ok from 11. method"<<t->fullName();
+                                //     qDebug()<<"Returning ok from t != 0 && ok"<<t->fullName();
                                 return t;
                             }
                         }
                     }
-                }
 
-                ClassModelItem item = m_dom->findClass(contexts.at(0));
-                if (item) {
-                    for(const QPair<QString,bool>& p : item->baseClasses())
-                        contexts.append(p.first);
-                }else{
-                    MetaClass* cls = m_meta_classes.findClass(contexts.at(0));
-                    if(cls){
-                        for(const QPair<QString,bool>& p : cls->baseClassNames()){
-                            if(p.second){
-                                contexts.insert(1,p.first);
-                                break;
+                    //10. Try if the type is in a base class
+                    //e.g. MimeType is QWebPluginFactory::MimeType and called by QWebPluginFactory::Plugin
+                    QStringList parts = contexts.at(0).qualifiedName();
+                    while (parts.size() > 1) {
+                        parts.removeLast();
+                        if(!name.startsWith(parts.join("::"))){
+                            info.setQualifiedName(QStringList() << parts << name.split("::"));
+                            if(!visitedNames.contains(info.qualifiedName().join("::"))){
+                                visitedNames.insert(info.qualifiedName().join("::"));
+                                MetaType *t = translateType(info, &ok, contextString, true, false, prependScope);
+                                if (t && ok) {
+                                    //       qDebug()<<"Returning ok from 11. method"<<t->fullName();
+                                    return t;
+                                }
+                            }
+                        }
+                    }
+
+                    ClassModelItem item = m_dom->findClass(contexts.at(0).toString());
+                    if (item) {
+                        for(const QPair<TypeInfo,bool>& p : item->baseClasses())
+                            contexts.append(p.first);
+                    }else{
+                        MetaClass* cls = m_meta_classes.findClass(contexts.at(0).toString());
+                        if(cls){
+                            for(const QPair<TypeInfo,bool>& p : cls->baseClassTypeInfo()){
+                                if(p.second){
+                                    contexts.insert(1,p.first);
+                                    break;
+                                }
                             }
                         }
                     }
+                    removeDuplicates(contexts);
                 }
-                contexts.removeDuplicates();
+                contexts.removeFirst();
             }
-            contexts.removeFirst();
         }
     }
 
@@ -6187,21 +7049,21 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
         QStringList contexts;
         QSet<QString> visitedContexts;
         contexts.append(m_current_class->qualifiedCppName());
-        QStringList superClasses;
-        for(const QPair<QString,bool>& p : m_current_class->baseClassNames()){
+        QList<TypeInfo> superClasses;
+        for(const QPair<TypeInfo,bool>& p : m_current_class->baseClassTypeInfo()){
             if(p.second){
                 superClasses << p.first;
-                contexts.append(p.first);
+                contexts.append(p.first.qualifiedName().join("::"));
             }
         }
         while(!superClasses.isEmpty()){
-            QStringList _superClasses;
-            for(const QString& scl : qAsConst(superClasses)){
-                if(MetaClass* superClass = m_meta_classes.findClass(scl)){
-                    for(const QPair<QString,bool>& p : superClass->baseClassNames()){
+            QList<TypeInfo> _superClasses;
+            for(const TypeInfo& scl : qAsConst(superClasses)){
+                if(MetaClass* superClass = m_meta_classes.findClass(scl.toString())){
+                    for(const QPair<TypeInfo,bool>& p : superClass->baseClassTypeInfo()){
                         if(p.second){
                             _superClasses << p.first;
-                            contexts.append(p.first);
+                            contexts.append(p.first.qualifiedName().join("::"));
                         }
                     }
                 }
@@ -6223,7 +7085,7 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
             QString base = contexts.at(0);
             if(!visitedContexts.contains(base)){
                 visitedContexts.insert(base);
-                info.setQualifiedName(QStringList() << base << typei.qualifiedName());
+                info.setQualifiedName(base.split("::") << typei.qualifiedName());
                 //   qDebug()<< "whiling in 9. type," << info.toString();
                 if(!visitedNames.contains(info.qualifiedName().join("::"))){
                     visitedNames.insert(info.qualifiedName().join("::"));
@@ -6254,13 +7116,13 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
 
                 ClassModelItem item = m_dom->findClass(contexts.at(0));
                 if (item) {
-                    for(const QPair<QString,bool>& p : item->baseClasses())
-                        contexts += p.first;
+                    for(const QPair<TypeInfo,bool>& p : item->baseClasses())
+                        contexts += p.first.qualifiedName().join("::");
                 }else if(current_class){
-                    for(const QPair<QString,bool>& p : m_current_class->baseClassNames()){
+                    for(const QPair<TypeInfo,bool>& p : m_current_class->baseClassTypeInfo()){
                         if(p.second){
-                            contexts.insert(1, p.first);
-                            current_class = m_meta_classes.findClass(p.first);
+                            contexts.insert(1, p.first.qualifiedName().join("::"));
+                            current_class = m_meta_classes.findClass(p.first.toString());
                             break;
                         }
                     }
@@ -6278,6 +7140,23 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
         }
     }
 
+    if(!type && resolveType){
+        TypeInfo type_info = typei;
+        auto i = m_scopes.size() - 1;
+        while (i >= 0) {
+            typei = TypeInfo::resolveType(type_info, m_scopes.at(i--)->toItem());
+            if (typei.qualifiedName().join("::") != type_info.qualifiedName().join("::"))
+                break;
+        }
+        if (typei.qualifiedName().join("::") != type_info.qualifiedName().join("::")){
+            bool ok;
+            MetaType *t = translateType(typei, &ok, contextString, false, resolveScope, prependScope);
+            if (t && ok) {
+                return t;
+            }
+        }
+    }
+
     // if error happened in type resolving
     if (!type) {
         *ok = false;
@@ -6298,28 +7177,16 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
 
     MetaType *meta_type = new MetaType();
     meta_type->setTypeEntry(type);
-    meta_type->setIndirections(typeInfo.indirections);
-    meta_type->setReferenceType(MetaType::ReferenceType(typeInfo.reference_type));
-    meta_type->setConstant(typeInfo.is_constant);
-    meta_type->setVolatile(typeInfo.is_volatile);
-    meta_type->setOriginalTypeDescription(type_info.toString());
+    meta_type->setIndirections(typei.indirections());
+    meta_type->setReferenceType(MetaType::ReferenceType(typei.getReferenceType()));
+    meta_type->setConstant(typei.isConstant());
+    meta_type->setVolatile(typei.isVolatile());
+    meta_type->setOriginalTypeDescription(typei.toString());
     decideUsagePattern(meta_type);
 
     if (meta_type->typeEntry()->isInitializerList()) {
-        Q_ASSERT(typeInfo.template_instantiations.size() == 1);
-
-        const TypeParser::Info &ta = typeInfo.template_instantiations[0];
-        TypeInfo info;
-        info.setConstant(ta.is_constant);
-        info.setVolatile(ta.is_volatile);
-        info.setReferenceType(TypeInfo::ReferenceType(ta.reference_type));
-        info.setIndirections(ta.indirections);
-
-        info.setFunctionPointer(false);
-        QString qualifiedName = ta.instantiationName();
-        info.setIndirections(info.indirections());
-        info.setQualifiedName(qualifiedName.split("::"));
-
+        Q_ASSERT(typei.arguments().size() == 1);
+        const TypeInfo& info = typei.arguments()[0];
         MetaType *targ_type = translateType(info, ok, contextString);
         if (!(*ok)) {
             delete meta_type;
@@ -6336,20 +7203,11 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
              || pointer_container_type == PointerContainerTypeEntry::unique_ptr
              || pointer_container_type == PointerContainerTypeEntry::shared_ptr
              || pointer_container_type == PointerContainerTypeEntry::weak_ptr ) {
-            Q_ASSERT(typeInfo.template_instantiations.size() >= 1);
-            const TypeParser::Info &ta = typeInfo.template_instantiations[0];
-            TypeInfo info;
-            info.setConstant(ta.is_constant);
-            info.setVolatile(ta.is_volatile);
-            info.setReferenceType(TypeInfo::ReferenceType(ta.reference_type));
-            info.setIndirections(ta.indirections);
-
-            info.setFunctionPointer(false);
-            QString qualifiedName = ta.instantiationName();
+            Q_ASSERT(typei.arguments().size() >= 1);
+            TypeInfo info = typei.arguments()[0];
             QList<bool> ic = info.indirections();
             if(!ic.isEmpty())ic.removeAt(0);
             info.setIndirections(ic);
-            info.setQualifiedName(qualifiedName.split("::"));
 
             //    qDebug()<< "Foreaching in container thingy," << info.toString();
             MetaType *targ_type = translateType(info, ok, contextString);
@@ -6386,21 +7244,12 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
                 meta_type->setInstantiationInCpp(false);
 
         } else {
-            for(const TypeParser::Info &ta : typeInfo.template_instantiations) {
-                TypeInfo info;
-                info.setConstant(ta.is_constant);
-                info.setVolatile(ta.is_volatile);
-                info.setReferenceType(TypeInfo::ReferenceType(ta.reference_type));
-                info.setIndirections(ta.indirections);
-
-                info.setFunctionPointer(false);
-                QString qualifiedName = ta.instantiationName();
+            for(TypeInfo info : typei.arguments()) {
                 if (container_type == ContainerTypeEntry::QQmlListPropertyContainer) {
                     QList<bool> ic = info.indirections();
                     ic << false;
                     info.setIndirections(ic);
                 }
-                info.setQualifiedName(qualifiedName.split("::"));
 
                 //    qDebug()<< "Foreaching in container thingy," << info.toString();
                 MetaType *targ_type = translateType(info, ok, contextString);
@@ -6426,17 +7275,7 @@ MetaType *MetaBuilder::translateType(const TypeInfo& type_info,
         }
 
     }else if (meta_type->typeEntry()->isComplex() && reinterpret_cast<const ComplexTypeEntry *>(type)->isGenericClass()) {
-        for(const TypeParser::Info &ta : typeInfo.template_instantiations) {
-            TypeInfo info;
-            info.setConstant(ta.is_constant);
-            info.setVolatile(ta.is_volatile);
-            info.setReferenceType(TypeInfo::ReferenceType(ta.reference_type));
-            info.setIndirections(ta.indirections);
-
-            info.setFunctionPointer(false);
-            QString qualifiedName = ta.instantiationName();
-            info.setQualifiedName(qualifiedName.split("::"));
-
+        for(TypeInfo info : typei.arguments()) {
             //    qDebug()<< "Foreaching in container thingy," << info.toString();
             bool _ok = false;
             MetaType *targ_type = translateType(info, &_ok, contextString);
@@ -6546,8 +7385,8 @@ void MetaBuilder::fixMissingIterator(){
                 if(missingIterator.iteratorType->containerType()==missingIterator.current_class->templateBaseClass()->typeEntry()){
                     missingIterator.meta_type->setIteratorInstantiations(missingIterator.current_class->templateBaseClassInstantiations());
                     QStringList baseClassNames;
-                    for(const QPair<QString,bool>& p : missingIterator.current_class->baseClassNames())
-                        baseClassNames << p.first;
+                    for(const QPair<TypeInfo,bool>& p : missingIterator.current_class->baseClassTypeInfo())
+                        baseClassNames << p.first.toString();
                     IteratorTypeEntry* newIteratorType = missingIterator.iteratorType->clone(missingIterator.iteratorType->containerType(), baseClassNames.join("::"));
                     missingIterator.meta_type->setTypeEntry(newIteratorType);
                     found = true;
@@ -6576,6 +7415,10 @@ void MetaBuilder::decideUsagePattern(MetaType *meta_type) {
         }else if(meta_type->actualIndirections() == 1
                  && type->qualifiedCppName().startsWith("_j")){
             meta_type->setTypeUsagePattern(MetaType::PrimitivePattern);
+        }else if(meta_type->isConstant()
+                 && meta_type->indirections().size() == 1
+                 && meta_type->typeEntry()->qualifiedCppName()=="char"){
+            meta_type->setTypeUsagePattern(MetaType::CharStringPattern);
         }else{
             meta_type->setTypeUsagePattern(MetaType::NativePointerPattern);
         }
@@ -6591,49 +7434,55 @@ void MetaBuilder::decideUsagePattern(MetaType *meta_type) {
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        meta_type->setTypeUsagePattern(MetaType::StringPattern);
-
-    } else if (type->isLatin1String()
+        meta_type->setTypeUsagePattern(MetaType::QStringPattern);
+    } else if (type->isQString()
+               && (meta_type->indirections().size() == 1
+                   || (meta_type->getReferenceType()==MetaType::Reference && !meta_type->isConstant())
+                )) {
+        if(!meta_type->isConstant())
+            meta_type->setTypeEntry(TypeDatabase::instance()->qstringType());
+        meta_type->setTypeUsagePattern(MetaType::QStringPattern);
+    } else if (type->isQLatin1String()
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        meta_type->setTypeUsagePattern(MetaType::Latin1StringPattern);
+        meta_type->setTypeUsagePattern(MetaType::QLatin1StringPattern);
 
-    } else if (type->isLatin1StringView()
+    } else if (type->isQLatin1StringView()
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        meta_type->setTypeUsagePattern(MetaType::Latin1StringViewPattern);
+        meta_type->setTypeUsagePattern(MetaType::QLatin1StringViewPattern);
 
-    } else if (type->isStringView()
+    } else if (type->isQStringView()
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        meta_type->setTypeUsagePattern(MetaType::StringViewPattern);
+        meta_type->setTypeUsagePattern(MetaType::QStringViewPattern);
 
-    } else if (type->isUtf8StringView()
+    } else if (type->isQUtf8StringView()
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        meta_type->setTypeUsagePattern(MetaType::Utf8StringViewPattern);
+        meta_type->setTypeUsagePattern(MetaType::QUtf8StringViewPattern);
 
-    } else if (type->isAnyStringView()
+    } else if (type->isQAnyStringView()
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        meta_type->setTypeUsagePattern(MetaType::AnyStringViewPattern);
+        meta_type->setTypeUsagePattern(MetaType::QAnyStringViewPattern);
 
-    } else if (type->isStringRef()
+    } else if (type->isQStringRef()
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        meta_type->setTypeUsagePattern(MetaType::StringRefPattern);
+        meta_type->setTypeUsagePattern(MetaType::QStringRefPattern);
 
-    } else if (type->isChar()
+    } else if (type->isQChar()
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        meta_type->setTypeUsagePattern(MetaType::CharPattern);
+        meta_type->setTypeUsagePattern(MetaType::QCharPattern);
 
     } else if ((
                    type->isJObjectWrapper()
@@ -6646,23 +7495,20 @@ void MetaBuilder::decideUsagePattern(MetaType *meta_type) {
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        if(type->isJObjectWrapper())
-            meta_type->setTypeUsagePattern(MetaType::JObjectWrapperPattern);
-        else if(type->isJMapWrapper())
-            meta_type->setTypeUsagePattern(MetaType::JMapWrapperPattern);
-        else if(type->isJCollectionWrapper())
-            meta_type->setTypeUsagePattern(MetaType::JCollectionWrapperPattern);
-        else if(type->isJEnumWrapper())
-            meta_type->setTypeUsagePattern(MetaType::JEnumWrapperPattern);
-        else if(type->isJIteratorWrapper())
-            meta_type->setTypeUsagePattern(MetaType::JIteratorWrapperPattern);
-        else if(type->isJQFlagsWrapper())
-            meta_type->setTypeUsagePattern(MetaType::JQFlagsWrapperPattern);
-    } else if (type->isVariant()
+        meta_type->setTypeUsagePattern(MetaType::JObjectWrapperPattern);
+    } else if (type->isQVariant()
                && meta_type->indirections().size() == 0
                && ((meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant())
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
-        meta_type->setTypeUsagePattern(MetaType::VariantPattern);
+        meta_type->setTypeUsagePattern(MetaType::QVariantPattern);
+
+    } else if (type->isQVariant()
+               && (meta_type->indirections().size() == 1
+                   || (meta_type->getReferenceType()==MetaType::Reference && !meta_type->isConstant())
+                )) {
+        if(!meta_type->isConstant())
+            meta_type->setTypeEntry(TypeDatabase::instance()->qvariantType());
+        meta_type->setTypeUsagePattern(MetaType::QVariantPattern);
 
     } else if (type->isEnum() && (meta_type->actualIndirections() == 0
                     || (meta_type->isConstant() && meta_type->getReferenceType()==MetaType::Reference && meta_type->indirections().size() == 0))) {
@@ -6671,17 +7517,11 @@ void MetaBuilder::decideUsagePattern(MetaType *meta_type) {
     } else if (type->isObject()
                && meta_type->indirections().size() == 0
                && meta_type->getReferenceType()==MetaType::Reference) {
-        if (static_cast<const ComplexTypeEntry *>(type)->isQObject())
-            meta_type->setTypeUsagePattern(MetaType::QObjectPattern);
-        else
-            meta_type->setTypeUsagePattern(MetaType::ObjectPattern);
+        meta_type->setTypeUsagePattern(MetaType::ObjectPattern);
 
     } else if (type->isObject()
                && meta_type->indirections().size() == 1) {
-        if (static_cast<const ComplexTypeEntry *>(type)->isQObject())
-            meta_type->setTypeUsagePattern(MetaType::QObjectPattern);
-        else
-            meta_type->setTypeUsagePattern(MetaType::ObjectPattern);
+        meta_type->setTypeUsagePattern(MetaType::ObjectPattern);
 
         // const-references to pointers can be passed as pointers
         if (meta_type->getReferenceType()==MetaType::Reference && meta_type->isConstant()) {
@@ -6698,6 +7538,9 @@ void MetaBuilder::decideUsagePattern(MetaType *meta_type) {
     } else if (type->isInitializerList() && meta_type->indirections().size() == 0) {
         meta_type->setTypeUsagePattern(MetaType::InitializerListPattern);
 
+    } else if (type->isUnknown()) {
+        meta_type->setTypeUsagePattern(MetaType::InvalidPattern);
+
     } else if (type->isTemplateArgument()) {
         meta_type->setTypeUsagePattern(MetaType::TemplateArgumentPattern);
 
@@ -6722,8 +7565,18 @@ void MetaBuilder::decideUsagePattern(MetaType *meta_type) {
                    || meta_type->getReferenceType()==MetaType::NoReference)) {
         meta_type->setTypeUsagePattern(MetaType::ValuePattern);
 
+    } else if (type->isValue()
+               && meta_type->indirections().size() == 1) {
+        meta_type->setTypeUsagePattern(MetaType::ObjectPattern);
+
+    } else if (type->isValue()
+               && meta_type->indirections().size() == 0
+               && !meta_type->isConstant()
+               && meta_type->getReferenceType()!=MetaType::NoReference) {
+        meta_type->setTypeUsagePattern(MetaType::ObjectPattern);
+
     } else if (type->isObject() && meta_type->actualIndirections() == 0) {
-        meta_type->setTypeUsagePattern(MetaType::NativePointerPattern);
+        meta_type->setTypeUsagePattern(MetaType::ValuePattern);
 
     } else if (type->type()==TypeEntry::InstantiatedTemplateArgumentType) {
         meta_type->setTypeUsagePattern(MetaType::JObjectWrapperPattern);
@@ -6737,11 +7590,14 @@ QString MetaBuilder::translateDefaultValue(const QString& defaultValueExpression
         MetaFunction *fnc, MetaClass *implementing_class,
         int argument_index) {
     QString function_name = fnc->name();
-    QString class_name = implementing_class->name();
-
-    QString replaced_expression = fnc->replacedDefaultExpression(implementing_class, argument_index + 1);
-    if (fnc->removedDefaultExpression(implementing_class, argument_index + 1)){
-        return "";
+    QString class_name;
+    QString replaced_expression;
+    if(implementing_class){
+        class_name = implementing_class->name();
+        replaced_expression = fnc->replacedDefaultExpression(implementing_class, argument_index + 1);
+        if (fnc->removedDefaultExpression(implementing_class, argument_index + 1)){
+            return "";
+        }
     }
     if (!replaced_expression.isEmpty())
         return replaced_expression;
@@ -6787,7 +7643,18 @@ QString MetaBuilder::translateDefaultValue(const QString& defaultValueExpression
         return expr;
 
     } else {
-        if (type && type->isFunctional() && expr == "{}") {
+        if (type && type->isFunctional() && (expr == "{}"
+                                             || (expr.startsWith("std::function<") && expr.endsWith(">()"))
+                                             || (expr.startsWith("qxp::function_ref<") && expr.endsWith(">()")))) {
+            return "null";
+        }
+        if (type
+                && type->typeEntry()->isUnknown()
+                && (type->typeEntry()->qualifiedCppName().startsWith("std::function<")
+                    || type->typeEntry()->qualifiedCppName().startsWith("qxp::function_ref<")
+                    || type->typeEntry()->qualifiedCppName().contains("(*)")
+                    )
+                && (expr == "{}" || expr == "0" || expr == "nullptr" || (expr.startsWith("std::function<") && expr.endsWith(">()")))) {
             return "null";
         }
         // constructor or functioncall can be a bit tricky...
@@ -6821,10 +7688,11 @@ QString MetaBuilder::translateDefaultValue(const QString& defaultValueExpression
                 return expr;
         } else if (expr == "0" || expr == "nullptr" || expr == "NULL") {
             return "null";
-        } else if (type->isTargetLangString()
-                   || type->isTargetLangStringView()
-                   || type->isTargetLangAnyStringView()
-                   || type->isTargetLangUtf8StringView()) {
+        } else if (type->isQString()
+                   || type->isCharString()
+                   || type->isQStringView()
+                   || type->isQAnyStringView()
+                   || type->isQUtf8StringView()) {
             if (expr == "{}"
                     || expr == "QString()"
                     || expr == "QStringRef()"
@@ -6919,8 +7787,8 @@ QString MetaBuilder::translateDefaultValue(const QString& defaultValueExpression
         return "java.util.Optional.empty()";
 
 
-    QString warn = QString("unsupported default value '%3' of argument in function '%1', class '%2'")
-                   .arg(function_name).arg(class_name).arg(defaultValueExpression);
+    QString warn = QString("Unsupported default value '%1' of argument %2 in function '%3%4'")
+                   .arg(defaultValueExpression, QString::number(argument_index), class_name.isEmpty() ? class_name : QString("%1::").arg(class_name), fnc->minimalSignature());
     ReportHandler::warning(warn);
 
     return QString();
@@ -6937,7 +7805,7 @@ bool MetaBuilder::isClass(const QString &qualified_name, const QString& classNam
         QStringList names = qualified_name.split(QLatin1String("::"));
         NamespaceModelItem ns = model_dynamic_cast<NamespaceModelItem>(m_dom);
         for (int i = 0; i < names.size() - 1 && ns; ++i)
-            ns = ns->namespaceMap().value(names.at(i));
+            ns = ns->findNamespace(names.at(i));
         if (ns && names.size() >= 2)
             class_item = ns->findClass(names.at(names.size() - 1));
     }
@@ -6945,9 +7813,9 @@ bool MetaBuilder::isClass(const QString &qualified_name, const QString& classNam
     bool result = class_item && class_item->extendsClass(className);
 
     if (class_item && !result) {
-        for(const QPair<QString,bool>& p : class_item->baseClasses()){
+        for(const QPair<TypeInfo,bool>& p : class_item->baseClasses()){
             if(p.second){
-                result = isClass(p.first, className);
+                result = isClass(p.first.qualifiedName().join("::"), className);
                 if (result)
                     break;
             }
@@ -7017,59 +7885,64 @@ MetaType *MetaBuilder::inheritTemplateType(const QList<const MetaType *> &templa
     return returned;
 }
 
-bool MetaBuilder::inheritHiddenBaseType(MetaClass *subclass,
-        const MetaClass *hidden_base_class,
-        const TypeParser::Info &info) {
+void MetaBuilder::inheritHiddenBaseType(MetaClass *subclass, const MetaClass *hidden_base_class,
+        const TypeInfo &info, QList<MetaClass *>& pendingConstructorUsages) {
     QList<const MetaType *> template_types;
     QHash<const TypeEntry *,const MetaType *> template_types_by_name;
-    for (int i = 0; i < info.template_instantiations.size(); ++i) {
-        const TypeParser::Info &ti = info.template_instantiations[i];
-        TypeEntry *t = m_database->findType(ti.qualified_name.join("::"));
-        MetaType *temporary_type = nullptr;
-        if (t) {
-            temporary_type = new MetaType();
-            temporary_type->setTypeEntry(t);
-            temporary_type->setConstant(ti.is_constant);
-            temporary_type->setReferenceType(MetaType::ReferenceType(ti.reference_type));
-            temporary_type->setIndirections(ti.indirections);
-            if( t->isPrimitive() && temporary_type->indirections().isEmpty() && (
-                        hidden_base_class->typeEntry()->isContainer()
-                        || hidden_base_class->typeEntry()->isIterator() ) ){
-                temporary_type->setForceBoxedPrimitives(true);
-            }
-            decideUsagePattern(temporary_type);
-            if(subclass->typeEntry()->isGenericClass() && i < hidden_base_class->templateArguments().size()){
-                temporary_type->setTypeEntry(new InstantiatedTemplateArgumentEntry(i, hidden_base_class->templateArguments().at(i), t));
-            }
-            template_types << temporary_type;
-        }else if(m_templates.contains(subclass) && template_types.size()<subclass->templateArguments().size()){
-            temporary_type = new MetaType();
-            temporary_type->setTypeEntry(subclass->templateArguments().at(template_types.size()));
-            temporary_type->setConstant(ti.is_constant);
-            temporary_type->setReferenceType(MetaType::ReferenceType(ti.reference_type));
-            temporary_type->setIndirections(ti.indirections);
-            decideUsagePattern(temporary_type);
+    for (int i = 0; i < info.arguments().size(); ++i) {
+        const TypeInfo &ti = info.arguments()[i];
+        bool ok = false;
+        MetaType *temporary_type = translateType(ti, &ok);
+        if(ok){
             template_types << temporary_type;
-        }
-    }
-
-    for (int i = 0; i < template_types.size() && i < info.template_instantiations.size(); ++i) {
+        }else{
+            TypeEntry *t = m_database->findType(ti.toString());
+            if (t) {
+                temporary_type = new MetaType();
+                temporary_type->setTypeEntry(t);
+                temporary_type->setConstant(ti.isConstant());
+                temporary_type->setReferenceType(MetaType::ReferenceType(ti.getReferenceType()));
+                temporary_type->setIndirections(ti.indirections());
+                if( t->isPrimitive() && temporary_type->indirections().isEmpty() && (
+                            hidden_base_class->typeEntry()->isContainer()
+                            || hidden_base_class->typeEntry()->isIterator() ) ){
+                    temporary_type->setForceBoxedPrimitives(true);
+                }
+                decideUsagePattern(temporary_type);
+                if(subclass->typeEntry()->isGenericClass() && i < hidden_base_class->templateArguments().size()){
+                    temporary_type->setTypeEntry(new InstantiatedTemplateArgumentEntry(i, hidden_base_class->templateArguments().at(i), t));
+                }
+                template_types << temporary_type;
+            }else if(m_templates.contains(subclass) && template_types.size()<subclass->templateArguments().size()){
+                temporary_type = new MetaType();
+                temporary_type->setTypeEntry(subclass->templateArguments().at(template_types.size()));
+                temporary_type->setConstant(ti.isConstant());
+                temporary_type->setReferenceType(MetaType::ReferenceType(ti.getReferenceType()));
+                temporary_type->setIndirections(ti.indirections());
+                decideUsagePattern(temporary_type);
+                template_types << temporary_type;
+            }
+        }
+    }
+
+    for (auto l = qMin(template_types.size(), qMin(hidden_base_class->templateArguments().size(), info.arguments().size())), i = decltype(l)(0); i < l; ++i) {
         template_types_by_name.insert(hidden_base_class->templateArguments().at(i), template_types.at(i));
     }
 
     {
-        if(!info.template_instantiations.isEmpty()){
+        if(!info.arguments().isEmpty()){
             subclass->setTemplateBaseClass(hidden_base_class);
             subclass->setTemplateBaseClassInstantiations(template_types);
 
             subclass->setInterfaces(hidden_base_class->interfaces());
             subclass->setBaseClass(hidden_base_class->baseClass());
+            pendingConstructorUsages.append(subclass);
         }
 
         QString implements = hidden_base_class->typeEntry()->implements();
         if(!implements.isEmpty()){
-            for (QHash<const TypeEntry *,const MetaType *>::const_iterator ki = template_types_by_name.begin();
-                 ki != template_types_by_name.end(); ki++) {
+            for (QHash<const TypeEntry *,const MetaType *>::const_iterator ki = template_types_by_name.constBegin();
+                 ki != template_types_by_name.constEnd(); ki++) {
                 const TypeEntry * t_entry = ki.value()->typeEntry();
                 if(t_entry->isTemplateArgument())
                     implements = implements.replace("%"+ki.key()->name(),"%"+t_entry->qualifiedCppName());
@@ -7096,7 +7969,7 @@ bool MetaBuilder::inheritHiddenBaseType(MetaClass *subclass,
         case ContainerTypeEntry::HashContainer:
         case ContainerTypeEntry::MultiMapContainer:
         case ContainerTypeEntry::MultiHashContainer:
-            return true;
+            return;
         default: break;
         }
     }
@@ -7121,10 +7994,10 @@ bool MetaBuilder::inheritHiddenBaseType(MetaClass *subclass,
             bool exchanged = false;
             if(ftype->typeEntry()->isComplex()
                     && reinterpret_cast<const ComplexTypeEntry*>(ftype->typeEntry())->isTemplate()
-                    && !info.template_instantiations.isEmpty()){
+                    && !info.arguments().isEmpty()){
                 const ComplexTypeEntry* ctype = reinterpret_cast<const ComplexTypeEntry*>(ftype->typeEntry());
                 QStringList templateArgs;
-                for(const TypeParser::Info &i : info.template_instantiations) {
+                for(const TypeInfo &i : info.arguments()) {
                     templateArgs << i.toString();
                 }
                 if(const ComplexTypeEntry* instantiation = ctype->instantiations()[templateArgs]){
@@ -7171,10 +8044,10 @@ bool MetaBuilder::inheritHiddenBaseType(MetaClass *subclass,
                 bool exchanged = false;
                 if(atype->typeEntry()->isComplex()
                         && reinterpret_cast<const ComplexTypeEntry*>(atype->typeEntry())->isTemplate()
-                        && !info.template_instantiations.isEmpty()){
+                        && !info.arguments().isEmpty()){
                     const ComplexTypeEntry* ctype = reinterpret_cast<const ComplexTypeEntry*>(atype->typeEntry());
                     QStringList templateArgs;
-                    for(const TypeParser::Info &i : info.template_instantiations) {
+                    for(const TypeInfo &i : info.arguments()) {
                         templateArgs << i.toString();
                     }
                     if(const ComplexTypeEntry* instantiation = ctype->instantiations()[templateArgs]){
@@ -7326,10 +8199,10 @@ bool MetaBuilder::inheritHiddenBaseType(MetaClass *subclass,
             bool exchanged = false;
             if(ftype->typeEntry()->isComplex()
                     && reinterpret_cast<const ComplexTypeEntry*>(ftype->typeEntry())->isTemplate()
-                    && !info.template_instantiations.isEmpty()){
+                    && !info.arguments().isEmpty()){
                 const ComplexTypeEntry* ctype = reinterpret_cast<const ComplexTypeEntry*>(ftype->typeEntry());
                 QStringList templateArgs;
-                for(const TypeParser::Info &i : info.template_instantiations) {
+                for(const TypeInfo &i : info.arguments()) {
                     templateArgs << i.toString();
                 }
                 if(const ComplexTypeEntry* instantiation = ctype->instantiations()[templateArgs]){
@@ -7425,8 +8298,6 @@ bool MetaBuilder::inheritHiddenBaseType(MetaClass *subclass,
     subclass->setHasPublicDestructor(hidden_base_class->hasPublicDestructor());
     subclass->setHasVirtualDestructor(hidden_base_class->hasVirtualDestructor());
     subclass->setHasPrivateDestructor(hidden_base_class->hasPrivateDestructor());
-
-    return true;
 }
 
 void MetaBuilder::parseQ_Property(MetaClass *meta_class, const QStringList &declarations) {
@@ -7779,27 +8650,28 @@ void MetaBuilder::setupBeginEnd(MetaClass *cls) {
 void MetaBuilder::setupEquals(MetaClass *cls) {
     MetaFunctionList equals;
     MetaFunctionList nequals;
-
-    QString op_equals = QLatin1String("operator==");
-    QString op_nequals = QLatin1String("operator!=");
-
     MetaFunctionList functions = cls->queryFunctions(
                                         MetaClass::ClassImplements
                                         | MetaClass::Visible
                                         | MetaClass::NotRemovedFromTargetLang);
     for(MetaFunction *f : functions) {
-        if(f->arguments().size()==1){
-            if (f->originalName() == op_equals)
+        switch(f->operatorType()){
+        case OperatorType::Equals:
+            if(f->arguments().size()==1)
                 equals << f;
-            else if (f->originalName() == op_nequals)
+            break;
+        case OperatorType::NotEquals:
+            if(f->arguments().size()==1)
                 nequals << f;
+            break;
+        default: break;
         }
     }
 
     if (equals.size() || nequals.size()) {
         if (!cls->hasHashFunction() && cls->typeEntry()->isValue() && cls->typeEntry()->codeGeneration()==TypeEntry::GenerateAll) {
             ReportHandler::warning(QString::fromLatin1("Class '%1' has equals operators but no qHash() function. Hashcode of objects will consistently be 0.")
-                                   .arg(cls->name()));
+                                   .arg(cls->qualifiedCppName()));
         }
 
         hide_functions(equals);
@@ -7821,26 +8693,31 @@ void MetaBuilder::setupComparable(MetaClass *cls) {
     MetaFunctionList lessEquals;
     MetaFunctionList compare;
 
-    QString op_greater = QLatin1String("operator>");
-    QString op_greater_eq = QLatin1String("operator>=");
-    QString op_less = QLatin1String("operator<");
-    QString op_less_eq = QLatin1String("operator<=");
-    QString op_compare = QLatin1String("operator<=>");
-
-    MetaFunctionList functions = cls->queryFunctions(MetaClass::ClassImplements
+    const MetaFunctionList functions = cls->queryFunctions(MetaClass::ClassImplements
                                          | MetaClass::NotRemovedFromTargetLang);
     for(MetaFunction *f : functions) {
-        if(f->arguments().size()==1){
-            if (f->originalName() == op_greater)
+        switch(f->operatorType()){
+        case OperatorType::Greater:
+            if(f->arguments().size()==1)
                 greater << f;
-            else if (f->originalName() == op_greater_eq)
+            break;
+        case OperatorType::GreaterOrEquals:
+            if(f->arguments().size()==1)
                 greaterEquals << f;
-            else if (f->originalName() == op_less)
+            break;
+        case OperatorType::Less:
+            if(f->arguments().size()==1)
                 less << f;
-            else if (f->originalName() == op_less_eq)
+            break;
+        case OperatorType::LessOrEquals:
+            if(f->arguments().size()==1)
                 lessEquals << f;
-            else if (f->originalName() == op_compare)
+            break;
+        case OperatorType::Compare:
+            if(f->arguments().size()==1)
                 compare << f;
+            break;
+        default: break;
         }
     }
 
diff --git a/src/cpp/QtJambiGenerator/metabuilder.h b/src/cpp/QtJambiGenerator/metabuilder.h
index 7bf30d96..cdbdf9cd 100644
--- a/src/cpp/QtJambiGenerator/metabuilder.h
+++ b/src/cpp/QtJambiGenerator/metabuilder.h
@@ -69,9 +69,9 @@ class MetaBuilder {
         const MetaFunctionalList& functionals() const { return m_meta_functionals; }
         MetaClassList classesTopologicalSorted() const;
 
-        ScopeModelItem popScope() { return m_scopes.takeLast(); }
+        ScopeModelItem popScope() { Q_ASSERT(m_scopes.size()); return m_scopes.takeLast(); }
         void pushScope(ScopeModelItem item) { m_scopes << item; }
-        ScopeModelItem currentScope() const { return m_scopes.last(); }
+        ScopeModelItem currentScope() const { Q_ASSERT(m_scopes.size()); return m_scopes.last(); }
 
         void dumpLog();
 
@@ -83,54 +83,82 @@ class MetaBuilder {
         QVariant figureOutEnumValue(const uint size, const QString &name, QVariant value, MetaClass *global, MetaEnum *meta_enum, MetaFunction *meta_function = nullptr, QSet<QString> *warnings = nullptr);
         void figureOutEnumValues();
         void figureOutDefaultEnumArguments();
-        void figureOutFunctionsInNamespace(const NamespaceModelItem &item);
 
-        void addAbstractMetaClass(MetaClass *cls);
-        void addAbstractMetaFunctional(MetaFunctional *cls);
+        void addClass(MetaClass *cls);
+        void addFunctional(MetaFunctional *cls);
         MetaClass *traverseTypeAlias(TypeAliasModelItem item);
         MetaFunctional *traverseFunctional(TypeAliasModelItem item);
-        MetaClass *traverseClass(ClassModelItem item);
-        bool setupInheritance(MetaClass *meta_class);
-        bool setupTemplateInstantiations(MetaClass *meta_class);
-        MetaClass *traverseNamespace(NamespaceModelItem item);
+        struct PendingClass{
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            PendingClass() = default;
+            PendingClass(const PendingClass&) = default;
+            inline PendingClass(ScopeModelItem _scope, MetaClass* _metaClass, const QList<ScopeModelItem>& _scopes)
+                : scope(_scope), metaClass(_metaClass), scopes(_scopes) {}
+#endif
+            ScopeModelItem scope;
+            MetaClass* metaClass = nullptr;
+            QList<ScopeModelItem> scopes;
+        };
+
+        struct PendingFunctional{
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            PendingFunctional() = default;
+            PendingFunctional(const PendingFunctional&) = default;
+            inline PendingFunctional(TypeAliasModelItem _scope, MetaClass* _metaClass, const QList<ScopeModelItem>& _scopes)
+                : scope(_scope), metaClass(_metaClass), scopes(_scopes) {}
+#endif
+            TypeAliasModelItem scope;
+            MetaClass* metaClass = nullptr;
+            QList<ScopeModelItem> scopes;
+        };
+
+        struct PendingHiddenBaseType{
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            PendingHiddenBaseType() = default;
+            PendingHiddenBaseType(const PendingHiddenBaseType&) = default;
+            inline PendingHiddenBaseType(MetaClass *_subclass, const MetaClass *_hidden_base_class, const TypeInfo& _info)
+                : subclass(_subclass), hidden_base_class(_hidden_base_class), info(_info) {}
+#endif
+            MetaClass *subclass = nullptr;
+            const MetaClass *hidden_base_class = nullptr;
+            TypeInfo info;
+        };
+
+        MetaClass *traverseClass(ClassModelItem item, QList<PendingClass>& pendingClasses, QList<PendingFunctional>& pendingFunctionals);
+        void setupInheritance(MetaClass *meta_class, QList<PendingHiddenBaseType>& pendingHiddenBaseTypes, QList<MetaClass *>& pendingConstructorUsages);
+        bool setupFunctionTemplateInstantiations(MetaClass *meta_class);
+        MetaClass *traverseNamespace(NamespaceModelItem item, QList<PendingClass>& pendingClasses, QList<PendingFunctional>& pendingFunctionals);
         MetaEnum *traverseEnum(EnumModelItem item, MetaClass *enclosing, const QSet<QString> &metaEnums, const QMap<QString,QString>& flagByEnums);
         MetaClass * instantiateIterator(IteratorTypeEntry *iteratorTypeEntry, MetaClass *subclass, const QList<const MetaType *>& template_types, const QHash<const TypeEntry *,const MetaType *>& template_types_by_name);
         void traverseEnums(ScopeModelItem item, MetaClass *parent, const QSet<QString> &metaEnums, const QMap<QString,QString>& flagByEnums);
-        void traverseFunctions(ScopeModelItem item, MetaClass *parent);
-        void traverseFields(ScopeModelItem item, MetaClass *parent);
-        void traverseStreamOperator(FunctionModelItem function_item);
-        void traverseCompareOperator(FunctionModelItem item);
-        MetaFunction *traverseFunction(FunctionModelItem function);
-        MetaField *traverseField(VariableModelItem field, const MetaClass *cls);
+        void traverseFunctions(ScopeModelItem item);
+        void traverseFields(ScopeModelItem item);
+        MetaFunction *traverseFunction(FunctionModelItem function, const QString& _function_name, const QStringList& tparams);
+        MetaField *traverseField(VariableModelItem field);
         void checkFunctionModifications();
-        void registerHashFunction(FunctionModelItem function_item);
-        void registerToStringCapability(FunctionModelItem function_item);
 
         void parseQ_Property(MetaClass *meta_class, const QStringList &declarations);
         void setupEquals(MetaClass *meta_class);
         void setupBeginEnd(MetaClass *meta_class);
         void setupComparable(MetaClass *meta_class);
         void setupClonable(MetaClass *cls);
-        void setupFunctionDefaults(MetaFunction *meta_function, MetaClass *meta_class);
 
         QString translateDefaultValue(const QString& defaultValueExpression, MetaType *type,
                                       MetaFunction *fnc, MetaClass *,
                                       int argument_index);
-        MetaType *translateType(const TypeInfo& type_info, bool* ok, const QString &contextString = QString(),
+        MetaType *translateType(TypeInfo type_info, bool* ok, const QString &contextString = QString(),
                                       bool resolveType = true, bool resolveScope = true, bool prependScope = true);
 
         static void decideUsagePattern(MetaType *type);
 
-        bool inheritHiddenBaseType(MetaClass *subclass,
+        void inheritHiddenBaseType(MetaClass *subclass,
                              const MetaClass *template_class,
-                             const TypeParser::Info &info);
+                             const TypeInfo &info, QList<MetaClass *>& pendingConstructorUsages);
         MetaType *inheritTemplateType(const QList<const MetaType *> &template_types, const MetaType *meta_type, bool *ok = nullptr);
 
         bool isClass(const QString &qualified_name, const QString& className);
         bool isEnum(const QStringList &qualified_name);
 
-        void fixQObjectForScope(NamespaceModelItem item);
-
         const QString& outputDirectory() const { return m_out_dir; }
         void setOutputDirectory(const QString &outDir) { m_out_dir = outDir; }
         void setFeatures(const QMap<QString, QString>& features){ m_features = &features; }
@@ -141,19 +169,24 @@ class MetaBuilder {
             m_qtjambiVersionPatch = qtjambiVersionPatch;
         }
         const QMap<QString,TypeSystemTypeEntry *>& typeSystemByPackage() const { return m_typeSystemByPackage; }
-        const QMap<TypeSystemTypeEntry *,QSet<QString>>& containerBaseClasses() const { return m_containerBaseClasses; }
         const QStringList &getIncludePathsList() const;
         void setIncludePathsList(const QStringList &newIncludePathsList);
 
         const QString &generateTypeSystemQML() const;
         void setGenerateTypeSystemQML(const QString &newGenerateTypeSystemQML);
+        const QMap<QString,QStringList>& requiredFeatures() const { return _M_requiredFeatures; }
+        void setRequiredFeatures(const QMap<QString,QStringList>& requiredFeatures) { _M_requiredFeatures = requiredFeatures; }
 
 protected:
         MetaType* exchangeTemplateTypes(const MetaType* type, bool isReturn, const QMap<QString,MetaType*>& templateTypes);
-        MetaClass *argumentToClass(ArgumentModelItem, const QString &contextString);
+        MetaClass *argumentToClass(const MetaType* type);
+        void addInclude(TS::TypeEntry * entry, QString fileName, bool extra = false);
+        void addInclude(TS::ComplexTypeEntry * entry, const MetaType* includedType);
 
+        void fixFunctions(MetaClass * cls);
     private:
         TypeInfo analyzeTypeInfo(MetaClass *cls, QString strg);
+        TypeInfo convertInfo(MetaClass *cls, const TypeParser::Info& ti);
         MetaFunctional * findFunctional(MetaClass *cls, const FunctionalTypeEntry * fentry);
         void fixMissingIterator();
         void sortLists();
@@ -162,17 +195,11 @@ class MetaBuilder {
                               MetaEnum *meta_enum,
                               MetaFunction *meta_function, QSet<QString> *warnings = nullptr);
 
-        struct RenamedOperator{
-            QString newName;
-            TypeEntry *castType;
-            bool skip;
-        };
-
-        RenamedOperator rename_operator(const QString &oper);
-
         QString m_out_dir;
 
         MetaClassList m_meta_classes;
+        QMap<QString,QHashDummyValue> m_classNames;
+        QMap<QString,MetaClass*> m_globals;
         MetaFunctionalList m_meta_functionals;
         MetaClassList m_templates;
         MetaClassList m_template_iterators;
@@ -214,15 +241,16 @@ class MetaBuilder {
         QList<MissingIterator> m_missing_iterators;
         const QMap<QString, QString>* m_features;
         QMap<QString,TypeSystemTypeEntry *> m_typeSystemByPackage;
-        QMap<TypeSystemTypeEntry *,QSet<QString>> m_containerBaseClasses;
         QList<MetaEnum *> m_scopeChangedEnums;
         QStringList m_includePathsList;
+        QMap<QString,QStringList> _M_requiredFeatures;
         uint m_qtVersionMajor;
         uint m_qtVersionMinor;
         uint m_qtVersionPatch;
         uint m_qtjambiVersionPatch;
         TS::TypeDatabase* m_database;
         QString m_generateTypeSystemQML;
+        QSet<MetaClass*> m_functions_fixed;
 };
 
 struct Operator {
diff --git a/src/cpp/QtJambiGenerator/metainfogenerator.cpp b/src/cpp/QtJambiGenerator/metainfogenerator.cpp
index b3c999a0..de499e83 100644
--- a/src/cpp/QtJambiGenerator/metainfogenerator.cpp
+++ b/src/cpp/QtJambiGenerator/metainfogenerator.cpp
@@ -45,8 +45,8 @@
 #include "typesystem/typedatabase.h"
 
 MetaInfoGenerator::MetaInfoGenerator(PriGenerator *pri):
-        JavaGenerator(pri->database()),
-        priGenerator(pri)
+        AbstractGenerator(),
+        priGenerator(pri), m_database(pri->database())
 
 {
     setFilenameStub("metainfo");
@@ -251,17 +251,17 @@ void MetaInfoGenerator::writeCppFile() {
             QTextStream& stream  = *buffer;
             buffers.insert(cls->targetTypeSystem(), buffer);
 
-            QSet<QString> dedupe = QSet<QString>();
-            writeInclude(stream, Include(Include::IncludePath, "QtJambi/MetaInfo"), dedupe);
+            QSet<QString> includes;
+            writeInclude(stream, Include(Include::IncludePath, "QtJambi/MetaInfo"), includes);
             //QString typeSystemName = cls->targetTypeSystem();
             TypeSystemTypeEntry * typeSystemEntry = static_cast<TypeSystemTypeEntry *>(m_database->findType(cls->targetTypeSystem()));
             if(typeSystemEntry){
                 if(typeSystemEntry->include().type!=Include::TargetLangImport){
-                    writeInclude(stream, typeSystemEntry->include(), dedupe);
+                    writeInclude(stream, typeSystemEntry->include(), includes);
                 }
                 for(const Include& incl : typeSystemEntry->extraIncludes()){
                     if(incl.type!=Include::TargetLangImport){
-                        writeInclude(stream, incl, dedupe);
+                        writeInclude(stream, incl, includes);
                     }
                 }
             }
@@ -289,6 +289,7 @@ void MetaInfoGenerator::writeCppFile() {
                 if(functional->enclosingClass()){
                     if(!(!functional->enclosingClass()->isFake()
                          && functional->enclosingClass()->typeEntry()
+                         && (functional->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp)
                          && (functional->enclosingClass()->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp))){
                         continue;
                     }
@@ -338,6 +339,7 @@ void MetaInfoGenerator::writeCppFile() {
                         if(functional->enclosingClass()){
                             if(!(!functional->enclosingClass()->isFake()
                                  && functional->enclosingClass()->typeEntry()
+                                 && (functional->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp)
                                  && (functional->enclosingClass()->typeEntry()->codeGeneration() & TypeEntry::GenerateCpp))){
                                 continue;
                             }
@@ -493,20 +495,33 @@ void MetaInfoGenerator::writeLibraryInitializers() {
             Indentor INDENT;
             s << INDENT << "package " << package << ";" << Qt::endl << Qt::endl;
 
-            QSet<QString> dedupe;
+            QSet<QString> imports;
+            imports.insert("io.qt.*");
+            s << "import io.qt.*;" << Qt::endl;
+            imports.insert("static io.qt.QtUtilities.*");
+            s << "import static io.qt.QtUtilities.*;" << Qt::endl;
+            if(package=="io.qt.internal"){
+                imports.insert("java.util.*");
+                s << "import java.util.*;" << Qt::endl;
+                imports.insert("static java.util.Arrays.*");
+                s << "import static java.util.Arrays.*;" << Qt::endl;
+                imports.insert("static java.util.Collections.*");
+                s << "import static java.util.Collections.*;" << Qt::endl;
+            }
+
             if(typeSystemEntry){
                 allTypeSystems[typeSystemEntry->module()].insert(typeSystemEntry);
                 //allTypeSystems[typeSystemEntry->module().isEmpty() ? typeSystemEntry->qtLibrary() : typeSystemEntry->module()].insert(typeSystemEntry);
                 if(typeSystemEntry->include().type==Include::TargetLangImport){
-                    writeInclude(s, typeSystemEntry->include(), dedupe);
+                    writeInclude(s, typeSystemEntry->include(), imports);
                 }
                 for(const Include& incl : typeSystemEntry->extraIncludes()){
                     if(incl.type==Include::TargetLangImport){
-                        writeInclude(s, incl, dedupe);
+                        writeInclude(s, incl, imports);
                     }
                 }
             }
-            if(!dedupe.isEmpty()){
+            if(!imports.isEmpty()){
                 s << Qt::endl;
             }
             s << INDENT << "final class QtJambi_LibraryUtilities {" << Qt::endl << Qt::endl;
@@ -516,7 +531,7 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                   << INDENT << "final static int qtMinorVersion = " << m_qtVersionMinor << ";" << Qt::endl << Qt::endl
                   << INDENT << "final static int qtJambiPatch = " << m_qtjambiVersionPatch << ";" << Qt::endl;
                 if(typeSystemEntry){
-                    s << Qt::endl << INDENT << "final static io.qt.InternalAccess internal;" << Qt::endl
+                    s << Qt::endl << INDENT << "final static InternalAccess internal;" << Qt::endl
                       << Qt::endl << INDENT << "static{" << Qt::endl;
                     {
                         INDENTATION(INDENT)
@@ -531,7 +546,7 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                             if(!typeSystemID.isEmpty() && !typeSystemEntry->qtLibrary().isEmpty() && (!nativeLibs.contains(typeSystemEntry) || !nativeLibs[typeSystemEntry].contains(typeSystemEntry->qtLibrary())))
                                 nativeLibs[typeSystemEntry] << typeSystemEntry->qtLibrary();
                             generateInitializer(s, typeSystemEntry, {}, TS::TargetLangCode, CodeSnip::Beginning, INDENT);
-                            s << INDENT << "io.qt.QtUtilities.initializePackage(\"io.qt.internal\");" << Qt::endl;
+                            s << INDENT << "initializePackage(\"io.qt.internal\");" << Qt::endl;
                             generateInitializer(s, typeSystemEntry, {}, TS::TargetLangCode, CodeSnip::Position1, INDENT);
                             if(typeSystemID!="qtjambi")
                                 requiredTypeSystems[typeSystemEntry] << "qtjambi";
@@ -720,11 +735,11 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                             expandedQtLibraries.take("QtQmlIntegration");
                             for(const QString& key : expandedQtLibraries.keys()){
                                 if(key.startsWith("Qt")){
-                                    s << INDENT << "io.qt.QtUtilities.loadQtLibrary(\"" << key.mid(2);
+                                    s << INDENT << "loadQtLibrary(\"" << key.mid(2);
                                 }else{
-                                    s << INDENT << "io.qt.QtUtilities.loadUtilityLibrary(\"" << key;
+                                    s << INDENT << "loadUtilityLibrary(\"" << key;
                                 }
-                                s << "\", io.qt.QtUtilities.LibraryRequirementMode.ProvideOnly";
+                                s << "\", LibraryRequirementMode.ProvideOnly";
                                 for(const QString& pl : expandedQtLibraries[key]){
                                     if(!pl.isEmpty()){
                                         s << ", \"" << pl << "\"";
@@ -741,13 +756,13 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                                 switch(dep.mode){
                                 case Dependency::Mandatory:
                                     if(dep.entry.startsWith("Qt")){
-                                        append = ", io.qt.QtUtilities.LibraryRequirementMode.Mandatory";
+                                        append = ", LibraryRequirementMode.Mandatory";
                                     }else{
-                                        append = ", io.qt.QtUtilities.LibraryRequirementMode.Optional";
+                                        append = ", LibraryRequirementMode.Optional";
                                     }
                                     break;
-                                case Dependency::Optional: append = ", io.qt.QtUtilities.LibraryRequirementMode.Optional"; break;
-                                case Dependency::ProvideOnly: append = ", io.qt.QtUtilities.LibraryRequirementMode.ProvideOnly"; break;
+                                case Dependency::Optional: append = ", LibraryRequirementMode.Optional"; break;
+                                case Dependency::ProvideOnly: append = ", LibraryRequirementMode.ProvideOnly"; break;
                                 }
                                 bool isPlatformDependent = false;
                                 for(const QString& pl : dep.platforms){
@@ -760,9 +775,9 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                                     loaded.insert(dep.entry);
                                 }
                                 if(dep.entry.startsWith("Qt")){
-                                    s << INDENT << "io.qt.QtUtilities.loadQtLibrary(\"" << dep.entry.mid(2) << "\"" << append << ");" << Qt::endl;
+                                    s << INDENT << "loadQtLibrary(\"" << dep.entry.mid(2) << "\"" << append << ");" << Qt::endl;
                                 }else{
-                                    s << INDENT << "io.qt.QtUtilities.loadUtilityLibrary(\"" << dep.entry << "\"" << append << ");" << Qt::endl;
+                                    s << INDENT << "loadUtilityLibrary(\"" << dep.entry << "\"" << append << ");" << Qt::endl;
                                 }
                             }
                             generateInitializer(s, typeSystemEntry, {}, TS::TargetLangCode, CodeSnip::Position3, INDENT);
@@ -770,22 +785,22 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                                     && typeSystemEntry->qtLibrary()!="QtCore"
                                     && !m_staticLibraries.contains(typeSystemEntry->qtLibrary())){
                                 if(typeSystemEntry->qtLibrary().startsWith("Qt")){
-                                    s << INDENT << "io.qt.QtUtilities.loadQtLibrary(\"" << typeSystemEntry->qtLibrary().mid(2) << "\", io.qt.QtUtilities.LibraryRequirementMode.Mandatory);" << Qt::endl;
+                                    s << INDENT << "loadQtLibrary(\"" << typeSystemEntry->qtLibrary().mid(2) << "\", LibraryRequirementMode.Mandatory);" << Qt::endl;
                                 }else{
-                                    s << INDENT << "io.qt.QtUtilities.loadUtilityLibrary(\"" << typeSystemEntry->qtLibrary() << "\", io.qt.QtUtilities.LibraryRequirementMode.Mandatory);" << Qt::endl;
+                                    s << INDENT << "loadUtilityLibrary(\"" << typeSystemEntry->qtLibrary() << "\", LibraryRequirementMode.Mandatory);" << Qt::endl;
                                 }
                             }
                             generateInitializer(s, typeSystemEntry, {}, TS::TargetLangCode, CodeSnip::Position4, INDENT);
                             if(typeSystemEntry->qtLibrary().startsWith("Qt")){
                                 QString libName = typeSystemEntry->qtLibrary();
-                                s << INDENT << "io.qt.QtUtilities.loadQtJambiLibrary(\"" << libName.mid(2) << "\");" << Qt::endl;
+                                s << INDENT << "loadQtJambiLibrary(\"" << libName.mid(2) << "\");" << Qt::endl;
                             }else if(!typeSystemEntry->targetName().isEmpty()){
                                 if(typeSystemEntry->targetName().startsWith("QtJambi"))
-                                    s << INDENT << "io.qt.QtUtilities.loadQtJambiLibrary(\"" << typeSystemEntry->targetName().mid(7) << "\");" << Qt::endl;
+                                    s << INDENT << "loadQtJambiLibrary(\"" << typeSystemEntry->targetName().mid(7) << "\");" << Qt::endl;
                                 else
-                                    s << INDENT << "io.qt.QtUtilities.loadJambiLibrary(\"" << typeSystemEntry->targetName() << "\");" << Qt::endl;
+                                    s << INDENT << "loadJambiLibrary(\"" << typeSystemEntry->targetName() << "\");" << Qt::endl;
                             }else{
-                                s << INDENT << "io.qt.QtUtilities.loadJambiLibrary(\"" << QString(package).replace(".", "_") << "\");" << Qt::endl;
+                                s << INDENT << "loadJambiLibrary(\"" << QString(package).replace(".", "_") << "\");" << Qt::endl;
                             }
                             generateInitializer(s, typeSystemEntry, package, TS::TargetLangCode, CodeSnip::Position5, INDENT);
                         }
@@ -813,12 +828,9 @@ void MetaInfoGenerator::writeLibraryInitializers() {
 
                         if(package=="io.qt.internal"){
                             s << Qt::endl
-                              << INDENT << "private final static java.util.Map<String,java.util.List<Dependency>> dependencies = new java.util.TreeMap<>();" << Qt::endl << Qt::endl
-                              << INDENT << "final static java.util.Map<String,java.util.List<Dependency>> getDependencies() {" << Qt::endl
-                              << INDENT << "    return java.util.Collections.unmodifiableMap(dependencies);" << Qt::endl
-                              << INDENT << "}" << Qt::endl << Qt::endl;
+                              << INDENT << "final static Map<String,List<Dependency>> dependencies;" << Qt::endl << Qt::endl;
                         }else{
-                            s << INDENT << "final static io.qt.InternalAccess internal;" << Qt::endl << Qt::endl;
+                            s << INDENT << "final static InternalAccess internal;" << Qt::endl << Qt::endl;
                         }
 
                         generateInitializer(s, typeSystemEntry, package, TS::TargetLangCode, CodeSnip::Beginning, INDENT);
@@ -826,13 +838,15 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                         {
                             INDENTATION(INDENT)
                             if(package=="io.qt.internal"){
-                                for(TypeSystemTypeEntry* ts : m_database->typeSystemsByQtLibrary().values()){
+                                s << INDENT << "Map<String,List<Dependency>> _dependencies = new TreeMap<>();" << Qt::endl;
+                                const QList<TypeSystemTypeEntry*> typeSystems = m_database->typeSystems();
+                                for(TypeSystemTypeEntry* ts : typeSystems){
                                     if(ts->codeGeneration()!=TypeEntry::GenerateNothing && !m_staticLibraries.contains(ts->qtLibrary())){
                                         QString dependencyString;
                                         QSet<QString> deps{"QtCore"};
                                         {
                                             QTextStream s(&dependencyString);
-                                            s << INDENT << "dependencies.put(\"" << ts->qtLibrary() << "\", java.util.Arrays.asList(";
+                                            s << INDENT << "_dependencies.put(\"" << ts->qtLibrary() << "\", unmodifiableList(asList(";
                                             bool isFirst = true;
                                             for(const TypeSystemTypeEntry* entry : ts->requiredTypeSystems()){
                                                 if(entry->qtLibrary().isEmpty() || deps.contains(entry->qtLibrary()))
@@ -860,9 +874,9 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                                                 }
                                                 QString append;
                                                 switch(dep.mode){
-                                                case Dependency::Mandatory: append = ", io.qt.QtUtilities.LibraryRequirementMode.Mandatory"; break;
-                                                case Dependency::Optional: append = ", io.qt.QtUtilities.LibraryRequirementMode.Optional"; break;
-                                                case Dependency::ProvideOnly: append = ", io.qt.QtUtilities.LibraryRequirementMode.ProvideOnly"; break;
+                                                case Dependency::Mandatory: append = ", LibraryRequirementMode.Mandatory"; break;
+                                                case Dependency::Optional: append = ", LibraryRequirementMode.Optional"; break;
+                                                case Dependency::ProvideOnly: append = ", LibraryRequirementMode.ProvideOnly"; break;
                                                 }
                                                 for(const QString& pl : dep.platforms){
                                                     if(!pl.isEmpty())
@@ -870,13 +884,13 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                                                 }
                                                 s << "new Dependency(\"" << dep.entry << "\"" << append << ")";
                                             }
-                                            s << "));" << Qt::endl;
+                                            s << ")));" << Qt::endl;
                                         }
                                         if(deps.size()>1)
                                             s << dependencyString;
                                     }
                                 }
-                                s << Qt::endl;
+                                s << Qt::endl << INDENT << "dependencies = unmodifiableMap(_dependencies);" << Qt::endl;
                             }
                             generateInitializer(s, typeSystemEntry, package, TS::TargetLangCode, CodeSnip::Position1, INDENT);
                             s << INDENT << "try {" << Qt::endl;
@@ -884,7 +898,7 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                                 INDENTATION(INDENT)
                                 generateInitializer(s, typeSystemEntry, package, TS::TargetLangCode, CodeSnip::Position2, INDENT);
                                 if(package!="io.qt.internal")
-                                    s << INDENT << "io.qt.QtUtilities.initializePackage(\"" << typeSystemByPackage << "\");" << Qt::endl;
+                                    s << INDENT << "initializePackage(\"" << typeSystemByPackage << "\");" << Qt::endl;
                                 generateInitializer(s, typeSystemEntry, package, TS::TargetLangCode, CodeSnip::Position3, INDENT);
                             }
                             s << INDENT << "} catch(Error t) {" << Qt::endl;
@@ -907,18 +921,18 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                         s << INDENT << "}" << Qt::endl;
                         generateInitializer(s, typeSystemEntry, package, TS::TargetLangCode, CodeSnip::End, INDENT);
                     }else if(package!="io.qt.internal"){
-                        s << INDENT << "static final io.qt.InternalAccess internal;" << Qt::endl << Qt::endl
+                        s << INDENT << "static final InternalAccess internal;" << Qt::endl << Qt::endl
                           << INDENT << "static{" << Qt::endl
-                          << INDENT << "    io.qt.QtUtilities.initializePackage(\"" << typeSystemByPackage << "\");" << Qt::endl
+                          << INDENT << "    initializePackage(\"" << typeSystemByPackage << "\");" << Qt::endl
                           << INDENT << "    internal = internalAccess();" << Qt::endl
                           << INDENT << "}" << Qt::endl;
                     }
                 }
                 if(package!="io.qt.internal"){
-                    s << INDENT << "private static native io.qt.InternalAccess internalAccess();" << Qt::endl << Qt::endl;
+                    s << INDENT << "private static native InternalAccess internalAccess();" << Qt::endl << Qt::endl;
                 }
                 s << INDENT << "static void initialize() { };" << Qt::endl << Qt::endl
-                  << INDENT << "private QtJambi_LibraryUtilities() throws java.lang.InstantiationError { throw new java.lang.InstantiationError(\"Cannot instantiate QtJambi_LibraryUtilities.\"); }" << Qt::endl;
+                  << INDENT << "private QtJambi_LibraryUtilities() throws InstantiationError { throw new InstantiationError(\"Cannot instantiate QtJambi_LibraryUtilities.\"); }" << Qt::endl;
             }
             s << INDENT << "}" << Qt::endl << Qt::endl;
 
@@ -983,7 +997,7 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                         generateInitializer(stream, typeSystem, {}, TS::ModuleInfo, CodeSnip::Position3, INDENT);
                         generateInitializer(stream, typeSystem, {}, TS::ModuleInfo, CodeSnip::End, INDENT);
                         if(!typeSystem->isNoExports())
-                            for(const QString& e : exports[typeSystem])
+                            for(const QString& e : qAsConst(exports[typeSystem]))
                                 stream << "    exports " << e << ";" << Qt::endl;
                     }
                 }
@@ -1025,9 +1039,11 @@ void MetaInfoGenerator::writeLibraryInitializers() {
                 else
                     settings.setValue("qtjambi.jar.excludes", "");
 
-                m_database->typeSystemsByQtLibrary();
-                for(TypeSystemTypeEntry* ts : m_database->typeSystemsByQtLibrary().values()){
-                    if(ts && ts->codeGeneration()!=TypeEntry::GenerateNothing){
+                const QList<TypeSystemTypeEntry*> typeSystems = m_database->typeSystems();
+                for(TypeSystemTypeEntry* ts : typeSystems){
+                    if(ts
+                            && ts->codeGeneration()!=TypeEntry::GenerateForSubclass
+                            && ts->codeGeneration()!=TypeEntry::GenerateNothing){
                         QString qtJambiLibrary;
                         if(ts->qtLibrary().isEmpty()){
                             qtJambiLibrary = ts->targetName();
diff --git a/src/cpp/QtJambiGenerator/metainfogenerator.h b/src/cpp/QtJambiGenerator/metainfogenerator.h
index a3cee1a4..8411633a 100644
--- a/src/cpp/QtJambiGenerator/metainfogenerator.h
+++ b/src/cpp/QtJambiGenerator/metainfogenerator.h
@@ -43,7 +43,7 @@
 #include "cppgenerator.h"
 #include "typedatabase.h"
 
-class MetaInfoGenerator : public JavaGenerator {
+class MetaInfoGenerator : public AbstractGenerator {
     public:
         MetaInfoGenerator(PriGenerator *pri);
 
@@ -79,6 +79,13 @@ class MetaInfoGenerator : public JavaGenerator {
         }
         void setIncludeDirectories(const QStringList &newIncludeDirectories);
 
+        QString javaOutputDirectory() const {
+            if (!m_java_out_dir.isNull())
+                return m_java_out_dir;
+            return outputDirectory() + QLatin1String("/java");
+        }
+        void setJavaOutputDirectory(const QString &javaOutDir) { m_java_out_dir = javaOutDir; }
+
 private:
         void writeCppFile();
         void buildSkipList();
@@ -87,6 +94,7 @@ class MetaInfoGenerator : public JavaGenerator {
         QMap<QString, quint8> m_packageGenerationPolicies;
         QMap<QString, QString> m_typeSystemByPackage;
         QString m_filenameStub;
+        QString m_java_out_dir;
 
         PriGenerator *priGenerator;
 
@@ -94,6 +102,7 @@ class MetaInfoGenerator : public JavaGenerator {
         QStringList m_includeDirectories;
 
         QStringList m_staticLibraries;
+        TS::TypeDatabase* m_database;
 };
 
 #endif // METAINFOGENERATOR_H
diff --git a/src/cpp/QtJambiGenerator/metalang.cpp b/src/cpp/QtJambiGenerator/metalang.cpp
index 1f4fc158..4bc0c629 100644
--- a/src/cpp/QtJambiGenerator/metalang.cpp
+++ b/src/cpp/QtJambiGenerator/metalang.cpp
@@ -62,6 +62,8 @@ MetaType *MetaType::copy() const {
     return cpy;
 }
 
+bool MetaType::isQObject() const { return m_pattern == ObjectPattern && static_cast<const ComplexTypeEntry *>(m_type_entry)->isQObject(); }
+
 QString MetaType::cppSignature() const {
     QString s;
 
@@ -127,6 +129,21 @@ MetaArgument *MetaArgument::copy() const {
     return cpy;
 }
 
+bool MetaArgument::isNullPointerDisabled(const MetaFunction* java_function) const{
+    if(java_function->nullPointersDisabled(java_function->declaringClass(), argumentIndex() + 1))
+        return true;
+    QString typeReplaced = java_function->typeReplaced(argumentIndex() + 1);
+    if(typeReplaced.isEmpty()
+        && ((type()->indirections().isEmpty() && type()->isObject())
+            || (type()->getReferenceType()==MetaType::Reference && !type()->isConstant() && type()->isObject())
+            || (type()->getReferenceType()==MetaType::Reference && !type()->isConstant() && type()->isValue())
+            || (type()->getReferenceType()==MetaType::Reference && !type()->isConstant() && type()->isQVariant())
+            || (type()->getReferenceType()==MetaType::Reference && !type()->isConstant() && type()->isQString()))){
+        return true;
+    }
+    return typeReplaced.contains("@StrictNonNull");
+}
+
 QString MetaArgument::argumentName() const {
     QString n = MetaVariable::name();
     if (n.isEmpty()) {
@@ -238,7 +255,7 @@ bool MetaFunction::needsCallThrough() const {
             || isConstructor()
             || (((ownerClass()->typeEntry()->designatedInterface() && !this->isAbstract()) || implementingClass()->typeEntry()->isNativeIdBased()) && !isStatic()))
         return true;
-    if(this->argumentReplaced(0)=="this" && implementingClass()->typeEntry()->isNativeIdBased())
+    if(this->isSelfReturningFunction() && implementingClass()->typeEntry()->isNativeIdBased())
         return true;
 
     for(const MetaArgument *arg : arguments()) {
@@ -282,6 +299,18 @@ bool MetaFunction::needsCallThrough() const {
     return false;
 }
 
+bool MetaFunction::needsReturnScope() const {
+    if(type()
+            && (
+                type()->isCharString() // -> returning const char* from jstring
+                || (type()->isQString() && type()->isConstant() && !type()->indirections().isEmpty())  // -> returning const QString* from jstring
+                || (type()->isQVariant() && type()->isConstant() && !type()->indirections().isEmpty())  // -> returning const QVariant* from jobject
+                )){
+        return true;
+    }
+    return false;
+}
+
 bool MetaFunction::needsSuppressRawTypeWarning() const {
     MetaArgumentList arguments = this->arguments();
     for(const MetaArgument *arg : arguments) {
@@ -342,8 +371,11 @@ QString MetaFunction::marshalledName() const {
                 qualifiedCppName = "double";
             returned += "_" + qualifiedCppName
                     .replace("::", "_")
+                    .replace("(*)", "_fptr")
                     .replace("<", "_")
                     .replace(">", "_")
+                    .replace("(", "_")
+                    .replace(")", "_")
                     .replace(",", "_")
                     .replace(".", "_")
                     .replace("*", "_ptr")
@@ -460,7 +492,9 @@ MetaFunction *MetaFunction::copy() const {
     cpy->setDeclaringClass(declaringClass());
     if (type())
         cpy->setType(type()->copy());
+    cpy->setOperatorType(operatorType());
     cpy->setConstant(isConstant());
+    cpy->setFunctionReferenceType(functionReferenceType());
     cpy->setOriginalAttributes(originalAttributes());
     cpy->setDeprecatedComment(deprecatedComment());
     cpy->setHref(href());
@@ -611,6 +645,24 @@ QList<ReferenceCount> MetaFunction::referenceCounts(const MetaClass *cls, int id
     return returned;
 }
 
+void MetaFunction::setArguments(const MetaArgumentList &arguments) {
+    m_arguments = arguments;
+    m_actualMinimumArgumentCount = -1;
+    m_cached_minimal_signature.clear();
+}
+void MetaFunction::addArgument(MetaArgument *argument) {
+    m_arguments << argument;
+    m_actualMinimumArgumentCount = -1;
+    m_cached_minimal_signature.clear();
+}
+
+
+void MetaFunction::setName(const QString &name) {
+    m_name = name;
+    m_cached_minimal_signature.clear();
+}
+
+
 QList<TemplateInstantiation> MetaFunction::templateInstantiations(const MetaClass *cls) const{
     QList<TemplateInstantiation> returned;
 
@@ -666,7 +718,34 @@ bool MetaFunction::resetObjectAfterUse(int argument_idx) const {
                 return true;
         }
     }
-
+    if(argument_idx>0
+            && argument_idx>=m_arguments.size()
+            && ownership(declaringClass(), TS::ShellCode, argument_idx).ownership==TS::InvalidOwnership
+            && ownership(declaringClass(), TS::NativeCode, argument_idx).ownership==TS::InvalidOwnership
+            && ownership(declaringClass(), TS::TargetLangCode, argument_idx).ownership==TS::InvalidOwnership
+            && !hasConversionRule(TS::NativeCode, argument_idx)
+            && !hasConversionRule(TS::ShellCode, argument_idx)
+            && typeReplaced(argument_idx).isEmpty()
+            && argumentRemoved(argument_idx)==ArgumentRemove_No
+            && !argumentTypeArray(argument_idx)
+            && !argumentTypeBuffer(argument_idx)){
+        const MetaArgument *argument = m_arguments[argument_idx-1];
+        if(argument->type()->isObject()
+            || (argument->type()->isValue()
+                 && !argument->type()->isConstant()
+                 && argument->type()->actualIndirections()>0)
+            || (argument->type()->isContainer()
+                 && !argument->type()->isConstant()
+                 && argument->type()->actualIndirections()>0)
+            || (argument->type()->isQVariant()
+                 && !argument->type()->isConstant()
+                 && argument->type()->actualIndirections()>0)
+            || (argument->type()->isJavaString()
+                 && !argument->type()->isConstant()
+                 && argument->type()->actualIndirections()>0)
+            )
+            return true;
+    }
     return false;
 }
 
@@ -720,6 +799,17 @@ QString MetaFunction::nullPointerDefaultValue(const MetaClass *mainClass, int ar
 
 }
 
+bool MetaFunctional::needsReturnScope() const {
+    if(type()
+            && (
+                type()->isCharString() // -> returning const char* from jstring
+                || (type()->isQString() && type()->isConstant() && !type()->indirections().isEmpty())  // -> returning const QString* from jstring
+                )){
+        return true;
+    }
+    return false;
+}
+
 bool MetaFunctional::needsCallThrough() const{
     bool needsCallThrough = typeEntry()->isNativeIdBased();
     if(!needsCallThrough){
@@ -902,6 +992,22 @@ QString MetaFunction::proxyCall() const {
     return {};
 }
 
+bool MetaFunction::isSelfReturningFunction() const{
+    QString trepl = typeReplaced(0);
+    QString arepl = argumentReplaced(0);
+    if(arepl.isEmpty()
+            && trepl.isEmpty()
+            && !isStatic()
+            && type()
+            && !type()->isConstant()
+            && type()->indirections().isEmpty()
+            && type()->getReferenceType()==MetaType::Reference
+            && type()->typeEntry()==implementingClass()->typeEntry()){
+        return true;
+    }
+    return arepl=="this";
+}
+
 QString MetaFunction::argumentReplaced(int key) const {
     FunctionModificationList modifications = this->modifications(implementingClass());
     if(implementingClass()!=declaringClass())
@@ -938,6 +1044,23 @@ QPair<QMap<int,ArgumentModification>,QList<ArgumentModification>> MetaFunction::
     return result;
 }
 
+QList<Delegate> MetaFunction::delegates() const{
+    QSet<QString> names;
+    QList<Delegate> result;
+    FunctionModificationList modifications = this->modifications(implementingClass());
+    if(implementingClass()!=declaringClass())
+        modifications << this->modifications(declaringClass());
+    for(const FunctionModification& modification : modifications) {
+        for(const Delegate& dlg : modification.delegates){
+            if(!names.contains(dlg.name)){
+                result << dlg;
+                names.insert(dlg.name);
+            }
+        }
+    }
+    return result;
+}
+
 QList<Parameter> MetaFunction::addedParameterTypes() const
 {
     QList<Parameter> result;
@@ -947,7 +1070,7 @@ QList<Parameter> MetaFunction::addedParameterTypes() const
     for(const FunctionModification& modification : modifications) {
         for(const ArgumentModification& argument_modification : modification.argument_mods) {
             if(argument_modification.type==ArgumentModification::TypeParameter){
-                result << Parameter{{}, argument_modification.modified_name, argument_modification.modified_type};
+                result << Parameter{{}, argument_modification.modified_name, argument_modification.modified_type,false};
             }
         }
     }
@@ -972,13 +1095,6 @@ ArgumentRemove MetaFunction::argumentRemoved(int key) const {
             }
         }
     }
-    if(arguments().size()>=key){
-        MetaType* type = arguments()[key-1]->type();
-        if(type && type->isNullPtr()){
-            return ArgumentRemove_Remove;
-        }
-    }
-
     return ArgumentRemove_No;
 }
 
@@ -1102,7 +1218,14 @@ bool MetaFunction::isDeprecated() const {
 
 OwnershipRule MetaFunction::ownership(const MetaClass *cls, TS::Language language, int key) const {
     if(m_accessedField){
-        if(key==1 && (this->attributes() & MetaAttributes::SetterFunction) == MetaAttributes::SetterFunction){
+        if(key==1 && ((this->attributes() & MetaAttributes::SetterFunction) == MetaAttributes::SetterFunction)){
+            for(const FieldModification& modification : m_accessedField->modifications()) {
+                OwnershipRule o = modification.ownerships.value(language, OwnershipRule{TS::InvalidOwnership, QString()});
+                if(o.ownership!=TS::InvalidOwnership)
+                    return o;
+            }
+        }
+        if(key==0 && ((this->attributes() & MetaAttributes::GetterFunction) == MetaAttributes::GetterFunction)){
             for(const FieldModification& modification : m_accessedField->modifications()) {
                 OwnershipRule o = modification.ownerships.value(language, OwnershipRule{TS::InvalidOwnership, QString()});
                 if(o.ownership!=TS::InvalidOwnership)
@@ -1439,34 +1562,31 @@ QString MetaFunction::minimalSignature() const {
     if (!m_cached_minimal_signature.isEmpty())
         return m_cached_minimal_signature;
 
-    QString tmpl;
-    for(int i=0; i<m_templateParameters.size(); i++){
-        MetaTemplateParameter* param = m_templateParameters[i];
+    QStringList args;
+    for(MetaTemplateParameter* param : m_templateParameters){
         if(param->type()){
-            if(!tmpl.isEmpty()){
-                tmpl += ",";
-            }
-            QTextStream s2(&tmpl);
+            QString strg;
+            QTextStream s2(&strg);
             writeTypeInfo(s2, param->type());
+            s2.flush();
+            args << strg;
         }else{
-            tmpl.clear();
+            args.clear();
             break;
         }
     }
-    if(!tmpl.isEmpty())
-        tmpl = "<" + tmpl.trimmed() + ">";
+    QString tmpl;
+    if(!args.isEmpty())
+        tmpl = "<" + args.join(",") + ">";
     QString minimalSignature = originalName() + tmpl + "(";
     const MetaArgumentList& arguments = this->arguments();
 
+    args.clear();
     for (int i = 0; i < arguments.count(); ++i) {
-        MetaType *t = arguments.at(i)->type();
-
-        if (i > 0)
-            minimalSignature += ",";
-
-        minimalSignature += t->minimalSignature();
+        MetaType *t = arguments[i]->type();
+        args << t->minimalSignature();
     }
-    minimalSignature += ")";
+    minimalSignature += args.join(",") + ")";
     if (isConstant())
         minimalSignature += "const";
 
@@ -1493,35 +1613,54 @@ bool MetaFunction::hasCodeInjections(const MetaClass *implementor, TS::Language
 }
 
 FunctionModificationList MetaFunction::modifications(const MetaClass *implementor) const {
-    Q_ASSERT(implementor);
-    FunctionModificationList result = implementor->typeEntry()->functionModifications(minimalSignature());
-    if(result.isEmpty() && (implementor->qualifiedCppName().startsWith("QOpenGLFunctions") || implementor->qualifiedCppName()=="QOpenGLExtraFunctions")){
-        const MetaArgumentList& arguments = this->arguments();
-        QList<ArgumentModification> argumentMods;
-        for (int i = 0; i < arguments.count(); ++i) {
-            MetaType *t = arguments.at(i)->type();
-            if(t->isNativePointer() && (t->typeEntry()->isPrimitive() || t->typeEntry()->isVoid()) && t->typeEntry()->qualifiedCppName()!="GLboolean" && t->indirections().size()==1){
-                ArgumentModification mod(i+1);
-                mod.useAsArrayType |= AsArrayType::Yes;
-                mod.useAsArrayType |= AsArrayType::Buffer;
-                argumentMods << mod;
+    if(implementor)
+        return modifications(implementor->typeEntry());
+    return {};
+}
+
+FunctionModificationList MetaFunction::modifications(const ComplexTypeEntry *entry) const{
+    FunctionModificationList result;
+    if(entry){
+        result = entry->functionModifications(minimalSignature());
+        if(result.isEmpty() && (entry->qualifiedCppName().startsWith("QOpenGLFunctions") || entry->qualifiedCppName()=="QOpenGLExtraFunctions")){
+            const MetaArgumentList& arguments = this->arguments();
+            QList<ArgumentModification> argumentMods;
+            for (int i = 0; i < arguments.count(); ++i) {
+                MetaType *t = arguments.at(i)->type();
+                if(t->isNativePointer() && (t->typeEntry()->isPrimitive() || t->typeEntry()->isVoid()) && t->typeEntry()->qualifiedCppName()!="GLboolean" && t->indirections().size()==1){
+                    ArgumentModification mod(i+1);
+                    mod.useAsArrayType |= AsArrayType::Yes;
+                    mod.useAsArrayType |= AsArrayType::Buffer;
+                    argumentMods << mod;
+                }
+            }
+            if(!argumentMods.isEmpty()){
+                FunctionModification mod;
+                mod.signature = minimalSignature();
+                mod.argument_mods = argumentMods;
+                result << mod;
             }
-        }
-        if(!argumentMods.isEmpty()){
-            FunctionModification mod;
-            mod.signature = minimalSignature();
-            mod.argument_mods = argumentMods;
-            result << mod;
         }
     }
     return result;
 }
 
+FunctionModificationList MetaFunction::modifications(const TypeSystemTypeEntry *entry) const{
+    if(entry)
+        return entry->functionModifications(minimalSignature());
+    return {};
+}
+
 bool MetaFunction::hasModifications(const MetaClass *implementor) const {
     FunctionModificationList mods = modifications(implementor);
     return mods.count() > 0;
 }
 
+bool MetaFunction::hasModifications(const ComplexTypeEntry *implementor) const {
+    FunctionModificationList mods = modifications(implementor);
+    return mods.count() > 0;
+}
+
 QString MetaFunction::modifiedName() const {
     if (m_cached_modified_name.isEmpty()) {
         FunctionModificationList mods = modifications(implementingClass());
@@ -1659,22 +1798,6 @@ MetaClass *MetaClass::extractInterface() {
 
         iface->setTypeEntry(typeEntry()->designatedInterface());
 
-        for(MetaFunction *function : functions()) {
-            if (!function->isConstructor())
-                iface->addFunction(function->copy());
-        }
-
-//         iface->setEnums(enums());
-//         setEnums(AbstractMetaEnumList());
-
-        for(const MetaField *field : fields()) {
-            if (field->isPublic()) {
-                MetaField *new_field = field->copy();
-                new_field->setEnclosingClass(iface);
-                iface->addField(new_field);
-            }
-        }
-
         if(iface->isInterface()){
             m_extracted_interface = iface;
             addInterface(iface);
@@ -1714,7 +1837,7 @@ MetaClass *MetaClass::extractInterfaceImpl() {
         ifaceImpl->setHasVirtualSlots(hasVirtualSlots());
         ifaceImpl->setHas_Q_GADGET(has_Q_GADGET());
         ifaceImpl->setHas_Q_OBJECT(has_Q_OBJECT());
-        ifaceImpl->setBaseClassNames(this->baseClassNames());
+        ifaceImpl->setBaseClassTypeInfo(this->baseClassTypeInfo());
         ifaceImpl->setHref(href());
         ifaceImpl->setBrief(brief());
         itype->origin()->setInclude(itype->include());
@@ -1724,30 +1847,6 @@ MetaClass *MetaClass::extractInterfaceImpl() {
 
         ifaceImpl->setTypeEntry(itype->origin());
 
-        for(MetaFunction *function : functions()) {
-//            if (!function->isConstructor())
-                function = function->copy();
-                if (function->isConstructor())
-                    function->setName(InterfaceTypeEntry::implName("X").split("::").last());
-                else
-                    *function += MetaAttributes::InterfaceFunction;
-                function->setInterfaceClass(this);
-                function->setImplementingClass(ifaceImpl);
-                function->setDeclaringClass(ifaceImpl);
-                ifaceImpl->addFunction(function);
-        }
-
-//         iface->setEnums(enums());
-//         setEnums(AbstractMetaEnumList());
-
-        for(const MetaField *field : fields()) {
-//            if (field->isPublic()) {
-                MetaField *new_field = field->copy();
-                new_field->setEnclosingClass(ifaceImpl);
-                ifaceImpl->addField(new_field);
-//            }
-        }
-
         if(!ifaceImpl->isInterface()){
             ifaceImpl->addInterface(this);
             this->addEnclosedClass(ifaceImpl);
@@ -1980,30 +2079,23 @@ const ContainerTypeEntry* MetaClass::findContainerSuperClass(QList<const MetaTyp
 void MetaClass::setBaseClass(MetaClass *base_class) {
     m_base_class = base_class;
     if(base_class){
+        if(base_class->typeEntry()->isQObject())
+            m_type_entry->setQObject(true);
+        if(base_class->typeEntry()->isQWidget())
+            m_type_entry->setQWidget(true);
+        if(base_class->typeEntry()->isQWindow())
+            m_type_entry->setQWindow(true);
+        if(base_class->typeEntry()->isQCoreApplication())
+            m_type_entry->setQCoreApplication(true);
+        if(base_class->typeEntry()->isQAction())
+            m_type_entry->setQAction(true);
         base_class->m_has_subClasses = true;
-        if(m_usingProtectedBaseConstructors || m_usingPublicBaseConstructors){
-            for(const MetaFunction* fun : base_class->functions()){
-                if(fun->isConstructor()){
-                    MetaFunction* constructor = fun->copy();
-                    constructor->setImplementingClass(this);
-                    constructor->setDeclaringClass(this);
-                    constructor->setName(qualifiedCppName().split("::").last());
-                    constructor->setOriginalName(constructor->name());
-                    if(m_usingPublicBaseConstructors){
-                        constructor->setVisibility(MetaAttributes::Public);
-                    }else{
-                        constructor->setVisibility(MetaAttributes::Protected);
-                    }
-                    addFunction(constructor);
-                }
-            }
-        }
     }
 }
 
 void MetaClass::setFunctions(const MetaFunctionList &functions) {
     m_functions = functions;
-    sortFunctions();
+    //sortFunctions();
 
     // Functions must be sorted by name before next loop
     QString currentName;
@@ -2136,7 +2228,7 @@ bool MetaClass::hasHashFunction() const {
             bool has_hash = true;
             for(auto instantiation : m_template_base_class_instantiations){
                 if(instantiation->indirections().isEmpty()){
-                    if(instantiation->typeEntry()->isVariant()){
+                    if(instantiation->typeEntry()->isQVariant()){
                         has_hash = false;
                     }
                 }
@@ -2155,7 +2247,7 @@ bool MetaClass::hasEqualsOperator() const {
             bool has_eq = true;
             for(auto instantiation : m_template_base_class_instantiations){
                 if(instantiation->indirections().isEmpty()){
-                    if(instantiation->typeEntry()->isVariant()){
+                    if(instantiation->typeEntry()->isQVariant()){
                         has_eq = false;
                     }
                 }
@@ -2196,6 +2288,7 @@ void MetaClass::addFunction(MetaFunction *function) {
 
     if (!function->isDestructor()){
         m_functions << function;
+        m_functionsBySignature[function->minimalSignature()] = function;
         if(function->type() && function->type()->isNativePointer() && function->type()->typeEntry()->isValue() && function->valueAsPointer(0)){
             function->type()->setTypeUsagePattern(MetaType::ObjectPattern);
         }
@@ -2204,7 +2297,7 @@ void MetaClass::addFunction(MetaFunction *function) {
                 arg->type()->setTypeUsagePattern(MetaType::ObjectPattern);
             }
         }
-        sortFunctions();
+        //sortFunctions();
     }
 
     m_has_virtual_slots |= function->isVirtualSlot();
@@ -2220,6 +2313,7 @@ void MetaClass::addFunction(MetaFunction *function) {
              && function->arguments()[2]->type()->cppSignature()=="void**"){
         m_has_private_metacall = true;
     }
+    //printf("Adding function: %s::%s\n", qPrintable(qualifiedCppName()), qPrintable(function->minimalSignature()));
 }
 
 void MetaClass::addInvalidFunction(MetaFunction *function) {
@@ -2296,15 +2390,11 @@ bool MetaClass::instantiateShellClass() const {
 
 bool MetaClass::generateShellClass() const {
     return !isFinal()
-            //&& !m_has_private_metacall
-            //&& !m_has_private_metaObject
             && !(typeEntry()->codeGeneration() & TypeEntry::GenerateNoShell)
             && (hasVirtualFunctions()
                 || hasVirtualDestructor()
                 || hasProtectedFunctions()
                 || hasProtectedFieldAccessors()
-            //    || typeEntry()->designatedInterface()
-            //    || typeEntry()->isInterface()
             );
 }
 
@@ -2376,7 +2466,7 @@ MetaField *MetaField::copy() const {
     return returned;
 }
 
-static QString upCaseFirst(const QString &str) {
+QString upCaseFirst(const QString &str) {
     Q_ASSERT(!str.isEmpty());
     QString s = str;
     s[0] = s.at(0).toUpper();
@@ -2523,7 +2613,12 @@ const MetaFunction *MetaField::getter() const {
                 && (
                     type()->isPrimitive()
                     || type()->isEnum()
-                    || type()->isTargetLangString()
+                    || type()->isQString()
+                    || type()->isCharString()
+                    || type()->isQStringRef()
+                    || type()->isQStringView()
+                    || type()->isQAnyStringView()
+                    || type()->isQUtf8StringView()
                     )){
             m_getter->setVisibility(MetaAttributes::Private);
         }
@@ -2651,6 +2746,55 @@ bool MetaClass::hasPublicAssignment() const {
     return m_has_publicassignment>0;
 }
 
+MetaClass::MetaClass()
+        : MetaAttributes(),
+          m_namespace(false),
+        m_qobject(false),
+        m_has_virtuals(false),
+        m_has_nonpublic(false),
+        m_has_virtual_slots(false),
+        m_has_justprivateconstructors(false),
+        m_has_standardconstructor(0),
+        m_has_publicstandardconstructor(0),
+        m_has_explicitstandardconstructor(0),
+        m_has_publiccopyconstructor(0),
+        m_has_explicitcopyconstructor(0),
+        m_has_unimplmentablePureVirtualFunctions(false),
+        m_unimplmentablePureVirtualFunctions(),
+        m_has_public_destructor(true),
+        m_has_private_destructor(false),
+        m_has_metaObject(false),
+        m_has_metacall(false),
+        m_has_metacast(false),
+        m_has_private_metaObject(false),
+        m_has_private_metacall(false),
+        m_has_private_metacast(false),
+        m_has_virtual_destructor(false),
+        m_has_hash_function(false),
+        m_needs_hash_workaround(false),
+        m_has_equals_operator(false),
+        m_has_clone_operator(false),
+        m_is_type_alias(false),
+        m_has_Q_GADGET(false),
+        m_has_Q_OBJECT(false),
+        m_has_subClasses(false),
+        m_usingProtectedBaseConstructors(false),
+        m_usingPublicBaseConstructors(false),
+        m_enclosing_class(nullptr),
+        m_base_class(nullptr),
+        m_typeAliasType(nullptr),
+        m_template_base_class(nullptr),
+        m_template_base_class_instantiations(),
+        m_extracted_interface(nullptr),
+        m_extracted_interface_impl(nullptr),
+        m_primary_interface_implementor(nullptr),
+        m_type_entry(nullptr),
+        m_qDebug_stream_function(nullptr){
+}
+
+const MetaFunctionList& MetaClass::functions() const { return m_functions; }
+const MetaFunctionList& MetaClass::invalidFunctions() const { return m_invalidfunctions; }
+
 bool MetaClass::hasExplicitCopyConstructor() const {
     if(m_has_explicitcopyconstructor==0){
         MetaFunctionList functions = queryFunctions(Constructors);
@@ -2864,29 +3008,6 @@ void MetaClass::addInterface(MetaClass *interface) {
         m_extracted_interface->addInterface(interface);
     if (interface!=this && m_extracted_interface_impl && !m_extracted_interface_impl->interfaces().contains(interface))
         m_extracted_interface_impl->addInterface(interface);
-
-    for(MetaFunction *function : interface->functions()) {
-        if (!hasFunction(function) && !function->isConstructor()) {
-            MetaFunction *cpy = function->copy();
-
-            // Setup that this function is an interface class.
-            cpy->setInterfaceClass(interface);
-            *cpy += MetaAttributes::InterfaceFunction;
-
-            // Copy the modifications in interface into the implementing classes.
-            FunctionModificationList mods = function->modifications(interface);
-            for(const FunctionModification &mod : mods) {
-                m_type_entry->addFunctionModification(mod);
-            }
-
-            // It should be mostly safe to assume that when we implement an interface
-            // we don't "pass on" pure virtual functions to our sublcasses...
-//                 *cpy -= AbstractMetaAttributes::Abstract;
-
-            cpy->setImplementingClass(this);
-            addFunction(cpy);
-        }
-    }
 }
 
 
@@ -3016,308 +3137,10 @@ QString MetaEnumValue::cppName() const {
     return m_enum && m_enum->typeEntry()->isScopedEnum() ? m_enum->typeEntry()->name() + "::" + m_name : m_name;
 }
 
-void add_extra_include_for_type(MetaClass *meta_class, const MetaType *type) {
-
-    if (!type)
-        return;
-
-    Q_ASSERT(meta_class);
-    const TypeEntry *entry = (type ? type->typeEntry() : nullptr);
-    if (entry && entry->isComplex()) {
-        const ComplexTypeEntry *centry = static_cast<const ComplexTypeEntry *>(entry);
-        ComplexTypeEntry *class_entry = meta_class->typeEntry();
-        if (class_entry && centry->include().isValid())
-            class_entry->addExtraInclude(centry->include());
-    }
-
-    if (type->hasInstantiations()) {
-        for(const MetaType *instantiation : type->instantiations())
-            add_extra_include_for_type(meta_class, instantiation);
-    }
-}
-
-void add_extra_includes_for_function(MetaClass *meta_class, const MetaFunction *meta_function) {
-    Q_ASSERT(meta_class);
-    Q_ASSERT(meta_function);
-    add_extra_include_for_type(meta_class, meta_function->type());
-
-    for(MetaArgument *argument : meta_function->arguments())
-        add_extra_include_for_type(meta_class, argument->type());
-}
-
 void MetaClass::fixUnimplmentablePureVirtualFunctions(){
     this->m_has_unimplmentablePureVirtualFunctions = !getAllUnimplmentablePureVirtualFunctions().isEmpty();
 }
 
-void MetaClass::fixFunctions(std::function<MetaArgument*(TypeEntry *)> argumentCreator) {
-    if (m_functions_fixed)
-        return;
-    else
-        m_functions_fixed = true;
-
-    MetaClass *super_class = baseClass();
-    MetaFunctionList funcs = functions();
-
-//     printf("fix functions for %s\n", qPrintable(name()));
-
-    if (super_class)
-        super_class->fixFunctions(argumentCreator);
-    int iface_idx = 0;
-
-    while (super_class || iface_idx < interfaces().size()) {
-//         printf(" - base: %s\n", qPrintable(super_class->name()));
-
-        // Since we always traverse the complete hierarchy we are only
-        // interrested in what each super class implements, not what
-        // we may have propagated from their base classes again.
-        MetaFunctionList super_funcs;
-        if (super_class) {
-            bool pullDown = super_class->isPullProtectedMethodsDown();
-            // Super classes can never be final
-            if (super_class->isFinalInTargetLang()) {
-                ReportHandler::warning("Final class '" + super_class->name() + "' set to non-final, as it is extended by other classes");
-                *super_class -= MetaAttributes::FinalInTargetLang;
-                *super_class += MetaAttributes::PullProtectedMethodsDown;
-                pullDown = true;
-            }
-            if(pullDown){
-                // when a class cannot be subclassed from external but has subclasses inside Qt,
-                // the protected functions of the class must be pulled down to the subclasses.
-                super_funcs = super_class->queryFunctions(MetaClass::Protected | MetaClass::NormalFunctions);
-                for (int sfi = 0; sfi < super_funcs.size(); ++sfi) {
-                    MetaFunction *sf = super_funcs.at(sfi);
-                    if(!sf->isAbstract() && !sf->isConstructor() && !sf->isEmptyFunction() && !sf->isInvalid()){
-                        MetaFunction *sfcopy = sf->copy();
-                        sfcopy->setDeclaringClass(this);
-                        this->addFunction(sfcopy);
-                    }
-                }
-            }
-            super_funcs = super_class->queryFunctions(MetaClass::ClassImplements);
-        } else {
-            super_funcs = interfaces().at(iface_idx)->queryFunctions(MetaClass::NormalFunctions);
-        }
-
-        QSet<MetaFunction *> funcs_to_add;
-        for (int sfi = 0; sfi < super_funcs.size(); ++sfi) {
-            MetaFunction *sf = super_funcs.at(sfi);
-
-            if (sf->isRemovedFromAllLanguages(sf->implementingClass()))
-                continue;
-
-            // we generally don't care about private functions, but we have to get the ones that are
-            // virtual in case they override abstract functions.
-            bool add = (sf->isNormal() || sf->isSignal() || sf->isEmptyFunction());
-            for (int fi = 0; fi < funcs.size(); ++fi) {
-                MetaFunction *f = funcs.at(fi);
-                if (f->isRemovedFromAllLanguages(f->implementingClass()))
-                    continue;
-
-                const uint cmp = f->compareTo(sf);
-
-                if (cmp & MetaFunction::EqualModifiedName) {
-//                     printf("   - %s::%s similar to %s::%s %x vs %x\n",
-//                            qPrintable(sf->implementingClass()->typeEntry()->qualifiedCppName()),
-//                            qPrintable(sf->name()),
-//                            qPrintable(f->implementingClass()->typeEntry()->qualifiedCppName()),
-//                            qPrintable(f->name()),
-//                            sf->attributes(),
-//                            f->attributes());
-
-                    add = sf->isSignal();
-                    if (cmp & MetaFunction::EqualArguments) {
-
-//                         if (!(cmp & AbstractMetaFunction::EqualReturnType)) {
-//                             ReportHandler::warning(QString("%1::%2 and %3::%4 differ in retur type")
-//                                                    .arg(sf->implementingClass()->name())
-//                                                    .arg(sf->name())
-//                                                    .arg(f->implementingClass()->name())
-//                                                    .arg(f->name()));
-//                         }
-
-                        // Same function, propegate virtual...
-                        if (!(cmp & MetaFunction::EqualAttributes)) {
-                            if (!f->isEmptyFunction()) {
-                                if (!sf->isFinalInCpp() && f->isFinalInCpp() && !f->isDeclaredFinalInCpp()) {
-                                    *f -= MetaAttributes::FinalInCpp;
-                                    //                                 printf("   --- inherit virtual\n");
-                                }
-                                if (!sf->isFinalInTargetLang() && f->isFinalInTargetLang() && !f->isDeclaredFinalInCpp()) {
-                                    *f -= MetaAttributes::FinalInTargetLang;
-                                    //                                 printf("   --- inherit virtual\n");
-                                }
-                                if (!f->isFinalInTargetLang() && f->isPrivate() && !sf->isPrivate()) {
-                                    f->setFunctionType(MetaFunction::EmptyFunction);
-                                    f->setVisibility(MetaAttributes::Protected);
-                                    *f += MetaAttributes::FinalInTargetLang;
-                                    ReportHandler::warning(QString("private virtual function '%1' in '%2'")
-                                                           .arg(f->signature())
-                                                           .arg(f->implementingClass()->name()));
-                                }
-                            }
-                        }
-
-                        if (f->visibility() != sf->visibility()) {
-                            QString warn = QString("visibility of function '%1' modified in class '%2'")
-                                           .arg(f->name()).arg(name());
-                            ReportHandler::warning(warn);
-
-                            // If new visibility is private, we can't
-                            // do anything. If it isn't, then we
-                            // prefer the parent class's visibility
-                            // setting for the function.
-                            if (!f->isPrivate() && !sf->isPrivate())
-                                f->setVisibility(sf->visibility());
-
-                            // Private overrides of abstract functions have to go into the class or
-                            // the subclasses will not compile as non-abstract classes.
-                            // But they don't need to be implemented, since they can never be called.
-                            if (f->isPrivate() && sf->isAbstract()) {
-                                f->setFunctionType(MetaFunction::EmptyFunction);
-                                f->setVisibility(sf->visibility());
-                                *f += MetaAttributes::FinalInTargetLang;
-                                *f += MetaAttributes::FinalInCpp;
-                            }
-                        }
-
-                        // Set the class which first declares this function, afawk
-                        f->setDeclaringClass(sf->declaringClass());
-
-                        if (sf->isFinalInTargetLang() && !sf->isPrivate() && !f->isPrivate() && !sf->isStatic() && !f->isStatic() && !f->isSignal()) {
-                            // Shadowed funcion, need to make base class
-                            // function non-virtual
-                            if (f->implementingClass() != sf->implementingClass() && f->implementingClass()->inheritsFrom(sf->implementingClass())) {
-
-                                // Check whether the superclass method has been redefined to non-final
-
-                                bool hasNonFinalModifier = false;
-                                bool isBaseImplPrivate = false;
-                                FunctionModificationList mods = sf->modifications(sf->implementingClass());
-                                for(const FunctionModification& mod : mods) {
-                                    if (mod.isNonFinal()) {
-                                        hasNonFinalModifier = true;
-                                        break;
-                                    } else if (mod.isPrivate()) {
-                                        isBaseImplPrivate = true;
-                                        break;
-                                    }
-                                }
-
-                                QPair<QMap<int,ArgumentModification>,QList<ArgumentModification>> addedArguments;
-                                if (!hasNonFinalModifier
-                                        && !isBaseImplPrivate
-                                        && ( addedArguments = f->addedArguments() ).first.isEmpty()
-                                        && addedArguments.second.isEmpty()
-                                        && (f->implementingClass()->typeEntry()->codeGeneration() & TypeEntry::GenerateTargetLang)
-                                        && (sf->implementingClass()->typeEntry()->codeGeneration() & TypeEntry::GenerateTargetLang)) {
-                                    ReportHandler::warning(QString::fromLatin1("Shadowing: %1::%2 and %3::%4; Java code will not compile")
-                                                           .arg(sf->implementingClass()->qualifiedCppName())
-                                                           .arg(sf->signature())
-                                                           .arg(f->implementingClass()->qualifiedCppName())
-                                                           .arg(f->signature()));
-                                }
-                            }
-                        }
-
-                    }
-
-                    if (!f->isPrivate() && cmp & MetaFunction::EqualDefaultValueOverload) {
-                        const MetaArgumentList& arguments = f->arguments().size() < sf->arguments().size() ? sf->arguments() : f->arguments();
-
-                        for (int i = 0; i < arguments.size(); ++i)
-                            arguments[i]->setDefaultValueExpression(QString());
-                    }
-
-
-                    // Otherwise we have function shadowing and we can
-                    // skip the thing...
-                } else if (cmp & MetaFunction::EqualName && !sf->isSignal()) {
-
-                    // In the case of function shadowing where the function name has been altered to
-                    // avoid conflict, we don't copy in the original.
-                    add = false;
-                }
-
-                // this feature is necessary because
-                // Q_DECL_FINAL (meaning the shell must not override the method)
-                // is not yet recognized by generator.
-                // Example: Qt3D::QColorMask::copy(const Qt3D::QNode *) Q_DECL_FINAL
-
-                FunctionModificationList mods = f->modifications(this);
-                for(const FunctionModification& mod : mods) {
-                    if (mod.isDeclaredFinal()) {
-                        *f += MetaAttributes::FinalInTargetLang;
-                        *f += MetaAttributes::FinalInCpp;
-//                        ReportHandler::warning(QString("final overriding method %1 in class %2").arg(f->signature()).arg(f->implementingClass()->qualifiedCppName()));
-                        break;
-                    }
-                }
-            }
-
-            if (add)
-                funcs_to_add << sf;
-        }
-
-        for(MetaFunction *f : funcs_to_add)
-            funcs << f->copy();
-
-        if (super_class)
-            super_class = super_class->baseClass();
-        else
-            iface_idx++;
-    }
-
-    bool hasPrivateConstructors = false;
-    bool hasPublicConstructors = false;
-    for(MetaFunction *func : funcs) {
-        FunctionModificationList mods = func->modifications(this);
-        for(const FunctionModification &mod : mods) {
-            if (mod.isRenameModifier()) {
-                func->setName(mod.renamedTo());
-            }
-        }
-
-        // Make sure class is abstract if one of the functions is
-        if (func->isAbstract()) {
-            (*this) += MetaAttributes::Abstract;
-            (*this) -= MetaAttributes::Final;
-        }
-
-        if (func->isConstructor()) {
-            if (func->isPrivate())
-                hasPrivateConstructors = true;
-            else
-                hasPublicConstructors = true;
-        }
-    }
-
-    if (hasPrivateConstructors && !hasPublicConstructors) {
-        (*this) += MetaAttributes::Abstract;
-        (*this) -= MetaAttributes::Final;
-    }
-
-    for(MetaFunction *f1 : funcs) {
-        for(MetaFunction *f2 : funcs) {
-            if (f1 != f2) {
-                uint cmp = f1->compareTo(f2);
-                if ((cmp & MetaFunction::EqualName)
-                        && !f1->isFinalInCpp()
-                        && f2->isFinalInCpp()) {
-                    *f2 += MetaAttributes::FinalOverload;
-                }
-            }
-        }
-    }
-
-    setFunctions(funcs);
-    for(MetaFunction *func : m_functions) {
-        // Make sure that we include files for all classes that are in use
-
-        if (!func->isRemovedFrom(this, TS::ShellCode))
-            add_extra_includes_for_function(this, func);
-    }
-}
-
 QString MetaType::minimalSignature() const {
     QString minimalSignature;
     if (isConstant())
diff --git a/src/cpp/QtJambiGenerator/metalang.h b/src/cpp/QtJambiGenerator/metalang.h
index b245fd0a..1a0fa44b 100644
--- a/src/cpp/QtJambiGenerator/metalang.h
+++ b/src/cpp/QtJambiGenerator/metalang.h
@@ -196,44 +196,39 @@ class MetaAttributes {
 class MetaType {
     public:
         enum ReferenceType{
-            NoReference,
-            Reference,
-            RReference
+            NoReference = TypeInfo::NoReference,
+            Reference = TypeInfo::Reference,
+            RReference = TypeInfo::RReference
         };
         enum TypeUsagePattern {
             InvalidPattern,
             PrimitivePattern,
             FlagsPattern,
             EnumPattern,
+            CharStringPattern,
+            QStringPattern,
+            QLatin1StringPattern,
+            QLatin1StringViewPattern,
+            QStringViewPattern,
+            QAnyStringViewPattern,
+            QUtf8StringViewPattern,
+            QStringRefPattern,
+            QCharPattern,
+            NullptrPattern,
+            AutoPattern,
             ValuePattern,
-            StringPattern,
-            Latin1StringPattern,
-            Latin1StringViewPattern,
-            StringViewPattern,
-            AnyStringViewPattern,
-            Utf8StringViewPattern,
-            StringRefPattern,
-            CharPattern,
             ObjectPattern,
-            QObjectPattern,
             NativePointerPattern,
             FunctionalPattern,
             ContainerPattern,
             IteratorPattern,
             PointerContainerPattern,
             InitializerListPattern,
-            VariantPattern,
+            QVariantPattern,
             JObjectWrapperPattern,
-            JCollectionWrapperPattern,
-            JMapWrapperPattern,
-            JIteratorWrapperPattern,
-            JEnumWrapperPattern,
-            JQFlagsWrapperPattern,
             ArrayPattern,
             TemplateArgumentPattern,
-            RValuePattern,
-            NullptrPattern,
-            AutoPattern
+            RValuePattern
         };
 
         MetaType() :
@@ -320,7 +315,7 @@ class MetaType {
         bool isFunctional() const { return m_pattern == FunctionalPattern; }
 
         // returns true if the type is used as a QObject *
-        bool isQObject() const { return m_pattern == QObjectPattern; }
+        bool isQObject() const;
 
         // returns true if the type is used as an object, e.g. Xxx *
         bool isObject() const { return m_pattern == ObjectPattern; }
@@ -340,59 +335,46 @@ class MetaType {
         // returns true for more complex types...
         bool isNativePointer() const { return m_pattern == NativePointerPattern; }
 
-        bool isString() const {
-            return m_pattern == StringPattern
-                    || m_pattern == Latin1StringPattern
-                    || m_pattern == Latin1StringViewPattern
-                    || m_pattern == StringViewPattern
-                    || m_pattern == AnyStringViewPattern
-                    || m_pattern == Utf8StringViewPattern
-                    || m_pattern == StringRefPattern;
+        bool isJavaString() const {
+            return m_pattern == QStringPattern
+                    || m_pattern == QLatin1StringPattern
+                    || m_pattern == QLatin1StringViewPattern
+                    || m_pattern == QStringViewPattern
+                    || m_pattern == QAnyStringViewPattern
+                    || m_pattern == QUtf8StringViewPattern
+                    || m_pattern == QStringRefPattern;
         }
 
         // returns true if the type was originally a QString or const QString &
-        bool isTargetLangString() const { return m_pattern == StringPattern; }
+        bool isQString() const { return m_pattern == QStringPattern; }
+
+        bool isCharString() const { return m_pattern == CharStringPattern; }
 
         // returns true if the type was originally a QLatin1String
-        bool isTargetLangLatin1String() const { return m_pattern == Latin1StringPattern; }
+        bool isQLatin1String() const { return m_pattern == QLatin1StringPattern; }
 
         // returns true if the type was originally a QLatin1StringView
-        bool isTargetLangLatin1StringView() const { return m_pattern == Latin1StringViewPattern; }
+        bool isQLatin1StringView() const { return m_pattern == QLatin1StringViewPattern; }
 
         // returns true if the type was originally a QString or const QString & or equivalent for QLatin1String
-        bool isTargetLangStringView() const { return m_pattern == StringViewPattern; }
+        bool isQStringView() const { return m_pattern == QStringViewPattern; }
 
-        bool isTargetLangAnyStringView() const { return m_pattern == AnyStringViewPattern; }
+        bool isQAnyStringView() const { return m_pattern == QAnyStringViewPattern; }
 
-        bool isTargetLangUtf8StringView() const { return m_pattern == Utf8StringViewPattern; }
+        bool isQUtf8StringView() const { return m_pattern == QUtf8StringViewPattern; }
 
         // returns true if the type was originally a QStringRef or const QStringRef &
-        bool isTargetLangStringRef() const { return m_pattern == StringRefPattern; }
+        bool isQStringRef() const { return m_pattern == QStringRefPattern; }
 
         // returns true if the type was originally a QChar or const QChar &
-        bool isTargetLangChar() const { return m_pattern == CharPattern; }
+        bool isQChar() const { return m_pattern == QCharPattern; }
 
         // return true if the type was originally a QVariant or const QVariant &
-        bool isVariant() const { return m_pattern == VariantPattern; }
+        bool isQVariant() const { return m_pattern == QVariantPattern; }
 
         // return true if the type was originally a JObjectWrapper or const JObjectWrapper &
         bool isJObjectWrapper() const { return m_pattern == JObjectWrapperPattern; }
 
-        // return true if the type was originally a JMapWrapper or const JMapWrapper &
-        bool isJMapWrapper() const { return m_pattern == JMapWrapperPattern; }
-
-        // return true if the type was originally a JCollectionWrapper or const JCollectionWrapper &
-        bool isJCollectionWrapper() const { return m_pattern == JCollectionWrapperPattern; }
-
-        // return true if the type was originally a JIteratorWrapper or const JIteratorWrapper &
-        bool isJIteratorWrapper() const { return m_pattern == JIteratorWrapperPattern; }
-
-        // return true if the type was originally a JEnumWrapper or const JEnumWrapper &
-        bool isJEnumWrapper() const { return m_pattern == JEnumWrapperPattern; }
-
-        // return true if the type was originally a JQFlagsWrapper or const JQFlagsWrapper &
-        bool isJQFlagsWrapper() const { return m_pattern == JQFlagsWrapperPattern; }
-
         // returns true if the type was used as a container
         bool isContainer() const { return m_pattern == ContainerPattern; }
 
@@ -416,13 +398,13 @@ class MetaType {
 
         // Returns true if the type is to be implemented using Java enums, e.g. not plain ints.
         bool isTargetLangEnum() const { return isEnum() && !static_cast<const EnumTypeEntry *>(typeEntry())->forceInteger(); }
-        bool isIntegerEnum() const { return isEnum() && !isTargetLangEnum(); }
+        bool isIntegerEnum() const { return isEnum() && static_cast<const EnumTypeEntry *>(typeEntry())->forceInteger(); }
 
         // Returns true if the type is to be implemented using Java QFlags, e.g. not plain ints.
         bool isTargetLangFlags() const {
             return isFlags() && !static_cast<const FlagsTypeEntry *>(typeEntry())->forceInteger();
         }
-        bool isIntegerFlags() const { return isFlags() && !isTargetLangFlags(); }
+        bool isIntegerFlags() const { return isFlags() && static_cast<const FlagsTypeEntry *>(typeEntry())->forceInteger(); }
 
         int actualIndirections() const { return m_indirections.size() + (m_reference==Reference ? 1 : 0); }
         const QList<bool>& indirections() const { return m_indirections; }
@@ -446,7 +428,6 @@ class MetaType {
 
         void setOriginalTemplateType(const MetaType *type) { m_original_template_type = type; }
         const MetaType *originalTemplateType() const { return m_original_template_type; }
-
     private:
         const TypeEntry *m_type_entry;
         QList <const MetaType *> m_instantiations;
@@ -527,6 +508,8 @@ class MetaArgument : public MetaVariable {
 
         MetaArgument *copy() const;
 
+        bool isNullPointerDisabled(const MetaFunction* function) const;
+
     private:
         // Just to force people to call argumentName() And indexedName();
         QString name() const;
@@ -562,326 +545,343 @@ class MetaField : public MetaVariable, public MetaAttributes {
 
 class MetaFunction : public MetaAttributes {
     public:
-        enum FunctionType {
-            ConstructorFunction,
-            DestructorFunction,
-            NormalFunction,
-            SignalFunction,
-            PrivateSignalFunction,
-            EmptyFunction,
-            SlotFunction,
-            GlobalScopeFunction,
-            BaseClassDelegateFunction
-        };
-
-        enum CompareResult {
-            EqualName                   = 0x00000001,
-            EqualArguments              = 0x00000002,
-            EqualAttributes             = 0x00000004,
-            EqualImplementor            = 0x00000008,
-            EqualReturnType             = 0x00000010,
-            EqualDefaultValueOverload   = 0x00000020,
-            EqualModifiedName           = 0x00000040,
-
-            NameLessThan                = 0x00001000,
-
-            PrettySimilar               = EqualName | EqualArguments,
-            Equal                       = 0x0000001f,
-            NotEqual                    = 0x00001000
-        };
-
-        MetaFunction()
-                :MetaAttributes(),
-                m_original_name(),
-                m_original_signature(),
-                m_function_type(NormalFunction),
-                m_type(nullptr),
-                m_class(nullptr),
-                m_implementing_class(nullptr),
-                m_declaring_class(nullptr),
-                m_interface_class(nullptr),
-                m_property_spec(nullptr),
-                m_constant(false),
-                m_variadics(false),
-                m_explicit(false),
-                m_invalid(false),
-                m_actualMinimumArgumentCount(-1),
-                m_accessedField(nullptr),
-                m_functionReferenceType(MetaType::NoReference),
-                m_functionTemplate(nullptr)
-        {
-        }
-
-        ~MetaFunction();
-
-        QString name() const { return m_name; }
-        void setName(const QString &name) { m_name = name; }
-
-        QString originalName() const { return m_original_name.isEmpty() ? name() : m_original_name; }
-        void setOriginalName(const QString &name) { m_original_name = name; }
-
-        QString modifiedName() const;
-
-        QString minimalSignature() const;
-        void setOriginalSignature(const QString &signature) { m_original_signature = signature; }
-        const QString& originalSignature() const { return m_original_signature; }
-
-        QString marshalledName() const;
-
-        // true if one or more of the arguments are of QtObject subclasses
-        bool argumentsHaveNativeId() const {
-            for(const MetaArgument *arg : m_arguments) {
-                if (arg->type()->hasNativeId())
-                    return true;
-            }
-
-            return false;
+    enum FunctionType {
+        ConstructorFunction,
+        DestructorFunction,
+        NormalFunction,
+        SignalFunction,
+        PrivateSignalFunction,
+        EmptyFunction,
+        SlotFunction,
+        GlobalScopeFunction,
+        BaseClassDelegateFunction
+    };
+
+    enum CompareResult {
+        EqualName                   = 0x00000001,
+        EqualArguments              = 0x00000002,
+        EqualAttributes             = 0x00000004,
+        EqualImplementor            = 0x00000008,
+        EqualReturnType             = 0x00000010,
+        EqualDefaultValueOverload   = 0x00000020,
+        EqualModifiedName           = 0x00000040,
+
+        NameLessThan                = 0x00001000,
+
+        PrettySimilar               = EqualName | EqualArguments,
+        Equal                       = 0x0000001f,
+        NotEqual                    = 0x00001000
+    };
+
+    MetaFunction()
+            :MetaAttributes(),
+            m_original_name(),
+            m_original_signature(),
+            m_function_type(NormalFunction),
+            m_type(nullptr),
+            m_class(nullptr),
+            m_implementing_class(nullptr),
+            m_declaring_class(nullptr),
+            m_interface_class(nullptr),
+            m_property_spec(nullptr),
+            m_operatorType(OperatorType::None),
+            m_constant(false),
+            m_variadics(false),
+            m_explicit(false),
+            m_template(false),
+            m_invalid(false),
+            m_actualMinimumArgumentCount(-1),
+            m_accessedField(nullptr),
+            m_functionReferenceType(MetaType::NoReference),
+            m_functionTemplate(nullptr)
+    {
+    }
+
+    ~MetaFunction();
+
+    QString name() const { return m_name; }
+    void setName(const QString &name);
+
+    QString originalName() const { return m_original_name.isEmpty() ? name() : m_original_name; }
+    void setOriginalName(const QString &name) { m_original_name = name; }
+
+    QString modifiedName() const;
+
+    QString minimalSignature() const;
+    void setOriginalSignature(const QString &signature) { m_original_signature = signature; }
+    const QString& originalSignature() const { return m_original_signature; }
+
+    QString marshalledName() const;
+
+    // true if one or more of the arguments are of QtObject subclasses
+    bool argumentsHaveNativeId() const {
+        for(const MetaArgument *arg : m_arguments) {
+            if (arg->type()->hasNativeId())
+                return true;
         }
 
-        bool isModifiedRemoved(int types = TS::All) const;
-
-        bool isProxyCall() const;
-
-        MetaType *type() const { return m_type; }
-        void setType(MetaType *type) { m_type = type; }
-
-        // The class that has this function as a member.
-        const MetaClass *ownerClass() const { return m_class; }
-        void setOwnerClass(const MetaClass *cls) { m_class = cls; }
-
-        // The first class in a hierarchy that declares the function
-        const MetaClass *declaringClass() const { return m_declaring_class; }
-        void setDeclaringClass(const MetaClass *cls) { m_declaring_class = cls; }
-
-        // The class that actually implements this function
-        const MetaClass *implementingClass() const { return m_implementing_class; }
-        void setImplementingClass(const MetaClass *cls) { m_implementing_class = cls; }
-
-        bool needsCallThrough() const;
-
-        const MetaArgumentList& arguments() const { return m_arguments; }
-        void setArguments(const MetaArgumentList &arguments) { m_arguments = arguments; m_actualMinimumArgumentCount = -1; }
-        void addArgument(MetaArgument *argument) { m_arguments << argument; m_actualMinimumArgumentCount = -1; }
-        int actualMinimumArgumentCount() const;
-
-        void setInvalid(bool on) { m_invalid = on; }
-        bool isInvalid() const { return m_invalid; }
-        bool isDeprecated() const;
-        bool isDestructor() const { return functionType() == DestructorFunction; }
-        bool isConstructor() const { return functionType() == ConstructorFunction; }
-
-        /**
-         *detects, if the constructor is of form T(const T&)
-         * @brief isCopyConstructor
-         * @return
-         */
-        bool isCopyConstructor() const;
-        bool hasRReferences() const;
-        bool isNormal() const { return functionType() == NormalFunction || isSlot() || isInGlobalScope() || isBaseClassDelegateFunction(); }
-        bool isInGlobalScope() const { return functionType() == GlobalScopeFunction; }
-        bool isSignal() const { return functionType() == SignalFunction || functionType() == PrivateSignalFunction; }
-        bool isPrivateSignal() const { return functionType() == PrivateSignalFunction; }
-        bool isSlot() const { return functionType() == SlotFunction; }
-        bool isEmptyFunction() const { return functionType() == EmptyFunction; }
-        bool isBaseClassDelegateFunction() const { return functionType() == BaseClassDelegateFunction; }
-        bool hasTemplateArgumentTypes() const{
-            for(const MetaArgument *arg : m_arguments) {
-                if (arg->type()->isTemplateArgument())
-                    return true;
-            }
-            return m_type && (m_type->isTemplateArgument() || m_type->typeUsagePattern()==MetaType::AutoPattern);
+        return false;
+    }
+
+    bool isModifiedRemoved(int types = TS::All) const;
+
+    bool isProxyCall() const;
+
+    MetaType *type() const { return m_type; }
+    void setType(MetaType *type) { m_type = type; }
+
+    // The class that has this function as a member.
+    const MetaClass *ownerClass() const { return m_class; }
+    void setOwnerClass(const MetaClass *cls) { m_class = cls; }
+
+    // The first class in a hierarchy that declares the function
+    const MetaClass *declaringClass() const { return m_declaring_class; }
+    void setDeclaringClass(const MetaClass *cls) { m_declaring_class = cls; }
+
+    // The class that actually implements this function
+    const MetaClass *implementingClass() const { return m_implementing_class; }
+    void setImplementingClass(const MetaClass *cls) { m_implementing_class = cls; }
+
+    bool needsCallThrough() const;
+
+    bool needsReturnScope() const;
+
+    const MetaArgumentList& arguments() const { return m_arguments; }
+    void setArguments(const MetaArgumentList &arguments);
+    void addArgument(MetaArgument *argument);
+    int actualMinimumArgumentCount() const;
+
+    void setInvalid(bool on) { m_invalid = on; }
+    bool isInvalid() const { return m_invalid; }
+    void setTemplate(bool on) { m_template = on; }
+    bool isTemplate() const { return m_template; }
+    bool isDeprecated() const;
+    bool isDestructor() const { return functionType() == DestructorFunction; }
+    bool isConstructor() const { return functionType() == ConstructorFunction; }
+
+    /**
+     *detects, if the constructor is of form T(const T&)
+     * @brief isCopyConstructor
+     * @return
+     */
+    bool isCopyConstructor() const;
+    bool hasRReferences() const;
+    bool isNormal() const { return functionType() == NormalFunction || isSlot() || isInGlobalScope() || isBaseClassDelegateFunction(); }
+    bool isInGlobalScope() const { return functionType() == GlobalScopeFunction; }
+    bool isSignal() const { return functionType() == SignalFunction || functionType() == PrivateSignalFunction; }
+    bool isPrivateSignal() const { return functionType() == PrivateSignalFunction; }
+    bool isSlot() const { return functionType() == SlotFunction; }
+    bool isEmptyFunction() const { return functionType() == EmptyFunction; }
+    bool isBaseClassDelegateFunction() const { return functionType() == BaseClassDelegateFunction; }
+    bool hasTemplateArgumentTypes() const{
+        for(const MetaArgument *arg : m_arguments) {
+            if (arg->type()->isTemplateArgument())
+                return true;
         }
-        bool hasTemplateTypes() const{
-            for(const MetaTemplateParameter *arg : m_templateParameters) {
-                if (arg->type()->isTemplateArgument() && arg->defaultType().isEmpty())
-                    return true;
-            }
-            return false;
+        return m_type && (m_type->isTemplateArgument() || m_type->typeUsagePattern()==MetaType::AutoPattern);
+    }
+    bool hasTemplateTypes() const{
+        for(const MetaTemplateParameter *arg : m_templateParameters) {
+            if (arg->type()->isTemplateArgument() && arg->defaultType().isEmpty())
+                return true;
         }
-        FunctionType functionType() const { return m_function_type; }
-        void setFunctionType(FunctionType type) { m_function_type = type; }
+        return false;
+    }
+    FunctionType functionType() const { return m_function_type; }
+    void setFunctionType(FunctionType type) { m_function_type = type; }
+
+    QStringList introspectionCompatibleSignatures(const QStringList &resolvedArguments = QStringList()) const;
+    QString signature(bool skipName = false) const;
+    QString targetLangSignature(bool minimal = false) const;
+    bool shouldReturnThisObject() const { return QLatin1String("this") == argumentReplaced(0); }
+
+    bool isConstant() const { return m_constant; }
+    void setConstant(bool constant) { m_constant = constant; }
+
+    QString toString() const { return m_name; }
 
-        QStringList introspectionCompatibleSignatures(const QStringList &resolvedArguments = QStringList()) const;
-        QString signature(bool skipName = false) const;
-        QString targetLangSignature(bool minimal = false) const;
-        bool shouldReturnThisObject() const { return QLatin1String("this") == argumentReplaced(0); }
+    uint compareTo(const MetaFunction *other) const;
+
+    bool operator <(const MetaFunction &a) const;
 
-        bool isConstant() const { return m_constant; }
-        void setConstant(bool constant) { m_constant = constant; }
+    MetaFunction *copy() const;
+
+    QString replacedDefaultExpression(const MetaClass *cls, int idx) const;
+    bool removedDefaultExpression(const MetaClass *cls, int idx) const;
+    QString conversionRule(TS::Language language, int idx) const;
+    bool hasConversionRule(TS::Language language, int idx) const;
+    QList<ReferenceCount> referenceCounts(const MetaClass *cls, int idx = -2) const;
+    QList<TemplateInstantiation> templateInstantiations(const MetaClass *cls) const;
+
+    bool nullPointersDisabled(const MetaClass *cls = nullptr, int argument_idx = 0) const;
+    QString nullPointerDefaultValue(const MetaClass *cls = nullptr, int argument_idx = 0) const;
 
-        QString toString() const { return m_name; }
+    bool resetObjectAfterUse(int argument_idx) const;
 
-        uint compareTo(const MetaFunction *other) const;
+    bool valueAsPointer(int argument_idx) const;
 
-        bool operator <(const MetaFunction &a) const;
+    // Returns the ownership rules for the given argument in the given context
+    OwnershipRule ownership(const MetaClass *cls, TS::Language language, int idx) const;
 
-        MetaFunction *copy() const;
+    bool isVirtualSlot() const;
+    bool isAllowedAsSlot() const;
+    bool isPaintMethod() const;
+    bool isThreadAffine() const;
+    bool isUIThreadAffine() const;
+    bool isPixmapThreadAffine() const;
 
-        QString replacedDefaultExpression(const MetaClass *cls, int idx) const;
-        bool removedDefaultExpression(const MetaClass *cls, int idx) const;
-        QString conversionRule(TS::Language language, int idx) const;
-        bool hasConversionRule(TS::Language language, int idx) const;
-        QList<ReferenceCount> referenceCounts(const MetaClass *cls, int idx = -2) const;
-        QList<TemplateInstantiation> templateInstantiations(const MetaClass *cls) const;
-
-        bool nullPointersDisabled(const MetaClass *cls = nullptr, int argument_idx = 0) const;
-        QString nullPointerDefaultValue(const MetaClass *cls = nullptr, int argument_idx = 0) const;
+    int argumentTypeArrayLengthIndex(int argument_index) const;
+    int argumentTypeArrayLengthMinValue(int argument_index) const;
+    int argumentTypeArrayLengthMaxValue(int argument_index) const;
+    bool argumentTypeArrayDeref(int key) const;
+    bool argumentTypeArray(int key) const;
+    bool argumentTypeBuffer(int key) const;
+    bool argumentTypeArrayVarArgs(int key) const;
+    bool isNoExcept() const;
+    bool isBlockExceptions() const;
+    bool isRethrowExceptions() const;
+    QString typeReplaced(int argument_index, QString* jniType = nullptr) const;
+    bool isRemovedFromAllLanguages(const MetaClass *) const;
+    bool isRemovedFrom(const MetaClass *, TS::Language language) const;
 
-        bool resetObjectAfterUse(int argument_idx) const;
+    ArgumentRemove argumentRemoved(int) const;
+    ThreadAffinity argumentThreadAffinity(int) const;
 
-        bool valueAsPointer(int argument_idx) const;
+    QList<Delegate> delegates() const;
 
-        // Returns the ownership rules for the given argument in the given context
-        OwnershipRule ownership(const MetaClass *cls, TS::Language language, int idx) const;
+    QPair<QMap<int,ArgumentModification>,QList<ArgumentModification>> addedArguments() const;
 
-        bool isVirtualSlot() const;
-        bool isAllowedAsSlot() const;
-        bool isPaintMethod() const;
-        bool isThreadAffine() const;
-        bool isUIThreadAffine() const;
-        bool isPixmapThreadAffine() const;
+    QString proxyCall() const;
+    QString argumentReplaced(int key) const;
+    bool isSelfReturningFunction() const;
+    bool needsSuppressUncheckedWarning() const;
+    bool needsSuppressRawTypeWarning() const;
 
-        int argumentTypeArrayLengthIndex(int argument_index) const;
-        int argumentTypeArrayLengthMinValue(int argument_index) const;
-        int argumentTypeArrayLengthMaxValue(int argument_index) const;
-        bool argumentTypeArrayDeref(int key) const;
-        bool argumentTypeArray(int key) const;
-        bool argumentTypeBuffer(int key) const;
-        bool argumentTypeArrayVarArgs(int key) const;
-        bool isNoExcept() const;
-        bool isBlockExceptions() const;
-        bool isRethrowExceptions() const;
-        QString typeReplaced(int argument_index, QString* jniType = nullptr) const;
-        bool isRemovedFromAllLanguages(const MetaClass *) const;
-        bool isRemovedFrom(const MetaClass *, TS::Language language) const;
+    bool hasModifications(const MetaClass *implementor) const;
+    bool hasModifications(const ComplexTypeEntry *entry) const;
+    FunctionModificationList modifications(const MetaClass *implementor) const;
+    FunctionModificationList modifications(const ComplexTypeEntry *entry) const;
+    FunctionModificationList modifications(const TypeSystemTypeEntry *entry) const;
+    bool hasCodeInjections(const MetaClass *implementor, TS::Language language, const QSet<CodeSnip::Position>& positions) const;
+    QString throws(const MetaClass *implementor = nullptr) const;
 
-        ArgumentRemove argumentRemoved(int) const;
-        ThreadAffinity argumentThreadAffinity(int) const;
+    // If this function stems from an interface, this returns the
+    // interface that declares it.
+    const MetaClass *interfaceClass() const { return m_interface_class; }
+    void setInterfaceClass(const MetaClass *cl) { m_interface_class = cl; }
 
-        QPair<QMap<int,ArgumentModification>,QList<ArgumentModification>> addedArguments() const;
+    void setPropertySpec(QPropertySpec *spec) { m_property_spec = spec; }
+    QPropertySpec *propertySpec() const { return m_property_spec; }
 
-        QString proxyCall() const;
-        QString argumentReplaced(int key) const;
-        bool needsSuppressUncheckedWarning() const;
-        bool needsSuppressRawTypeWarning() const;
+    const MetaTemplateParameterList & templateParameters() const {
+        return m_templateParameters;
+    }
 
-        bool hasModifications(const MetaClass *implementor) const;
-        FunctionModificationList modifications(const MetaClass *implementor) const;
-        bool hasCodeInjections(const MetaClass *implementor, TS::Language language, const QSet<CodeSnip::Position>& positions) const;
-        QString throws(const MetaClass *implementor = nullptr) const;
+    void setTemplateParameters(const MetaTemplateParameterList & templateParameters) {
+        m_templateParameters = templateParameters;
+    }
 
-        // If this function stems from an interface, this returns the
-        // interface that declares it.
-        const MetaClass *interfaceClass() const { return m_interface_class; }
-        void setInterfaceClass(const MetaClass *cl) { m_interface_class = cl; }
+    void addTemplateParameter(MetaTemplateParameter* templateParameter) {
+        m_templateParameters << templateParameter;
+    }
 
-        void setPropertySpec(QPropertySpec *spec) { m_property_spec = spec; }
-        QPropertySpec *propertySpec() const { return m_property_spec; }
+    const MetaField *accessedField() const { return m_accessedField; }
 
-        const MetaTemplateParameterList & templateParameters() const {
-            return m_templateParameters;
-        }
+    void setAccessedField(const MetaField *accessedField) { m_accessedField = accessedField; }
+    void setDeprecatedComment(const QString &deprecatedComment) { m_deprecatedComment = deprecatedComment; }
+    const QString& deprecatedComment() const { return m_deprecatedComment; }
 
-        void setTemplateParameters(const MetaTemplateParameterList & templateParameters) {
-            m_templateParameters = templateParameters;
-        }
+    bool isVariadics() const { return m_variadics; }
+    void setVariadics(bool isVariadics) { m_variadics = isVariadics; }
+    bool isExplicit() const { return m_explicit; }
+    void setExplicit(bool isExplicit) { m_explicit = isExplicit; }
 
-        void addTemplateParameter(MetaTemplateParameter* templateParameter) {
-            m_templateParameters << templateParameter;
-        }
+    MetaType::ReferenceType functionReferenceType() const{
+        return m_functionReferenceType;
+    }
 
-        const MetaField *accessedField() const { return m_accessedField; }
+    void setFunctionReferenceType(MetaType::ReferenceType functionReferenceType) {
+        m_functionReferenceType = functionReferenceType;
+    }
 
-        void setAccessedField(const MetaField *accessedField) { m_accessedField = accessedField; }
-        void setDeprecatedComment(const QString &deprecatedComment) { m_deprecatedComment = deprecatedComment; }
-        const QString& deprecatedComment() const { return m_deprecatedComment; }
+    MetaFunction* functionTemplate() const{
+        return m_functionTemplate;
+    }
 
-        bool isVariadics() const { return m_variadics; }
-        void setVariadics(bool isVariadics) { m_variadics = isVariadics; }
-        bool isExplicit() const { return m_explicit; }
-        void setExplicit(bool isExplicit) { m_explicit = isExplicit; }
+    void setFunctionTemplate(MetaFunction* functionTemplate) {
+        m_functionTemplate = functionTemplate;
+    }
 
-        MetaType::ReferenceType functionReferenceType() const{
-            return m_functionReferenceType;
-        }
+    QList<Parameter> addedParameterTypes() const;
 
-        void setFunctionReferenceType(MetaType::ReferenceType functionReferenceType) {
-            m_functionReferenceType = functionReferenceType;
-        }
+    OperatorType operatorType() const{return m_operatorType;}
 
-        MetaFunction* functionTemplate() const{
-            return m_functionTemplate;
-        }
+    void setOperatorType(OperatorType operatorType){ m_operatorType = operatorType; }
 
-        void setFunctionTemplate(MetaFunction* functionTemplate) {
-            m_functionTemplate = functionTemplate;
-        }
-
-        QList<Parameter> addedParameterTypes() const;
-
-    private:
-        QString m_name;
-        QString m_original_name;
-        QString m_original_signature;
-        mutable QString m_cached_full_signature;
-        mutable QString m_cached_full_signature_no_name;
-        mutable QString m_cached_minimal_signature;
-        mutable QString m_cached_minimal_template_signature;
-        mutable QString m_cached_modified_name;
-
-        FunctionType m_function_type;
-        MetaType *m_type;
-        const MetaClass *m_class;
-        const MetaClass *m_implementing_class;
-        const MetaClass *m_declaring_class;
-        const MetaClass *m_interface_class;
-        QPropertySpec *m_property_spec;
-        MetaArgumentList m_arguments;
-        MetaTemplateParameterList m_templateParameters;
-        uint m_constant          : 1;
-        uint m_variadics         : 1;
-        uint m_explicit          : 1;
-        uint m_invalid           : 1;
-        mutable int m_actualMinimumArgumentCount;
-        const MetaField *m_accessedField;
-        QString m_deprecatedComment;
-        MetaType::ReferenceType m_functionReferenceType;
-        MetaFunction* m_functionTemplate;
+private:
+    QString m_name;
+    QString m_original_name;
+    QString m_original_signature;
+    mutable QString m_cached_full_signature;
+    mutable QString m_cached_full_signature_no_name;
+    mutable QString m_cached_minimal_signature;
+    mutable QString m_cached_modified_name;
+
+    FunctionType m_function_type;
+    MetaType *m_type;
+    const MetaClass *m_class;
+    const MetaClass *m_implementing_class;
+    const MetaClass *m_declaring_class;
+    const MetaClass *m_interface_class;
+    QPropertySpec *m_property_spec;
+    MetaArgumentList m_arguments;
+    MetaTemplateParameterList m_templateParameters;
+    OperatorType m_operatorType;
+    uint m_constant          : 1;
+    uint m_variadics         : 1;
+    uint m_explicit          : 1;
+    uint m_template          : 1;
+    uint m_invalid           : 1;
+    mutable int m_actualMinimumArgumentCount;
+    const MetaField *m_accessedField;
+    QString m_deprecatedComment;
+    MetaType::ReferenceType m_functionReferenceType;
+    MetaFunction* m_functionTemplate;
 };
 
 class MetaEnum;
 
 class MetaEnumValue {
-    public:
-        MetaEnumValue()
-                : m_value(), _M_deprecated(false) {
-        }
+public:
+    MetaEnumValue()
+            : m_value(), _M_deprecated(false) {
+    }
 
-        const QVariant& value() const { return m_value; }
-        void setValue(const QVariant& value) { m_value = value; }
+    const QVariant& value() const { return m_value; }
+    void setValue(const QVariant& value) { m_value = value; }
 
-        const QString& stringValue() const { return m_string_value; }
-        void setStringValue(const QString &v) { m_string_value = v; }
+    const QString& stringValue() const { return m_string_value; }
+    void setStringValue(const QString &v) { m_string_value = v; }
 
-        const QString& name() const { return m_name; }
-        void setName(const QString &name) { m_name = name; }
-        QString cppName() const;
+    const QString& name() const { return m_name; }
+    void setName(const QString &name) { m_name = name; }
+    QString cppName() const;
 
-        const MetaEnum * getEnum(){ return m_enum;}
-        void setEnum(const MetaEnum * enm) {m_enum = enm;}
-        bool deprecated() const { return _M_deprecated; }
-        void setDeprecated(bool value) { _M_deprecated = value; }
-        void setDeprecatedComment(const QString &deprecatedComment) { m_deprecatedComment = deprecatedComment; }
-        const QString& deprecatedComment() const { return m_deprecatedComment; }
+    const MetaEnum * getEnum(){ return m_enum;}
+    void setEnum(const MetaEnum * enm) {m_enum = enm;}
+    bool deprecated() const { return _M_deprecated; }
+    void setDeprecated(bool value) { _M_deprecated = value; }
+    void setDeprecatedComment(const QString &deprecatedComment) { m_deprecatedComment = deprecatedComment; }
+    const QString& deprecatedComment() const { return m_deprecatedComment; }
 
-    private:
-        const MetaEnum * m_enum;
-        QString m_name;
-        QString m_string_value;
+private:
+    const MetaEnum * m_enum;
+    QString m_name;
+    QString m_string_value;
 
-        QVariant m_value;
-        bool _M_deprecated;
-        QString m_deprecatedComment;
+    QVariant m_value;
+    bool _M_deprecated;
+    QString m_deprecatedComment;
 };
 
 
@@ -972,6 +972,7 @@ class MetaFunctional : public MetaAttributes {
         bool isRethrowExceptions() const;
         bool nullPointersDisabled(int argument_idx = 0) const;
         bool needsCallThrough() const;
+        bool needsReturnScope() const;
 
     private:
         QString m_base_type_name;
@@ -1019,64 +1020,17 @@ class MetaClass : public MetaAttributes {
             VirtualSlots           = 0x1000000     // Only functions that are set as virtual slots in the type system
         };
 
-        MetaClass()
-                : MetaAttributes(),
-                  m_namespace(false),
-                m_qobject(false),
-                m_has_virtuals(false),
-                m_has_nonpublic(false),
-                m_has_virtual_slots(false),
-                m_has_justprivateconstructors(false),
-                m_has_standardconstructor(0),
-                m_has_publicstandardconstructor(0),
-                m_has_explicitstandardconstructor(0),
-                m_has_publiccopyconstructor(0),
-                m_has_explicitcopyconstructor(0),
-                m_has_unimplmentablePureVirtualFunctions(false),
-                m_unimplmentablePureVirtualFunctions(),
-                m_functions_fixed(false),
-                m_has_public_destructor(true),
-                m_has_private_destructor(false),
-                m_has_metaObject(false),
-                m_has_metacall(false),
-                m_has_metacast(false),
-                m_has_private_metaObject(false),
-                m_has_private_metacall(false),
-                m_has_private_metacast(false),
-                m_has_virtual_destructor(false),
-                m_has_hash_function(false),
-                m_needs_hash_workaround(false),
-                m_has_equals_operator(false),
-                m_has_clone_operator(false),
-                m_is_type_alias(false),
-                m_has_Q_GADGET(false),
-                m_has_Q_OBJECT(false),
-                m_has_subClasses(false),
-                m_usingProtectedBaseConstructors(false),
-                m_usingPublicBaseConstructors(false),
-                m_enclosing_class(nullptr),
-                m_base_class(nullptr),
-                m_typeAliasType(nullptr),
-                m_template_base_class(nullptr),
-                m_template_base_class_instantiations(),
-                m_extracted_interface(nullptr),
-                m_extracted_interface_impl(nullptr),
-                m_primary_interface_implementor(nullptr),
-                m_type_entry(nullptr),
-                m_qDebug_stream_function(nullptr){
-        }
-
+        MetaClass();
         virtual ~MetaClass();
 
         MetaClass *extractInterface();
         MetaClass *extractInterfaceImpl();
         MetaClass *extractInterface()const;
         MetaClass *extractInterfaceImpl()const;
-        void fixFunctions(std::function<MetaArgument*(TypeEntry *)> argumentCreator);
         void fixUnimplmentablePureVirtualFunctions();
 
-        const MetaFunctionList& functions() const { return m_functions; }
-        const MetaFunctionList& invalidFunctions() const { return m_invalidfunctions; }
+        const MetaFunctionList& functions() const;
+        const MetaFunctionList& invalidFunctions() const;
         void setFunctions(const MetaFunctionList &functions);
         void addFunction(MetaFunction *function);
         bool hasFunction(const MetaFunction *f) const;
@@ -1219,8 +1173,8 @@ class MetaClass : public MetaAttributes {
         bool hasProtectedFieldAccessors() const;
 
         // only valid during metajavabuilder's run
-        const QList<QPair<QString,bool>>& baseClassNames() const { return m_base_class_names; }
-        void setBaseClassNames(const QList<QPair<QString,bool>> &names) { m_base_class_names = names; }
+        const QList<QPair<TypeInfo,bool>>& baseClassTypeInfo() const { return m_base_class_typeinfo; }
+        void setBaseClassTypeInfo(const QList<QPair<TypeInfo,bool>> &names) { m_base_class_typeinfo = names; }
 
         MetaClass *primaryInterfaceImplementor() const { return m_primary_interface_implementor; }
         void setPrimaryInterfaceImplementor(MetaClass *cl) { m_primary_interface_implementor = cl; }
@@ -1235,8 +1189,8 @@ class MetaClass : public MetaAttributes {
         void setNeedsHashWorkaround(bool on) { m_needs_hash_workaround = on; }
         bool needsHashWorkaround() const { return m_needs_hash_workaround; }
 
-        void setToStringCapability(FunctionModelItem fun) { m_qDebug_stream_function = fun; }
-        const FunctionModelItem& toStringCapability() const { return m_qDebug_stream_function; }
+        void setToStringCapability(const MetaFunction* fun) { m_qDebug_stream_function = fun; }
+        const MetaFunction* toStringCapability() const { return m_qDebug_stream_function; }
 
         virtual bool hasDefaultToStringFunction() const;
 
@@ -1318,10 +1272,18 @@ class MetaClass : public MetaAttributes {
         }
         const QMap<QString,MetaFunctional*>& functionalByUsing(){ return m_functionalByUsing; }
 
+        const QMap<QString,MetaFunction*>& functionBySignature(){ return m_functionsBySignature; }
+
         void setDeprecatedComment(const QString &deprecatedComment) { m_deprecatedComment = deprecatedComment; }
         const QString& deprecatedComment() const { return m_deprecatedComment; }
+
+        void setQHashScope(const QString &qHashScope) { m_qHashScope = qHashScope; }
+        const QString& qHashScope() const { return m_qHashScope; }
+
         void setUsingProtectedBaseConstructors(bool usingBaseConstructors){m_usingProtectedBaseConstructors = usingBaseConstructors;}
         void setUsingPublicBaseConstructors(bool usingBaseConstructors){m_usingPublicBaseConstructors = usingBaseConstructors;}
+        bool usingProtectedBaseConstructors() const {return m_usingProtectedBaseConstructors;}
+        bool usingPublicBaseConstructors() const {return m_usingPublicBaseConstructors;}
         bool hasPaintMethod() const;
         bool hasQmlListProperty() const;
 private:
@@ -1342,7 +1304,6 @@ class MetaClass : public MetaAttributes {
     mutable int m_has_publicassignment : 2;
     uint m_has_unimplmentablePureVirtualFunctions : 1;
     QSet<QString> m_unimplmentablePureVirtualFunctions;
-    uint m_functions_fixed : 1;
     uint m_has_public_destructor : 1;
     uint m_has_private_destructor : 1;
     uint m_has_metaObject : 1;
@@ -1370,6 +1331,7 @@ class MetaClass : public MetaAttributes {
         const MetaClass *m_template_base_class;
         QList<const MetaType *> m_template_base_class_instantiations;
         MetaFunctionList m_functions;
+        QMap<QString,MetaFunction*> m_functionsBySignature;
         MetaFunctionList m_invalidfunctions;
         MetaFieldList m_fields;
         MetaEnumList m_enums;
@@ -1392,11 +1354,12 @@ class MetaClass : public MetaAttributes {
         MetaFunctionList m_beginFunctions;
         MetaFunctionList m_endFunctions;
 
-        QList<QPair<QString,bool>> m_base_class_names;
+        QList<QPair<TypeInfo,bool>> m_base_class_typeinfo;
         QList<TypeEntry *> m_template_args;
         ComplexTypeEntry *m_type_entry;
-        FunctionModelItem m_qDebug_stream_function;
+        const MetaFunction* m_qDebug_stream_function;
         QString m_deprecatedComment;
+        QString m_qHashScope;
 };
 
 class QPropertySpec {
diff --git a/src/cpp/QtJambiGenerator/parser/ast.h b/src/cpp/QtJambiGenerator/parser/ast.h
index fd7d088a..381b7744 100644
--- a/src/cpp/QtJambiGenerator/parser/ast.h
+++ b/src/cpp/QtJambiGenerator/parser/ast.h
@@ -301,7 +301,7 @@ struct BinaryExpressionAST: public ExpressionAST {
     DECLARE_AST_NODE(BinaryExpression)
 
     std::size_t op;
-    bool op2;
+    unsigned opLength;
     ExpressionAST *left_expression;
     ExpressionAST *right_expression;
 };
@@ -646,9 +646,7 @@ struct OperatorAST: public AST {
     DECLARE_AST_NODE(Operator)
 
     std::size_t op;
-    bool op2;
-    std::size_t open;
-    std::size_t close;
+    unsigned opLength;
 };
 
 struct OperatorFunctionIdAST: public AST {
@@ -901,7 +899,6 @@ struct UsingAsAST: public DeclarationAST {
     NameAST *name;
     TypeSpecifierAST* type_specifier;
     DeclaratorAST *declarator;
-    ParameterDeclarationClauseAST *parameters;
 };
 
 struct QGadgetAST: public DeclarationAST {
diff --git a/src/cpp/QtJambiGenerator/parser/binder.cpp b/src/cpp/QtJambiGenerator/parser/binder.cpp
index baecb0e5..6f75b2c4 100644
--- a/src/cpp/QtJambiGenerator/parser/binder.cpp
+++ b/src/cpp/QtJambiGenerator/parser/binder.cpp
@@ -64,12 +64,19 @@ void binder_default_message_handler(const std::string &str) {
 
 MessageHandler Binder::_M_message_handler = binder_default_message_handler;
 
-Binder::Binder(CodeModel *__model, LocationManager &__location, Control *__control)
+Binder::Binder(uint qtVersionMajor, uint qtVersionMinor, uint qtVersionPatch, const TS::TypeDatabase& database,
+               CodeModelPtr __model, LocationManager &__location, Control *__control)
         : _M_model(__model),
         _M_location(__location),
         _M_token_stream(&_M_location.token_stream),
         _M_control(__control),
         _M_current_function_type(CodeModel::Normal),
+        _M_current_is_template(false),
+        m_qtVersionMajor(qtVersionMajor),
+        m_qtVersionMinor(qtVersionMinor),
+        m_qtVersionPatch(qtVersionPatch),
+        m_database(database),
+        class_cc(this),
         type_cc(this),
         name_cc(this),
         decl_cc(this) {
@@ -85,18 +92,10 @@ Binder::Binder(CodeModel *__model, LocationManager &__location, Control *__contr
 Binder::~Binder() {
 }
 
-FileModelItem Binder::run(AST *node) {
-    FileModelItem old = _M_current_file;
+void Binder::run(AST *node) {
     _M_current_access = CodeModel::Public;
-
-    _M_current_file = model()->create<FileModelItem>();
-    updateItemPosition(_M_current_file->toItem(), node);
+    updateItemPosition(_M_model->globalNamespace()->toItem(), node);
     visit(node);
-    FileModelItem result = _M_current_file;
-
-    _M_current_file = old; // restore
-
-    return result;
 }
 
 ScopeModelItem Binder::currentScope() {
@@ -105,7 +104,14 @@ ScopeModelItem Binder::currentScope() {
     else if (_M_current_namespace)
         return model_static_cast<ScopeModelItem>(_M_current_namespace);
 
-    return model_static_cast<ScopeModelItem>(_M_current_file);
+    return model_static_cast<ScopeModelItem>(_M_model->globalNamespace());
+}
+
+
+bool Binder::changeIsTemplate(bool currentIsTemplate){
+    bool c = _M_current_is_template;
+    _M_current_is_template = currentIsTemplate;
+    return c;
 }
 
 TemplateParameterList Binder::changeTemplateParameters(TemplateParameterList templateParameters) {
@@ -246,22 +252,71 @@ void Binder::declare_symbol(SimpleDeclarationAST *node, InitDeclaratorAST *init_
 
     CodeModelFinder finder(model(), this);
     ScopeModelItem symbolScope = finder.resolveScope(id, currentScope());
-    if (! symbolScope) {
-        name_cc.run(id);
-        _M_message_handler(std::string("scope not found for symbol: ") + qPrintable(name_cc.name()));
-        return;
+    if (!symbolScope) {
+        name_cc.run(declarator->id);
+        QStringList qualifiedName = name_cc.qualifiedName();
+        QString name = qualifiedName.isEmpty() ? QString() : qualifiedName.takeLast();
+        bool isTemplate = false;
+        for(QString& n : qualifiedName){
+            auto idx = n.indexOf('<');
+            if(idx>0){
+                n = n.mid(0, idx);
+                isTemplate = true;
+            }
+        }
+        if(currentScope()){
+            if(isTemplate){
+                symbolScope = model_dynamic_cast<ScopeModelItem> (model()->findItem(qualifiedName, currentScope()));
+            }
+            if(!symbolScope){
+                if (TypeAliasModelItem __alias = currentScope()->findTypeAlias(qualifiedName.join("::"))){
+                    const TypeInfo& typeInfo = __alias->type();
+                    if(!typeInfo.isConstant()
+                            && !typeInfo.isFunctionPointer()
+                            && !typeInfo.isVariadic()
+                            && !typeInfo.isVolatile()
+                            && typeInfo.getReferenceType()==TypeInfo::NoReference
+                            && typeInfo.indirections().isEmpty()
+                            && typeInfo.arguments().isEmpty()){
+                        QString typeName = typeInfo.toString();
+                        symbolScope = model_dynamic_cast<ScopeModelItem> (model()->findItem(typeInfo.qualifiedName(), currentScope()));
+                    }
+                }
+            }
+        }
+        if(!symbolScope && isTemplate){
+            symbolScope = model_dynamic_cast<ScopeModelItem> (model()->findItem(qualifiedName, model()->globalNamespace()));
+        }
+        if(!symbolScope){
+            if (TypeAliasModelItem __alias = model()->globalNamespace()->findTypeAlias(qualifiedName.join("::"))){
+                const TypeInfo& typeInfo = __alias->type();
+                if(!typeInfo.isConstant()
+                        && !typeInfo.isFunctionPointer()
+                        && !typeInfo.isVariadic()
+                        && !typeInfo.isVolatile()
+                        && typeInfo.getReferenceType()==TypeInfo::NoReference
+                        && typeInfo.indirections().isEmpty()
+                        && typeInfo.arguments().isEmpty()){
+                    QString typeName = typeInfo.toString();
+                    symbolScope = model_dynamic_cast<ScopeModelItem> (model()->findItem(typeInfo.qualifiedName(), model()->globalNamespace()));
+                }
+            }
+        }
+        if (!symbolScope) {
+            if(_M_message_handler && !isTemplate)
+                _M_message_handler(std::string("scope not found for symbol: ") + qPrintable(name_cc.name()));
+            return;
+        }
     }
 
     decl_cc.run(declarator);
 
     if (decl_cc.isFunction()) {
-        name_cc.run(id->unqualified_name);
-
         FunctionModelItem fun = model()->create<FunctionModelItem>();
         updateItemPosition(fun->toItem(), node);
         fun->setAccessPolicy(_M_current_access);
         fun->setFunctionType(_M_current_function_type);
-        fun->setName(name_cc.name());
+        fun->setName(decl_cc.id().split("::").last());
         fun->setAbstract(false);
         if(init_declarator->initializer){
             if(init_declarator->initializer->initializer_clause
@@ -299,7 +354,11 @@ void Binder::declare_symbol(SimpleDeclarationAST *node, InitDeclaratorAST *init_
             }
         }
         fun->setDeclFinal(declarator->decl_final != nullptr);
+        fun->setTemplate(_M_current_is_template);
         fun->setTemplateParameters(_M_current_template_parameters);
+        if(_M_current_is_template){
+            fun->setTemplateInstantiations(name_cc.templateArgumentTypes());
+        }
         applyStorageSpecifiers(node->storage_specifiers, model_static_cast<MemberModelItem>(fun));
         applyFunctionSpecifiers(node->function_specifiers, fun);
         if(fun->isDeprecated() && node->deprecationComment){
@@ -324,13 +383,28 @@ void Binder::declare_symbol(SimpleDeclarationAST *node, InitDeclaratorAST *init_
         }
 
         // build the type
-        TypeInfo typeInfo = CompilerUtils::typeDescription(node->type_specifier,
-                            declarator,
-                            this);
+        type_cc.run(node->type_specifier);
+        TypeInfo typeInfo;
+        typeInfo.setQualifiedName(type_cc.qualifiedName());
+        typeInfo.setVariadic(type_cc.isVariadic());
+        typeInfo.setConstant(type_cc.isConstant());
+        typeInfo.setVolatile(type_cc.isVolatile());
+        typeInfo.setReferenceType(TypeInfo::ReferenceType(decl_cc.getReferenceType()));
+        typeInfo.setIndirections(decl_cc.indirection());
+        typeInfo.setArrayElements(decl_cc.arrayElements());
+        typeInfo.setArguments(type_cc.templateArgumentTypes());
+        typeInfo.setFunctionalArgumentTypes(type_cc.functionalArgumentTypes());
+        typeInfo.setFunctionalArgumentNames(type_cc.functionalArgumentNames());
+        if(!type_cc.functionalReturnType().qualifiedName().isEmpty())
+            typeInfo.setFunctionalReturnType(type_cc.functionalReturnType());
 
         fun->setType(qualifyType(typeInfo, symbolScope->qualifiedName()));
-
-
+        if(decl_cc.operatorType()==OperatorType::TypeCast){
+            if(!decl_cc.operatorCastType().qualifiedName().isEmpty()){
+                fun->setType(decl_cc.operatorCastType());
+            }
+        }
+        fun->setOperatorType(decl_cc.operatorType());
         fun->setVariadics(decl_cc.isVariadics());
 
         // ... and the signature
@@ -361,13 +435,30 @@ void Binder::declare_symbol(SimpleDeclarationAST *node, InitDeclaratorAST *init_
     } else {
         VariableModelItem var = model()->create<VariableModelItem>();
         updateItemPosition(var->toItem(), node);
+        var->setTemplate(_M_current_is_template);
         var->setTemplateParameters(_M_current_template_parameters);
+        if(_M_current_is_template){
+            var->setTemplateInstantiations(name_cc.templateArgumentTypes());
+        }
         var->setAccessPolicy(_M_current_access);
         name_cc.run(id->unqualified_name);
         var->setName(name_cc.name());
-        TypeInfo typeInfo = CompilerUtils::typeDescription(node->type_specifier,
-                            declarator,
-                            this);
+
+        type_cc.run(node->type_specifier);
+        TypeInfo typeInfo;
+        typeInfo.setQualifiedName(type_cc.qualifiedName());
+        typeInfo.setVariadic(type_cc.isVariadic());
+        typeInfo.setConstant(type_cc.isConstant());
+        typeInfo.setVolatile(type_cc.isVolatile());
+        typeInfo.setReferenceType(TypeInfo::ReferenceType(decl_cc.getReferenceType()));
+        typeInfo.setIndirections(decl_cc.indirection());
+        typeInfo.setArrayElements(decl_cc.arrayElements());
+        typeInfo.setArguments(type_cc.templateArgumentTypes());
+        typeInfo.setFunctionalArgumentTypes(type_cc.functionalArgumentTypes());
+        typeInfo.setFunctionalArgumentNames(type_cc.functionalArgumentNames());
+        if(!type_cc.functionalReturnType().qualifiedName().isEmpty())
+            typeInfo.setFunctionalReturnType(type_cc.functionalReturnType());
+
         if (node->type_specifier && node->type_specifier->cv) {
             const ListNode<std::size_t> *it = node->type_specifier->cv->toFront();
             const ListNode<std::size_t> *end = it;
@@ -390,12 +481,15 @@ void Binder::declare_symbol(SimpleDeclarationAST *node, InitDeclaratorAST *init_
         }
         if (declarator != init_declarator->declarator
                 && init_declarator->declarator->parameter_declaration_clause != nullptr) {
-            typeInfo.setFunctionPointer(true);
+            TypeInfo fpTypeInfo;
+            fpTypeInfo.setFunctionPointer(true);
+            fpTypeInfo.setFunctionalReturnType(typeInfo);
             decl_cc.run(init_declarator->declarator);
             for(const DeclaratorCompiler::Parameter& p : decl_cc.parameters()){
-                typeInfo.addArgument(p.type);
-                typeInfo.addArgumentName(p.name);
+                fpTypeInfo.addFunctionalArgumentType(p.type);
+                fpTypeInfo.addFunctionalArgumentName(p.name);
             }
+            typeInfo = fpTypeInfo;
         }
 
         var->setType(qualifyType(typeInfo, _M_context));
@@ -428,20 +522,70 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node) {
     CodeModelFinder finder(model(), this);
 
     ScopeModelItem functionScope = finder.resolveScope(declarator->id, scope);
-    if (_M_message_handler && ! functionScope) {
+    if (!functionScope) {
         name_cc.run(declarator->id);
-        _M_message_handler(std::string("scope not found for function definition: '")
-                           + qPrintable(name_cc.name())
-                           + std::string("' - definition *ignored*"));
-        return;
+        QStringList qualifiedName = name_cc.qualifiedName();
+        QString name = qualifiedName.isEmpty() ? QString() : qualifiedName.takeLast();
+        bool isTemplate = false;
+        for(QString& n : qualifiedName){
+            auto idx = n.indexOf('<');
+            if(idx>0){
+                n = n.mid(0, idx);
+                isTemplate = true;
+            }
+        }
+        if(scope){
+            if(isTemplate){
+                functionScope = model_dynamic_cast<ScopeModelItem> (model()->findItem(qualifiedName, scope));
+            }
+            if(!functionScope){
+                if (TypeAliasModelItem __alias = scope->findTypeAlias(qualifiedName.join("::"))){
+                    TypeInfo typeInfo = __alias->type();
+                    if(!typeInfo.isConstant()
+                            && !typeInfo.isFunctionPointer()
+                            && !typeInfo.isVariadic()
+                            && !typeInfo.isVolatile()
+                            && typeInfo.getReferenceType()==TypeInfo::NoReference
+                            && typeInfo.indirections().isEmpty()
+                            && typeInfo.arguments().isEmpty()){
+                        QString typeName = typeInfo.toString();
+                        functionScope = model_dynamic_cast<ScopeModelItem> (model()->findItem(typeInfo.qualifiedName(), scope));
+                    }
+                }
+            }
+        }
+        if(!functionScope && isTemplate){
+            functionScope = model_dynamic_cast<ScopeModelItem> (model()->findItem(qualifiedName, model()->globalNamespace()));
+        }
+        if(!functionScope){
+            if (TypeAliasModelItem __alias = model()->globalNamespace()->findTypeAlias(qualifiedName.join("::"))){
+                TypeInfo typeInfo = __alias->type();
+                if(!typeInfo.isConstant()
+                        && !typeInfo.isFunctionPointer()
+                        && !typeInfo.isVariadic()
+                        && !typeInfo.isVolatile()
+                        && typeInfo.getReferenceType()==TypeInfo::NoReference
+                        && typeInfo.indirections().isEmpty()
+                        && typeInfo.arguments().isEmpty()){
+                    QString typeName = typeInfo.toString();
+                    functionScope = model_dynamic_cast<ScopeModelItem> (model()->findItem(typeInfo.qualifiedName(), model()->globalNamespace()));
+                }
+            }
+        }
+        if(!functionScope){
+            if(_M_message_handler && !isTemplate)
+                _M_message_handler(std::string("scope not found for function definition: '")
+                               + qPrintable(name_cc.name())
+                               + std::string("' - definition *ignored*"));
+            return;
+        }
     }
 
     decl_cc.run(declarator);
 
     Q_ASSERT(! decl_cc.id().isEmpty());
 
-    FunctionDefinitionModelItem
-    old = changeCurrentFunction(_M_model->create<FunctionDefinitionModelItem>());
+    FunctionDefinitionModelItem old = changeCurrentFunction(_M_model->create<FunctionDefinitionModelItem>());
     _M_current_function->setScope(functionScope->qualifiedName());
     updateItemPosition(_M_current_function->toItem(), node);
 
@@ -450,12 +594,30 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node) {
     QString unqualified_name = name_cc.name();
 
     _M_current_function->setName(unqualified_name);
-    TypeInfo tmp_type = CompilerUtils::typeDescription(node->type_specifier,
-                        declarator, this);
 
-    _M_current_function->setType(qualifyType(tmp_type, _M_context));
+    type_cc.run(node->type_specifier);
+    TypeInfo typeInfo;
+    typeInfo.setQualifiedName(type_cc.qualifiedName());
+    typeInfo.setVariadic(type_cc.isVariadic());
+    typeInfo.setConstant(type_cc.isConstant());
+    typeInfo.setVolatile(type_cc.isVolatile());
+    typeInfo.setReferenceType(TypeInfo::ReferenceType(decl_cc.getReferenceType()));
+    typeInfo.setIndirections(decl_cc.indirection());
+    typeInfo.setArrayElements(decl_cc.arrayElements());
+    typeInfo.setArguments(type_cc.templateArgumentTypes());
+    typeInfo.setFunctionalArgumentTypes(type_cc.functionalArgumentTypes());
+    typeInfo.setFunctionalArgumentNames(type_cc.functionalArgumentNames());
+    if(!type_cc.functionalReturnType().qualifiedName().isEmpty())
+        typeInfo.setFunctionalReturnType(type_cc.functionalReturnType());
+
+    _M_current_function->setType(qualifyType(typeInfo, _M_context));
     _M_current_function->setAccessPolicy(_M_current_access);
     _M_current_function->setFunctionType(_M_current_function_type);
+    _M_current_function->setOperatorType(decl_cc.operatorType());
+    if(_M_current_function->operatorType()==OperatorType::TypeCast){
+        if(!decl_cc.operatorCastType().qualifiedName().isEmpty())
+            _M_current_function->setType(decl_cc.operatorCastType());
+    }
     if(declarator->fun_cv){
         for(int i=0; i<declarator->fun_cv->count(); ++i){
             int kind = decode_token(declarator->fun_cv->at(i)->element);
@@ -476,7 +638,11 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node) {
             _M_current_function->setReferenceType(TypeInfo::Reference);
         }
     }
+    _M_current_function->setTemplate(_M_current_is_template);
     _M_current_function->setTemplateParameters(_M_current_template_parameters);
+    if(_M_current_is_template){
+        _M_current_function->setTemplateInstantiations(name_cc.templateArgumentTypes());
+    }
     _M_current_function->setDeclFinal(declarator->decl_final != nullptr);
     _M_current_function->setHasBody(node->function_body);
 
@@ -553,70 +719,71 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node) {
 
 void Binder::visitTemplateDeclaration(TemplateDeclarationAST *node) {
     const ListNode<TemplateParameterAST*> *it = node->template_parameters;
-    if (!it)
-        return;
 
     TemplateParameterList savedTemplateParameters = changeTemplateParameters(TemplateParameterList());
+    bool oldIsTemplate = changeIsTemplate(true);
+    auto sc = qScopeGuard([&](){
+        changeTemplateParameters(savedTemplateParameters);
+        changeIsTemplate(oldIsTemplate);
+    });
+
+    if (it){
+        it = it->toFront();
+        const ListNode<TemplateParameterAST*> *end = it;
+
+        do{
+            TemplateParameterAST *parameter = it->element;
+            TypeParameterAST *type_parameter = parameter->type_parameter;
+
+            QString defaultType;
+            NameAST *name;
+            bool isVariadic = false;
+            if (!type_parameter) {
+                // A hacky hack to work around missing support for parameter declarations in
+                // templates. We just need the to get the name of the variable, since we
+                // aren't actually compiling these anyway. We are still not supporting much
+                // more, but we are refusing to fail for a few more declarations
+                if (parameter->parameter_declaration == nullptr ||
+                        parameter->parameter_declaration->declarator == nullptr ||
+                        parameter->parameter_declaration->declarator->id == nullptr) {
+                    changeTemplateParameters(savedTemplateParameters);
+                    return;
 
-    it = it->toFront();
-    const ListNode<TemplateParameterAST*> *end = it;
-
-    TemplateParameterList templateParameters;
-    do {
-        TemplateParameterAST *parameter = it->element;
-        TypeParameterAST *type_parameter = parameter->type_parameter;
-
-        QString defaultType;
-        NameAST *name;
-        bool isVariadic = false;
-        if (!type_parameter) {
-            // A hacky hack to work around missing support for parameter declarations in
-            // templates. We just need the to get the name of the variable, since we
-            // aren't actually compiling these anyway. We are still not supporting much
-            // more, but we are refusing to fail for a few more declarations
-            if (parameter->parameter_declaration == nullptr ||
-                    parameter->parameter_declaration->declarator == nullptr ||
-                    parameter->parameter_declaration->declarator->id == nullptr) {
-                changeTemplateParameters(savedTemplateParameters);
-                return;
-
-            }
+                }
 
-            isVariadic = parameter->parameter_declaration->declarator->ellipsis!=0 && parameter->parameter_declaration->declarator->ellipsis!=std::numeric_limits<std::size_t>::max();
-            name = parameter->parameter_declaration->declarator->id;
-            if(parameter->parameter_declaration->expression){
-                defaultType = parameter->parameter_declaration->expression->toString(this->tokenStream());
-            }
-        } else {
-            int tk = decode_token(type_parameter->type);
-            if (tk != Token_typename && tk != Token_class) {
-                changeTemplateParameters(savedTemplateParameters);
-                return;
-            }
-            assert(tk == Token_typename || tk == Token_class);
-
-            isVariadic = type_parameter->ellipsis!=0 && type_parameter->ellipsis!=std::numeric_limits<std::size_t>::max();
-            name = type_parameter->name;
-            if(type_parameter->type_id){
-                defaultType = type_parameter->type_id->toString(this->tokenStream());
-            }else if(type_parameter->type_expression){
-                defaultType = type_parameter->type_expression->toString(this->tokenStream());
+                isVariadic = parameter->parameter_declaration->declarator->ellipsis!=0 && parameter->parameter_declaration->declarator->ellipsis!=std::numeric_limits<std::size_t>::max();
+                name = parameter->parameter_declaration->declarator->id;
+                if(parameter->parameter_declaration->expression){
+                    defaultType = parameter->parameter_declaration->expression->toString(this->tokenStream());
+                }
+            } else {
+                int tk = decode_token(type_parameter->type);
+                if (tk != Token_typename && tk != Token_class) {
+                    return;
+                }
+                assert(tk == Token_typename || tk == Token_class);
+
+                isVariadic = type_parameter->ellipsis!=0 && type_parameter->ellipsis!=std::numeric_limits<std::size_t>::max();
+                name = type_parameter->name;
+                if(type_parameter->type_id){
+                    defaultType = type_parameter->type_id->toString(this->tokenStream());
+                }else if(type_parameter->type_expression){
+                    defaultType = type_parameter->type_expression->toString(this->tokenStream());
+                }
             }
-        }
 
-        TemplateParameterModelItem p = model()->create<TemplateParameterModelItem>();
-        name_cc.run(name);
-        p->setName(name_cc.name());
-        p->setIsVaradic(isVariadic);
-        p->setDefaultValue(defaultType);
+            TemplateParameterModelItem p = model()->create<TemplateParameterModelItem>();
+            name_cc.run(name);
+            p->setName(name_cc.name());
+            p->setIsVaradic(isVariadic);
+            p->setDefaultValue(defaultType);
 
-        _M_current_template_parameters.append(p);
-        it = it->next;
-    } while (it != end);
+            _M_current_template_parameters.append(p);
+            it = it->next;
+        }while (it != end);
+    }
 
     visit(node->declaration);
-
-    changeTemplateParameters(savedTemplateParameters);
 }
 
 void Binder::visitTypedef(TypedefAST *node) {
@@ -650,19 +817,23 @@ void Binder::visitTypedef(TypedefAST *node) {
         TypeInfo typeInfo = CompilerUtils::typeDescription(node->type_specifier,
                             init_declarator->declarator,
                             this);
+
         DeclaratorAST *decl = init_declarator->declarator;
         while (decl && decl->sub_declarator)
             decl = decl->sub_declarator;
 
-        if (decl != init_declarator->declarator
+        /*if (decl != init_declarator->declarator
                 && init_declarator->declarator->parameter_declaration_clause != nullptr) {
-            typeInfo.setFunctionPointer(true);
+            TypeInfo fpTypeInfo;
+            fpTypeInfo.setFunctionPointer(true);
+            fpTypeInfo.setFunctionalReturnType(typeInfo);
             decl_cc.run(init_declarator->declarator);
             for(const DeclaratorCompiler::Parameter& p : decl_cc.parameters()){
-                typeInfo.addArgument(p.type);
-                typeInfo.addArgumentName(p.name);
+                fpTypeInfo.addFunctionalArgumentType(p.type);
+                fpTypeInfo.addFunctionalArgumentName(p.name);
             }
-        }
+            typeInfo = fpTypeInfo;
+        }*/
 
         ScopeModelItem scope = currentScope();
         DeclaratorAST *declarator = init_declarator->declarator;
@@ -676,6 +847,13 @@ void Binder::visitTypedef(TypedefAST *node) {
         typeAlias->setScope(typedefScope->qualifiedName());
         typeAlias->setAccessPolicy(_M_current_access);
         _M_qualified_types[typeAlias->qualifiedName().join(".")] = QString();
+        if(m_database.findPrimitiveType(alias_name))
+            continue;
+        /*if(typeAlias->fileName().endsWith("qtypes.h"))
+            continue;
+        if(!typeAlias->fileName().endsWith("qtypes.h")
+                && !typeAlias->fileName().endsWith("qglobal.h"))
+        */
         currentScope()->addTypeAlias(typeAlias);
     } while (it != end);
 }
@@ -683,6 +861,7 @@ void Binder::visitTypedef(TypedefAST *node) {
 void Binder::visitNamespace(NamespaceAST *node) {
     bool anonymous = (node->namespace_name == 0);
 
+    bool isNew = false;
     ScopeModelItem scope = currentScope();
 
     NamespaceModelItem old;
@@ -696,8 +875,14 @@ void Binder::visitNamespace(NamespaceAST *node) {
         qualified_name << name.join("::");
         NamespaceModelItem ns =
             model_safe_cast<NamespaceModelItem>(_M_model->findItem(qualified_name,
-                                                _M_current_file->toItem()));
+                                                scope));
+//        if (!ns) {
+//            if (NamespaceModelItem sc = model_static_cast<NamespaceModelItem>(scope)) {
+//                ns = sc->findNamespace(name.join("::"));
+//            }
+//        }
         if (!ns) {
+            isNew = true;
             ns = _M_model->create<NamespaceModelItem>();
             updateItemPosition(ns->toItem(), node);
             ns->setName(name.join("::"));
@@ -716,8 +901,10 @@ void Binder::visitNamespace(NamespaceAST *node) {
 
         _M_context.removeLast();
 
-        if (NamespaceModelItem ns = model_static_cast<NamespaceModelItem>(scope)) {
-            ns->addNamespace(_M_current_namespace);
+        if(isNew){
+            if (NamespaceModelItem ns = model_static_cast<NamespaceModelItem>(scope)) {
+                ns->addNamespace(_M_current_namespace);
+            }
         }
 
         changeCurrentNamespace(old);
@@ -734,9 +921,7 @@ void Binder::visitForwardDeclarationSpecifier(ForwardDeclarationSpecifierAST *no
 }
 
 void Binder::visitClassSpecifier(ClassSpecifierAST *node) {
-    ClassCompiler class_cc(this);
     class_cc.run(node);
-
     if (class_cc.name().isEmpty()) {
         // anonymous not supported
         return;
@@ -745,52 +930,64 @@ void Binder::visitClassSpecifier(ClassSpecifierAST *node) {
     Q_ASSERT(node->name != nullptr && node->name->unqualified_name != nullptr);
 
     ScopeModelItem scope = currentScope();
-
-    ClassModelItem old = changeCurrentClass(_M_model->create<ClassModelItem>());
-    updateItemPosition(_M_current_class->toItem(), node);
-    _M_current_class->setName(class_cc.name());
-    _M_current_class->setDeclFinal(node->is_final);
-    _M_current_class->setDeclDeprecated(node->is_deprecated);
-    _M_current_class->setAccessPolicy(_M_current_access);
+    ClassModelItem thisClass/* = scope->findClass((scope->qualifiedName() << class_cc.name()).join("::"));
+    bool isNewClass = !thisClass;
+    if(isNewClass)
+        thisClass*/ = _M_model->create<ClassModelItem>();
+
+    ClassModelItem old = changeCurrentClass(thisClass);
+    updateItemPosition(thisClass->toItem(), node);
+    thisClass->setName(class_cc.name());
+    thisClass->setDeclFinal(node->is_final);
+    thisClass->setDeclDeprecated(node->is_deprecated);
+    thisClass->setAccessPolicy(_M_current_access);
     if(node->deprecationComment)
-        _M_current_class->setDeclDeprecatedComment(node->deprecationComment->toString(tokenStream()));
+        thisClass->setDeclDeprecatedComment(node->deprecationComment->toString(tokenStream()));
 
-    QList<QPair<QString,bool>> baseClasses = class_cc.baseClasses(); TypeInfo info;
+    QList<QPair<TypeInfo,bool>> baseClasses = class_cc.baseClasses();
     for (int i = 0; i < baseClasses.size(); ++i) {
-        info.setQualifiedName(baseClasses.at(i).first.split("::"));
-        baseClasses[i].first = qualifyType(info, scope->qualifiedName()).qualifiedName().join("::");
+        baseClasses[i].first.setQualifiedName(qualifyType(baseClasses.at(i).first, scope->qualifiedName()).qualifiedName());
     }
 
-    _M_current_class->setBaseClasses(baseClasses);
-    _M_current_class->setClassType(decode_class_type(node->class_key));
-    _M_current_class->setTemplateParameters(_M_current_template_parameters);
-    //_M_current_class->setIsGadget(node->);
+    thisClass->setBaseClasses(baseClasses);
+    thisClass->setClassType(decode_class_type(node->class_key));
+    thisClass->setIsTemplate(_M_current_is_template);
+    thisClass->setTemplateParameters(_M_current_template_parameters);
+    if(_M_current_is_template){
+        thisClass->setTemplateInstantiations(class_cc.templateArgumentTypes());
+    }
+    //thisClass->setIsGadget(node->);
 
-    if (! _M_current_template_parameters.isEmpty()) {
-        QString name = _M_current_class->name();
-        name += "<";
-        for (int i = 0; i < _M_current_template_parameters.size(); ++i) {
-            if (i != 0)
-                name += ",";
+//    if (_M_current_is_template) {
+//        QString name = thisClass->name();
+//        name += "<";
+//        for (int i = 0; i < _M_current_template_parameters.size(); ++i) {
+//            if (i != 0)
+//                name += ",";
 
-            name += _M_current_template_parameters.at(i)->name();
-        }
+//            name += _M_current_template_parameters.at(i)->name();
+//        }
 
-        name += ">";
-        _M_current_class->setName(name);
-    }
+//        name += ">";
+//        thisClass->setName(name);
+//    }
 
     CodeModel::AccessPolicy oldAccessPolicy = changeCurrentAccess(decode_access_policy(node->class_key));
     CodeModel::FunctionType oldFunctionType = changeCurrentFunctionType(CodeModel::Normal);
 
-    _M_current_class->setScope(scope->qualifiedName());
-    _M_qualified_types[_M_current_class->qualifiedName().join(".")] = QString();
+    /*if(isNewClass)*/{
+        thisClass->setScope(scope->qualifiedName());
+        _M_qualified_types[thisClass->qualifiedName().join(".")] = QString();
 
-    scope->addClass(_M_current_class);
+        scope->addClass(thisClass);
+    }
 
-    name_cc.run(node->name->unqualified_name);
-    _M_context.append(name_cc.name());
+    //name_cc.run(node->name->unqualified_name);
+    //_M_context.append(name_cc.name());
+    _M_context.append(class_cc.name());
+    bool oldIsTemplate = changeIsTemplate(false);
     visitNodes(this, node->member_specs);
+    changeIsTemplate(oldIsTemplate);
     _M_context.removeLast();
 
     changeCurrentClass(old);
@@ -816,7 +1013,7 @@ void Binder::visitUsing(UsingAST *node) {
         name_cc.run(node->name);
         QStringList qualifiedName = name_cc.qualifiedName();
         if(!_M_current_class->baseClasses().isEmpty()){
-            QString baseClassName = _M_current_class->baseClasses().first().first;
+            QString baseClassName = _M_current_class->baseClasses().first().first.qualifiedName().last();
             QString methodName = qualifiedName.takeLast();
             QString className = qualifiedName.join("::");
             if((className==baseClassName || className.startsWith(baseClassName+"<"))
@@ -850,15 +1047,18 @@ void Binder::visitUsingAs(UsingAsAST *node) {
         while (decl && decl->sub_declarator)
             decl = decl->sub_declarator;
 
-        if (decl != node->declarator
+        /*if (decl != node->declarator
                 && node->declarator->parameter_declaration_clause != nullptr) {
-            typeInfo.setFunctionPointer(true);
+            TypeInfo fpTypeInfo;
+            fpTypeInfo.setFunctionPointer(true);
+            fpTypeInfo.setFunctionalReturnType(typeInfo);
             decl_cc.run(node->declarator);
             for(const DeclaratorCompiler::Parameter& p : decl_cc.parameters()){
-                typeInfo.addArgument(p.type);
-                typeInfo.addArgumentName(p.name);
+                fpTypeInfo.addFunctionalArgumentType(p.type);
+                fpTypeInfo.addFunctionalArgumentName(p.name);
             }
-        }
+            typeInfo = fpTypeInfo;
+        }*/
 
         ScopeModelItem scope = currentScope();
         DeclaratorAST *declarator = node->declarator;
@@ -872,8 +1072,9 @@ void Binder::visitUsingAs(UsingAsAST *node) {
         typeAlias->setScope(typedefScope->qualifiedName());
         typeAlias->setAccessPolicy(_M_current_access);
         _M_qualified_types[typeAlias->qualifiedName().join(".")] = QString();
+        if(m_database.findPrimitiveType(alias_name))
+            return;
         currentScope()->addTypeAlias(typeAlias);
-        //visitNodes(this, node->template_arguments);
     }
 }
 
@@ -1081,9 +1282,26 @@ void Binder::applyFunctionSpecifiers(const ListNode<std::size_t> *it, FunctionMo
     } while (it != end);
 }
 
-TypeInfo Binder::qualifyType(const TypeInfo &type, const QStringList &context) const {
+TypeInfo Binder::qualifyType(TypeInfo type, const QStringList &context) const {
     // ### Potentially improve to use string list in the name table to
-    if (context.size() == 0) {
+    if(type.functionalReturnType()){
+        type.setFunctionalReturnType(qualifyType(type.functionalReturnType(), context));
+    }
+    if(!type.functionalArgumentTypes().isEmpty()){
+        QList<TypeInfo> functionalArgumentTypes;
+        for(const TypeInfo& functionalArgumentType : type.functionalArgumentTypes()){
+            functionalArgumentTypes << qualifyType(functionalArgumentType, context);
+        }
+        type.setFunctionalArgumentTypes(functionalArgumentTypes);
+    }
+    if(!type.arguments().isEmpty()){
+        QList<TypeInfo> argumentTypes;
+        for(const TypeInfo& argumentType : type.arguments()){
+            argumentTypes << qualifyType(argumentType, context);
+        }
+        type.setArguments(argumentTypes);
+    }
+    if (context.isEmpty() || type.qualifiedName().isEmpty()) {
         // ### We can assume that this means global namespace for now...
         return type;
     } else if (_M_qualified_types.contains(type.qualifiedName().join("."))) {
@@ -1092,17 +1310,16 @@ TypeInfo Binder::qualifyType(const TypeInfo &type, const QStringList &context) c
         QStringList expanded = context;
         expanded << type.qualifiedName();
         if (_M_qualified_types.contains(expanded.join("."))) {
-            TypeInfo modified_type = type;
-            modified_type.setQualifiedName(expanded);
-            return modified_type;
+            type.setQualifiedName(expanded);
+            return type;
         } else {
-            CodeModelItem scope = model()->findItem(context, _M_current_file->toItem());
+            CodeModelItem scope = model()->findItem(context, _M_model->globalNamespace()->toItem());
 
             if (ClassModelItem klass = model_dynamic_cast<ClassModelItem> (scope)) {
-                for(const QPair<QString,bool>& base : klass->baseClasses()) {
+                for(const QPair<TypeInfo,bool>& base : klass->baseClasses()) {
                     QStringList ctx = context;
-                    if(ctx.takeLast()!=base.first){
-                        ctx.append(base.first);
+                    if(ctx.takeLast()!=base.first.qualifiedName().join("::")){
+                        ctx.append(base.first.qualifiedName().join("::"));
 
                         TypeInfo qualified = qualifyType(type, ctx);
                         if (qualified != type)
diff --git a/src/cpp/QtJambiGenerator/parser/binder.h b/src/cpp/QtJambiGenerator/parser/binder.h
index fdd17d8e..a15bb449 100644
--- a/src/cpp/QtJambiGenerator/parser/binder.h
+++ b/src/cpp/QtJambiGenerator/parser/binder.h
@@ -51,7 +51,9 @@
 #include "codemodel.h"
 #include "type_compiler.h"
 #include "name_compiler.h"
+#include "class_compiler.h"
 #include "declarator_compiler.h"
+#include "typesystem/typedatabase.h"
 
 #include <string>
 
@@ -64,17 +66,18 @@ typedef void (*MessageHandler)(const std::string &s);
 
 class Binder: protected DefaultVisitor {
     public:
-        Binder(CodeModel *__model, LocationManager &__location, Control *__control = nullptr);
+        Binder(uint qtVersionMajor, uint qtVersionMinor, uint qtVersionPatch, const TS::TypeDatabase& database,
+        CodeModelPtr __model, LocationManager &__location, Control *__control = nullptr);
         virtual ~Binder();
 
         inline TokenStream *tokenStream() const { return _M_token_stream; }
-        inline CodeModel *model() const { return _M_model; }
+        inline CodeModelPtr model() const { return _M_model; }
         ScopeModelItem currentScope();
 
-        FileModelItem run(AST *node);
+        void run(AST *node);
 
 // utils
-        TypeInfo qualifyType(const TypeInfo &type, const QStringList &context) const;
+        TypeInfo qualifyType(TypeInfo type, const QStringList &context) const;
 
         static void installMessageHandler(MessageHandler handler);
 
@@ -111,6 +114,8 @@ class Binder: protected DefaultVisitor {
         FunctionDefinitionModelItem changeCurrentFunction(FunctionDefinitionModelItem item);
         TemplateParameterList changeTemplateParameters(TemplateParameterList templateParameters);
 
+        bool changeIsTemplate(bool currentIsTemplate);
+
         void declare_symbol(SimpleDeclarationAST *node, InitDeclaratorAST *init_declarator);
 
         void applyStorageSpecifiers(const ListNode<std::size_t> *storage_specifiers, MemberModelItem item);
@@ -119,26 +124,31 @@ class Binder: protected DefaultVisitor {
         void updateItemPosition(CodeModelItem item, AST *node);
 
     private:
-        CodeModel *_M_model;
+        CodeModelPtr _M_model;
         LocationManager &_M_location;
         TokenStream *_M_token_stream;
         Control *_M_control;
 
         CodeModel::FunctionType _M_current_function_type;
         CodeModel::AccessPolicy _M_current_access;
-        FileModelItem _M_current_file;
         NamespaceModelItem _M_current_namespace;
         ClassModelItem _M_current_class;
         FunctionDefinitionModelItem _M_current_function;
         EnumModelItem _M_current_enum;
         QStringList _M_context;
+        bool _M_current_is_template;
         TemplateParameterList _M_current_template_parameters; // ### check me
         QMap<QString, QString> _M_qualified_types;
         QMap<QString, int> _M_anonymous_enums;
+        uint m_qtVersionMajor;
+        uint m_qtVersionMinor;
+        uint m_qtVersionPatch;
+        const TS::TypeDatabase& m_database;
 
         static MessageHandler _M_message_handler;
 
     protected:
+        ClassCompiler class_cc;
         TypeCompiler type_cc;
         NameCompiler name_cc;
         DeclaratorCompiler decl_cc;
diff --git a/src/cpp/QtJambiGenerator/parser/class_compiler.cpp b/src/cpp/QtJambiGenerator/parser/class_compiler.cpp
index 3120aea9..5bd95f51 100644
--- a/src/cpp/QtJambiGenerator/parser/class_compiler.cpp
+++ b/src/cpp/QtJambiGenerator/parser/class_compiler.cpp
@@ -47,6 +47,76 @@
 #include "class_compiler.h"
 #include "lexer.h"
 #include "binder.h"
+#include "tokens.h"
 
+ClassCompiler::ClassCompiler(Binder *binder): m_isClass(false), _M_binder(binder),
+        _M_token_stream(binder->tokenStream()),
+        name_cc(_M_binder),
+        type_cc(_M_binder) {
+}
+
+ClassCompiler::~ClassCompiler() {}
+
+const QString& ClassCompiler::name() const { return _M_name; }
+const QList<TypeInfo>& ClassCompiler::templateArgumentTypes() const { return _M_templateArgumentTypes; }
+const QList<QPair<TypeInfo,bool>>& ClassCompiler::baseClasses() const { return _M_base_classes; }
+
+void ClassCompiler::run(ClassSpecifierAST *node){
+    m_isClass = _M_token_stream->kind(node->class_key)==Token_class;
+    name_cc.run(node->name);
+    _M_name = name_cc.name();
+    _M_templateArgumentTypes = name_cc.templateArgumentTypes();
+    _M_base_classes.clear();
+
+    visit(node->base_clause);
+}
+
+void ClassCompiler::visitBaseSpecifier(BaseSpecifierAST *node) {
+    name_cc.run(node->name);
+    QString name = name_cc.name();
+    if (! name.isEmpty()){
+        TypeInfo info;
+        info.setQualifiedName(name_cc.qualifiedName());
+        info.setArguments(name_cc.templateArgumentTypes());
+        if(node->access_specifier>0){
+            switch(_M_token_stream->kind(node->access_specifier)){
+            case Token_protected:
+                _M_base_classes.append({info, false});
+                break;
+            case Token_public:
+                _M_base_classes.append({info, true});
+                break;
+            default:break;
+            }
+        }else if(!m_isClass){
+            _M_base_classes.append({info, true});
+        }
+    }
+}
+
+EnumCompiler::EnumCompiler(Binder *binder): _M_binder(binder),
+        _M_token_stream(binder->tokenStream()),
+        name_cc(_M_binder),
+        type_cc(_M_binder) {
+}
+
+EnumCompiler::~EnumCompiler() {}
+
+const QString& EnumCompiler::name() const { return _M_name; }
+const TypeInfo& EnumCompiler::baseType() const { return _M_base_type; }
+
+
+void EnumCompiler::run(EnumSpecifierAST *node){
+    name_cc.run(node->name);
+    _M_name = name_cc.name();
+    _M_base_type = TypeInfo();
+
+    if(node->base_type){
+        type_cc.run(node->base_type);
+        _M_base_type.setQualifiedName(type_cc.qualifiedName());
+        _M_base_type.setConstant(type_cc.isConstant());
+        _M_base_type.setVolatile(type_cc.isVolatile());
+    }
+}
 
 // kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/src/cpp/QtJambiGenerator/parser/class_compiler.h b/src/cpp/QtJambiGenerator/parser/class_compiler.h
index fa062705..27cab237 100644
--- a/src/cpp/QtJambiGenerator/parser/class_compiler.h
+++ b/src/cpp/QtJambiGenerator/parser/class_compiler.h
@@ -54,94 +54,38 @@
 #include "name_compiler.h"
 #include "type_compiler.h"
 #include "lexer.h"
-#include "binder.h"
-#include "tokens.h"
 
 class TokenStream;
 class Binder;
 
 class ClassCompiler: protected DefaultVisitor {
     public:
-        ClassCompiler(Binder *binder): m_isClass(false), _M_binder(binder),
-                _M_token_stream(binder->tokenStream()),
-                name_cc(_M_binder),
-                type_cc(_M_binder) {
-        }
-
-        ~ClassCompiler() override {}
-
-        inline QString name() const { return _M_name; }
-        inline QList<QPair<QString,bool>> baseClasses() const { return _M_base_classes; }
-
-        void run(ClassSpecifierAST *node){
-            m_isClass = _M_token_stream->kind(node->class_key)==Token_class;
-            name_cc.run(node->name);
-            _M_name = name_cc.name();
-            _M_base_classes.clear();
-
-            visit(node->base_clause);
-        }
-
+        ClassCompiler(Binder *binder);
+        ~ClassCompiler() override;
+        const QString& name() const;
+        const QList<TypeInfo>& templateArgumentTypes() const;
+        const QList<QPair<TypeInfo,bool>>& baseClasses() const;
+        void run(ClassSpecifierAST *node);
     protected:
-        virtual void visitBaseSpecifier(BaseSpecifierAST *node) override {
-            name_cc.run(node->name);
-            QString name = name_cc.name();
-            if (! name.isEmpty()){
-                if(node->access_specifier>0){
-                    switch(_M_token_stream->kind(node->access_specifier)){
-                    case Token_protected:
-                        _M_base_classes.append({name, false});
-                        break;
-                    case Token_public:
-                        _M_base_classes.append({name, true});
-                        break;
-                    default:break;
-                    }
-                }else if(!m_isClass){
-                    _M_base_classes.append({name, true});
-                }
-            }
-        }
-
+        void visitBaseSpecifier(BaseSpecifierAST *node) override;
     private:
         bool m_isClass;
         Binder *_M_binder;
         TokenStream *_M_token_stream;
         QString _M_name;
-        QList<QPair<QString,bool>> _M_base_classes;
+        QList<TypeInfo> _M_templateArgumentTypes;
+        QList<QPair<TypeInfo,bool>> _M_base_classes;
         NameCompiler name_cc;
         TypeCompiler type_cc;
 };
 
 class EnumCompiler: protected DefaultVisitor {
     public:
-        EnumCompiler(Binder *binder): _M_binder(binder),
-                _M_token_stream(binder->tokenStream()),
-                name_cc(_M_binder),
-                type_cc(_M_binder) {
-        }
-
-        ~EnumCompiler() override {}
-
-        inline QString name() const { return _M_name; }
-        inline TypeInfo baseType() const { return _M_base_type; }
-
-
-        void run(EnumSpecifierAST *node){
-            name_cc.run(node->name);
-            _M_name = name_cc.name();
-            _M_base_type = TypeInfo();
-
-            if(node->base_type){
-                type_cc.run(node->base_type);
-                _M_base_type.setQualifiedName(type_cc.qualifiedName());
-                _M_base_type.setConstant(type_cc.isConstant());
-                _M_base_type.setVolatile(type_cc.isVolatile());
-            }
-        }
-
-    protected:
-
+        EnumCompiler(Binder *binder);
+        ~EnumCompiler() override;
+        const QString& name() const;
+        const TypeInfo& baseType() const;
+        void run(EnumSpecifierAST *node);
     private:
         Binder *_M_binder;
         TokenStream *_M_token_stream;
diff --git a/src/cpp/QtJambiGenerator/parser/codemodel.cpp b/src/cpp/QtJambiGenerator/parser/codemodel.cpp
index c1d0eebe..bda6d6f2 100644
--- a/src/cpp/QtJambiGenerator/parser/codemodel.cpp
+++ b/src/cpp/QtJambiGenerator/parser/codemodel.cpp
@@ -83,45 +83,12 @@ void reduceStringLiteral(QString& strg) {
 
 CodeModel::CodeModel()
         : _M_creation_id(0) {
-    _M_globalNamespace = create<NamespaceModelItem>();
+    _M_globalNamespace = create<FileModelItem>();
 }
 
 CodeModel::~CodeModel() {
 }
 
-void CodeModel::wipeout() {
-    _M_globalNamespace = create<NamespaceModelItem>();
-    _M_files.clear();
-}
-
-FileList CodeModel::files() const {
-    return _M_files.values();
-}
-
-NamespaceModelItem CodeModel::globalNamespace() const {
-    return _M_globalNamespace;
-}
-
-void CodeModel::addFile(FileModelItem item) {
-    _M_creation_id = 0; // reset the creation id
-    _M_files.insert(item->name(), item);
-}
-
-void CodeModel::removeFile(FileModelItem item) {
-    QMap<QString, FileModelItem>::Iterator it = _M_files.find(item->name());
-
-    if (it != _M_files.end() && it.value() == item)
-        _M_files.erase(it);
-}
-
-FileModelItem CodeModel::findFile(const QString &name) const {
-    return _M_files.value(name);
-}
-
-const QMap<QString, FileModelItem>& CodeModel::fileMap() const {
-    return _M_files;
-}
-
 CodeModelItem CodeModel::findItem(const QStringList &qualifiedName, CodeModelItem scope) const {
     for (int i = 0; i < qualifiedName.size(); ++i) {
         // ### Extend to look for members etc too.
@@ -171,15 +138,30 @@ TypeInfo TypeInfo::combine(const TypeInfo &__lhs, const TypeInfo &__rhs) {
     }
     __result.setIndirections(__result.indirections() + __rhs.indirections());
     __result.setArrayElements(__result.arrayElements() + __rhs.arrayElements());
-
+    if(!__rhs.arguments().isEmpty()){
+        for(auto l = qMin(__rhs.arguments().size(), __lhs.arguments().size()), i = decltype(l)(0); i<l; ++i){
+            __result.m_arguments[i] = __rhs.m_arguments[i];
+        }
+    }
     return __result;
 }
 
 TypeInfo TypeInfo::resolveType(TypeInfo const &__type, CodeModelItem __scope) {
-    CodeModel *__model = __scope->model();
+    CodeModelPtr __model = __scope->model();
     Q_ASSERT(__model);
-
-    CodeModelItem __item = __model->findItem(__type.qualifiedName(), __scope);
+    QStringList qualifiedName = __type.qualifiedName();
+    CodeModelItem __item = __model->findItem(qualifiedName, __scope);
+    if(!__item){
+        if(!__scope->qualifiedName().isEmpty() && qualifiedName.mid(0, __scope->qualifiedName().size())==__scope->qualifiedName()){
+            for(auto i=__scope->qualifiedName().size()-1; i>=0; --i)
+                qualifiedName.removeAt(0);
+            __item = __model->findItem(qualifiedName, __scope);
+        }else if(qualifiedName.size()==1){
+            if(__scope.data()!=__model->globalNamespace().data()){
+                __item = __model->findItem(qualifiedName, __model->globalNamespace());
+            }
+        }
+    }
 
     // Copy the type and replace with the proper qualified name. This
     // only makes sence to do if we're actually getting a resolved
@@ -201,46 +183,68 @@ TypeInfo TypeInfo::resolveType(TypeInfo const &__type, CodeModelItem __scope) {
 QString TypeInfo::toString() const {
     QString tmp;
 
-    if (isConstant())
-        tmp += QLatin1String("const ");
+    if(isFunctionPointer()){
+        if(!m_functionalReturnType.isEmpty())
+            tmp += m_functionalReturnType[0].toString();
+        tmp += QLatin1String("(*)(");
+        for (int i = 0; i < m_functionalArgumentTypes.count(); ++i) {
+            if (i != 0)
+                tmp += QLatin1String(",");
 
-    if (isVolatile())
-        tmp += QLatin1String("volatile ");
+            tmp += m_functionalArgumentTypes.at(i).toString();
+        }
+        tmp += QLatin1String(")");
+    }else{
+        if (isConstant())
+            tmp += QLatin1String("const ");
 
-    tmp += m_qualifiedName.join("::");
-    if(isVariadic()){
-        tmp += "...";
-    }
+        if (isVolatile())
+            tmp += QLatin1String("volatile ");
 
-    for (int i=0; i<indirections().size(); i++){
-        if(indirections()[i]){
-            tmp += QLatin1String("*const");
-        }else{
-            tmp += QLatin1Char('*');
-        }
-    }
-    if (getReferenceType()==TypeInfo::Reference)
-        tmp += QLatin1Char('&');
-    if (getReferenceType()==TypeInfo::RReference)
-        tmp += QLatin1String("&&");
-
-    if (isFunctionPointer()) {
-        tmp += QLatin1String(" (*)(");
-        for (int i = 0; i < m_arguments.count(); ++i) {
-            if (i != 0)
-                tmp += QLatin1String(", ");
+        tmp += m_qualifiedName.join("::");
+        if(!m_arguments.isEmpty()){
+            tmp += QLatin1String("<");
+            for (int i = 0; i < m_arguments.count(); ++i) {
+                if (i != 0)
+                    tmp += QLatin1String(",");
 
-            tmp += m_arguments.at(i).toString();
+                tmp += m_arguments.at(i).toString();
+            }
+            tmp += QLatin1String(">");
+        }else if(!m_functionalReturnType.isEmpty()){
+            tmp += QLatin1String("<");
+            tmp += m_functionalReturnType[0].toString();
+            tmp += QLatin1String("(");
+            for (int i = 0; i < m_functionalArgumentTypes.count(); ++i) {
+                if (i != 0)
+                    tmp += QLatin1String(",");
+
+                tmp += m_functionalArgumentTypes.at(i).toString();
+            }
+            tmp += QLatin1String(")>");
+        }
+        if(isVariadic()){
+            tmp += "...";
         }
-        tmp += QLatin1String(")");
-    }
 
-    for(const QString& elt : arrayElements()) {
-        tmp += QLatin1String("[");
-        tmp += elt;
-        tmp += QLatin1String("]");
+        for (int i=0; i<indirections().size(); i++){
+            if(indirections()[i]){
+                tmp += QLatin1String("*const");
+            }else{
+                tmp += QLatin1Char('*');
+            }
+        }
+        if (getReferenceType()==TypeInfo::Reference)
+            tmp += QLatin1Char('&');
+        if (getReferenceType()==TypeInfo::RReference)
+            tmp += QLatin1String("&&");
+
+        for(const QString& elt : arrayElements()) {
+            tmp += QLatin1String("[");
+            tmp += elt;
+            tmp += QLatin1String("]");
+        }
     }
-
     return tmp;
 }
 
@@ -264,11 +268,13 @@ bool TypeInfo::operator==(const TypeInfo &other) const {
 
     return m_flags == other.m_flags
            && m_qualifiedName == other.m_qualifiedName
-           && (!isFunctionPointer() || m_arguments == other.m_arguments);
+            && m_arguments == other.m_arguments
+            && m_functionalReturnType == other.m_functionalReturnType
+            && m_functionalArgumentTypes == other.m_functionalArgumentTypes;
 }
 
 // ---------------------------------------------------------------------------
-_CodeModelItem::_CodeModelItem(CodeModel *model, int kind)
+_CodeModelItem::_CodeModelItem(CodeModelPtr model, int kind)
         : _M_model(model),
         _M_kind(kind),
         _M_startLine(0),
@@ -327,6 +333,14 @@ void _ClassModelItem::setDeclDeprecatedComment(const QString& declDeprecatedComm
     reduceStringLiteral(_M_declDeprecatedComment);
 }
 
+bool _ClassModelItem::isTemplate() const {
+    return _M_isTemplate;
+}
+
+void _ClassModelItem::setIsTemplate(bool isTemplate) {
+    _M_isTemplate = isTemplate;
+}
+
 bool _ClassModelItem::isDeclDeprecated() const {
     return _M_declDeprecated;
 }
@@ -370,10 +384,6 @@ void _CodeModelItem::setRequiredFeatures(const QStringList &features) {
     }
 }
 
-FileModelItem _CodeModelItem::file() const {
-    return model()->findFile(fileName());
-}
-
 void _CodeModelItem::getStartPosition(int *line, int *column) {
     *line = _M_startLine;
     *column = _M_startColumn;
@@ -395,14 +405,22 @@ void _CodeModelItem::setEndPosition(int line, int column) {
 }
 
 // ---------------------------------------------------------------------------
-const QList<QPair<QString,bool>>& _ClassModelItem::baseClasses() const {
+const QList<QPair<TypeInfo,bool>>& _ClassModelItem::baseClasses() const {
     return _M_baseClasses;
 }
 
-void _ClassModelItem::setBaseClasses(const QList<QPair<QString,bool>> &baseClasses) {
+void _ClassModelItem::setBaseClasses(const QList<QPair<TypeInfo,bool>> &baseClasses) {
     _M_baseClasses = baseClasses;
 }
 
+const QList<TypeInfo>& _ClassModelItem::templateInstantiations() const{
+    return _M_templateInstantiations;
+}
+
+void _ClassModelItem::setTemplateInstantiations(const QList<TypeInfo> &templateInstantiations){
+    _M_templateInstantiations = templateInstantiations;
+}
+
 const TemplateParameterList& _ClassModelItem::templateParameters() const {
     return _M_templateParameters;
 }
@@ -416,7 +434,11 @@ void _ClassModelItem::setTemplateParameters(const TemplateParameterList &templat
 }
 
 bool _ClassModelItem::extendsClass(const QString &name) const {
-    return _M_baseClasses.contains({name,true}) || _M_baseClasses.contains({name,false});
+    for (int i = 0; i < _M_baseClasses.size(); ++i) {
+        if(_M_baseClasses[i].first.qualifiedName().join("::")==name)
+            return true;
+    }
+    return false;
 }
 
 void _ClassModelItem::setClassType(CodeModel::ClassType type) {
@@ -434,8 +456,7 @@ void _ClassModelItem::addPropertyDeclaration(const QString &propertyDeclaration)
 
 // ---------------------------------------------------------------------------
 FunctionModelItem _ScopeModelItem::declaredFunction(FunctionModelItem item) {
-    FunctionList function_list = findFunctions(item->name());
-
+    const FunctionList function_list = findFunctions(item->name());
     for(const FunctionModelItem& fun : function_list) {
         if (fun->isSimilar(item))
             return fun;
@@ -448,12 +469,12 @@ ScopeModelItem _ScopeModelItem::toScope() const {
     return ScopeModelItem(const_cast<_ScopeModelItem*>(this));
 }
 
-TypeAliasList _ScopeModelItem::typeAliases() const {
-    return _M_typeAliases.values();
+const TypeAliasList& _ScopeModelItem::typeAliases() const {
+    return _M_typeAliasList;
 }
 
-VariableList _ScopeModelItem::variables() const {
-    return _M_variables.values();
+const VariableList& _ScopeModelItem::variables() const {
+    return _M_variableList;
 }
 
 NamespaceModelItem _ScopeModelItem::findNamespace(const QString &) const
@@ -461,100 +482,60 @@ NamespaceModelItem _ScopeModelItem::findNamespace(const QString &) const
     return NamespaceModelItem();
 }
 
-FunctionList _ScopeModelItem::functions() const {
-    return _M_functions.values();
+const FunctionList& _ScopeModelItem::functions() const {
+    return _M_functionList;
 }
 
-FunctionDefinitionList _ScopeModelItem::functionDefinitions() const {
-    return _M_functionDefinitions.values();
+const FunctionDefinitionList& _ScopeModelItem::functionDefinitions() const {
+    return _M_functionDefinitionList;
 }
 
-EnumList _ScopeModelItem::enums() const {
-    return _M_enums.values();
+const EnumList& _ScopeModelItem::enums() const {
+    return _M_enumList;
 }
 
 void _ScopeModelItem::addClass(ClassModelItem item) {
-    QString name = item->name();
-    auto idx = name.indexOf("<");
-    if (idx > 0)
-        _M_classes.insert(name.left(idx), item);
-    _M_classes.insert(name, item);
-    _M_classList << item;
+    //if(!_M_classes.contains(item->name()))
+    {
+        _M_classes.insert(item->name(), item);
+        _M_classList << item;
+    }
 }
 
 void _ScopeModelItem::addFunction(FunctionModelItem item) {
     _M_functions.insert(item->name(), item);
+    _M_functionList << item;
 }
 
 void _ScopeModelItem::addFunctionDefinition(FunctionDefinitionModelItem item) {
     _M_functionDefinitions.insert(item->name(), item);
+    _M_functionDefinitionList << item;
 }
 
 void _ScopeModelItem::addVariable(VariableModelItem item) {
     _M_variables.insert(item->name(), item);
+    _M_variableList << item;
 }
 
 void _ScopeModelItem::addTypeAlias(TypeAliasModelItem item) {
-    _M_typeAliases.insert(item->name(), item);
+    if(!item->type().isConstant()
+            && !item->type().isVariadic()
+            && !item->type().isVolatile()
+            && item->type().getReferenceType()==TypeInfo::NoReference
+            && item->type().qualifiedName().size()==1
+            && item->type().qualifiedName()[0]=="QFlags"
+            && item->type().arguments().size()==1){
+        _M_flags.insert(item->type().arguments()[0].toString(), item->name());
+    }else{
+        //printf("using %s = %s\n", qPrintable(item->name()), qPrintable(item->type().toString()));
+        _M_typeAliases.insert(item->name(), item);
+        _M_typeAliasList << item;
+    }
 }
 
 void _ScopeModelItem::addEnum(EnumModelItem item) {
     _M_enums.insert(item->name(), item);
-}
-
-void _ScopeModelItem::removeClass(ClassModelItem item) {
-    QMap<QString, ClassModelItem>::Iterator it = _M_classes.find(item->name());
-
-    if (it != _M_classes.end() && it.value() == item)
-        _M_classes.erase(it);
-    _M_classList.removeAll(item);
-}
-
-void _ScopeModelItem::removeFunction(FunctionModelItem item) {
-    QMultiHash<QString, FunctionModelItem>::Iterator it = _M_functions.find(item->name());
-
-    while (it != _M_functions.end() && it.key() == item->name()
-            && it.value() != item) {
-        ++it;
-    }
-
-    if (it != _M_functions.end() && it.value() == item) {
-        _M_functions.erase(it);
-    }
-}
-
-void _ScopeModelItem::removeFunctionDefinition(FunctionDefinitionModelItem item) {
-    QMultiHash<QString, FunctionDefinitionModelItem>::Iterator it = _M_functionDefinitions.find(item->name());
-
-    while (it != _M_functionDefinitions.end() && it.key() == item->name()
-            && it.value() != item) {
-        ++it;
-    }
-
-    if (it != _M_functionDefinitions.end() && it.value() == item) {
-        _M_functionDefinitions.erase(it);
-    }
-}
-
-void _ScopeModelItem::removeVariable(VariableModelItem item) {
-    QMap<QString, VariableModelItem>::Iterator it = _M_variables.find(item->name());
-
-    if (it != _M_variables.end() && it.value() == item)
-        _M_variables.erase(it);
-}
-
-void _ScopeModelItem::removeTypeAlias(TypeAliasModelItem item) {
-    QMap<QString, TypeAliasModelItem>::Iterator it = _M_typeAliases.find(item->name());
-
-    if (it != _M_typeAliases.end() && it.value() == item)
-        _M_typeAliases.erase(it);
-}
-
-void _ScopeModelItem::removeEnum(EnumModelItem item) {
-    QMap<QString, EnumModelItem>::Iterator it = _M_enums.find(item->name());
-
-    if (it != _M_enums.end() && it.value() == item)
-        _M_enums.erase(it);
+    _M_enumList << item;
 }
 
 ClassModelItem _ScopeModelItem::findClass(const QString &name) const {
@@ -582,17 +563,15 @@ FunctionDefinitionList _ScopeModelItem::findFunctionDefinitions(const QString &n
 }
 
 // ---------------------------------------------------------------------------
-NamespaceList _NamespaceModelItem::namespaces() const {
-    return _M_namespaces.values();
+const QList<NamespaceModelItem>& _NamespaceModelItem::namespaces() const {
+    return _M_namespaceList;
 }
 void _NamespaceModelItem::addNamespace(NamespaceModelItem item) {
-    _M_namespaces.insert(item->name(), item);
-}
-void _NamespaceModelItem::removeNamespace(NamespaceModelItem item) {
-    QMap<QString, NamespaceModelItem>::Iterator it = _M_namespaces.find(item->name());
-
-    if (it != _M_namespaces.end() && it.value() == item)
-        _M_namespaces.erase(it);
+    //if(!_M_namespaces.contains(item->name()))
+    {
+        _M_namespaces.insert(item->name(), item);
+        _M_namespaceList << item;
+    }
 }
 
 NamespaceModelItem _NamespaceModelItem::findNamespace(const QString &name) const {
@@ -696,6 +675,14 @@ void _FunctionModelItem::setVariadics(bool isVariadics) {
     _M_flags.setFlag(IsVariadics, isVariadics);
 }
 
+OperatorType _FunctionModelItem::operatorType() const {
+    return _M_operatorType;
+}
+
+void _FunctionModelItem::setOperatorType(OperatorType op) {
+    _M_operatorType = op;
+}
+
 TypeInfo::ReferenceType _FunctionModelItem::referenceType() const {
     return _M_referenceType;
 }
@@ -851,62 +838,62 @@ void _TemplateParameterModelItem::setDefaultValue(const QString& defaultValue) {
 }
 
 // ---------------------------------------------------------------------------
-ScopeModelItem _ScopeModelItem::create(CodeModel *model) {
+ScopeModelItem _ScopeModelItem::create(CodeModelPtr model) {
     ScopeModelItem item(new _ScopeModelItem(model));
     return item;
 }
 
-ClassModelItem _ClassModelItem::create(CodeModel *model) {
+ClassModelItem _ClassModelItem::create(CodeModelPtr model) {
     ClassModelItem item(new _ClassModelItem(model));
     return item;
 }
 
-NamespaceModelItem _NamespaceModelItem::create(CodeModel *model) {
+NamespaceModelItem _NamespaceModelItem::create(CodeModelPtr model) {
     NamespaceModelItem item(new _NamespaceModelItem(model));
     return item;
 }
 
-FileModelItem _FileModelItem::create(CodeModel *model) {
+FileModelItem _FileModelItem::create(CodeModelPtr model) {
     FileModelItem item(new _FileModelItem(model));
     return item;
 }
 
-ArgumentModelItem _ArgumentModelItem::create(CodeModel *model) {
+ArgumentModelItem _ArgumentModelItem::create(CodeModelPtr model) {
     ArgumentModelItem item(new _ArgumentModelItem(model));
     return item;
 }
 
-FunctionModelItem _FunctionModelItem::create(CodeModel *model) {
+FunctionModelItem _FunctionModelItem::create(CodeModelPtr model) {
     FunctionModelItem item(new _FunctionModelItem(model));
     return item;
 }
 
-FunctionDefinitionModelItem _FunctionDefinitionModelItem::create(CodeModel *model) {
+FunctionDefinitionModelItem _FunctionDefinitionModelItem::create(CodeModelPtr model) {
     FunctionDefinitionModelItem item(new _FunctionDefinitionModelItem(model));
     return item;
 }
 
-VariableModelItem _VariableModelItem::create(CodeModel *model) {
+VariableModelItem _VariableModelItem::create(CodeModelPtr model) {
     VariableModelItem item(new _VariableModelItem(model));
     return item;
 }
 
-TypeAliasModelItem _TypeAliasModelItem::create(CodeModel *model) {
+TypeAliasModelItem _TypeAliasModelItem::create(CodeModelPtr model) {
     TypeAliasModelItem item(new _TypeAliasModelItem(model));
     return item;
 }
 
-EnumModelItem _EnumModelItem::create(CodeModel *model) {
+EnumModelItem _EnumModelItem::create(CodeModelPtr model) {
     EnumModelItem item(new _EnumModelItem(model));
     return item;
 }
 
-EnumeratorModelItem _EnumeratorModelItem::create(CodeModel *model) {
+EnumeratorModelItem _EnumeratorModelItem::create(CodeModelPtr model) {
     EnumeratorModelItem item(new _EnumeratorModelItem(model));
     return item;
 }
 
-TemplateParameterModelItem _TemplateParameterModelItem::create(CodeModel *model) {
+TemplateParameterModelItem _TemplateParameterModelItem::create(CodeModelPtr model) {
     TemplateParameterModelItem item(new _TemplateParameterModelItem(model));
     return item;
 }
@@ -992,6 +979,14 @@ void _MemberModelItem::setMutable(bool isMutable) {
     _M_flags.setFlag(IsMutable, isMutable);
 }
 
+bool _MemberModelItem::isTemplate() const {
+    return _M_flags.testFlag(IsTemplate);
+}
+
+void _MemberModelItem::setTemplate(bool isTemplate) {
+    _M_flags.setFlag(IsTemplate, isTemplate);
+}
+
 bool _MemberModelItem::isDeprecated() const {
     return _M_flags.testFlag(IsDeprecated);
 }
diff --git a/src/cpp/QtJambiGenerator/parser/codemodel.h b/src/cpp/QtJambiGenerator/parser/codemodel.h
index cc256f85..43ab4def 100644
--- a/src/cpp/QtJambiGenerator/parser/codemodel.h
+++ b/src/cpp/QtJambiGenerator/parser/codemodel.h
@@ -56,7 +56,7 @@ _Target model_static_cast(_Source item) {
     return ptr;
 }
 
-class CodeModel {
+class CodeModel : public QSharedData {
     public:
         enum AccessPolicy {
             Public,
@@ -84,31 +84,19 @@ class CodeModel {
         template <class _Target> _Target create() {
             typedef typename _Target::Type _Target_type;
 
-            _Target result = _Target_type::create(this);
+            _Target result = _Target_type::create(CodeModelPtr(this));
             result->setCreationId(_M_creation_id++);
             return result;
         }
 
-        FileList files() const;
-        NamespaceModelItem globalNamespace() const;
-
-        void addFile(FileModelItem item);
-        void removeFile(FileModelItem item);
-        FileModelItem findFile(const QString &name) const;
-        const QMap<QString, FileModelItem>& fileMap() const;
-
         CodeModelItem findItem(const QStringList &qualifiedName, CodeModelItem scope) const;
 
-        void wipeout();
-
+        FileModelItem globalNamespace() const { return _M_globalNamespace; }
     private:
-        QMap<QString, FileModelItem> _M_files;
-        NamespaceModelItem _M_globalNamespace;
+        FileModelItem _M_globalNamespace;
         std::size_t _M_creation_id;
 
-    private:
-        CodeModel(const CodeModel &other);
-        void operator = (const CodeModel &other);
+        Q_DISABLE_COPY_MOVE(CodeModel)
 };
 
 class TypeInfo {
@@ -142,8 +130,10 @@ class TypeInfo {
         inline const QList<bool>& indirections() const { return m_indirections; }
         void setIndirections(const QList<bool> & indirections) { m_indirections = indirections; }
 
-        bool isFunctionPointer() const { return m_flags.testFlag(IsFunctionPointer); }
+        bool isFunctionPointer() const { return m_flags.testFlag(IsFunctionPointer) || (m_qualifiedName.isEmpty() && !m_functionalReturnType.isEmpty()); }
         void setFunctionPointer(bool is) { m_flags.setFlag(IsFunctionPointer, is); }
+        //bool isFunctionDecl() const { return m_flags.testFlag(IsFunctionDecl); }
+        //void setFunctionDecl(bool is) { m_flags.setFlag(IsFunctionDecl, is); }
 
         bool isVariadic() const { return m_flags.testFlag(IsVariadic); }
         void setVariadic(bool is) { m_flags.setFlag(IsVariadic, is); }
@@ -171,17 +161,23 @@ class TypeInfo {
         TypeInfo functionalReturnType() const { return m_functionalReturnType.isEmpty() ? TypeInfo() : m_functionalReturnType.first(); }
         const QList<TypeInfo>& functionalArgumentTypes() const { return m_functionalArgumentTypes; }
         const QList<QString>& functionalArgumentNames() const { return m_functionalArgumentNames; }
-        void setFunctionalReturnType(const TypeInfo& s) { m_functionalReturnType.clear(); if(!s.qualifiedName().isEmpty()) m_functionalReturnType << s; }
+        void setFunctionalReturnType(const TypeInfo& s) { m_functionalReturnType.clear(); if(s) m_functionalReturnType << s; }
         void setFunctionalArgumentTypes(const QList<TypeInfo>& l) { m_functionalArgumentTypes = l; }
         void setFunctionalArgumentNames(const QList<QString>& l) { m_functionalArgumentNames = l; }
+        void addFunctionalArgumentType(const TypeInfo& l) { m_functionalArgumentTypes << l; }
+        void addFunctionalArgumentName(const QString& l) { m_functionalArgumentNames << l; }
+
+        bool operator!()const{return m_qualifiedName.isEmpty() && m_functionalReturnType.isEmpty();}
+        operator bool()const{return !m_qualifiedName.isEmpty() || !m_functionalReturnType.isEmpty();}
 
     private:
-        enum Flag : quint8{
+        enum Flag{
             None = 0x00,
             IsConst = 0x01,
             IsVolatile = 0x02,
             IsFunctionPointer = 0x04,
-            IsVariadic = 0x08,
+            IsFunctionDecl = 0x08,
+            IsVariadic = 0x10,
         };
         QFlags<Flag> m_flags;
 
@@ -243,8 +239,6 @@ class _CodeModelItem: public QSharedData {
         const QStringList& requiredFeatures() const;
         void setRequiredFeatures(const QStringList &features);
 
-        FileModelItem file() const;
-
         void getStartPosition(int *line, int *column);
         void setStartPosition(int line, int column);
 
@@ -254,16 +248,16 @@ class _CodeModelItem: public QSharedData {
         inline std::size_t creationId() const { return _M_creation_id; }
         inline void setCreationId(std::size_t creation_id) { _M_creation_id = creation_id; }
 
-        inline CodeModel *model() const { return _M_model; }
+        inline CodeModelPtr model() const { return _M_model; }
 
         CodeModelItem toItem() const;
 
     protected:
-        _CodeModelItem(CodeModel *model, int kind);
+        _CodeModelItem(CodeModelPtr model, int kind);
         void setKind(int kind);
 
     private:
-        CodeModel *_M_model;
+        CodeModelPtr _M_model;
         int _M_kind;
         int _M_startLine;
         int _M_startColumn;
@@ -283,15 +277,15 @@ class _ScopeModelItem: public _CodeModelItem {
     public:
         DECLARE_MODEL_NODE(Scope)
 
-        static ScopeModelItem create(CodeModel *model);
+        static ScopeModelItem create(CodeModelPtr model);
 
     public:
         ScopeModelItem toScope() const;
-        EnumList enums() const;
-        FunctionDefinitionList functionDefinitions() const;
-        FunctionList functions() const;
-        TypeAliasList typeAliases() const;
-        VariableList variables() const;
+        const EnumList& enums() const;
+        const FunctionDefinitionList& functionDefinitions() const;
+        const FunctionList& functions() const;
+        const TypeAliasList& typeAliases() const;
+        const VariableList& variables() const;
         virtual NamespaceModelItem findNamespace(const QString &name) const;
 
         void addClass(ClassModelItem item);
@@ -301,13 +295,6 @@ class _ScopeModelItem: public _CodeModelItem {
         void addTypeAlias(TypeAliasModelItem item);
         void addVariable(VariableModelItem item);
 
-        void removeClass(ClassModelItem item);
-        void removeEnum(EnumModelItem item);
-        void removeFunction(FunctionModelItem item);
-        void removeFunctionDefinition(FunctionDefinitionModelItem item);
-        void removeTypeAlias(TypeAliasModelItem item);
-        void removeVariable(VariableModelItem item);
-
         ClassModelItem findClass(const QString &name) const;
         EnumModelItem findEnum(const QString &name) const;
         FunctionDefinitionList findFunctionDefinitions(const QString &name) const;
@@ -316,25 +303,28 @@ class _ScopeModelItem: public _CodeModelItem {
         VariableModelItem findVariable(const QString &name) const;
 
         inline const QList<ClassModelItem>& classes() const { return _M_classList; }
-        inline const QMap<QString, EnumModelItem>& enumMap() const { return _M_enums; }
-        inline const QMap<QString, TypeAliasModelItem>& typeAliasMap() const { return _M_typeAliases; }
-        inline const QMap<QString, VariableModelItem>& variableMap() const { return _M_variables; }
-        inline const QMultiHash<QString, FunctionDefinitionModelItem>& functionDefinitionMap() const { return _M_functionDefinitions; }
-        inline const QMultiHash<QString, FunctionModelItem>& functionMap() const { return _M_functions; }
+        inline const QMap<QString, QString>& flagsMap() const { return _M_flags; }
 
         FunctionModelItem declaredFunction(FunctionModelItem item);
 
     protected:
-        _ScopeModelItem(CodeModel *model, int kind = __node_kind)
+        _ScopeModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _CodeModelItem(model, kind) {}
 
     private:
         QList<ClassModelItem> _M_classList;
+        QMap<QString, ClassModelItem> _M_qnclasses;
         QMap<QString, ClassModelItem> _M_classes;
+        QList<EnumModelItem> _M_enumList;
         QMap<QString, EnumModelItem> _M_enums;
+        QList<TypeAliasModelItem> _M_typeAliasList;
         QMap<QString, TypeAliasModelItem> _M_typeAliases;
+        QMap<QString, QString> _M_flags;
+        QList<VariableModelItem> _M_variableList;
         QMap<QString, VariableModelItem> _M_variables;
+        QList<FunctionDefinitionModelItem> _M_functionDefinitionList;
         QMultiHash<QString, FunctionDefinitionModelItem> _M_functionDefinitions;
+        QList<FunctionModelItem> _M_functionList;
         QMultiHash<QString, FunctionModelItem> _M_functions;
 
     private:
@@ -346,16 +336,19 @@ class _ClassModelItem: public _ScopeModelItem {
     public:
         DECLARE_MODEL_NODE(Class)
 
-        static ClassModelItem create(CodeModel *model);
+        static ClassModelItem create(CodeModelPtr model);
 
     public:
-        const QList<QPair<QString,bool>>& baseClasses() const;
+        const QList<QPair<TypeInfo,bool>>& baseClasses() const;
 
-        void setBaseClasses(const QList<QPair<QString,bool>> &baseClasses);
+        void setBaseClasses(const QList<QPair<TypeInfo,bool>> &baseClasses);
 
         const TemplateParameterList& templateParameters() const;
         void setTemplateParameters(const TemplateParameterList &templateParameters);
 
+        const QList<TypeInfo>& templateInstantiations() const;
+        void setTemplateInstantiations(const QList<TypeInfo> &templateInstantiations);
+
         bool extendsClass(const QString &name) const;
 
         void setClassType(CodeModel::ClassType type);
@@ -370,6 +363,9 @@ class _ClassModelItem: public _ScopeModelItem {
         void setHas_Q_OBJECT(bool has_Q_OBJECT){m_has_Q_OBJECT = has_Q_OBJECT;}
         bool has_Q_OBJECT() const {return m_has_Q_OBJECT;}
 
+        void setIsTemplate(bool isTemplate);
+        bool isTemplate() const;
+
         void setUsingBaseConstructors(CodeModel::AccessPolicy usingBaseConstructors){_M_usingBaseConstructors = usingBaseConstructors;}
         CodeModel::AccessPolicy usingBaseConstructors() const {return _M_usingBaseConstructors;}
         bool isDeclFinal() const;
@@ -381,21 +377,23 @@ class _ClassModelItem: public _ScopeModelItem {
         CodeModel::AccessPolicy accessPolicy() const;
         void setAccessPolicy(CodeModel::AccessPolicy accessPolicy);
     protected:
-        _ClassModelItem(CodeModel *model, int kind = __node_kind)
+        _ClassModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _ScopeModelItem(model, kind), m_has_Q_GADGET(false), m_has_Q_OBJECT(false), _M_classType(CodeModel::Class),
-                  _M_declFinal(false), _M_declDeprecated(false),
+                  _M_declFinal(false), _M_declDeprecated(false), _M_isTemplate(false),
                   _M_accessPolicy(CodeModel::Public),
                   _M_usingBaseConstructors(CodeModel::AccessPolicy::Private){}
 
     private:
         bool m_has_Q_GADGET;
         bool m_has_Q_OBJECT;
-        QList<QPair<QString,bool>> _M_baseClasses;
+        QList<QPair<TypeInfo,bool>> _M_baseClasses;
         TemplateParameterList _M_templateParameters;
+        QList<TypeInfo> _M_templateInstantiations;
         CodeModel::ClassType _M_classType;
         QStringList _M_propertyDeclarations;
         bool _M_declFinal;
         bool _M_declDeprecated;
+        bool _M_isTemplate;
         QString _M_declDeprecatedComment;
         CodeModel::AccessPolicy _M_accessPolicy;
         CodeModel::AccessPolicy _M_usingBaseConstructors;
@@ -409,23 +407,21 @@ class _NamespaceModelItem: public _ScopeModelItem {
     public:
         DECLARE_MODEL_NODE(Namespace)
 
-        static NamespaceModelItem create(CodeModel *model);
+        static NamespaceModelItem create(CodeModelPtr model);
 
     public:
-        NamespaceList namespaces() const;
+        const QList<NamespaceModelItem>& namespaces() const;
 
         void addNamespace(NamespaceModelItem item);
-        void removeNamespace(NamespaceModelItem item);
 
         NamespaceModelItem findNamespace(const QString &name) const;
 
-        inline const QMap<QString, NamespaceModelItem>& namespaceMap() const { return _M_namespaces; }
-
     protected:
-        _NamespaceModelItem(CodeModel *model, int kind = __node_kind)
+        _NamespaceModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _ScopeModelItem(model, kind) {}
 
     private:
+        QList<NamespaceModelItem> _M_namespaceList;
         QMap<QString, NamespaceModelItem> _M_namespaces;
 
     private:
@@ -437,10 +433,10 @@ class _FileModelItem: public _NamespaceModelItem {
     public:
         DECLARE_MODEL_NODE(File)
 
-        static FileModelItem create(CodeModel *model);
+        static FileModelItem create(CodeModelPtr model);
 
     protected:
-        _FileModelItem(CodeModel *model, int kind = __node_kind)
+        _FileModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _NamespaceModelItem(model, kind) {}
 
     private:
@@ -452,7 +448,7 @@ class _ArgumentModelItem: public _CodeModelItem {
     public:
         DECLARE_MODEL_NODE(Argument)
 
-        static ArgumentModelItem create(CodeModel *model);
+        static ArgumentModelItem create(CodeModelPtr model);
 
     public:
         const TypeInfo& type() const;
@@ -465,7 +461,7 @@ class _ArgumentModelItem: public _CodeModelItem {
         void setDefaultValueExpression(const QString &expr) { _M_defaultValueExpression = expr; }
 
     protected:
-        _ArgumentModelItem(CodeModel *model, int kind = __node_kind)
+        _ArgumentModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _CodeModelItem(model, kind), _M_defaultValue(false) {}
 
     private:
@@ -506,6 +502,9 @@ class _MemberModelItem: public _CodeModelItem {
         bool isMutable() const;
         void setMutable(bool isMutable);
 
+        bool isTemplate() const;
+        void setTemplate(bool isTemplate);
+
         const QString& getDeprecatedComment() const;
         void setDeprecatedComment(const QString& comment);
 
@@ -521,17 +520,22 @@ class _MemberModelItem: public _CodeModelItem {
         void setTemplateParameters(const TemplateParameterList &templateParameters)
         { _M_templateParameters = templateParameters; }
 
+        const QList<TypeInfo>& templateInstantiations() const
+        { return _M_templateInstantiations; }
+        void setTemplateInstantiations(const QList<TypeInfo> &templateInstantiations)
+        { _M_templateInstantiations = templateInstantiations; }
+
         const TypeInfo& type() const;
         void setType(const TypeInfo &type);
 
     protected:
-        _MemberModelItem(CodeModel *model, int kind)
+        _MemberModelItem(CodeModelPtr model, int kind)
                 : _CodeModelItem(model, kind),
                 _M_accessPolicy(CodeModel::Public),
                 _M_flags(None) {}
 
     private:
-        enum Flag : quint16{
+        enum Flag{
             None = 0x00,
             IsConstant = 0x001,
             IsVolatile = 0x002,
@@ -542,20 +546,81 @@ class _MemberModelItem: public _CodeModelItem {
             IsMutable = 0x040,
             IsDeprecated = 0x080,
             IsConstExpr = 0x100,
+            IsTemplate = 0x200,
         };
 
         TemplateParameterList _M_templateParameters;
+        QList<TypeInfo> _M_templateInstantiations;
         TypeInfo _M_type;
         CodeModel::AccessPolicy _M_accessPolicy;
         QFlags<Flag> _M_flags;
         QString _M_deprecatedComment;
 };
 
+enum class OperatorType{
+    None,
+    Plus,
+    Minus,
+    Times,
+    Div,
+    Rem,
+    And,
+    Or,
+    Xor,
+    Not,
+    ShiftLeft,
+    ShiftRight,
+
+    // assigments
+    Assign,
+    PlusAssign,
+    MinusAssign,
+    TimesAssign,
+    DivAssign,
+    RemAssign,
+    AndAssign,
+    OrAssign,
+    XorAssign,
+    ShiftLeftAssign,
+    ShiftRightAssign,
+
+    // Logical
+    ExclusiveAnd,
+    ExclusiveOr,
+    Negation,
+
+    // incr/decr
+    Inc,
+    Dec,
+
+    // compare
+    Less,
+    Greater,
+    LessOrEquals,
+    Compare,
+    GreaterOrEquals,
+    NotEquals,
+    Equals,
+
+    // other
+    Subscript,
+    MemberOfPointer,
+    PointerToMemberOfPointer,
+    Comma,
+    FunctionCall,
+    TypeCast,
+    String,
+    New,
+    Delete,
+    NewArray,
+    DeleteArray
+};
+
 class _FunctionModelItem: public _MemberModelItem {
     public:
         DECLARE_MODEL_NODE(Function)
 
-        static FunctionModelItem create(CodeModel *model);
+        static FunctionModelItem create(CodeModelPtr model);
 
     public:
         const ArgumentList& arguments() const;
@@ -590,6 +655,8 @@ class _FunctionModelItem: public _MemberModelItem {
         void setHasBody(bool hasBody);
         bool isDeleted() const;
         void setDeleted(bool deleted);
+        OperatorType operatorType() const;
+        void setOperatorType(OperatorType op);
 
         TypeInfo::ReferenceType referenceType() const;
         void setReferenceType(TypeInfo::ReferenceType referenceType);
@@ -597,10 +664,10 @@ class _FunctionModelItem: public _MemberModelItem {
         bool isSimilar(FunctionModelItem other) const;
 
     protected:
-        _FunctionModelItem(CodeModel *model, int kind = __node_kind)
+        _FunctionModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _MemberModelItem(model, kind),
                 _M_functionType(CodeModel::Normal),
-                _M_flags(None), _M_referenceType(TypeInfo::NoReference) {}
+                _M_flags(None), _M_referenceType(TypeInfo::NoReference), _M_operatorType(OperatorType::None) {}
 
     private:
         enum Flag : quint16{
@@ -613,12 +680,13 @@ class _FunctionModelItem: public _MemberModelItem {
             IsInvokable = 0x020,
             IsDeclFinal = 0x040,
             HasBody = 0x080,
-            IsDeleted = 0x100,
+            IsDeleted = 0x100
         };
         ArgumentList _M_arguments;
         CodeModel::FunctionType _M_functionType;
         QFlags<Flag> _M_flags;
         TypeInfo::ReferenceType _M_referenceType;
+        OperatorType _M_operatorType;
 
     private:
         _FunctionModelItem(const _FunctionModelItem &other);
@@ -629,10 +697,10 @@ class _FunctionDefinitionModelItem: public _FunctionModelItem {
     public:
         DECLARE_MODEL_NODE(FunctionDefinition)
 
-        static FunctionDefinitionModelItem create(CodeModel *model);
+        static FunctionDefinitionModelItem create(CodeModelPtr model);
 
     protected:
-        _FunctionDefinitionModelItem(CodeModel *model, int kind = __node_kind)
+        _FunctionDefinitionModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _FunctionModelItem(model, kind) {}
 
     private:
@@ -644,10 +712,10 @@ class _VariableModelItem: public _MemberModelItem {
     public:
         DECLARE_MODEL_NODE(Variable)
 
-        static VariableModelItem create(CodeModel *model);
+        static VariableModelItem create(CodeModelPtr model);
 
     protected:
-        _VariableModelItem(CodeModel *model, int kind = __node_kind)
+        _VariableModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _MemberModelItem(model, kind) {}
 
     private:
@@ -659,7 +727,7 @@ class _TypeAliasModelItem: public _CodeModelItem {
     public:
         DECLARE_MODEL_NODE(TypeAlias)
 
-        static TypeAliasModelItem create(CodeModel *model);
+        static TypeAliasModelItem create(CodeModelPtr model);
 
     public:
         const TypeInfo& type() const;
@@ -668,7 +736,7 @@ class _TypeAliasModelItem: public _CodeModelItem {
         void setAccessPolicy(CodeModel::AccessPolicy accessPolicy);
 
     protected:
-        _TypeAliasModelItem(CodeModel *model, int kind = __node_kind)
+        _TypeAliasModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _CodeModelItem(model, kind),
                   _M_accessPolicy(CodeModel::Public) {}
 
@@ -685,7 +753,7 @@ class _EnumModelItem: public _CodeModelItem {
     public:
         DECLARE_MODEL_NODE(Enum)
 
-        static EnumModelItem create(CodeModel *model);
+        static EnumModelItem create(CodeModelPtr model);
 
     public:
         const TypeInfo& baseType() const;
@@ -707,7 +775,7 @@ class _EnumModelItem: public _CodeModelItem {
         void removeEnumerator(EnumeratorModelItem item);
 
     protected:
-        _EnumModelItem(CodeModel *model, int kind = __node_kind)
+        _EnumModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _CodeModelItem(model, kind),
                 _M_accessPolicy(CodeModel::Public), _M_isAnonymous(false), _M_isScopedEnum(false), _M_baseType() {}
 
@@ -729,7 +797,7 @@ class _EnumeratorModelItem: public _CodeModelItem {
     public:
         DECLARE_MODEL_NODE(Enumerator)
 
-        static EnumeratorModelItem create(CodeModel *model);
+        static EnumeratorModelItem create(CodeModelPtr model);
 
     public:
         const QString& value() const;
@@ -740,7 +808,7 @@ class _EnumeratorModelItem: public _CodeModelItem {
         void setDeprecatedComment(const QString& value);
 
     protected:
-        _EnumeratorModelItem(CodeModel *model, int kind = __node_kind)
+        _EnumeratorModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _CodeModelItem(model, kind), _M_deprecated(false), _M_deprecatedComment() {}
 
     private:
@@ -757,7 +825,7 @@ class _TemplateParameterModelItem: public _CodeModelItem {
     public:
         DECLARE_MODEL_NODE(TemplateParameter)
 
-        static TemplateParameterModelItem create(CodeModel *model);
+        static TemplateParameterModelItem create(CodeModelPtr model);
 
     public:
         const QString& defaultValue() const;
@@ -768,7 +836,7 @@ class _TemplateParameterModelItem: public _CodeModelItem {
         ClassModelItem ownerClass() const;
 
     protected:
-        _TemplateParameterModelItem(CodeModel *model, int kind = __node_kind)
+        _TemplateParameterModelItem(CodeModelPtr model, int kind = __node_kind)
                 : _CodeModelItem(model, kind), _M_defaultValue(), _M_isVaradic(false), _M_ownerClass(nullptr) {}
 
     private:
@@ -811,6 +879,7 @@ _Target model_dynamic_cast(_Source item) {
 
     return _Target();
 }
+
 #endif // CODEMODEL_H
 
 // kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/src/cpp/QtJambiGenerator/parser/codemodel_finder.cpp b/src/cpp/QtJambiGenerator/parser/codemodel_finder.cpp
index 4ebcb41a..08aee546 100644
--- a/src/cpp/QtJambiGenerator/parser/codemodel_finder.cpp
+++ b/src/cpp/QtJambiGenerator/parser/codemodel_finder.cpp
@@ -48,7 +48,7 @@
 #include "codemodel.h"
 #include "binder.h"
 
-CodeModelFinder::CodeModelFinder(CodeModel *model, Binder *binder)
+CodeModelFinder::CodeModelFinder(CodeModelPtr model, Binder *binder)
         : _M_model(model),
         _M_binder(binder),
         _M_token_stream(binder->tokenStream()),
diff --git a/src/cpp/QtJambiGenerator/parser/codemodel_finder.h b/src/cpp/QtJambiGenerator/parser/codemodel_finder.h
index b03f46cc..15028925 100644
--- a/src/cpp/QtJambiGenerator/parser/codemodel_finder.h
+++ b/src/cpp/QtJambiGenerator/parser/codemodel_finder.h
@@ -61,12 +61,12 @@ class CodeModelFinder: protected DefaultVisitor {
         };
 
     public:
-        CodeModelFinder(CodeModel *model, Binder *binder);
+        CodeModelFinder(CodeModelPtr model, Binder *binder);
         virtual ~CodeModelFinder();
 
         ScopeModelItem resolveScope(NameAST *name, ScopeModelItem scope);
 
-        inline CodeModel *model() const { return _M_model; }
+        inline CodeModelPtr model() const { return _M_model; }
 
     protected:
         virtual void visitName(NameAST *node);
@@ -75,7 +75,7 @@ class CodeModelFinder: protected DefaultVisitor {
         ScopeModelItem changeCurrentScope(ScopeModelItem scope);
 
     private:
-        CodeModel *_M_model;
+        CodeModelPtr _M_model;
         Binder *_M_binder;
         TokenStream *_M_token_stream;
         NameCompiler name_cc;
diff --git a/src/cpp/QtJambiGenerator/parser/codemodel_fwd.h b/src/cpp/QtJambiGenerator/parser/codemodel_fwd.h
index 85585115..1704e8d4 100644
--- a/src/cpp/QtJambiGenerator/parser/codemodel_fwd.h
+++ b/src/cpp/QtJambiGenerator/parser/codemodel_fwd.h
@@ -68,6 +68,7 @@ class _VariableModelItem;
 class _MemberModelItem;
 class TypeInfo;
 
+typedef QExplicitlySharedDataPointer<CodeModel> CodeModelPtr;
 typedef QExplicitlySharedDataPointer<_ArgumentModelItem> ArgumentModelItem;
 typedef QExplicitlySharedDataPointer<_ClassModelItem> ClassModelItem;
 typedef QExplicitlySharedDataPointer<_CodeModelItem> CodeModelItem;
diff --git a/src/cpp/QtJambiGenerator/parser/compiler_utils.cpp b/src/cpp/QtJambiGenerator/parser/compiler_utils.cpp
index b883b398..0dda10fa 100644
--- a/src/cpp/QtJambiGenerator/parser/compiler_utils.cpp
+++ b/src/cpp/QtJambiGenerator/parser/compiler_utils.cpp
@@ -66,9 +66,21 @@ TypeInfo CompilerUtils::typeDescription(TypeSpecifierAST *type_specifier, Declar
     typeInfo.setReferenceType(TypeInfo::ReferenceType(decl_cc.getReferenceType()));
     typeInfo.setIndirections(decl_cc.indirection());
     typeInfo.setArrayElements(decl_cc.arrayElements());
+    typeInfo.setArguments(type_cc.templateArgumentTypes());
     typeInfo.setFunctionalArgumentTypes(type_cc.functionalArgumentTypes());
     typeInfo.setFunctionalArgumentNames(type_cc.functionalArgumentNames());
-    typeInfo.setFunctionalReturnType(type_cc.functionalReturnType());
+    if(!type_cc.functionalReturnType().qualifiedName().isEmpty())
+        typeInfo.setFunctionalReturnType(type_cc.functionalReturnType());
+    if(decl_cc.isFunction()){
+        TypeInfo fpTypeInfo;
+        fpTypeInfo.setFunctionPointer(true);
+        fpTypeInfo.setFunctionalReturnType(typeInfo);
+        for(const DeclaratorCompiler::Parameter& p : decl_cc.parameters()){
+            fpTypeInfo.addFunctionalArgumentType(p.type);
+            fpTypeInfo.addFunctionalArgumentName(p.name);
+        }
+        typeInfo = fpTypeInfo;
+    }
 
     return typeInfo;
 }
diff --git a/src/cpp/QtJambiGenerator/parser/declarator_compiler.cpp b/src/cpp/QtJambiGenerator/parser/declarator_compiler.cpp
index bcd5fd7c..717fae23 100644
--- a/src/cpp/QtJambiGenerator/parser/declarator_compiler.cpp
+++ b/src/cpp/QtJambiGenerator/parser/declarator_compiler.cpp
@@ -48,7 +48,7 @@
 #include <qdebug.h>
 
 DeclaratorCompiler::DeclaratorCompiler(Binder *binder)
-        : _M_binder(binder), _M_token_stream(binder->tokenStream()) {
+        : _M_binder(binder), _M_token_stream(binder->tokenStream()), _M_operatorType(OperatorType::None) {
 }
 
 void DeclaratorCompiler::run(DeclaratorAST *node) {
@@ -71,6 +71,8 @@ void DeclaratorCompiler::run(DeclaratorAST *node) {
 
         name_cc.run(decl->id);
         _M_id = name_cc.name();
+        _M_operatorType = name_cc.operatorType();
+        _M_operatorCastType = name_cc.operatorCastType();
         _M_function = (node->parameter_declaration_clause != nullptr);
         if (node->parameter_declaration_clause && node->parameter_declaration_clause->ellipsis)
             _M_variadics = true;
@@ -125,7 +127,7 @@ void DeclaratorCompiler::visitPtrOperator(PtrOperatorAST *node) {
 void DeclaratorCompiler::visitParameterDeclaration(ParameterDeclarationAST *node) {
     Parameter p;
 
-    TypeCompiler type_cc(_M_binder);
+    //TypeCompiler type_cc(_M_binder);
     DeclaratorCompiler decl_cc(_M_binder);
 
     decl_cc.run(node->declarator);
diff --git a/src/cpp/QtJambiGenerator/parser/declarator_compiler.h b/src/cpp/QtJambiGenerator/parser/declarator_compiler.h
index 1407b015..110aa6cd 100644
--- a/src/cpp/QtJambiGenerator/parser/declarator_compiler.h
+++ b/src/cpp/QtJambiGenerator/parser/declarator_compiler.h
@@ -79,6 +79,8 @@ class DeclaratorCompiler: protected DefaultVisitor {
         inline ReferenceType getReferenceType() const { return _M_reference_type; }
         inline const QList<bool>& indirection() const { return _M_indirection; }
         inline const QList<Parameter>& parameters() const { return _M_parameters; }
+        OperatorType operatorType() const { return _M_operatorType; }
+        const TypeInfo& operatorCastType() const { return _M_operatorCastType; }
 
     protected:
         virtual void visitPtrOperator(PtrOperatorAST *node);
@@ -98,6 +100,8 @@ class DeclaratorCompiler: protected DefaultVisitor {
          */
         QList<bool> _M_indirection;
         QString _M_id;
+        OperatorType _M_operatorType;
+        TypeInfo _M_operatorCastType;
         QStringList _M_array;
         QList<Parameter> _M_parameters;
 };
diff --git a/src/cpp/QtJambiGenerator/parser/lexer.cpp b/src/cpp/QtJambiGenerator/parser/lexer.cpp
index f656b03c..8cd1507b 100644
--- a/src/cpp/QtJambiGenerator/parser/lexer.cpp
+++ b/src/cpp/QtJambiGenerator/parser/lexer.cpp
@@ -50,6 +50,7 @@
 
 #include <cctype>
 #include <iostream>
+#include <QFileInfo>
 
 scan_fun_ptr Lexer::s_scan_keyword_table[] = {
     &Lexer::scanKeyword0, &Lexer::scanKeyword0,
@@ -125,6 +126,9 @@ void LocationManager::positionAt(std::size_t offset, int *line, int *column,
 
     location_table.positionAt(offset, line, column);
     *line = base_line + *line - line2  - 1;
+    if(filename){
+        *filename = QFileInfo(*filename).canonicalFilePath();
+    }
 }
 
 scan_fun_ptr Lexer::s_scan_table[256];
@@ -201,6 +205,7 @@ void Lexer::initialize_scan_table() {
             s_scan_table[i] = &Lexer::scan_invalid_input;
     }
 
+    s_scan_table[int('@')] = &Lexer::scan_identifier_or_keyword;
     s_scan_table[int('L')] = &Lexer::scan_identifier_or_literal;
     s_scan_table[int('u')] = &Lexer::scan_identifier_or_literal;
     s_scan_table[int('U')] = &Lexer::scan_identifier_or_literal;
@@ -383,6 +388,8 @@ void Lexer::scan_identifier_or_literal() {
 
 void Lexer::scan_identifier_or_keyword() {
     const unsigned char *skip = cursor;
+    if(*cursor == '@')
+        ++skip;
     while (isalnum(*skip) || *skip == '_' || *skip == '$')
         ++skip;
 
@@ -441,7 +448,7 @@ void Lexer::scan_remainder() {
 
     if (*cursor == '=') {
         ++cursor;
-        token_stream[index++].kind = Token_assign;
+        token_stream[index++].kind = Token_rem_assign;
     } else {
         token_stream[index++].kind = '%';
     }
@@ -457,7 +464,7 @@ void Lexer::scan_and() {
     ++cursor;
     if (*cursor == '=') {
         ++cursor;
-        token_stream[index++].kind = Token_assign;
+        token_stream[index++].kind = Token_and_eq;
     } else if (*cursor == '&') {
         ++cursor;
         token_stream[index++].kind = Token_and;
@@ -486,7 +493,7 @@ void Lexer::scan_star() {
 
     if (*cursor == '=') {
         ++cursor;
-        token_stream[index++].kind = Token_assign;
+        token_stream[index++].kind = Token_times_assign;
     } else {
         token_stream[index++].kind = '*';
     }
@@ -502,7 +509,7 @@ void Lexer::scan_plus() {
     ++cursor;
     if (*cursor == '=') {
         ++cursor;
-        token_stream[index++].kind = Token_assign;
+        token_stream[index++].kind = Token_plus_assign;
     } else if (*cursor == '+') {
         ++cursor;
         token_stream[index++].kind = Token_incr;
@@ -527,7 +534,7 @@ void Lexer::scan_minus() {
     ++cursor;
     if (*cursor == '=') {
         ++cursor;
-        token_stream[index++].kind = Token_assign;
+        token_stream[index++].kind = Token_minus_assign;
     } else if (*cursor == '-') {
         ++cursor;
         token_stream[index++].kind = Token_decr;
@@ -570,7 +577,7 @@ void Lexer::scan_divide() {
 
     if (*cursor == '=') {
         ++cursor;
-        token_stream[index++].kind = Token_assign;
+        token_stream[index++].kind = Token_div_assign;
     } else {
         token_stream[index++].kind = '/';
     }
@@ -629,9 +636,9 @@ void Lexer::scan_less() {
         ++cursor;
         if (*cursor == '=') {
             ++cursor;
-            token_stream[index++].kind = Token_assign;
+            token_stream[index++].kind = Token_left_shift_assign;
         } else {
-            token_stream[index++].kind = Token_shift;
+            token_stream[index++].kind = Token_left_shift;
         }
     } else {
         token_stream[index++].kind = '<';
@@ -666,10 +673,10 @@ void Lexer::scan_greater() {
         ++cursor;
         token_stream[index++].kind = Token_geq;
     } else if (*cursor == '>') {
-        ++cursor;
-        if (*cursor == '=') {
+        if (*(cursor+1) == '=') {
+            ++cursor;
             ++cursor;
-            token_stream[index++].kind = Token_assign;
+            token_stream[index++].kind = Token_right_shift_assign;
         } else {
             token_stream[index++].kind = '>';
         }
@@ -702,7 +709,7 @@ void Lexer::scan_xor() {
 
     if (*cursor == '=') {
         ++cursor;
-        token_stream[index++].kind = Token_assign;
+        token_stream[index++].kind = Token_xor_eq;
     } else {
         token_stream[index++].kind = '^';
     }
@@ -722,7 +729,7 @@ void Lexer::scan_or() {
     ++cursor;
     if (*cursor == '=') {
         ++cursor;
-        token_stream[index++].kind = Token_assign;
+        token_stream[index++].kind = Token_or_eq;
     } else if (*cursor == '|') {
         ++cursor;
         token_stream[index++].kind = Token_or;
@@ -1584,6 +1591,19 @@ void Lexer::scanKeyword8() {
 
 void Lexer::scanKeyword9() {
     switch (*cursor) {
+    case '@': // @protocol objective-C-keyword mapping to class
+        if (*(cursor + 1) == 'p' &&
+                *(cursor + 2) == 'r' &&
+                *(cursor + 3) == 'o' &&
+                *(cursor + 4) == 't' &&
+                *(cursor + 5) == 'o' &&
+                *(cursor + 6) == 'c' &&
+                *(cursor + 7) == 'o' &&
+                *(cursor + 8) == 'l') {
+            token_stream[index++].kind = Token_class;
+            return;
+        }
+        break;
     case 'c':
         if (*(cursor + 1) == 'o' &&
                 *(cursor + 2) == 'n' &&
@@ -1596,6 +1616,7 @@ void Lexer::scanKeyword9() {
             token_stream[index++].kind = Token_constexpr;
             return;
         }
+        break;
     break;
         case 'p':
             if (*(cursor + 1) == 'r' &&
diff --git a/src/cpp/QtJambiGenerator/parser/lexer.h b/src/cpp/QtJambiGenerator/parser/lexer.h
index d9bac24d..a0c33cd2 100644
--- a/src/cpp/QtJambiGenerator/parser/lexer.h
+++ b/src/cpp/QtJambiGenerator/parser/lexer.h
@@ -151,7 +151,9 @@ class TokenStream {
         { return index++; }
 
         inline int lookAhead(std::size_t i = 0) const
-        { return tokens[index + i].kind; }
+        {
+            return tokens[index + i].kind;
+        }
 
         inline int kind(std::size_t i) const
         { return tokens[i].kind; }
@@ -187,11 +189,12 @@ class LocationManager {
     public:
         LocationManager(TokenStream &__token_stream,
                         LocationTable &__location_table,
-                        LocationTable &__line_table):
+                        LocationTable &__line_table,
+                        QMap<QString,QStringList>& requiredFeatures):
                 token_stream(__token_stream),
                 location_table(__location_table),
                 line_table(__line_table),
-                _M_requiredFeatures() {}
+                _M_requiredFeatures(requiredFeatures) {}
 
         void positionAt(std::size_t offset, int *line, int *column,
                         QString *filename) const;
@@ -206,7 +209,7 @@ class LocationManager {
         LocationTable &location_table;
         LocationTable &line_table;
     private:
-        QMap<QString,QStringList> _M_requiredFeatures;
+        QMap<QString,QStringList>& _M_requiredFeatures;
 };
 
 class Lexer {
diff --git a/src/cpp/QtJambiGenerator/parser/name_compiler.cpp b/src/cpp/QtJambiGenerator/parser/name_compiler.cpp
index 33f78414..23e2c606 100644
--- a/src/cpp/QtJambiGenerator/parser/name_compiler.cpp
+++ b/src/cpp/QtJambiGenerator/parser/name_compiler.cpp
@@ -48,18 +48,22 @@
 #include <QtCore/qdebug.h>
 
 NameCompiler::NameCompiler(Binder *binder)
-        : _M_binder(binder), _M_token_stream(binder->tokenStream()) {
+        : _M_binder(binder), _M_token_stream(binder->tokenStream()), _M_operatorType(OperatorType::None) {
 }
 
-QString NameCompiler::decode_operator(std::size_t index, bool op2) const {
+QString NameCompiler::decode_operator(std::size_t index, unsigned opLength) const {
     const Token &tk = _M_token_stream->token(index);
-    return QString::fromUtf8(&tk.text[tk.position], int(tk.size + (op2 ? 1 : 0)));
+    return QString::fromUtf8(&tk.text[tk.position], int(tk.size + opLength));
 }
 
-QString NameCompiler::internal_run(AST *node) {
+void NameCompiler::internal_run(AST *node) {
     _M_name.clear();
+    _M_functionalReturnType = TypeInfo();
+    _M_templateArgs.clear();
+    _M_templateArgumentTypes.clear();
+    _M_functionalArgumentTypes.clear();
+    _M_functionalArgumentNames.clear();
     visit(node);
-    return name();
 }
 
 void NameCompiler::visitUnqualifiedName(UnqualifiedNameAST *node) {
@@ -75,16 +79,187 @@ void NameCompiler::visitUnqualifiedName(UnqualifiedNameAST *node) {
 
     if (OperatorFunctionIdAST *op_id = node->operator_id) {
         if (op_id->op && op_id->op->op) {
+            switch (_M_token_stream->kind(op_id->op->op)) {
+            case Token_new:
+                if(op_id->op->opLength==0)
+                    _M_operatorType = OperatorType::New;
+                else
+                    _M_operatorType = OperatorType::NewArray;
+                break;
+            case Token_delete:
+                if(op_id->op->opLength==0)
+                    _M_operatorType = OperatorType::Delete;
+                else
+                    _M_operatorType = OperatorType::DeleteArray;
+                break;
+            case '+':
+                _M_operatorType = OperatorType::Plus;
+                break;
+            case Token_plus_assign:
+                _M_operatorType = OperatorType::PlusAssign;
+                break;
+            case '-':
+                _M_operatorType = OperatorType::Minus;
+                break;
+            case Token_minus_assign:
+                _M_operatorType = OperatorType::MinusAssign;
+                break;
+            case '*':
+                _M_operatorType = OperatorType::Times;
+                break;
+            case Token_times_assign:
+                _M_operatorType = OperatorType::TimesAssign;
+                break;
+            case '/':
+                _M_operatorType = OperatorType::Div;
+                break;
+            case Token_div_assign:
+                _M_operatorType = OperatorType::DivAssign;
+                break;
+            case '%':
+                _M_operatorType = OperatorType::Rem;
+                break;
+            case Token_rem_assign:
+                _M_operatorType = OperatorType::RemAssign;
+                break;
+            case '^':
+                _M_operatorType = OperatorType::Xor;
+                break;
+            case Token_xor_eq:
+                _M_operatorType = OperatorType::XorAssign;
+                break;
+            case '&':
+                _M_operatorType = OperatorType::And;
+                break;
+            case Token_and_eq:
+                _M_operatorType = OperatorType::AndAssign;
+                break;
+            case '|':
+                _M_operatorType = OperatorType::Or;
+                break;
+            case Token_or_eq:
+                _M_operatorType = OperatorType::OrAssign;
+                break;
+            case '~':
+                _M_operatorType = OperatorType::Not;
+                break;
+            case '!':
+                _M_operatorType = OperatorType::Negation;
+                break;
+            case Token_assign:
+            case '=':
+                _M_operatorType = OperatorType::Assign;
+                break;
+            case '<':
+                _M_operatorType = OperatorType::Less;
+                break;
+            case Token_leq:
+                _M_operatorType = OperatorType::LessOrEquals;
+                break;
+            case Token_geq:
+                _M_operatorType = OperatorType::GreaterOrEquals;
+                break;
+            case ',':
+                _M_operatorType = OperatorType::Comma;
+                break;
+            case Token_left_shift:
+                _M_operatorType = OperatorType::ShiftLeft;
+                break;
+            case Token_left_shift_assign:
+                _M_operatorType = OperatorType::ShiftLeftAssign;
+                break;
+            case Token_right_shift_assign:
+                _M_operatorType = OperatorType::ShiftRightAssign;
+                break;
+            case Token_eq:
+                _M_operatorType = OperatorType::Equals;
+                break;
+            case Token_not_eq:
+                _M_operatorType = OperatorType::NotEquals;
+                break;
+            case Token_compare:
+                _M_operatorType = OperatorType::Compare;
+                break;
+            case Token_and:
+                _M_operatorType = OperatorType::ExclusiveAnd;
+                break;
+            case Token_or:
+                _M_operatorType = OperatorType::ExclusiveOr;
+                break;
+            case Token_incr:
+                _M_operatorType = OperatorType::Inc;
+                break;
+            case Token_decr:
+                _M_operatorType = OperatorType::Dec;
+                break;
+            case Token_ptrmem:
+                _M_operatorType = OperatorType::PointerToMemberOfPointer;
+                break;
+            case Token_arrow:
+                _M_operatorType = OperatorType::MemberOfPointer;
+                break;
+            case '>':
+                switch(op_id->op->opLength){
+                case 0:
+                    _M_operatorType = OperatorType::Greater;
+                    break;
+                case 1:
+                    switch (_M_token_stream->kind(op_id->op->op+1)) {
+                    case '>':
+                        _M_operatorType = OperatorType::ShiftRight;
+                        break;
+                    }
+                    break;
+                }
+                break;
+            break;
+            case '(':
+                switch(op_id->op->opLength){
+                case 1:
+                    switch (_M_token_stream->kind(op_id->op->op+1)) {
+                    case ')':
+                        _M_operatorType = OperatorType::FunctionCall;
+                        break;
+                    }
+                    break;
+                }
+            break;
+            case '[':
+                switch(op_id->op->opLength){
+                case 1:
+                    switch (_M_token_stream->kind(op_id->op->op+1)) {
+                    case ']':
+                        _M_operatorType = OperatorType::Subscript;
+                        break;
+                    }
+                    break;
+                }
+            break;
+            }
+
             tmp_name += QLatin1String("operator");
-            tmp_name += decode_operator(op_id->op->op, op_id->op->op2);
-            if (op_id->op->close)
-                tmp_name += decode_operator(op_id->op->close, false);
+            tmp_name += decode_operator(op_id->op->op, op_id->op->opLength);
         } else if (op_id->type_specifier) {
+            TypeCompiler type_cc(_M_binder);
+            type_cc.run(op_id->type_specifier);
+            _M_operatorCastType.setQualifiedName(type_cc.qualifiedName());
+            _M_operatorCastType.setConstant(type_cc.isConstant());
+            _M_operatorCastType.setVolatile(type_cc.isVolatile());
+            _M_operatorCastType.setReferenceType(TypeInfo::NoReference);
+            _M_operatorCastType.setIndirections({});
+            _M_operatorCastType.setArrayElements({});
+            _M_operatorCastType.setFunctionalArgumentTypes(type_cc.functionalArgumentTypes());
+            _M_operatorCastType.setFunctionalArgumentNames(type_cc.functionalArgumentNames());
+            if(!type_cc.functionalReturnType().qualifiedName().isEmpty())
+                _M_operatorCastType.setFunctionalReturnType(type_cc.functionalReturnType());
+            _M_operatorType = OperatorType::TypeCast;
+
             Token const &tk = _M_token_stream->token(op_id->start_token);
             Token const &end_tk = _M_token_stream->token(op_id->end_token);
             tmp_name += QString::fromLatin1(&tk.text[tk.position],
                                             Size(end_tk.position - tk.position)).trimmed();
         } else if (_M_token_stream->token(op_id->type_name).kind==Token_string_literal) {
+            _M_operatorType = OperatorType::String;
             Token const &tk = _M_token_stream->token(op_id->type_name+1);
             tmp_name += QLatin1String("operator\"\"");
             tmp_name += QString::fromLatin1(&tk.text[tk.position], Size(tk.size)).trimmed();
@@ -94,15 +269,13 @@ void NameCompiler::visitUnqualifiedName(UnqualifiedNameAST *node) {
     _M_name += tmp_name;
     if (node->template_arguments) {
         // ### cleanup
-        _M_name.last() += QLatin1String("<");
         visitNodes(this, node->template_arguments);
-        _M_name.last().truncate(_M_name.last().size() - 1); // remove the last ','
-        _M_name.last() += QLatin1String(">");
     }
 
 }
 
 void NameCompiler::visitTemplateArgument(TemplateArgumentAST *node) {
+    QString templateArg;
     if (node->type_id && node->type_id->type_specifier) {
         TypeCompiler type_cc(_M_binder);
         type_cc.run(node->type_id->type_specifier);
@@ -111,7 +284,7 @@ void NameCompiler::visitTemplateArgument(TemplateArgumentAST *node) {
         decl_cc.run(node->type_id->declarator);
 
         if (type_cc.isConstant())
-            _M_name.last() += "const ";
+            templateArg += "const ";
 
         QStringList q = type_cc.qualifiedName();
 
@@ -129,17 +302,17 @@ void NameCompiler::visitTemplateArgument(TemplateArgumentAST *node) {
             }
         }
 
-        _M_name.last() += q.join("::");
+        templateArg += q.join("::");
 
         if (decl_cc.getReferenceType()==DeclaratorCompiler::Reference)
-            _M_name.last() += "&";
+            templateArg += "&";
         if (decl_cc.getReferenceType()==DeclaratorCompiler::RReference)
-            _M_name.last() += "&&";
+            templateArg += "&&";
         for (int i=0; i<decl_cc.indirection().size(); i++){
             if(decl_cc.indirection()[i]){
-                _M_name.last() += "*const ";
+                templateArg += "*const ";
             }else{
-                _M_name.last() += "*";
+                templateArg += "*";
             }
         }
 
@@ -152,29 +325,44 @@ void NameCompiler::visitTemplateArgument(TemplateArgumentAST *node) {
             _M_functionalReturnType.setArrayElements(decl_cc.arrayElements());
             _M_functionalReturnType.setFunctionalArgumentTypes(type_cc.functionalArgumentTypes());
             _M_functionalReturnType.setFunctionalArgumentNames(type_cc.functionalArgumentNames());
-            _M_functionalReturnType.setFunctionalReturnType(type_cc.functionalReturnType());
-            _M_name.last() += "(";
+            if(!type_cc.functionalReturnType().qualifiedName().isEmpty())
+                _M_functionalReturnType.setFunctionalReturnType(type_cc.functionalReturnType());
+            templateArg += "(";
             bool isBegin = true;
             for(const DeclaratorCompiler::Parameter& parameter : decl_cc.parameters()){
                 if(!isBegin)
-                    _M_name.last() += ",";
+                    templateArg += ",";
                 if(parameter.type.qualifiedName().isEmpty()){
-                    _M_name.last() += parameter.name;
+                    templateArg += parameter.name;
                 }else{
-                    _M_name.last() += parameter.type.toString();
+                    templateArg += parameter.type.toString();
                 }
                 _M_functionalArgumentTypes << parameter.type;
                 _M_functionalArgumentNames << parameter.name;
                 isBegin = false;
             }
-            _M_name.last() += ")";
+            templateArg += ")";
+        }else{
+            TypeInfo type;
+            type.setQualifiedName(type_cc.qualifiedName());
+            type.setConstant(type_cc.isConstant());
+            type.setVolatile(type_cc.isVolatile());
+            type.setReferenceType(TypeInfo::ReferenceType(decl_cc.getReferenceType()));
+            type.setIndirections(decl_cc.indirection());
+            type.setArrayElements(decl_cc.arrayElements());
+            type.setArguments(type_cc.templateArgumentTypes());
+            type.setFunctionalArgumentTypes(type_cc.functionalArgumentTypes());
+            if(!type_cc.functionalReturnType().qualifiedName().isEmpty())
+                type.setFunctionalArgumentNames(type_cc.functionalArgumentNames());
+            type.setFunctionalReturnType(type_cc.functionalReturnType());
+            _M_templateArgumentTypes << type;
         }
-        _M_name.last() += QLatin1String(",");
     }else if(node->expression){
 //        DefaultVisitor defaultVisitor;
 //        defaultVisitor.visit(node->expression);
-        _M_name.last() += QLatin1String("EXPRESSION,");
+        templateArg = QLatin1String("EXPRESSION");
     }
+    _M_templateArgs << templateArg;
 }
 
 // kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/src/cpp/QtJambiGenerator/parser/name_compiler.h b/src/cpp/QtJambiGenerator/parser/name_compiler.h
index c7288d32..f87f0a1a 100644
--- a/src/cpp/QtJambiGenerator/parser/name_compiler.h
+++ b/src/cpp/QtJambiGenerator/parser/name_compiler.h
@@ -62,8 +62,12 @@ class NameCompiler: protected DefaultVisitor {
         void run(UnqualifiedNameAST *node) { internal_run(node); }
 
         QString name() const { return _M_name.join("::"); }
+        const QStringList& templateArgs() const { return _M_templateArgs; }
         const QStringList& qualifiedName() const { return _M_name; }
         const TypeInfo& functionalReturnType() const { return _M_functionalReturnType; }
+        const TypeInfo& operatorCastType() const { return _M_operatorCastType; }
+        OperatorType operatorType() const { return _M_operatorType; }
+        const QList<TypeInfo>& templateArgumentTypes() const { return _M_templateArgumentTypes; }
         const QList<TypeInfo>& functionalArgumentTypes() const { return _M_functionalArgumentTypes; }
         const QList<QString>& functionalArgumentNames() const { return _M_functionalArgumentNames; }
 
@@ -71,14 +75,18 @@ class NameCompiler: protected DefaultVisitor {
         virtual void visitUnqualifiedName(UnqualifiedNameAST *node);
         virtual void visitTemplateArgument(TemplateArgumentAST *node);
 
-        QString internal_run(AST *node);
-        QString decode_operator(std::size_t index, bool op2) const;
+        void internal_run(AST *node);
+        QString decode_operator(std::size_t index, unsigned opLength) const;
 
     private:
         Binder *_M_binder;
         TokenStream *_M_token_stream;
         QStringList _M_name;
+        QStringList _M_templateArgs;
+        QList<TypeInfo> _M_templateArgumentTypes;
         TypeInfo _M_functionalReturnType;
+        OperatorType _M_operatorType;
+        TypeInfo _M_operatorCastType;
         QList<TypeInfo> _M_functionalArgumentTypes;
         QList<QString> _M_functionalArgumentNames;
 };
diff --git a/src/cpp/QtJambiGenerator/parser/parser.cpp b/src/cpp/QtJambiGenerator/parser/parser.cpp
index 7e6271f0..19f191e9 100644
--- a/src/cpp/QtJambiGenerator/parser/parser.cpp
+++ b/src/cpp/QtJambiGenerator/parser/parser.cpp
@@ -82,13 +82,14 @@
       (_node)->end_token = end; \
   } while (0)
 
-Parser::Parser(Control *c)
-        : _M_location(token_stream, location_table, line_table),
+Parser::Parser(Control *c, QMap<QString,QStringList>& requiredFeatures)
+        : _M_location(token_stream, location_table, line_table, requiredFeatures),
         control(c),
         lexer(_M_location, control),
         m_isInTemplate(0),
         m_isShift(false),
-        m_isTemplateDecl(false)
+        m_isTemplateDecl(false),
+        m_isExpression(false)
 {
     _M_block_errors = false;
 }
@@ -477,7 +478,10 @@ bool Parser::parseDeclaration(DeclarationAST *&node) {
             token_stream.nextToken();
             ADVANCE('(' , "(")
             NameAST *name = nullptr;
+            bool isExpression = m_isExpression;
+            m_isExpression = false;
             parseName(name, true);
+            m_isExpression = isExpression;
             QString feature = name->toString(&token_stream).trimmed();
             ADVANCE(')', ")")
             _M_location.addRequiredFeature(token_stream.position(name->start_token), feature);
@@ -768,7 +772,11 @@ bool Parser::parseNamespace(DeclarationAST *&node) {
         token_stream.nextToken();
 
         NameAST *name = nullptr;
-        if (parseName(name)) {
+        bool isExpression = m_isExpression;
+        m_isExpression = false;
+        bool p = parseName(name);
+        m_isExpression = isExpression;
+        if (p) {
             ADVANCE(';', ";")
 
             NamespaceAliasDefinitionAST *ast
@@ -813,7 +821,11 @@ bool Parser::parseUsing(DeclarationAST *&node) {
     }
 
     NameAST *name = nullptr;
-    if (!parseName(name))
+    bool isExpression = m_isExpression;
+    m_isExpression = false;
+    bool p = parseName(name);
+    m_isExpression = isExpression;
+    if (!p)
         return false;
 
     const ListNode<std::size_t> *storageSpec = nullptr;
@@ -894,12 +906,12 @@ bool Parser::parseUsing(DeclarationAST *&node) {
 
         DeclaratorAST* declarator = CreateNode<DeclaratorAST>(_M_pool);
         declarator->ptr_ops = ptr_ops;
+        declarator->parameter_declaration_clause = parameters;
 
         UsingAsAST *ast = CreateNode<UsingAsAST>(_M_pool);
         ast->name = name;
         ast->type_specifier = spec;
         ast->declarator = declarator;
-        ast->parameters = parameters;
         node = ast;
     }else{
         UsingAST *ast = CreateNode<UsingAST>(_M_pool);
@@ -921,7 +933,11 @@ bool Parser::parseUsingDirective(DeclarationAST *&node) {
     CHECK(Token_namespace);
 
     NameAST *name = nullptr;
-    if (!parseName(name)) {
+    bool isExpression = m_isExpression;
+    m_isExpression = false;
+    bool p = parseName(name);
+    m_isExpression = isExpression;
+    if (!p) {
         reportError(("Namespace name expected"));
         return false;
     }
@@ -1068,6 +1084,7 @@ bool Parser::parseTypedef(DeclarationAST *&node) {
     UPDATE_POS(ast, start, token_stream.cursor());
     node = ast;
 
+
     return true;
 }
 
@@ -1139,38 +1156,45 @@ bool Parser::parseOperator(OperatorAST *&node) {
         case Token_delete: {
             ast->op = token_stream.cursor();
             token_stream.nextToken();
-
             if (token_stream.lookAhead() == '['
                     && token_stream.lookAhead(1) == ']') {
-                ast->open = token_stream.cursor();
+                ast->opLength = 2;
                 token_stream.nextToken();
-
-                ast->close = token_stream.cursor();
                 token_stream.nextToken();
             }
         }
         break;
 
         case '+':
+        case Token_plus_assign:
         case '-':
+        case Token_minus_assign:
         case '*':
+        case Token_times_assign:
         case '/':
+        case Token_div_assign:
         case '%':
+        case Token_rem_assign:
         case '^':
+        case Token_xor_eq:
         case '&':
+        case Token_and_eq:
         case '|':
+        case Token_or_eq:
         case '~':
         case '!':
+        case Token_not_eq:
         case '=':
         case '<':
         case ',':
         case Token_assign:
-        case Token_shift:
+        case Token_left_shift:
+        case Token_left_shift_assign:
+        case Token_right_shift_assign:
         case Token_eq:
-        case Token_not_eq:
         case Token_leq:
-        case Token_compare:
         case Token_geq:
+        case Token_compare:
         case Token_and:
         case Token_or:
         case Token_incr:
@@ -1184,26 +1208,28 @@ bool Parser::parseOperator(OperatorAST *&node) {
             ast->op = token_stream.cursor();
             token_stream.nextToken();
             if(token_stream.lookAhead() == '>'){
-                ast->op2 = true;
+                ast->opLength = 1;
                 token_stream.nextToken();
             }
         break;
-        default:
-            if (token_stream.lookAhead() == '('
-                    && token_stream.lookAhead(1) == ')') {
-                ast->op = ast->open = token_stream.cursor();
-                token_stream.nextToken();
-                ast->close = token_stream.cursor();
-                token_stream.nextToken();
-            } else if (token_stream.lookAhead() == '['
-                       && token_stream.lookAhead(1) == ']') {
-                ast->op = ast->open = token_stream.cursor();
+        case '(':
+            ast->op = token_stream.cursor();
+            token_stream.nextToken();
+            if(token_stream.lookAhead() == ')'){
+                ast->opLength = 1;
                 token_stream.nextToken();
-                ast->close = token_stream.cursor();
+            }
+        break;
+        case '[':
+            ast->op = token_stream.cursor();
+            token_stream.nextToken();
+            if(token_stream.lookAhead() == ']'){
+                ast->opLength = 1;
                 token_stream.nextToken();
-            } else {
-                return false;
             }
+        break;
+        default:
+            return false;
     }
 
     UPDATE_POS(ast, start, token_stream.cursor());
@@ -1217,11 +1243,27 @@ bool Parser::parseCvQualify(const ListNode<std::size_t> *&node) {
 
     int tk;
     while (0 != (tk = token_stream.lookAhead())
-            && (tk == Token_const || tk == Token_constexpr || tk == Token_volatile)) {
-        node = snoc(node, token_stream.cursor(), _M_pool);
-        token_stream.nextToken();
+            && (tk == Token_const || tk == Token_constexpr || tk == Token_volatile || (tk == '[' && token_stream.lookAhead(1) == '['))) {
+        if (tk == '[') {
+            token_stream.nextToken();
+            token_stream.nextToken();
+            ExpressionAST *annotationExpression(nullptr);
+            if(!parseExpression(annotationExpression)){
+                token_stream.rewind(start);
+            }else{
+                if (token_stream.lookAhead() == ']' && token_stream.lookAhead(1) == ']') {
+                    token_stream.nextToken();
+                    token_stream.nextToken();
+                }else{
+                    token_stream.rewind(start);
+                    break;
+                }
+            }
+        }else{
+            node = snoc(node, token_stream.cursor(), _M_pool);
+            token_stream.nextToken();
+        }
     }
-
     return start != token_stream.cursor();
 }
 
@@ -2483,6 +2525,8 @@ bool Parser::parseMemberSpecification(DeclarationAST *&node) {
     }
     bool hasDeprecated = parseDeprecatedSpecifier(storageSpec, deprecationComment);
     parseStorageClassSpecifier(storageSpec);
+    if (token_stream.lookAhead() == Token_inline)
+        token_stream.nextToken();
 
     if(!hasDeprecated)
         hasDeprecated = parseDeprecatedSpecifier(storageSpec, deprecationComment);
@@ -2756,7 +2800,11 @@ bool Parser::parseMemInitializer(MemInitializerAST *&node) {
     std::size_t start = token_stream.cursor();
 
     NameAST *initId = nullptr;
-    if (!parseName(initId, true)) {
+    bool isExpression = m_isExpression;
+    m_isExpression = false;
+    bool p = parseName(initId, true);
+    m_isExpression = isExpression;
+    if (!p) {
         reportError(("Identifier expected"));
         return false;
     }
@@ -2831,7 +2879,11 @@ bool Parser::parseBaseSpecifier(BaseSpecifierAST *&node) {
         }
     }
 
-    if (!parseName(ast->name, true))
+    bool isExpression = m_isExpression;
+    m_isExpression = false;
+    bool p = parseName(ast->name, true);
+    m_isExpression = isExpression;
+    if (!p)
         reportError(("Class name expected"));
 
     UPDATE_POS(ast, start, token_stream.cursor());
@@ -2925,7 +2977,7 @@ bool Parser::parseUnqualifiedName(UnqualifiedNameAST *&node,
     if (token_stream.lookAhead() == Token_identifier) {
         id = token_stream.cursor();
         token_stream.nextToken();
-    } else if (token_stream.lookAhead() == '~'
+    } else if ((token_stream.lookAhead() == '~' || token_stream.lookAhead() == Token_compl)
                && token_stream.lookAhead(1) == Token_identifier) {
         tilde = token_stream.cursor();
         token_stream.nextToken(); // skip ~
@@ -2966,7 +3018,16 @@ bool Parser::parseUnqualifiedName(UnqualifiedNameAST *&node,
                     const Token & tkn = token_stream.token(token_stream.cursor());
                     if(QLatin1String(&tkn.text[tkn.position], int(tkn.size))==">>")
                         m_isShift = true;
-                    else token_stream.nextToken();
+                    else{
+                        token_stream.nextToken();
+                        if (m_isExpression && (token_stream.lookAhead() == Token_identifier
+                                                || (token_stream.lookAhead()>='0' && token_stream.lookAhead()<='9')
+                                                || token_stream.lookAhead()=='\''
+                                                || token_stream.lookAhead()=='"')) {
+                            ast->template_arguments = nullptr;
+                            token_stream.rewind(index);
+                        }
+                    }
                 }else{
                     token_stream.nextToken();
                 }
@@ -3421,9 +3482,18 @@ bool Parser::parseIfStatement(StatementAST *&node) {
     IfStatementAST *ast = CreateNode<IfStatementAST>(_M_pool);
 
     ConditionAST *cond = nullptr;
-    if (!parseCondition(cond)) {
-        reportError(("condition expected"));
-        return false;
+    StatementAST *decl_ast = nullptr;
+    //std::size_t start2 = token_stream.cursor();
+    bool ok = false;
+    while(true){
+        if(!(ok = parseDeclarationStatement(decl_ast))){
+            ok = parseCondition(cond);
+            if(ok && token_stream.lookAhead() == ';'){
+                token_stream.nextToken();
+            }
+        }
+        if(!ok)
+            break;
     }
     ADVANCE(')', ")")
 
@@ -3613,7 +3683,11 @@ bool Parser::parseNamespaceAliasDefinition(DeclarationAST *&node) {
 
     ADVANCE('=', "=")
 
-    if (!parseName(ast->alias_name)) {
+    bool isExpression = m_isExpression;
+    m_isExpression = false;
+    bool p = parseName(ast->alias_name);
+    m_isExpression = isExpression;
+    if (!p) {
         reportError(("Namespace name expected"));
     }
 
@@ -3733,7 +3807,11 @@ bool Parser::parseDeclarationInternal(DeclarationAST *&node) {
 
     size_t index = token_stream.cursor();
     NameAST *name = nullptr;
-    if (parseName(name, true) && token_stream.lookAhead() == '(') {
+    bool isExpression = m_isExpression;
+    m_isExpression = false;
+    bool p = parseName(name, true);
+    m_isExpression = isExpression;
+    if (p && token_stream.lookAhead() == '(') {
         // no type specifier, maybe a constructor or a cast operator??
 
         token_stream.rewind(index);
@@ -3743,7 +3821,10 @@ bool Parser::parseDeclarationInternal(DeclarationAST *&node) {
             UnqualifiedNameAST *arrowDecl = nullptr;
             if(m_isTemplateDecl && declarator && !declarator->initializer && token_stream.lookAhead()==Token_arrow){
                 token_stream.nextToken();
+                bool isExpression = m_isExpression;
+                m_isExpression = false;
                 parseUnqualifiedName(arrowDecl, true);
+                m_isExpression = isExpression;
             }
             switch (token_stream.lookAhead()) {
                 case ';': {
@@ -3850,6 +3931,8 @@ bool Parser::parseDeclarationInternal(DeclarationAST *&node) {
             hasDeprecated = parseDeprecatedSpecifier(storageSpec, deprecationComment);
         if (!hasFunSpec)
             parseFunctionSpecifier(funSpec);         // e.g. "void inline"
+        if (token_stream.lookAhead() == Token_static) // e.g. "enable_if_t static"
+            token_stream.nextToken();
         if(!hasDeprecated)
             hasDeprecated = parseDeprecatedSpecifier(storageSpec, deprecationComment);
         if(!spec->cv){
@@ -4163,10 +4246,14 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node) {
             CHECK(')');
             break;
 
-        default:
-            if (!parseName(ast->name))
+        default:{
+            bool isExpression = m_isExpression;
+            m_isExpression = true;
+            bool p = parseName(ast->name);
+            m_isExpression = isExpression;
+            if (!p)
                 return false;
-
+            }
             break;
     }
 
@@ -4230,7 +4317,7 @@ bool Parser::parsePostfixExpressionInternal(ExpressionAST *&node) {
             if (token_stream.lookAhead() == Token_template) {
                 templ = token_stream.cursor();
                 token_stream.nextToken();
-            }else if (token_stream.lookAhead() == '~') {
+            }else if (token_stream.lookAhead() == '~' || token_stream.lookAhead() == Token_compl) {
                 tilde = token_stream.cursor();
                 token_stream.nextToken();
             }
@@ -4239,8 +4326,11 @@ bool Parser::parsePostfixExpressionInternal(ExpressionAST *&node) {
             size_t saved = token_stream.cursor();
             NameAST *name = nullptr;
 
-
-            if (parseName(name, true) && name->unqualified_name
+            bool isExpression = m_isExpression;
+            m_isExpression = true;
+            bool p = parseName(name, true);
+            m_isExpression = isExpression;
+            if (p && name->unqualified_name
                     && name->unqualified_name->template_arguments
                     && token_stream.lookAhead() == '(') {
                 // a template method call
@@ -4249,7 +4339,11 @@ bool Parser::parsePostfixExpressionInternal(ExpressionAST *&node) {
                 token_stream.rewind(saved);
                 name = nullptr;
 
-                if (! parseName(name, templ != 0))
+                isExpression = m_isExpression;
+                m_isExpression = false;
+                p = parseName(name, templ != 0);
+                m_isExpression = isExpression;
+                if (!p)
                     return false;
             }
 
@@ -4326,7 +4420,11 @@ bool Parser::parsePostfixExpression(ExpressionAST *&node) {
             token_stream.nextToken();
 
             NameAST* name = nullptr;
-            if (!parseName(name, true))
+            bool isExpression = m_isExpression;
+            m_isExpression = false;
+            bool p = parseName(name, true);
+            m_isExpression = isExpression;
+            if (!p)
                 return false;
 
             ExpressionAST *expr = nullptr;
@@ -4374,7 +4472,12 @@ bool Parser::parsePostfixExpression(ExpressionAST *&node) {
 
     // let's try to parse a type
     NameAST *name = nullptr;
-    if (parseName(name, true)) {
+    bool isExpression = m_isExpression;
+    m_isExpression = true;
+    bool p = parseName(name, true);
+    m_isExpression = isExpression;
+
+    if (p) {
         Q_ASSERT(name->unqualified_name);
 
         bool has_template_args = name->unqualified_name->template_arguments != nullptr;
@@ -4410,7 +4513,7 @@ bool Parser::parsePostfixExpression(ExpressionAST *&node) {
                      || token_stream.lookAhead() == '>'
                      || token_stream.lookAhead() == Token_or
                      || token_stream.lookAhead() == Token_and
-                     || token_stream.lookAhead() == Token_shift
+                     || token_stream.lookAhead() == Token_left_shift
                      || token_stream.lookAhead() == Token_leq
                      || token_stream.lookAhead() == Token_compare
                      || token_stream.lookAhead() == Token_not
@@ -4421,6 +4524,8 @@ bool Parser::parsePostfixExpression(ExpressionAST *&node) {
                      || token_stream.lookAhead() == Token_decr
                      || token_stream.lookAhead() == Token_bitor
                      || token_stream.lookAhead() == Token_and_eq
+                     || token_stream.lookAhead() == Token_xor_eq
+                     || token_stream.lookAhead() == Token_or_eq
                      || token_stream.lookAhead() == Token_bitand){
                 // expression shall be a template function pointer
                 PostfixExpressionAST *ast = CreateNode<PostfixExpressionAST>(_M_pool);
@@ -4492,6 +4597,7 @@ bool Parser::parseUnaryExpression(ExpressionAST *&node) {
     switch (token_stream.lookAhead()) {
         case Token_incr:
         case Token_decr:
+        case Token_compl:
         case '*':
         case '&':
         case '+':
@@ -4900,17 +5006,22 @@ bool Parser::parseShiftExpression(ExpressionAST *&node, bool templArgs) {
     if (!parseAdditiveExpression(node))
         return false;
 
-    while (token_stream.lookAhead() == Token_shift
-           || (token_stream.lookAhead() == '>' && token_stream.lookAhead(1) == '>' && !templArgs)) {
+    while (token_stream.lookAhead() == Token_left_shift
+           || (token_stream.lookAhead() == '>' && token_stream.lookAhead(1) == '>' && token_stream.lookAhead(2) != '=' && !templArgs)) {
         std::size_t op = token_stream.cursor();
-        bool op2 = false;
+        unsigned opLength = 0;
 
-        if(token_stream.lookAhead() == Token_shift){
+        if(token_stream.lookAhead() == Token_left_shift){
             token_stream.nextToken();
         }else{
+            auto tk1 = token_stream.token(op);
+            auto tk2 = token_stream.token(op+1);
+            if(tk2.position!=tk1.position+1){
+                return true;
+            }
             token_stream.nextToken();
             token_stream.nextToken();
-            op2 = true;
+            opLength = 1;
         }
 
         ExpressionAST *rightExpr = nullptr;
@@ -4919,7 +5030,7 @@ bool Parser::parseShiftExpression(ExpressionAST *&node, bool templArgs) {
 
         BinaryExpressionAST *ast = CreateNode<BinaryExpressionAST>(_M_pool);
         ast->op = op;
-        ast->op2 = op2;
+        ast->opLength = opLength;
         ast->left_expression = node;
         ast->right_expression = rightExpr;
 
@@ -4939,8 +5050,9 @@ bool Parser::parseRelationalExpression(ExpressionAST *&node, bool templArgs) {
     while (token_stream.lookAhead() == '<'
             || (token_stream.lookAhead() == '>' && token_stream.lookAhead(1) != '>' && !templArgs)
             || token_stream.lookAhead() == Token_leq
+            || token_stream.lookAhead() == Token_geq
             || token_stream.lookAhead() == Token_compare
-            || token_stream.lookAhead() == Token_geq) {
+           ) {
         std::size_t op = token_stream.cursor();
         token_stream.nextToken();
 
@@ -4950,6 +5062,7 @@ bool Parser::parseRelationalExpression(ExpressionAST *&node, bool templArgs) {
 
         BinaryExpressionAST *ast = CreateNode<BinaryExpressionAST>(_M_pool);
         ast->op = op;
+        ast->opLength = 0;
         ast->left_expression = node;
         ast->right_expression = rightExpr;
 
@@ -4993,7 +5106,7 @@ bool Parser::parseAndExpression(ExpressionAST *&node, bool templArgs) {
     if (!parseEqualityExpression(node, templArgs))
         return false;
 
-    while (token_stream.lookAhead() == '&') {
+    while (token_stream.lookAhead() == '&' || token_stream.lookAhead() == Token_bitand) {
         std::size_t op = token_stream.cursor();
         token_stream.nextToken();
 
@@ -5019,7 +5132,7 @@ bool Parser::parseExclusiveOrExpression(ExpressionAST *&node, bool templArgs) {
     if (!parseAndExpression(node, templArgs))
         return false;
 
-    while (token_stream.lookAhead() == '^') {
+    while (token_stream.lookAhead() == '^' || token_stream.lookAhead() == Token_xor) {
         std::size_t op = token_stream.cursor();
         token_stream.nextToken();
 
@@ -5045,7 +5158,7 @@ bool Parser::parseInclusiveOrExpression(ExpressionAST *&node, bool templArgs) {
     if (!parseExclusiveOrExpression(node, templArgs))
         return false;
 
-    while (token_stream.lookAhead() == '|') {
+    while (token_stream.lookAhead() == '|' || token_stream.lookAhead() == Token_bitor) {
         std::size_t op = token_stream.cursor();
         token_stream.nextToken();
 
@@ -5161,7 +5274,17 @@ bool Parser::parseAssignmentExpression(ExpressionAST *&node, bool templArgs) {
         return false;
 
     while (token_stream.lookAhead() == Token_assign
-            || token_stream.lookAhead() == '=') {
+           || token_stream.lookAhead() == Token_xor_eq
+           || token_stream.lookAhead() == Token_or_eq
+           || token_stream.lookAhead() == Token_and_eq
+           || token_stream.lookAhead() == Token_plus_assign
+           || token_stream.lookAhead() == Token_minus_assign
+           || token_stream.lookAhead() == Token_times_assign
+           || token_stream.lookAhead() == Token_rem_assign
+           || token_stream.lookAhead() == Token_div_assign
+           || token_stream.lookAhead() == Token_left_shift_assign
+           || token_stream.lookAhead() == Token_right_shift_assign
+           || token_stream.lookAhead() == '=') {
         std::size_t op = token_stream.cursor();
         token_stream.nextToken();
 
@@ -5171,6 +5294,7 @@ bool Parser::parseAssignmentExpression(ExpressionAST *&node, bool templArgs) {
 
         BinaryExpressionAST *ast = CreateNode<BinaryExpressionAST>(_M_pool);
         ast->op = op;
+        ast->opLength = 0;
         ast->left_expression = node;
         ast->right_expression = rightExpr;
 
diff --git a/src/cpp/QtJambiGenerator/parser/parser.h b/src/cpp/QtJambiGenerator/parser/parser.h
index a7179af5..7e3e5b44 100644
--- a/src/cpp/QtJambiGenerator/parser/parser.h
+++ b/src/cpp/QtJambiGenerator/parser/parser.h
@@ -57,7 +57,7 @@ class Control;
 
 class Parser {
     public:
-        Parser(Control *control);
+        Parser(Control *control, QMap<QString,QStringList>& requiredFeatures);
         ~Parser();
 
         LocationManager &location() { return _M_location; }
@@ -220,6 +220,7 @@ class Parser {
         uint m_isInTemplate;
         bool m_isShift;
         bool m_isTemplateDecl;
+        bool m_isExpression;
 };
 
 #endif
diff --git a/src/cpp/QtJambiGenerator/parser/rpp/pp-engine-bits.cpp b/src/cpp/QtJambiGenerator/parser/rpp/pp-engine-bits.cpp
index a508d9dc..4f95ced6 100644
--- a/src/cpp/QtJambiGenerator/parser/rpp/pp-engine-bits.cpp
+++ b/src/cpp/QtJambiGenerator/parser/rpp/pp-engine-bits.cpp
@@ -45,6 +45,7 @@ rpp::pp::pp(pp_environment &__env) :
     iflevel = 0;
     _M_skipping[iflevel] = 0;
     _M_true_test[iflevel] = 0;
+    m_M_skipFile = false;
 }
 
 bool rpp::pp::is_absolute(std::string const &filename) const {
diff --git a/src/cpp/QtJambiGenerator/parser/rpp/pp-engine-bits.h b/src/cpp/QtJambiGenerator/parser/rpp/pp-engine-bits.h
index 5c2cf430..c9ae337d 100644
--- a/src/cpp/QtJambiGenerator/parser/rpp/pp-engine-bits.h
+++ b/src/cpp/QtJambiGenerator/parser/rpp/pp-engine-bits.h
@@ -174,7 +174,7 @@ namespace rpp {
              * data to _OutputIterator result.
              */
             template <typename _InputIterator, typename _OutputIterator>
-            void operator()(_InputIterator first, _InputIterator last, _OutputIterator result) {
+            void process(_InputIterator first, _InputIterator last, _OutputIterator result) {
 #ifndef PP_NO_SMART_HEADER_PROTECTION
                 std::string protection;
                 protection.reserve(255);
@@ -190,7 +190,7 @@ namespace rpp {
                 env.current_line = 1;
                 char buffer[512];
 
-                while (true) {
+                while (!m_M_skipFile) {
                     first = skip_blanks(first, last);
                     env.current_line += skip_blanks.lines;
 
@@ -244,10 +244,13 @@ namespace rpp {
                 qDebug() << "Reading file: " << fileInfo.absoluteFilePath();
                 QFile qfile(fileInfo.absoluteFilePath());
                 if (qfile.open(QIODevice::ReadOnly)) {
+                    bool skipFile = m_M_skipFile;
+                    m_M_skipFile = false;
                     QFileInfo was = env.current_file;
                     env.current_file = fileInfo;
                     file(qfile, __result);
                     env.current_file = was;
+                    m_M_skipFile = skipFile;
                 } else {
                     env.log(QString("File '%1' not found!").arg(fileInfo.absoluteFilePath()).toStdString());
                 }
@@ -267,7 +270,7 @@ namespace rpp {
                 }
                 file.close();
                 if (!data.isEmpty()) {
-                    this->operator()(data.constData(), (data.constData() + data.size()), result);
+                    process(data.constData(), (data.constData() + data.size()), result);
                 }
             }
 
@@ -327,6 +330,7 @@ namespace rpp {
             int _M_true_test[MAX_LEVEL];
             int iflevel;
             int verbose;
+            bool m_M_skipFile;
 
         private:
             pp_environment &env;
@@ -410,7 +414,10 @@ namespace rpp {
                         return handle_ifdef(true, first, last);
                     case PP_ERROR:
                         return handle_error(first, last);
-                    break;
+                    case PP_PRAGMA:
+                        if (! skipping())
+                            return handle_pragma(first, last);
+                        break;
                     default:
                         break;
                 }
@@ -485,6 +492,7 @@ namespace rpp {
                             "string.h",
                             "stdarg.h",
                             "string",
+                            "string_view",
                             "iterator",
                             "list",
                             "stdlib.h",
@@ -513,6 +521,7 @@ namespace rpp {
                             "xcb/xcb.h",
                             "CoreFoundation/CoreFoundation.h",
                             "qplatformdefs.h",
+                            "QtActiveQt/QtActiveQtDepends",
                             "QtMacExtras/QtMacExtrasDepends",
                             "QtX11Extras/QtX11ExtrasDepends",
                             "QtWinExtras/QtWinExtrasDepends",
@@ -1236,6 +1245,20 @@ namespace rpp {
                 return __first;
             }
 
+            template <typename _InputIterator>
+            _InputIterator handle_pragma(_InputIterator __first, _InputIterator __last) {
+                pp_macro_expander expand_condition(env);
+                std::string condition;
+                condition.reserve(255);
+                expand_condition(skip_blanks(__first, __last), __last, std::back_inserter(condition));
+                if(condition=="once"){
+                    if(env.pragmaOnce()){
+                        m_M_skipFile = true;
+                    }
+                }
+                return __first;
+            }
+
             template <typename _InputIterator>
             _InputIterator handle_undef(_InputIterator __first, _InputIterator __last) {
                 __first = skip_blanks(__first, __last);
diff --git a/src/cpp/QtJambiGenerator/parser/rpp/pp-environment.cpp b/src/cpp/QtJambiGenerator/parser/rpp/pp-environment.cpp
index d8930fc7..00acdf7e 100644
--- a/src/cpp/QtJambiGenerator/parser/rpp/pp-environment.cpp
+++ b/src/cpp/QtJambiGenerator/parser/rpp/pp-environment.cpp
@@ -85,6 +85,14 @@ rpp::pp_macro *rpp::pp_environment::resolve(pp_fast_string const *p_name) const
     return it;
 }
 
+bool rpp::pp_environment::pragmaOnce(){
+    bool result = _M_pragmaOnceFiles.contains(current_file.absoluteFilePath());
+    if(!result){
+        _M_pragmaOnceFiles.insert(current_file.absoluteFilePath());
+    }
+    return result;
+}
+
 rpp::pp_macro *rpp::pp_environment::resolve(char const *__data, std::size_t __size) const {
     pp_fast_string const __tmp(__data, __size);
     return resolve(&__tmp);
diff --git a/src/cpp/QtJambiGenerator/parser/rpp/pp-environment.h b/src/cpp/QtJambiGenerator/parser/rpp/pp-environment.h
index e219432d..bcc42944 100644
--- a/src/cpp/QtJambiGenerator/parser/rpp/pp-environment.h
+++ b/src/cpp/QtJambiGenerator/parser/rpp/pp-environment.h
@@ -43,6 +43,7 @@
 #include <functional>
 #include <QString>
 #include <QFileInfo>
+#include <QSet>
 
 #include "pp-macro.h"
 
@@ -105,6 +106,8 @@ namespace rpp {
 
             void log(const std::string &message) const;
 
+            bool pragmaOnce();
+
             QFileInfo current_file;
             int current_line;
 
@@ -120,6 +123,7 @@ namespace rpp {
             std::vector<pp_macro*> _M_macros;
             pp_macro **_M_base;
             std::size_t _M_hash_size;
+            QSet<QString> _M_pragmaOnceFiles;
             std::function<void(std::string,std::string,const QFileInfo&,bool)> _M_featureRegistry;
     };
 
diff --git a/src/cpp/QtJambiGenerator/parser/rpp/pp-macro-expander.h b/src/cpp/QtJambiGenerator/parser/rpp/pp-macro-expander.h
index 449ef9b7..8f13d096 100644
--- a/src/cpp/QtJambiGenerator/parser/rpp/pp-macro-expander.h
+++ b/src/cpp/QtJambiGenerator/parser/rpp/pp-macro-expander.h
@@ -67,6 +67,7 @@ namespace rpp {
             pp_skip_blanks skip_blanks;
             pp_skip_whitespaces skip_whitespaces;
             bool hasUnexpandedFunctionMacro;
+            bool skip_backslash;
 
             std::string const *resolve_formal(pp_fast_string const *__name);
 
@@ -75,8 +76,8 @@ namespace rpp {
             int generated_lines;
 
         public:
-            pp_macro_expander(pp_environment &__env, pp_frame *__frame = nullptr) :
-                    env(__env), frame(__frame), hasUnexpandedFunctionMacro(false), lines(0), generated_lines(0) {
+            pp_macro_expander(pp_environment &__env, pp_frame *__frame = nullptr, bool _skip_backslash = false) :
+                    env(__env), frame(__frame), hasUnexpandedFunctionMacro(false), skip_backslash(_skip_backslash), lines(0), generated_lines(0) {
                 if(frame && frame->expanding_macro && frame->expanding_macro->definition){
                     if(QByteArray(frame->expanding_macro->definition->begin()).contains("__VA_ARGS__")){
                         hasUnexpandedFunctionMacro = true;
@@ -104,7 +105,10 @@ namespace rpp {
                 lines = skip_blanks.lines;
 
                 while (first != last) {
-                    if (*first == '\n') {
+                    if (*first == '\\' && skip_backslash) {
+                        first = skip_blanks(++first, last);
+                        lines += skip_blanks.lines;
+                    }else if (*first == '\n') {
                         *result++ = *first;
                         ++lines;
 
@@ -145,8 +149,38 @@ namespace rpp {
 
                             *result++ = '\"';
                             first = end_id;
-                        } else
-                            *result++ = '#'; // ### warning message?
+                        } else {
+                            bool ok = false;
+                            if(frame && frame->actuals && frame->expanding_macro
+                                    && frame->actuals->size()>0
+                                    && frame->expanding_macro->variadics && fast_name=="__VA_ARGS__"){
+                                *result++ = '\"';
+                                bool comma = false;
+                                for(auto i=frame->expanding_macro->formals.size(); i<frame->actuals->size(); ++i){
+                                    if(comma){
+                                        *result++ = ',';
+                                        *result++ = ' ';
+                                    }else comma = true;
+                                    for (std::string::const_iterator it = skip_whitespaces(frame->actuals->at(i).begin(), frame->actuals->at(i).end());
+                                            it != frame->actuals->at(i).end(); ++it) {
+                                        if (*it == '"') {
+                                            *result++ = '\\';
+                                            *result++ = *it;
+                                        } else if (*it == '\n') {
+                                            *result++ = '"';
+                                            *result++ = '\n';
+                                            *result++ = '"';
+                                        } else
+                                            *result++ = *it;
+                                    }
+                                }
+                                ok = true;
+                                *result++ = '\"';
+                                first = end_id;
+                            }
+                            if(!ok)
+                                *result++ = '#'; // ### warning message?
+                        }
                     } else if (*first == '\"') {
                         _InputIterator next_pos = skip_string_literal(first, last);
                         lines += skip_string_literal.lines;
@@ -309,7 +343,7 @@ namespace rpp {
                         actuals.reserve(5);
                         ++arg_it; // skip '('
 
-                        pp_macro_expander expand_actual(env, frame);
+                        pp_macro_expander expand_actual(env, frame, true);
 
                         //_InputIterator arg_end = skip_argument_variadics(actuals, macro, arg_it, last);
                         _InputIterator arg_end = skip_argument(arg_it, last);
@@ -332,6 +366,8 @@ namespace rpp {
                                 expand_actual(actual.begin(), actual.end(), std::back_inserter(actuals.back()));
                             }
                             arg_it = arg_end;
+                        }else if(arg_it != last && *arg_end == ','){
+                            actuals.push_back(std::string{});
                         }
 
                         while (arg_it != last && *arg_end == ',') {
diff --git a/src/cpp/QtJambiGenerator/parser/rpp/pp-scanner.h b/src/cpp/QtJambiGenerator/parser/rpp/pp-scanner.h
index 2c6689dd..645d15e9 100644
--- a/src/cpp/QtJambiGenerator/parser/rpp/pp-scanner.h
+++ b/src/cpp/QtJambiGenerator/parser/rpp/pp-scanner.h
@@ -69,9 +69,14 @@ namespace rpp {
                 if (*first == '\\') {
                     _InputIterator begin = first;
                     ++begin;
-
+                    int counter = 1;
+                    while(begin != last && *begin==' ') {
+                        ++begin;
+                        ++counter;
+                    }
                     if (begin != last && *begin == '\n') {
-                        ++first;
+                        for(int i=0; i<counter; ++i)
+                            ++first;
                     } else {
                         break;
                     }
diff --git a/src/cpp/QtJambiGenerator/parser/rpp/preprocessor.cpp b/src/cpp/QtJambiGenerator/parser/rpp/preprocessor.cpp
index 3bd85c1e..cb20c319 100644
--- a/src/cpp/QtJambiGenerator/parser/rpp/preprocessor.cpp
+++ b/src/cpp/QtJambiGenerator/parser/rpp/preprocessor.cpp
@@ -93,7 +93,7 @@ void Preprocessor::processString(const QByteArray &str) {
     pp proc(d->env);
     d->initPP(proc);
 
-    proc(str.begin(), str.end(), std::back_inserter(d->result));
+    proc.process(str.begin(), str.end(), std::back_inserter(d->result));
 }
 
 QByteArray Preprocessor::result() const {
diff --git a/src/cpp/QtJambiGenerator/parser/tokens.cpp b/src/cpp/QtJambiGenerator/parser/tokens.cpp
index 2476a662..c0f101b4 100644
--- a/src/cpp/QtJambiGenerator/parser/tokens.cpp
+++ b/src/cpp/QtJambiGenerator/parser/tokens.cpp
@@ -59,6 +59,13 @@ static char const * const _S_token_names[] = {
     "arrow",
     "asm",
     "assign",
+    "rem_assign",
+    "plus_assign",
+    "minus_assign",
+    "times_assign",
+    "div_assign",
+    "left_shift_assign",
+    "right_shift_assign",
     "auto",
     "bitand",
     "bitor",
@@ -94,7 +101,6 @@ static char const * const _S_token_names[] = {
     "float",
     "for",
     "friend",
-    "geq",
     "goto",
     "identifier",
     "if",
@@ -104,6 +110,7 @@ static char const * const _S_token_names[] = {
     "k_dcop",
     "k_dcop_signals",
     "leq",
+    "geq",
     "cmp",
     "long",
     "mutable",
@@ -124,7 +131,7 @@ static char const * const _S_token_names[] = {
     "reinterpret_cast",
     "return",
     "scope",
-    "shift",
+    "left_shift",
     "short",
     "signals",
     "signed",
@@ -166,7 +173,7 @@ static char const * const _S_token_names[] = {
     "alignas",
     "alignof",
 //    "nullptr"
-    "noexcept"
+    "noexcept",
 };
 
 static char _S_printable[][2] = {
diff --git a/src/cpp/QtJambiGenerator/parser/tokens.h b/src/cpp/QtJambiGenerator/parser/tokens.h
index 5348625e..b7bdfa2e 100644
--- a/src/cpp/QtJambiGenerator/parser/tokens.h
+++ b/src/cpp/QtJambiGenerator/parser/tokens.h
@@ -60,6 +60,13 @@ enum TOKEN_KIND {
     Token_arrow,
     Token_asm,
     Token_assign,
+    Token_rem_assign,
+    Token_plus_assign,
+    Token_minus_assign,
+    Token_times_assign,
+    Token_div_assign,
+    Token_left_shift_assign,
+    Token_right_shift_assign,
     Token_auto,
     Token_bitand,
     Token_bitor,
@@ -95,7 +102,6 @@ enum TOKEN_KIND {
     Token_float,
     Token_for,
     Token_friend,
-    Token_geq,
     Token_goto,
     Token_identifier,
     Token_if,
@@ -105,6 +111,7 @@ enum TOKEN_KIND {
     Token_k_dcop,
     Token_k_dcop_signals,
     Token_leq,
+    Token_geq,
     Token_compare,
     Token_long,
     Token_mutable,
@@ -125,7 +132,7 @@ enum TOKEN_KIND {
     Token_reinterpret_cast,
     Token_return,
     Token_scope,
-    Token_shift,
+    Token_left_shift,
     Token_short,
     Token_signals,
     Token_signed,
diff --git a/src/cpp/QtJambiGenerator/parser/type_compiler.cpp b/src/cpp/QtJambiGenerator/parser/type_compiler.cpp
index db2bf17c..9c880e86 100644
--- a/src/cpp/QtJambiGenerator/parser/type_compiler.cpp
+++ b/src/cpp/QtJambiGenerator/parser/type_compiler.cpp
@@ -128,6 +128,7 @@ void TypeCompiler::visitName(NameAST *node) {
     }
     _M_type << name_cc.qualifiedName();
     _M_functionalReturnType = name_cc.functionalReturnType();
+    _M_templateArgumentTypes = name_cc.templateArgumentTypes();
     _M_functionalArgumentTypes = name_cc.functionalArgumentTypes();
     _M_functionalArgumentNames = name_cc.functionalArgumentNames();
 }
diff --git a/src/cpp/QtJambiGenerator/parser/type_compiler.h b/src/cpp/QtJambiGenerator/parser/type_compiler.h
index c0b54bbc..822a0dd0 100644
--- a/src/cpp/QtJambiGenerator/parser/type_compiler.h
+++ b/src/cpp/QtJambiGenerator/parser/type_compiler.h
@@ -72,6 +72,7 @@ class TypeCompiler: protected DefaultVisitor {
 
         void run(TypeSpecifierAST *node);
         const TypeInfo& functionalReturnType() const { return _M_functionalReturnType; }
+        const QList<TypeInfo>& templateArgumentTypes() const { return _M_templateArgumentTypes; }
         const QList<TypeInfo>& functionalArgumentTypes() const { return _M_functionalArgumentTypes; }
         const QList<QString>& functionalArgumentNames() const { return _M_functionalArgumentNames; }
 
@@ -88,6 +89,7 @@ class TypeCompiler: protected DefaultVisitor {
         Binder *_M_binder;
         TokenStream *_M_token_stream;
         QStringList _M_type;
+        QList<TypeInfo> _M_templateArgumentTypes;
         TypeInfo _M_functionalReturnType;
         QList<TypeInfo> _M_functionalArgumentTypes;
         QList<QString> _M_functionalArgumentNames;
diff --git a/src/cpp/QtJambiGenerator/preprocesshandler.cpp b/src/cpp/QtJambiGenerator/preprocesshandler.cpp
index f4c7a164..e8930829 100644
--- a/src/cpp/QtJambiGenerator/preprocesshandler.cpp
+++ b/src/cpp/QtJambiGenerator/preprocesshandler.cpp
@@ -109,7 +109,7 @@ bool PreprocessHandler::handler() {
 // FIXME: If nothing set on cmdline enable #define Q_OS_OS2
 // PROCESS string of "#define name value"
 // FIXME: Replace "null_out" with stdout
-    preprocess.operator()(ba.constData(), ba.constData() + ba.size(), null_out);
+    preprocess.process(ba.constData(), ba.constData() + ba.size(), null_out);
     preprocess.include_paths = includePathList;
     QString currentDir = QDir::current().absolutePath();
 
diff --git a/src/cpp/QtJambiGenerator/targets/all.h b/src/cpp/QtJambiGenerator/targets/all.h
index dbd6a86e..da64a8c2 100644
--- a/src/cpp/QtJambiGenerator/targets/all.h
+++ b/src/cpp/QtJambiGenerator/targets/all.h
@@ -49,30 +49,7 @@
 
 #include <QtCore/qcompilerdetection.h>
 
-#ifdef QT6_DECL_NEW_OVERLOAD
-#undef QT6_DECL_NEW_OVERLOAD
-#define QT6_DECL_NEW_OVERLOAD
-#endif
-#ifdef QT6_IMPL_NEW_OVERLOAD
-#undef QT6_IMPL_NEW_OVERLOAD
-#define QT6_IMPL_NEW_OVERLOAD
-#endif
-#ifdef QT6_CALL_NEW_OVERLOAD
-#undef QT6_CALL_NEW_OVERLOAD
-#define QT6_CALL_NEW_OVERLOAD
-#endif
-#ifdef QT6_DECL_NEW_OVERLOAD_TAIL
-#undef QT6_DECL_NEW_OVERLOAD_TAIL
-#define QT6_DECL_NEW_OVERLOAD_TAIL
-#endif
-#ifdef QT6_IMPL_NEW_OVERLOAD_TAIL
-#undef QT6_IMPL_NEW_OVERLOAD_TAIL
-#define QT6_IMPL_NEW_OVERLOAD_TAIL
-#endif
-#ifdef QT6_CALL_NEW_OVERLOAD_TAIL
-#undef QT6_CALL_NEW_OVERLOAD_TAIL
-#define QT6_CALL_NEW_OVERLOAD_TAIL
-#endif
+#define seed_seq initializer_list<uint>const
 
 #include <QtCore/qstringliteral.h>
 #undef QStringLiteral
@@ -91,6 +68,9 @@
 
 #define QSETTINGS_H
 #include <QtCore/QtCore>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#include <QtCore/qpermissions.h>
+#endif
 #include <QtCore/qfloat16.h>
 #undef QSETTINGS_H
 #define Q_OS_WIN
@@ -137,7 +117,7 @@ typedef struct __GLsync *GLsync;
 
 #ifndef QT_OPENGL_ES_2
 #define QT_OPENGL_ES_2
-#include <QtGui/QOpenGLFunctions_ES2>
+#include <QtGui/qopenglfunctions_es2.h>
 #undef QT_OPENGL_ES_2
 #else
 #include <QtGui/QOpenGLFunctions_ES2>
@@ -234,10 +214,22 @@ typedef struct __GLsync *GLsync;
 #       undef QSGTEXTURE_PLATFORM_H
 #       ifndef Q_OS_WIN
 #           define Q_OS_WIN
-#           include <QtQuick/qsgtexture_platform.h>
+#               ifndef __OBJC__
+#                   define __OBJC__
+#                   include <QtQuick/qsgtexture_platform.h>
+#                   undef __OBJC__
+#               else
+#                   include <QtQuick/qsgtexture_platform.h>
+#               endif
 #           undef Q_OS_WIN
 #       else
-#           include <QtQuick/qsgtexture_platform.h>
+#           ifndef __OBJC__
+#               define __OBJC__
+#               include <QtQuick/qsgtexture_platform.h>
+#               undef __OBJC__
+#           else
+#               include <QtQuick/qsgtexture_platform.h>
+#           endif
 #       endif
 #   endif
 #	include <QtQuick/private/qquickevents_p_p.h>
@@ -343,6 +335,7 @@ typedef struct __GLsync *GLsync;
 
 #ifndef QTJAMBI_NO_XMLPATTERNS
 #  include <QtXmlPatterns/QtXmlPatterns>
+#  include <QtJambiXmlPatterns/hashes.h>
 #endif
 
 #ifndef QTJAMBI_NO_DBUS
@@ -577,37 +570,37 @@ typedef void (*GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,
 #endif
 
 #include <QtOpenGL/QOpenGLPixelTransferOptions>
-#include <QtOpenGL/QOpenGLFunctions_1_0>
-#include <QtOpenGL/QOpenGLFunctions_1_1>
-#include <QtOpenGL/QOpenGLFunctions_1_2>
-#include <QtOpenGL/QOpenGLFunctions_1_3>
-#include <QtOpenGL/QOpenGLFunctions_1_4>
-#include <QtOpenGL/QOpenGLFunctions_1_5>
-#include <QtOpenGL/QOpenGLFunctions_2_0>
-#include <QtOpenGL/QOpenGLFunctions_2_1>
-#include <QtOpenGL/QOpenGLFunctions_3_0>
-#include <QtOpenGL/QOpenGLFunctions_3_1>
-#include <QtOpenGL/QOpenGLFunctions_3_2_Compatibility>
-#include <QtOpenGL/QOpenGLFunctions_3_2_Core>
-#include <QtOpenGL/QOpenGLFunctions_3_3_Compatibility>
-#include <QtOpenGL/QOpenGLFunctions_3_3_Core>
-#include <QtOpenGL/QOpenGLFunctions_4_0_Compatibility>
-#include <QtOpenGL/QOpenGLFunctions_4_0_Core>
-#include <QtOpenGL/QOpenGLFunctions_4_1_Compatibility>
-#include <QtOpenGL/QOpenGLFunctions_4_1_Core>
-#include <QtOpenGL/QOpenGLFunctions_4_2_Compatibility>
-#include <QtOpenGL/QOpenGLFunctions_4_2_Core>
-#include <QtOpenGL/QOpenGLFunctions_4_3_Compatibility>
-#include <QtOpenGL/QOpenGLFunctions_4_3_Core>
-#include <QtOpenGL/QOpenGLFunctions_4_4_Compatibility>
-#include <QtOpenGL/QOpenGLFunctions_4_4_Core>
-#include <QtOpenGL/QOpenGLFunctions_4_5_Compatibility>
-#include <QtOpenGL/QOpenGLFunctions_4_5_Core>
+#include <QtOpenGL/qopenglfunctions_1_0.h>
+#include <QtOpenGL/qopenglfunctions_1_1.h>
+#include <QtOpenGL/qopenglfunctions_1_2.h>
+#include <QtOpenGL/qopenglfunctions_1_3.h>
+#include <QtOpenGL/qopenglfunctions_1_4.h>
+#include <QtOpenGL/qopenglfunctions_1_5.h>
+#include <QtOpenGL/qopenglfunctions_2_0.h>
+#include <QtOpenGL/qopenglfunctions_2_1.h>
+#include <QtOpenGL/qopenglfunctions_3_0.h>
+#include <QtOpenGL/qopenglfunctions_3_1.h>
+#include <QtOpenGL/qopenglfunctions_3_2_compatibility.h>
+#include <QtOpenGL/qopenglfunctions_3_2_core.h>
+#include <QtOpenGL/qopenglfunctions_3_3_compatibility.h>
+#include <QtOpenGL/qopenglfunctions_3_3_core.h>
+#include <QtOpenGL/qopenglfunctions_4_0_compatibility.h>
+#include <QtOpenGL/qopenglfunctions_4_0_core.h>
+#include <QtOpenGL/qopenglfunctions_4_1_compatibility.h>
+#include <QtOpenGL/qopenglfunctions_4_1_core.h>
+#include <QtOpenGL/qopenglfunctions_4_2_compatibility.h>
+#include <QtOpenGL/qopenglfunctions_4_2_core.h>
+#include <QtOpenGL/qopenglfunctions_4_3_compatibility.h>
+#include <QtOpenGL/qopenglfunctions_4_3_core.h>
+#include <QtOpenGL/qopenglfunctions_4_4_compatibility.h>
+#include <QtOpenGL/qopenglfunctions_4_4_core.h>
+#include <QtOpenGL/qopenglfunctions_4_5_compatibility.h>
+#include <QtOpenGL/qopenglfunctions_4_5_core.h>
 
 #undef QT_CONFIG
 #define QT_CONFIG(feature) (1/QT_FEATURE_##feature == 1)
 
-#include <QtOpenGL/QOpenGLFunctions_ES2>
+#include <QtOpenGL/qopenglfunctions_es2.h>
 
 #ifdef QT_NO_OPENGL_BRIDGE
 #undef QT_NO_OPENGL_BRIDGE
diff --git a/src/cpp/QtJambiGenerator/typeparser.cpp b/src/cpp/QtJambiGenerator/typeparser.cpp
index 3168696d..78c308a4 100644
--- a/src/cpp/QtJambiGenerator/typeparser.cpp
+++ b/src/cpp/QtJambiGenerator/typeparser.cpp
@@ -130,7 +130,7 @@ Scanner::Token Scanner::nextToken() {
             }
         }
 
-        if (tok <= GreaterThanToken) {
+        if (tok <= GreaterThanToken || tok==EllipsisToken) {
             ++m_pos;
             break;
         }
@@ -170,6 +170,7 @@ Scanner::Token Scanner::nextToken() {
 
 TypeParser::Info TypeParser::parse(const QString &str) {
     Info info;
+    info.originalType = str;
     try{
         Scanner scanner(str);
 
@@ -178,6 +179,16 @@ TypeParser::Info TypeParser::parse(const QString &str) {
 
         bool colon_prefix = false;
         bool in_array = false;
+        bool isFunctionPointerExpected = false;
+
+        enum State{
+            None,
+            InParentheses,
+            InTemplateDecl
+        };
+
+        State currentState = None;
+        QStack<State> lastState;
         QString array;
 
         // search for 'T', 'T *', 'const T *', 'T const *', 'T * const' and so on
@@ -185,73 +196,149 @@ TypeParser::Info TypeParser::parse(const QString &str) {
         Scanner::Token tok = scanner.nextToken();
         while (tok != Scanner::NoToken) {
 
+            Q_ASSERT(!stack.isEmpty());
             switch (tok) {
-                case Scanner::EllipsisToken:
-                    stack.top()->is_variadics = true;
-                    break;
-                case Scanner::StarToken:
+            case Scanner::EllipsisToken:
+                stack.top()->is_variadics = true;
+                break;
+            case Scanner::StarToken:
+                if(isFunctionPointerExpected){
+                    stack.top()->is_functionPointer = true;
+                }else{
                     //++stack.top()->indirections;
                     stack.top()->indirections << false;
-                    break;
+                }
+                break;
 
-                case Scanner::AmpersandToken:
-                    if(stack.top()->reference_type==TypeParser::Info::Reference){
-                        stack.top()->reference_type = TypeParser::Info::RReference;
-                    }else{
-                        stack.top()->reference_type = TypeParser::Info::Reference;
-                    }
-                    break;
+            case Scanner::AmpersandToken:
+                if(stack.top()->reference_type==TypeParser::Info::Reference){
+                    stack.top()->reference_type = TypeParser::Info::RReference;
+                }else{
+                    stack.top()->reference_type = TypeParser::Info::Reference;
+                }
+                break;
 
-                case Scanner::LessThanToken:
-                    stack.top()->template_instantiations << Info();
-                    stack.push(&stack.top()->template_instantiations.last());
-                    break;
+            case Scanner::LessThanToken:
+                lastState.push(currentState);
+                currentState = InTemplateDecl;
+                stack.top()->arguments << Info();
+                stack.push(&stack.top()->arguments.last());
+                break;
 
-                case Scanner::CommaToken:
+            case Scanner::CommaToken:
+                switch(currentState){
+                case InTemplateDecl:
                     stack.pop();
-                    stack.top()->template_instantiations << Info();
-                    stack.push(&stack.top()->template_instantiations.last());
+                    Q_ASSERT(!stack.isEmpty());
+                    stack.top()->arguments << Info();
+                    stack.push(&stack.top()->arguments.last());
                     break;
-
-                case Scanner::GreaterThanToken:
+                case InParentheses:
                     stack.pop();
+                    Q_ASSERT(!stack.isEmpty());
+                    stack.top()->functionalArgumentTypes << Info();
+                    stack.push(&stack.top()->functionalArgumentTypes.last());
                     break;
+                default:
+                    Info i;
+                    i.is_busted = true;
+                    i.originalType = str;
+                    return i;
+                }
+                break;
 
-                case Scanner::ColonToken:
-                    colon_prefix = true;
-                    break;
-
-                case Scanner::ConstToken:
-                    if(lastWasStarToken){
-                        stack.top()->indirections[stack.top()->indirections.size()-1] = true;
-                    }else{
-                        stack.top()->is_constant = true;
+            case Scanner::GreaterThanToken:
+                switch(currentState){
+                case InTemplateDecl:
+                    if(stack.top()->arguments.size()>0
+                            && !stack.top()->arguments.last()){
+                        stack.top()->arguments.takeLast();
                     }
                     break;
+                default:
+                    break;
+                }
+                currentState = lastState.pop();
+                break;
+
+            case Scanner::ColonToken:
+                colon_prefix = true;
+                break;
+
+            case Scanner::ConstToken:
+                if(lastWasStarToken){
+                    stack.top()->indirections[stack.top()->indirections.size()-1] = true;
+                }else{
+                    stack.top()->is_constant = true;
+                }
+                break;
 
             case Scanner::VolatileToken:
                 stack.top()->is_volatile = true;
                 break;
 
-                case Scanner::OpenParenToken: // function pointers not supported
-                case Scanner::CloseParenToken: {
+            case Scanner::OpenParenToken:
+                switch(currentState){
+                case InTemplateDecl:
+                    lastState.push(currentState);
+                    currentState = InParentheses;
+                    stack.pop();
+                    Q_ASSERT(!stack.isEmpty());
+                    stack.top()->functionalReturnType << stack.top()->arguments;
+                    stack.top()->arguments.clear();
+                    stack.top()->functionalArgumentTypes << Info();
+                    stack.push(&stack.top()->functionalArgumentTypes.last());
+                    break;
+                default:
+                    lastState.push(currentState);
+                    currentState = InParentheses;
+                    if(stack.top()->is_functionPointer){
+                        Info* info = stack.top();
+                        Info returnType = *info;
+                        returnType.originalType.clear();
+                        returnType.is_functionPointer = false;
+                        *info = Info();
+                        info->originalType = str;
+                        info->is_functionPointer = true;
+                        info->functionalReturnType << returnType;
+                        info->functionalArgumentTypes << Info();
+                        stack.push(&info->functionalArgumentTypes.last());
+                    }else{
+                        isFunctionPointerExpected = true;
+                    }
+                }
+                break;
+            case Scanner::CloseParenToken:
+                switch(currentState){
+                case InParentheses:
+                    currentState = lastState.pop();
+                    if(stack.top()->functionalArgumentTypes.size()>0
+                            && !stack.top()->functionalArgumentTypes.last()){
+                        stack.top()->functionalArgumentTypes.takeLast();
+                    }
+                    isFunctionPointerExpected = false;
+                    break;
+                default:
                     Info i;
                     i.is_busted = true;
+                    i.originalType = str;
                     return i;
                 }
-
-                case Scanner::Identifier:
+                break;
+            case Scanner::Identifier:
+                if(!isFunctionPointerExpected){
                     parseIdentifier(scanner, stack, array, in_array, colon_prefix);
-                    break;
+                }
+                break;
 
-                case Scanner::SquareBegin:
-                    in_array = true;
-                    break;
+            case Scanner::SquareBegin:
+                in_array = true;
+                break;
 
-                case Scanner::SquareEnd:
-                    in_array = false;
-                    stack.top()->arrays += array;
-                    break;
+            case Scanner::SquareEnd:
+                in_array = false;
+                stack.top()->arrays += array;
+                break;
 
                 default:
                     break;
@@ -296,12 +383,12 @@ void TypeParser::parseIdentifier(Scanner &scanner, QStack<Info *> &stack, QStrin
 
 QString TypeParser::Info::instantiationName() const {
     QString s(qualified_name.join("::"));
-    if (!template_instantiations.isEmpty()) {
+    if (!arguments.isEmpty()) {
         s += '<';
-        for (int i = 0; i < template_instantiations.size(); ++i) {
+        for (int i = 0; i < arguments.size(); ++i) {
             if (i != 0)
                 s += ",";
-            s += template_instantiations.at(i).toString();
+            s += arguments.at(i).toString();
         }
         s += '>';
     }
diff --git a/src/cpp/QtJambiGenerator/typeparser.h b/src/cpp/QtJambiGenerator/typeparser.h
index 15fc4428..f0ad8d5f 100644
--- a/src/cpp/QtJambiGenerator/typeparser.h
+++ b/src/cpp/QtJambiGenerator/typeparser.h
@@ -55,18 +55,19 @@ class TypeParser {
                 RReference
             };
 
-            Info() : reference_type(NoReference), is_constant(false), is_volatile(false), is_variadics(false), is_busted(false), indirections() { }
+            Info() : reference_type(NoReference), is_constant(false), is_volatile(false), is_variadics(false), is_functionPointer(false), is_busted(false), indirections() { }
 
             QStringList qualified_name;
             /**
              * List of different parts of “array”, or [foo]
              */
             QStringList arrays;
-            QList<Info> template_instantiations;
+            QList<Info> arguments;
             ReferenceType reference_type;
             uint is_constant : 1;
             uint is_volatile : 1;
             uint is_variadics : 1;
+            uint is_functionPointer : 1;
             /**
              * If the type is not supported / valid
              */
@@ -78,8 +79,15 @@ class TypeParser {
              */
             QList<bool> indirections;
 
+            QString originalType;
+            QList<Info> functionalReturnType;
+            QList<Info> functionalArgumentTypes;
+
             QString toString() const;
             QString instantiationName() const; //private?
+
+            bool operator!()const{return qualified_name.isEmpty() && functionalReturnType.isEmpty();}
+            operator bool()const{return !qualified_name.isEmpty() || !functionalReturnType.isEmpty();}
         };
 
         /**
diff --git a/src/cpp/QtJambiGenerator/typesystem/codesnip.h b/src/cpp/QtJambiGenerator/typesystem/codesnip.h
index e2100fba..cf1b88c7 100644
--- a/src/cpp/QtJambiGenerator/typesystem/codesnip.h
+++ b/src/cpp/QtJambiGenerator/typesystem/codesnip.h
@@ -111,6 +111,7 @@ class CodeSnip : public CodeSnipAbstract {
             Compare,
             HashCode,
             ToString,
+            Comment,
             End = 1024
         };
 
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambi3DCore.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambi3DCore.java
index d1a60709..7c71217e 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambi3DCore.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambi3DCore.java
@@ -37,12 +37,12 @@ class QAbstractAspect___java extends QAbstractAspect {
     /**
      * <p>See <a href="@docRoot/qt3dcore-qabstractaspect.html#registerBackendType">Qt3DCore::QAbstractAspect::registerBackendType(Qt3DCore::QBackendNodeMapperPtr)</a></p>
      */
-    @io.qt.QtUninvokable
-    protected final void registerBackendType(Class<? extends io.qt.core.QObject> type, io.qt.qt3d.core.QBackendNodeMapper functor)    {
+    @QtUninvokable
+    protected final void registerBackendType(@StrictNonNull Class<? extends io.qt.core.QObject> type, io.qt.qt3d.core.@Nullable QBackendNodeMapper functor)    {
         registerBackendType(io.qt.core.QMetaObject.forType(type), functor);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     protected final void unregisterBackendType(Class<? extends io.qt.core.QObject> type)    {
         unregisterBackendType(io.qt.core.QMetaObject.forType(type));
     }
@@ -54,8 +54,8 @@ class QEntity_6_ {
     /**
      * <p>See <a href="@docRoot/qt3dcore-qentity.html#componentsOfType">Qt3DCore::QEntity::componentsOfType&lt;T>()const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final <T extends io.qt.qt3d.core.QComponent> io.qt.core.QList<T> componentsOfType(Class<T> type)
+    @QtUninvokable
+    public final <T extends io.qt.qt3d.core.@Nullable QComponent> io.qt.core.@NonNull QList<T> componentsOfType(@StrictNonNull Class<T> type)
     {
         io.qt.core.QList<T> matchComponents = new io.qt.core.QList<T>(type);
         for (io.qt.qt3d.core.QComponent component : components()) {
@@ -72,8 +72,8 @@ class QEntity_5_ {
     /**
      * <p>See <a href="@docRoot/qt3dcore-qentity.html#componentsOfType">Qt3DCore::QEntity::componentsOfType&lt;T>()const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final <T extends io.qt.qt3d.core.QComponent> io.qt.core.QVector<T> componentsOfType(Class<T> type)
+    @QtUninvokable
+    public final <T extends io.qt.qt3d.core.@Nullable QComponent> io.qt.core.@NonNull QVector<T> componentsOfType(@StrictNonNull Class<T> type)
     {
         io.qt.core.QVector<T> matchComponents = new io.qt.core.QVector<T>(type);
         for (io.qt.qt3d.core.QComponent component : components()) {
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiCharts.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiCharts.java
index 57188736..8d1f0398 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiCharts.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiCharts.java
@@ -35,8 +35,8 @@ class QChart___{
      * <li><code>series = null</code></li>
      * </ul>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QList<io.qt.charts.QAbstractAxis> axes(io.qt.core.Qt.Orientation... orientation) {
+    @QtUninvokable
+    public final io.qt.core.@NonNull QList<io.qt.charts.@Nullable QAbstractAxis> axes(io.qt.core.Qt.@NonNull Orientation @NonNull... orientation) {
         return axes(orientation==null || orientation.length==0 ? new io.qt.core.Qt.Orientations(3) : new io.qt.core.Qt.Orientations(orientation), (io.qt.charts.QAbstractSeries)null);
     }
 }// class
@@ -48,8 +48,8 @@ class QPolarChart___{
      * <li><code>series = null</code></li>
      * </ul>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QList<io.qt.charts.QAbstractAxis> axes(PolarOrientation... orientation) {
+    @QtUninvokable
+    public final io.qt.core.@NonNull QList<io.qt.charts.@Nullable QAbstractAxis> axes(@NonNull PolarOrientation @NonNull... orientation) {
         return axes(orientation==null || orientation.length==0 ? new PolarOrientations(3) : new PolarOrientations(orientation), (io.qt.charts.QAbstractSeries)null);
     }
 }// class
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiConcurrent.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiConcurrent.java
index 0637e3a5..064d1975 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiConcurrent.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiConcurrent.java
@@ -32,19 +32,19 @@
 
 class QtConcurrent___ extends QtConcurrent {
     
-    public static final class ThreadEngineStarter<T> extends io.qt.QtObject{
+    public static final class ThreadEngineStarter<T> extends QtObject{
         private ThreadEngineStarter(QPrivateConstructor p){
             super(p);
         }
 
-        public final QFuture<T> startAsynchronously(){
+        public final @NonNull QFuture<T> startAsynchronously(){
             QFuture<T> result = startAsynchronously(QtJambi_LibraryUtilities.internal.nativeId(this));
             dispose();
             return result;
         }
         
-        @io.qt.QtUninvokable
-        private static native final <T> QFuture<T> startAsynchronously(long nativeId);
+        @QtUninvokable
+        private static native final <T> @NonNull QFuture<T> startAsynchronously(long nativeId);
     }
     
     /**
@@ -58,7 +58,7 @@ public interface MapFunctor<T> {
         /**
          * This function is called for each item in the Collection. The function is then free to alter <code>object</code> as it see fit.
          */
-        @io.qt.NativeAccess
+        @NativeAccess
         public void map(T object);
     }
     
@@ -74,7 +74,7 @@ public interface MappedFunctor<U, T> {
          * This method is called for each object in a collection. It should returned a new altered
          * object.
          */
-        @io.qt.NativeAccess
+        @NativeAccess
         public U map(T object);
     }
     
@@ -105,12 +105,12 @@ public interface ReduceFunctor<U, T> extends java.io.Serializable{
          * Performs a reduce operation on <code>intermediate</code>.
          * Returns the result of the reduction.
          */
-        @io.qt.NativeAccess
+        @NativeAccess
         public U reduce(U result, T intermediate);
     }
     
     @SuppressWarnings("unchecked")
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static <U> U computeDefaultResult(ReduceFunctor<U,?> functor) {
         int[] types = QtJambi_LibraryUtilities.internal.lambdaMetaTypes(ReduceFunctor.class, functor);
         if(types!=null && types.length>0) {
@@ -122,33 +122,33 @@ private static <U> U computeDefaultResult(ReduceFunctor<U,?> functor) {
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#map">QtConcurrent::map(Sequence, MapFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<Void> map(Collection<T> sequence, MapFunctor<T> functor){
+    @QtUninvokable
+    public static <T> @NonNull QFuture<@QtPrimitiveType Void> map(@StrictNonNull Collection<T> sequence, MapFunctor<T> functor){
         return startMap(0, Objects.requireNonNull(sequence), Objects.requireNonNull(functor)).startAsynchronously();
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#blockingMap">QtConcurrent::blockingMap(Sequence, MapFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> void blockingMap(Collection<T> sequence, MapFunctor<T> functor){
-        QFuture<Void> future = map(sequence, functor);
+    @QtUninvokable
+    public static <T> void blockingMap(@StrictNonNull Collection<T> sequence, MapFunctor<T> functor){
+        QFuture<@QtPrimitiveType Void> future = map(sequence, functor);
         future.waitForFinished();
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#mapped">QtConcurrent::mapped(Sequence, MappedFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> mapped(Collection<T> sequence, MappedFunctor<U, T> functor){
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> mapped(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<U, T> functor){
         return startMapped(0, Objects.requireNonNull(sequence), Objects.requireNonNull(functor)).startAsynchronously();
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#blockingMapped">QtConcurrent::blockingMapped(Sequence, MappedFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QList<U> blockingMapped(Collection<T> sequence, MappedFunctor<U, T> functor){
+    @QtUninvokable
+    public static <U, T> @NonNull QList<U> blockingMapped(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<U, T> functor){
         QFuture<U> future = mapped(sequence, functor);
         return future.results();
     }
@@ -156,32 +156,32 @@ public static <U, T> QList<U> blockingMapped(Collection<T> sequence, MappedFunct
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor) {
         return mappedReduced(sequence, functor, reduceFunctor, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         return mappedReduced(sequence, functor, reduceFunctor, new ReduceOptions(options));
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOptions options) {
            return startMappedReduced(0, Objects.requireNonNull(sequence), Objects.requireNonNull(functor), Objects.requireNonNull(reduceFunctor), computeDefaultResult(reduceFunctor), options.value()).startAsynchronously();
      }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor) {
         QFuture<U> future = mappedReduced(sequence, functor, reduceFunctor);
         return future.result();
     }
@@ -189,8 +189,8 @@ public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFu
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         QFuture<U> future = mappedReduced(sequence, functor, reduceFunctor, options);
         return future.result();
     }
@@ -198,150 +198,150 @@ public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFu
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOptions options) {
         QFuture<U> future = mappedReduced(sequence, functor, reduceFunctor, options);
         return future.result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filter">QtConcurrent::filter(Sequence, FilteredFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filter">QtConcurrent::filter(Sequence, @StrictNonNull FilteredFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<Void> filter(Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
+    @QtUninvokable
+    public static <T> @NonNull QFuture<@QtPrimitiveType Void> filter(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
         return filter(0, Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor));
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilter">QtConcurrent::blockingFilter(Sequence, FilteredFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilter">QtConcurrent::blockingFilter(Sequence, @StrictNonNull FilteredFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> void blockingFilter(Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
-        QFuture<Void> future = filter(sequence, filteredFunctor);
+    @QtUninvokable
+    public static <T> void blockingFilter(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
+        QFuture<@QtPrimitiveType Void> future = filter(sequence, filteredFunctor);
         future.waitForFinished();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filtered">QtConcurrent::filtered(Sequence, FilteredFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filtered">QtConcurrent::filtered(Sequence, @StrictNonNull FilteredFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<T> filtered(Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
+    @QtUninvokable
+    public static <T> @NonNull QFuture<T> filtered(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
         return startFiltered(0, Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor)).startAsynchronously();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFiltered">QtConcurrent::blockingFiltered(Sequence, FilteredFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFiltered">QtConcurrent::blockingFiltered(Sequence, @StrictNonNull FilteredFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QList<T> blockingFiltered(Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
+    @QtUninvokable
+    public static <T> @NonNull QList<T> blockingFiltered(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
         QFuture<T> future = filtered(sequence, filteredFunctor);
         return future.results();
     }
         
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor) {
         return filteredReduced(sequence, filteredFunctor, reduceFunctor, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         return filteredReduced(sequence, filteredFunctor, reduceFunctor, new ReduceOptions(options));
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOptions options) {
         return startFilteredReduced(0, Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor), Objects.requireNonNull(reduceFunctor), computeDefaultResult(reduceFunctor), options.value()).startAsynchronously();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor) {
         QFuture<U> future = filteredReduced(sequence, filteredFunctor, reduceFunctor);
         return future.result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         QFuture<U> future = filteredReduced(sequence, filteredFunctor, reduceFunctor, options);
         return future.result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOptions options) {
         QFuture<U> future = filteredReduced(sequence, filteredFunctor, reduceFunctor, options);
         return future.result();
     }
     
-    @io.qt.QtUninvokable
-    private native static <T> QFuture<Void> filter(long threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor);
+    @QtUninvokable
+    private native static <T> @NonNull QFuture<@QtPrimitiveType Void> filter(long threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor);
     
-    @io.qt.QtUninvokable
-    private native static <T> ThreadEngineStarter<Void> startMap(long threadPool, Collection<T> sequence, MapFunctor<T> functor);
+    @QtUninvokable
+    private native static <T> @NonNull ThreadEngineStarter<@QtPrimitiveType Void> startMap(long threadPool, Collection<T> sequence, MapFunctor<T> functor);
     
-    @io.qt.QtUninvokable
-    private native static <U, T> ThreadEngineStarter<U> startMapped(long threadPool, Collection<T> sequence, MappedFunctor<U, T> functor);
+    @QtUninvokable
+    private native static <U, T> @NonNull ThreadEngineStarter<U> startMapped(long threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<U, T> functor);
     
-    @io.qt.QtUninvokable
-    private native static <U, V, T> ThreadEngineStarter<U> startMappedReduced(long threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, int options);
+    @QtUninvokable
+    private native static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(long threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, int options);
     
-    @io.qt.QtUninvokable
-    private native static <U, T> ThreadEngineStarter<U> startFilteredReduced(long threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, int options);
+    @QtUninvokable
+    private native static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(long threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, int options);
     
-    @io.qt.QtUninvokable
-    private native static <T> ThreadEngineStarter<T> startFiltered(long threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor);
+    @QtUninvokable
+    private native static <T> @NonNull ThreadEngineStarter<T> startFiltered(long threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<T> run(Callable<T> callable){
+    @QtUninvokable
+    public static <T> @NonNull QFuture<T> run(Callable<T> callable){
         return run0(null, Objects.requireNonNull(callable));
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<T> run(QThreadPool threadPool, Callable<T> callable){
+    @QtUninvokable
+    public static <T> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, Callable<T> callable){
         return run0(threadPool, Objects.requireNonNull(callable));
     }
-    @io.qt.QtUninvokable
-    private native static <T> QFuture<T> run0(QThreadPool threadPool, Callable<T> callable);
+    @QtUninvokable
+    private native static <T> @NonNull QFuture<T> run0(@Nullable QThreadPool threadPool, Callable<T> callable);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static QFuture<Void> run(Runnable runnable) {
+    @QtUninvokable
+    public static @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable runnable) {
         return runVoid0(null, Objects.requireNonNull(runnable));
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static QFuture<Void> run(QThreadPool threadPool, Runnable runnable) {
+    @QtUninvokable
+    public static @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable runnable) {
         return runVoid0(threadPool, Objects.requireNonNull(runnable));
     }
-    @io.qt.QtUninvokable
-    private native static QFuture<Void> runVoid0(QThreadPool threadPool, Runnable runnable);
+    @QtUninvokable
+    private native static @NonNull QFuture<@QtPrimitiveType Void> runVoid0(@Nullable QThreadPool threadPool, @StrictNonNull Runnable runnable);
     
     @FunctionalInterface
     public interface Runnable1<A>{
@@ -371,77 +371,77 @@ public interface Runnable5<A,B,C,D,E>{
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A> QFuture<Void> run(Runnable1<A> runnable, A a) {
+    public static <A> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable1<A> runnable, A a) {
         return runVoid1(null, runnable, a);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A> QFuture<Void> run(QThreadPool threadPool, Runnable1<A> runnable, A a) {
+    public static <A> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable1<A> runnable, A a) {
         return runVoid1(threadPool, Objects.requireNonNull(runnable), a);
     }
-    private native static <A> QFuture<Void> runVoid1(QThreadPool threadPool, Runnable1<A> runnable, A a);
+    private native static <A> @NonNull QFuture<@QtPrimitiveType Void> runVoid1(@Nullable QThreadPool threadPool, @StrictNonNull Runnable1<A> runnable, A a);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A,B> QFuture<Void> run(Runnable2<A,B> runnable, A a, B b) {
+    public static <A,B> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable2<A,B> runnable, A a, B b) {
         return runVoid2(null, Objects.requireNonNull(runnable), a, b);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A,B> QFuture<Void> run(QThreadPool threadPool, Runnable2<A,B> runnable, A a, B b) {
+    public static <A,B> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable2<A,B> runnable, A a, B b) {
         return runVoid2(threadPool, Objects.requireNonNull(runnable), a, b);
     }
-    private native static <A,B> QFuture<Void> runVoid2(QThreadPool threadPool, Runnable2<A,B> runnable, A a, B b);
+    private native static <A,B> @NonNull QFuture<@QtPrimitiveType Void> runVoid2(@Nullable QThreadPool threadPool, @StrictNonNull Runnable2<A,B> runnable, A a, B b);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A,B,C> QFuture<Void> run(Runnable3<A,B,C> runnable, A a, B b, C c) {
+    public static <A,B,C> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable3<A,B,C> runnable, A a, B b, C c) {
         return runVoid3(null, Objects.requireNonNull(runnable), a, b, c);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A,B,C> QFuture<Void> run(QThreadPool threadPool, Runnable3<A,B,C> runnable, A a, B b, C c) {
+    public static <A,B,C> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable3<A,B,C> runnable, A a, B b, C c) {
         return runVoid3(threadPool, Objects.requireNonNull(runnable), a, b, c);
     }
-    private native static <A,B,C> QFuture<Void> runVoid3(QThreadPool threadPool, Runnable3<A,B,C> runnable, A a, B b, C c);
+    private native static <A,B,C> @NonNull QFuture<@QtPrimitiveType Void> runVoid3(@Nullable QThreadPool threadPool, @StrictNonNull Runnable3<A,B,C> runnable, A a, B b, C c);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A,B,C,D> QFuture<Void> run(Runnable4<A,B,C,D> runnable, A a, B b, C c, D d) {
+    public static <A,B,C,D> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable4<A,B,C,D> runnable, A a, B b, C c, D d) {
         return runVoid4(null, Objects.requireNonNull(runnable), a, b, c, d);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A,B,C,D> QFuture<Void> run(QThreadPool threadPool, Runnable4<A,B,C,D> runnable, A a, B b, C c, D d) {
+    public static <A,B,C,D> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable4<A,B,C,D> runnable, A a, B b, C c, D d) {
         return runVoid4(threadPool, Objects.requireNonNull(runnable), a, b, c, d);
     }
-    private native static <A,B,C,D> QFuture<Void> runVoid4(QThreadPool threadPool, Runnable4<A,B,C,D> runnable, A a, B b, C c, D d);
+    private native static <A,B,C,D> @NonNull QFuture<@QtPrimitiveType Void> runVoid4(@Nullable QThreadPool threadPool, @StrictNonNull Runnable4<A,B,C,D> runnable, A a, B b, C c, D d);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A,B,C,D,E> QFuture<Void> run(Runnable5<A,B,C,D,E> runnable, A a, B b, C c, D d, E e) {
+    public static <A,B,C,D,E> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable5<A,B,C,D,E> runnable, A a, B b, C c, D d, E e) {
         return runVoid5(null, Objects.requireNonNull(runnable), a, b, c, d, e);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A,B,C,D,E> QFuture<Void> run(QThreadPool threadPool, Runnable5<A,B,C,D,E> runnable, A a, B b, C c, D d, E e) {
+    public static <A,B,C,D,E> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable5<A,B,C,D,E> runnable, A a, B b, C c, D d, E e) {
         return runVoid5(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e);
     }
-    private native static <A,B,C,D,E> QFuture<Void> runVoid5(QThreadPool threadPool, Runnable5<A,B,C,D,E> runnable, A a, B b, C c, D d, E e);
+    private native static <A,B,C,D,E> @NonNull QFuture<@QtPrimitiveType Void> runVoid5(@Nullable QThreadPool threadPool, @StrictNonNull Runnable5<A,B,C,D,E> runnable, A a, B b, C c, D d, E e);
     
     
     
@@ -473,113 +473,113 @@ public interface Callable5<T,A,B,C,D,E>{
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T,A> QFuture<T> run(Callable1<T,A> runnable, A a) {
+    public static <T,A> @NonNull QFuture<T> run(@StrictNonNull Callable1<T,A> runnable, A a) {
         return run1(null, Objects.requireNonNull(runnable), a);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T,A> QFuture<T> run(QThreadPool threadPool, Callable1<T,A> runnable, A a) {
+    public static <T,A> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull Callable1<T,A> runnable, A a) {
         return run1(threadPool, Objects.requireNonNull(runnable), a);
     }
-    private native static <T,A> QFuture<T> run1(QThreadPool threadPool, Callable1<T,A> runnable, A a);
+    private native static <T,A> @NonNull QFuture<T> run1(@Nullable QThreadPool threadPool, Callable1<T,A> runnable, A a);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T,A,B> QFuture<T> run(Callable2<T,A,B> runnable, A a, B b) {
+    public static <T,A,B> @NonNull QFuture<T> run(@StrictNonNull Callable2<T,A,B> runnable, A a, B b) {
         return run2(null, Objects.requireNonNull(runnable), a, b);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T,A,B> QFuture<T> run(QThreadPool threadPool, Callable2<T,A,B> runnable, A a, B b) {
+    public static <T,A,B> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull Callable2<T,A,B> runnable, A a, B b) {
         return run2(threadPool, Objects.requireNonNull(runnable), a, b);
     }
-    private native static <T,A,B> QFuture<T> run2(QThreadPool threadPool, Callable2<T,A,B> runnable, A a, B b);
+    private native static <T,A,B> @NonNull QFuture<T> run2(@Nullable QThreadPool threadPool, Callable2<T,A,B> runnable, A a, B b);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T,A,B,C> QFuture<T> run(Callable3<T,A,B,C> runnable, A a, B b, C c) {
+    public static <T,A,B,C> @NonNull QFuture<T> run(@StrictNonNull Callable3<T,A,B,C> runnable, A a, B b, C c) {
         return run3(null, Objects.requireNonNull(runnable), a, b, c);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T,A,B,C> QFuture<T> run(QThreadPool threadPool, Callable3<T,A,B,C> runnable, A a, B b, C c) {
+    public static <T,A,B,C> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull Callable3<T,A,B,C> runnable, A a, B b, C c) {
         return run3(threadPool, Objects.requireNonNull(runnable), a, b, c);
     }
-    private native static <T,A,B,C> QFuture<T> run3(QThreadPool threadPool, Callable3<T,A,B,C> runnable, A a, B b, C c);
+    private native static <T,A,B,C> @NonNull QFuture<T> run3(@Nullable QThreadPool threadPool, Callable3<T,A,B,C> runnable, A a, B b, C c);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T,A,B,C,D> QFuture<T> run(Callable4<T,A,B,C,D> runnable, A a, B b, C c, D d) {
+    public static <T,A,B,C,D> @NonNull QFuture<T> run(@StrictNonNull Callable4<T,A,B,C,D> runnable, A a, B b, C c, D d) {
         return run4(null, Objects.requireNonNull(runnable), a, b, c, d);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T,A,B,C,D> QFuture<T> run(QThreadPool threadPool, Callable4<T,A,B,C,D> runnable, A a, B b, C c, D d) {
+    public static <T,A,B,C,D> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull Callable4<T,A,B,C,D> runnable, A a, B b, C c, D d) {
         return run4(threadPool, Objects.requireNonNull(runnable), a, b, c, d);
     }
-    private native static <T,A,B,C,D> QFuture<T> run4(QThreadPool threadPool, Callable4<T,A,B,C,D> runnable, A a, B b, C c, D d);
+    private native static <T,A,B,C,D> @NonNull QFuture<T> run4(@Nullable QThreadPool threadPool, Callable4<T,A,B,C,D> runnable, A a, B b, C c, D d);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E> QFuture<T> run(Callable5<T,A,B,C,D,E> runnable, A a, B b, C c, D d, E e) {
+    public static <T,A,B,C,D,E> @NonNull QFuture<T> run(@StrictNonNull Callable5<T,A,B,C,D,E> runnable, A a, B b, C c, D d, E e) {
         return run5(null, Objects.requireNonNull(runnable), a, b, c, d, e);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E> QFuture<T> run(QThreadPool threadPool, Callable5<T,A,B,C,D,E> runnable, A a, B b, C c, D d, E e) {
+    public static <T,A,B,C,D,E> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull Callable5<T,A,B,C,D,E> runnable, A a, B b, C c, D d, E e) {
         return run5(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e);
     }
-    private native static <T,A,B,C,D,E> QFuture<T> run5(QThreadPool threadPool, Callable5<T,A,B,C,D,E> runnable, A a, B b, C c, D d, E e);
+    private native static <T,A,B,C,D,E> @NonNull QFuture<T> run5(@Nullable QThreadPool threadPool, Callable5<T,A,B,C,D,E> runnable, A a, B b, C c, D d, E e);
     
 }// class
 
 class QtConcurrent_5__ extends QtConcurrent {
     
-    public static <T> ThreadEngineStarter<Void> startMap(Collection<T> sequence, MapFunctor<T> functor) {
+    public static <T> @NonNull ThreadEngineStarter<@QtPrimitiveType Void> startMap(@StrictNonNull Collection<T> sequence, MapFunctor<T> functor) {
         return startMap(0, Objects.requireNonNull(sequence), Objects.requireNonNull(functor));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startMapped(Collection<T> sequence, MappedFunctor<U, T> functor){
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startMapped(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<U, T> functor){
         return startMapped(0, Objects.requireNonNull(sequence), Objects.requireNonNull(functor));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOptions options) {
         return startMappedReduced(0, Objects.requireNonNull(sequence), Objects.requireNonNull(functor), Objects.requireNonNull(reduceFunctor), computeDefaultResult(reduceFunctor), options.value());
     }
     
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOption... options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, ReduceOption... options) {
         return startMappedReduced(sequence, functor, reduceFunctor, new ReduceOptions(options));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         return startFilteredReduced(sequence, filteredFunctor, reduceFunctor, new ReduceOptions(options));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOptions options) {
         return startFilteredReduced(0, Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor), Objects.requireNonNull(reduceFunctor), computeDefaultResult(reduceFunctor), options.value());
     }
     
-    @io.qt.QtUninvokable
-    public static <T> ThreadEngineStarter<T> startFiltered(Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
+    @QtUninvokable
+    public static <T> @NonNull ThreadEngineStarter<T> startFiltered(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
         return startFiltered(0, Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor));
     }
     
@@ -630,281 +630,281 @@ public interface Callable9<T,A,B,C,D,E,F,G,H,I>{
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A,B,C,D,E,F> QFuture<Void> run(Runnable6<A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f) {
+    public static <A,B,C,D,E,F> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable6<A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f) {
         return runVoid6(null, Objects.requireNonNull(runnable), a, b, c, d, e, f);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A,B,C,D,E,F> QFuture<Void> run(QThreadPool threadPool, Runnable6<A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f) {
+    public static <A,B,C,D,E,F> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable6<A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f) {
         return runVoid6(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f);
     }
-    private native static <A,B,C,D,E,F> QFuture<Void> runVoid6(QThreadPool threadPool, Runnable6<A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f);
+    private native static <A,B,C,D,E,F> @NonNull QFuture<@QtPrimitiveType Void> runVoid6(@Nullable QThreadPool threadPool, @StrictNonNull Runnable6<A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A,B,C,D,E,F,G> QFuture<Void> run(Runnable7<A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static <A,B,C,D,E,F,G> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable7<A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g) {
         return runVoid7(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A,B,C,D,E,F,G> QFuture<Void> run(QThreadPool threadPool, Runnable7<A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static <A,B,C,D,E,F,G> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable7<A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g) {
         return runVoid7(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g);
     }
-    private native static <A,B,C,D,E,F,G> QFuture<Void> runVoid7(QThreadPool threadPool, Runnable7<A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g);
+    private native static <A,B,C,D,E,F,G> @NonNull QFuture<@QtPrimitiveType Void> runVoid7(@Nullable QThreadPool threadPool, @StrictNonNull Runnable7<A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A,B,C,D,E,F,G,H> QFuture<Void> run(Runnable8<A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+    public static <A,B,C,D,E,F,G,H> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable8<A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
         return runVoid8(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A,B,C,D,E,F,G,H> QFuture<Void> run(QThreadPool threadPool, Runnable8<A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+    public static <A,B,C,D,E,F,G,H> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable8<A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
         return runVoid8(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h);
     }
-    private native static <A,B,C,D,E,F,G,H> QFuture<Void> runVoid8(QThreadPool threadPool, Runnable8<A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h);
+    private native static <A,B,C,D,E,F,G,H> @NonNull QFuture<@QtPrimitiveType Void> runVoid8(@Nullable QThreadPool threadPool, @StrictNonNull Runnable8<A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A,B,C,D,E,F,G,H,I> QFuture<Void> run(Runnable9<A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
+    public static <A,B,C,D,E,F,G,H,I> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull Runnable9<A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
         return runVoid9(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h, i);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A,B,C,D,E,F,G,H,I> QFuture<Void> run(QThreadPool threadPool, Runnable9<A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
+    public static <A,B,C,D,E,F,G,H,I> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull Runnable9<A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
         return runVoid9(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h, i);
     }
-    private native static <A,B,C,D,E,F,G,H,I> QFuture<Void> runVoid9(QThreadPool threadPool, Runnable9<A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
+    private native static <A,B,C,D,E,F,G,H,I> @NonNull QFuture<@QtPrimitiveType Void> runVoid9(@Nullable QThreadPool threadPool, @StrictNonNull Runnable9<A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E,F> QFuture<T> run(Callable6<T,A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f) {
+    public static <T,A,B,C,D,E,F> @NonNull QFuture<T> run(Callable6<T,A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f) {
         return run6(null, Objects.requireNonNull(runnable), a, b, c, d, e, f);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E,F> QFuture<T> run(QThreadPool threadPool, Callable6<T,A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f) {
+    public static <T,A,B,C,D,E,F> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, Callable6<T,A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f) {
         return run6(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f);
     }
-    private native static <T,A,B,C,D,E,F> QFuture<T> run6(QThreadPool threadPool, Callable6<T,A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f);
+    private native static <T,A,B,C,D,E,F> @NonNull QFuture<T> run6(@Nullable QThreadPool threadPool, Callable6<T,A,B,C,D,E,F> runnable, A a, B b, C c, D d, E e, F f);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E,F,G> QFuture<T> run(Callable7<T,A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static <T,A,B,C,D,E,F,G> @NonNull QFuture<T> run(Callable7<T,A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g) {
         return run7(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E,F,G> QFuture<T> run(QThreadPool threadPool, Callable7<T,A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static <T,A,B,C,D,E,F,G> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, Callable7<T,A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g) {
         return run7(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g);
     }
-    private native static <T,A,B,C,D,E,F,G> QFuture<T> run7(QThreadPool threadPool, Callable7<T,A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g);
+    private native static <T,A,B,C,D,E,F,G> @NonNull QFuture<T> run7(@Nullable QThreadPool threadPool, Callable7<T,A,B,C,D,E,F,G> runnable, A a, B b, C c, D d, E e, F f, G g);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E,F,G,H> QFuture<T> run(Callable8<T,A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+    public static <T,A,B,C,D,E,F,G,H> @NonNull QFuture<T> run(Callable8<T,A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
         return run8(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E,F,G,H> QFuture<T> run(QThreadPool threadPool, Callable8<T,A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+    public static <T,A,B,C,D,E,F,G,H> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, Callable8<T,A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
         return run8(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h);
     }
-    private native static <T,A,B,C,D,E,F,G,H> QFuture<T> run8(QThreadPool threadPool, Callable8<T,A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h);
+    private native static <T,A,B,C,D,E,F,G,H> @NonNull QFuture<T> run8(@Nullable QThreadPool threadPool, Callable8<T,A,B,C,D,E,F,G,H> runnable, A a, B b, C c, D d, E e, F f, G g, H h);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E,F,G,H,I> QFuture<T> run(Callable9<T,A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
+    public static <T,A,B,C,D,E,F,G,H,I> @NonNull QFuture<T> run(Callable9<T,A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
         return run9(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h, i);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T,A,B,C,D,E,F,G,H,I> QFuture<T> run(QThreadPool threadPool, Callable9<T,A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
+    public static <T,A,B,C,D,E,F,G,H,I> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, Callable9<T,A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
         return run9(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h, i);
     }
-    private native static <T,A,B,C,D,E,F,G,H,I> QFuture<T> run9(QThreadPool threadPool, Callable9<T,A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
+    private native static <T,A,B,C,D,E,F,G,H,I> @NonNull QFuture<T> run9(@Nullable QThreadPool threadPool, Callable9<T,A,B,C,D,E,F,G,H,I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#map">QtConcurrent::map(QThreadPool*, Sequence, MapFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#map">QtConcurrent::map(@Nullable QThreadPool*, Sequence, MapFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<Void> map(QThreadPool threadPool, Collection<T> sequence, MapFunctor<T> functor){
+    @QtUninvokable
+    public static <T> @NonNull QFuture<@QtPrimitiveType Void> map(@Nullable QThreadPool threadPool, Collection<T> sequence, MapFunctor<T> functor){
         return startMap(threadPool, sequence, functor).startAsynchronously();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMap">QtConcurrent::blockingMap(QThreadPool*, Sequence, MapFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMap">QtConcurrent::blockingMap(@Nullable QThreadPool*, Sequence, MapFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> void blockingMap(QThreadPool threadPool, Collection<T> sequence, MapFunctor<T> functor){
-        QFuture<Void> future = map(threadPool, sequence, functor);
+    @QtUninvokable
+    public static <T> void blockingMap(@Nullable QThreadPool threadPool, Collection<T> sequence, MapFunctor<T> functor){
+        QFuture<@QtPrimitiveType Void> future = map(threadPool, sequence, functor);
         future.waitForFinished();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#mapped">QtConcurrent::mapped(QThreadPool*, Sequence, MappedFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#mapped">QtConcurrent::mapped(@Nullable QThreadPool*, Sequence, MappedFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> mapped(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<U, T> functor){
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> mapped(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<U, T> functor){
         return startMapped(threadPool, sequence, functor).startAsynchronously();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMapped">QtConcurrent::blockingMapped(QThreadPool*, Sequence, MappedFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMapped">QtConcurrent::blockingMapped(@Nullable QThreadPool*, Sequence, MappedFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QList<U> blockingMapped(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<U, T> functor){
+    @QtUninvokable
+    public static <U, T> QList<U> blockingMapped(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<U, T> functor){
         QFuture<U> future = mapped(threadPool, sequence, functor);
         return future.results();
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor) {
         return mappedReduced(threadPool, sequence, functor, reduceFunctor, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         return mappedReduced(threadPool, sequence, functor, reduceFunctor, new ReduceOptions(options));
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOptions options) {
         return startMappedReduced(threadPool, sequence, functor, reduceFunctor, options).startAsynchronously();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue) {
         return mappedReduced(threadPool, sequence, functor, reduceFunctor, initialValue, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, @NonNull ReduceOption @NonNull... options) {
         return mappedReduced(threadPool, sequence, functor, reduceFunctor, initialValue, new ReduceOptions(options));
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         return startMappedReduced(threadPool, sequence, functor, reduceFunctor, initialValue, options).startAsynchronously();
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue) {
         return mappedReduced(sequence, functor, reduceFunctor, initialValue, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, @NonNull ReduceOption @NonNull... options) {
         return mappedReduced(sequence, functor, reduceFunctor, initialValue, new ReduceOptions(options));
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#mappedReduced">QtConcurrent::mappedReduced(Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> QFuture<U> mappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull QFuture<U> mappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         return startMappedReduced(0, Objects.requireNonNull(sequence), Objects.requireNonNull(functor), Objects.requireNonNull(reduceFunctor), computeDefaultResult(reduceFunctor), options.value()).startAsynchronously();
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor) {
         QFuture<U> future = mappedReduced(threadPool, sequence, functor, reduceFunctor);
         return future.result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         QFuture<U> future = mappedReduced(threadPool, sequence, functor, reduceFunctor, options);
         return future.result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOptions options) {
         QFuture<U> future = mappedReduced(threadPool, sequence, functor, reduceFunctor, options);
         return future.result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue) {
         QFuture<U> future = mappedReduced(threadPool, sequence, functor, reduceFunctor, initialValue);
         return future.result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, @NonNull ReduceOption @NonNull... options) {
         QFuture<U> future = mappedReduced(threadPool, sequence, functor, reduceFunctor, initialValue, options);
         return future.result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(@Nullable QThreadPool*, Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         QFuture<U> future = mappedReduced(threadPool, sequence, functor, reduceFunctor, initialValue, options);
         return future.result();
     }
@@ -912,8 +912,8 @@ public static <U, V, T> U blockingMappedReduced(QThreadPool threadPool, Collecti
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue) {
         QFuture<U> future = mappedReduced(sequence, functor, reduceFunctor, initialValue);
         return future.result();
     }
@@ -921,8 +921,8 @@ public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFu
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, @NonNull ReduceOption @NonNull... options) {
         QFuture<U> future = mappedReduced(sequence, functor, reduceFunctor, initialValue, options);
         return future.result();
     }
@@ -930,718 +930,718 @@ public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFu
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#blockingMappedReduced">QtConcurrent::blockingMappedReduced(Sequence, MappedFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> U blockingMappedReduced(Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> U blockingMappedReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         QFuture<U> future = mappedReduced(sequence, functor, reduceFunctor, initialValue, options);
         return future.result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filter">QtConcurrent::filter(QThreadPool*, Sequence, FilteredFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filter">QtConcurrent::filter(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<Void> filter(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
+    @QtUninvokable
+    public static <T> @NonNull QFuture<@QtPrimitiveType Void> filter(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
         return filter(QtJambi_LibraryUtilities.internal.checkedNativeId(Objects.requireNonNull(threadPool)), Objects.requireNonNull(sequence), filteredFunctor);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filtered">QtConcurrent::filtered(QThreadPool*, Sequence, FilteredFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filtered">QtConcurrent::filtered(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<T> filtered(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
+    @QtUninvokable
+    public static <T> @NonNull QFuture<T> filtered(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
         return startFiltered(threadPool, sequence, filteredFunctor).startAsynchronously();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFiltered">QtConcurrent::blockingFiltered(QThreadPool*, Sequence, FilteredFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFiltered">QtConcurrent::blockingFiltered(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QList<T> blockingFiltered(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
+    @QtUninvokable
+    public static <T> QList<T> blockingFiltered(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
         QFuture<T> future = filtered(threadPool, sequence, filteredFunctor);
         return future.results();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilter">QtConcurrent::blockingFilter(QThreadPool*, Sequence, FilteredFunctor)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilter">QtConcurrent::blockingFilter(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> void blockingFilter(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
-        QFuture<Void> future = filter(threadPool, sequence, filteredFunctor);
+    @QtUninvokable
+    public static <T> void blockingFilter(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
+        QFuture<@QtPrimitiveType Void> future = filter(threadPool, sequence, filteredFunctor);
         future.waitForFinished();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, new ReduceOptions(options));
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOptions options) {
         return startFilteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, options).startAsynchronously();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, initialValue, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOption @NonNull... options) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, initialValue, new ReduceOptions(options));
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         return startFilteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, initialValue, options).startAsynchronously();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue) {
         return filteredReduced(sequence, filteredFunctor, reduceFunctor, initialValue, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOption @NonNull... options) {
         return filteredReduced(sequence, filteredFunctor, reduceFunctor, initialValue, new ReduceOptions(options));
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#filteredReduced">QtConcurrent::filteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> QFuture<U> filteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> @NonNull QFuture<U> filteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         return startFilteredReduced(0, Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor), Objects.requireNonNull(reduceFunctor), initialValue, options.value()).startAsynchronously();
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor).result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, options).result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOptions options) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, options).result();
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, initialValue).result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOption @NonNull... options) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, initialValue, options).result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(QThreadPool*, Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(@Nullable QThreadPool*, Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         return filteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, initialValue, options).result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue) {
         return filteredReduced(sequence, filteredFunctor, reduceFunctor, initialValue).result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOption @NonNull... options) {
         return filteredReduced(sequence, filteredFunctor, reduceFunctor, initialValue, options).result();
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#blockingFilteredReduced">QtConcurrent::blockingFilteredReduced(Sequence, @StrictNonNull FilteredFunctor, ReduceFunctor, InitialValueType, QtConcurrent::ReduceOptions)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <U, T> U blockingFilteredReduced(Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> U blockingFilteredReduced(@StrictNonNull Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         return filteredReduced(sequence, filteredFunctor, reduceFunctor, initialValue, options).result();
     }
     
-    @io.qt.QtUninvokable
-    public static <T> ThreadEngineStarter<Void> startMap(QThreadPool threadPool, Collection<T> sequence, MapFunctor<T> functor) {
+    @QtUninvokable
+    public static <T> @NonNull ThreadEngineStarter<@QtPrimitiveType Void> startMap(@Nullable QThreadPool threadPool, Collection<T> sequence, MapFunctor<T> functor) {
         return startMap(QtJambi_LibraryUtilities.internal.checkedNativeId(Objects.requireNonNull(threadPool)), Objects.requireNonNull(sequence), Objects.requireNonNull(functor));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startMapped(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<U, T> functor){
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startMapped(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<U, T> functor){
         return startMapped(QtJambi_LibraryUtilities.internal.checkedNativeId(Objects.requireNonNull(threadPool)), Objects.requireNonNull(sequence), Objects.requireNonNull(functor));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor) {
         return startMappedReduced(threadPool, sequence, functor, reduceFunctor, computeDefaultResult(reduceFunctor), ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOptions options) {
         return startMappedReduced(QtJambi_LibraryUtilities.internal.checkedNativeId(Objects.requireNonNull(threadPool)), Objects.requireNonNull(sequence), Objects.requireNonNull(functor), Objects.requireNonNull(reduceFunctor), computeDefaultResult(reduceFunctor), options.value());
     }
     
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOption... options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, ReduceOption... options) {
         return startMappedReduced(threadPool, sequence, functor, reduceFunctor, new ReduceOptions(options));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue) {
         return startMappedReduced(threadPool, sequence, functor, reduceFunctor, initialValue, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         return startMappedReduced(QtJambi_LibraryUtilities.internal.checkedNativeId(Objects.requireNonNull(threadPool)), Objects.requireNonNull(sequence), Objects.requireNonNull(functor), Objects.requireNonNull(reduceFunctor), initialValue, options.value());
     }
     
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOption... options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, U initialValue, ReduceOption... options) {
         return startMappedReduced(threadPool, sequence, functor, reduceFunctor, initialValue, new ReduceOptions(options));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor) {
         return startFilteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         return startFilteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, new ReduceOptions(options));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOptions options) {
         return startFilteredReduced(QtJambi_LibraryUtilities.internal.checkedNativeId(Objects.requireNonNull(threadPool)), Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor), Objects.requireNonNull(reduceFunctor), computeDefaultResult(reduceFunctor), options.value());
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue) {
         return startFilteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, initialValue, ReduceOption.UnorderedReduce, ReduceOption.SequentialReduce);
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOption @NonNull... options) {
         return startFilteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, initialValue, new ReduceOptions(options));
     }
     
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, U initialValue, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, U initialValue, @NonNull ReduceOptions options) {
         return startFilteredReduced(QtJambi_LibraryUtilities.internal.checkedNativeId(Objects.requireNonNull(threadPool)), Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor), Objects.requireNonNull(reduceFunctor), initialValue, options.value());
     }
     
-    @io.qt.QtUninvokable
-    public static <T> ThreadEngineStarter<T> startFiltered(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
+    @QtUninvokable
+    public static <T> @NonNull ThreadEngineStarter<T> startFiltered(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
         return startFiltered(QtJambi_LibraryUtilities.internal.checkedNativeId(Objects.requireNonNull(threadPool)), Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor));
     }
     
     @FunctionalInterface
     public interface RunnableWithPromise<T> {
-        public void run(QPromise<T> promise);
+        public void run(@StrictNonNull QPromise<T> promise);
     }
     
     @FunctionalInterface
     public interface RunnableWithPromise1<T, A> {
-        public void run(QPromise<T> promise, A a);
+        public void run(@StrictNonNull QPromise<T> promise, A a);
     }
 
     @FunctionalInterface
     public interface RunnableWithPromise2<T, A, B> {
-        public void run(QPromise<T> promise, A a, B b);
+        public void run(@StrictNonNull QPromise<T> promise, A a, B b);
     }
 
     @FunctionalInterface
     public interface RunnableWithPromise3<T, A, B, C> {
-        public void run(QPromise<T> promise, A a, B b, C c);
+        public void run(@StrictNonNull QPromise<T> promise, A a, B b, C c);
     }
 
     @FunctionalInterface
     public interface RunnableWithPromise4<T, A, B, C, D> {
-        public void run(QPromise<T> promise, A a, B b, C c, D d);
+        public void run(@StrictNonNull QPromise<T> promise, A a, B b, C c, D d);
     }
 
     @FunctionalInterface
     public interface RunnableWithPromise5<T, A, B, C, D, E> {
-        public void run(QPromise<T> promise, A a, B b, C c, D d, E e);
+        public void run(@StrictNonNull QPromise<T> promise, A a, B b, C c, D d, E e);
     }
 
     @FunctionalInterface
     public interface RunnableWithPromise6<T, A, B, C, D, E, F> {
-        public void run(QPromise<T> promise, A a, B b, C c, D d, E e, F f);
+        public void run(@StrictNonNull QPromise<T> promise, A a, B b, C c, D d, E e, F f);
     }
 
     @FunctionalInterface
     public interface RunnableWithPromise7<T, A, B, C, D, E, F, G> {
-        public void run(QPromise<T> promise, A a, B b, C c, D d, E e, F f, G g);
+        public void run(@StrictNonNull QPromise<T> promise, A a, B b, C c, D d, E e, F f, G g);
     }
 
     @FunctionalInterface
     public interface RunnableWithPromise8<T, A, B, C, D, E, F, G, H> {
-        public void run(QPromise<T> promise, A a, B b, C c, D d, E e, F f, G g, H h);
+        public void run(@StrictNonNull QPromise<T> promise, A a, B b, C c, D d, E e, F f, G g, H h);
     }
 
     @FunctionalInterface
     public interface RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> {
-        public void run(QPromise<T> promise, A a, B b, C c, D d, E e, F f, G g, H h, I i);
+        public void run(@StrictNonNull QPromise<T> promise, A a, B b, C c, D d, E e, F f, G g, H h, I i);
     }
     
     @FunctionalInterface
     public interface RunnableWithVoidPromise {
-        public void run(QPromise<Void> promise);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise);
     }
 
     @FunctionalInterface
     public interface RunnableWithVoidPromise1<A> {
-        public void run(QPromise<Void> promise, A a);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise, A a);
     }
 
     @FunctionalInterface
     public interface RunnableWithVoidPromise2<A, B> {
-        public void run(QPromise<Void> promise, A a, B b);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise, A a, B b);
     }
 
     @FunctionalInterface
     public interface RunnableWithVoidPromise3<A, B, C> {
-        public void run(QPromise<Void> promise, A a, B b, C c);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise, A a, B b, C c);
     }
 
     @FunctionalInterface
     public interface RunnableWithVoidPromise4<A, B, C, D> {
-        public void run(QPromise<Void> promise, A a, B b, C c, D d);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise, A a, B b, C c, D d);
     }
 
     @FunctionalInterface
     public interface RunnableWithVoidPromise5<A, B, C, D, E> {
-        public void run(QPromise<Void> promise, A a, B b, C c, D d, E e);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise, A a, B b, C c, D d, E e);
     }
 
     @FunctionalInterface
     public interface RunnableWithVoidPromise6<A, B, C, D, E, F> {
-        public void run(QPromise<Void> promise, A a, B b, C c, D d, E e, F f);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise, A a, B b, C c, D d, E e, F f);
     }
 
     @FunctionalInterface
     public interface RunnableWithVoidPromise7<A, B, C, D, E, F, G> {
-        public void run(QPromise<Void> promise, A a, B b, C c, D d, E e, F f, G g);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise, A a, B b, C c, D d, E e, F f, G g);
     }
 
     @FunctionalInterface
     public interface RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> {
-        public void run(QPromise<Void> promise, A a, B b, C c, D d, E e, F f, G g, H h);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise, A a, B b, C c, D d, E e, F f, G g, H h);
     }
 
     @FunctionalInterface
     public interface RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> {
-        public void run(QPromise<Void> promise, A a, B b, C c, D d, E e, F f, G g, H h, I i);
+        public void run(@StrictNonNull QPromise<@QtPrimitiveType Void> promise, A a, B b, C c, D d, E e, F f, G g, H h, I i);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T> QFuture<T> run(RunnableWithPromise<T> runnable) {
+    public static <T> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise<T> runnable) {
         return runWithPromise0(null, runnable);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T> QFuture<T> run(QThreadPool threadPool, RunnableWithPromise<T> runnable) {
+    public static <T> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise<T> runnable) {
         return runWithPromise0(threadPool, runnable);
     }
 
-    private native static <T> QFuture<T> runWithPromise0(QThreadPool threadPool, RunnableWithPromise<T> runnable);
+    private native static <T> @NonNull QFuture<T> runWithPromise0(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise<T> runnable);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T, A> QFuture<T> run(RunnableWithPromise1<T, A> runnable, A a) {
+    public static <T, A> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise1<T, A> runnable, A a) {
         return runWithPromise1(null, Objects.requireNonNull(runnable), a);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T, A> QFuture<T> run(QThreadPool threadPool, RunnableWithPromise1<T, A> runnable, A a) {
+    public static <T, A> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise1<T, A> runnable, A a) {
         return runWithPromise1(threadPool, Objects.requireNonNull(runnable), a);
     }
 
-    private native static <T, A> QFuture<T> runWithPromise1(QThreadPool threadPool, RunnableWithPromise1<T, A> runnable, A a);
+    private native static <T, A> @NonNull QFuture<T> runWithPromise1(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise1<T, A> runnable, A a);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T, A, B> QFuture<T> run(RunnableWithPromise2<T, A, B> runnable, A a, B b) {
+    public static <T, A, B> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise2<T, A, B> runnable, A a, B b) {
         return runWithPromise2(null, Objects.requireNonNull(runnable), a, b);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T, A, B> QFuture<T> run(QThreadPool threadPool, RunnableWithPromise2<T, A, B> runnable, A a, B b) {
+    public static <T, A, B> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise2<T, A, B> runnable, A a, B b) {
         return runWithPromise2(threadPool, Objects.requireNonNull(runnable), a, b);
     }
 
-    private native static <T, A, B> QFuture<T> runWithPromise2(QThreadPool threadPool, RunnableWithPromise2<T, A, B> runnable, A a, B b);
+    private native static <T, A, B> @NonNull QFuture<T> runWithPromise2(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise2<T, A, B> runnable, A a, B b);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T, A, B, C> QFuture<T> run(RunnableWithPromise3<T, A, B, C> runnable, A a, B b, C c) {
+    public static <T, A, B, C> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise3<T, A, B, C> runnable, A a, B b, C c) {
         return runWithPromise3(null, Objects.requireNonNull(runnable), a, b, c);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T, A, B, C> QFuture<T> run(QThreadPool threadPool, RunnableWithPromise3<T, A, B, C> runnable, A a, B b, C c) {
+    public static <T, A, B, C> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise3<T, A, B, C> runnable, A a, B b, C c) {
         return runWithPromise3(threadPool, Objects.requireNonNull(runnable), a, b, c);
     }
 
-    private native static <T, A, B, C> QFuture<T> runWithPromise3(QThreadPool threadPool, RunnableWithPromise3<T, A, B, C> runnable, A a, B b,
+    private native static <T, A, B, C> @NonNull QFuture<T> runWithPromise3(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise3<T, A, B, C> runnable, A a, B b,
             C c);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T, A, B, C, D> QFuture<T> run(RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b, C c, D d) {
+    public static <T, A, B, C, D> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b, C c, D d) {
         return runWithPromise4(null, Objects.requireNonNull(runnable), a, b, c, d);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T, A, B, C, D> QFuture<T> run(QThreadPool threadPool, RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b,
+    public static <T, A, B, C, D> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b,
             C c, D d) {
         return runWithPromise4(threadPool, Objects.requireNonNull(runnable), a, b, c, d);
     }
 
-    private native static <T, A, B, C, D> QFuture<T> runWithPromise4(QThreadPool threadPool, RunnableWithPromise4<T, A, B, C, D> runnable,
+    private native static <T, A, B, C, D> @NonNull QFuture<T> runWithPromise4(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise4<T, A, B, C, D> runnable,
             A a, B b, C c, D d);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E> QFuture<T> run(RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
+    public static <T, A, B, C, D, E> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
         return runWithPromise5(null, Objects.requireNonNull(runnable), a, b, c, d, e);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E> QFuture<T> run(QThreadPool threadPool, RunnableWithPromise5<T, A, B, C, D, E> runnable, A a,
+    public static <T, A, B, C, D, E> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise5<T, A, B, C, D, E> runnable, A a,
             B b, C c, D d, E e) {
         return runWithPromise5(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e);
     }
 
-    private native static <T, A, B, C, D, E> QFuture<T> runWithPromise5(QThreadPool threadPool,
+    private native static <T, A, B, C, D, E> @NonNull QFuture<T> runWithPromise5(@Nullable QThreadPool threadPool,
             RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c, D d, E e);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E, F> QFuture<T> run(RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e,
+    public static <T, A, B, C, D, E, F> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e,
             F f) {
         return runWithPromise6(null, Objects.requireNonNull(runnable), a, b, c, d, e, f);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E, F> QFuture<T> run(QThreadPool threadPool, RunnableWithPromise6<T, A, B, C, D, E, F> runnable,
+    public static <T, A, B, C, D, E, F> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable,
             A a, B b, C c, D d, E e, F f) {
         return runWithPromise6(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f);
     }
 
-    private native static <T, A, B, C, D, E, F> QFuture<T> runWithPromise6(QThreadPool threadPool,
+    private native static <T, A, B, C, D, E, F> @NonNull QFuture<T> runWithPromise6(@Nullable QThreadPool threadPool,
             RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G> QFuture<T> run(RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c,
+    public static <T, A, B, C, D, E, F, G> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c,
             D d, E e, F f, G g) {
         return runWithPromise7(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G> QFuture<T> run(QThreadPool threadPool,
+    public static <T, A, B, C, D, E, F, G> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool,
             RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g) {
         return runWithPromise7(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g);
     }
 
-    private native static <T, A, B, C, D, E, F, G> QFuture<T> runWithPromise7(QThreadPool threadPool,
+    private native static <T, A, B, C, D, E, F, G> @NonNull QFuture<T> runWithPromise7(@Nullable QThreadPool threadPool,
             RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G, H> QFuture<T> run(RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b,
+    public static <T, A, B, C, D, E, F, G, H> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b,
             C c, D d, E e, F f, G g, H h) {
         return runWithPromise8(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G, H> QFuture<T> run(QThreadPool threadPool,
+    public static <T, A, B, C, D, E, F, G, H> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool,
             RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
         return runWithPromise8(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h);
     }
 
-    private native static <T, A, B, C, D, E, F, G, H> QFuture<T> runWithPromise8(QThreadPool threadPool,
+    private native static <T, A, B, C, D, E, F, G, H> @NonNull QFuture<T> runWithPromise8(@Nullable QThreadPool threadPool,
             RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G, H, I> QFuture<T> run(RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a,
+    public static <T, A, B, C, D, E, F, G, H, I> @NonNull QFuture<T> run(@StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a,
             B b, C c, D d, E e, F f, G g, H h, I i) {
         return runWithPromise9(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h, i);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G, H, I> QFuture<T> run(QThreadPool threadPool,
+    public static <T, A, B, C, D, E, F, G, H, I> @NonNull QFuture<T> run(@Nullable QThreadPool threadPool,
             RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
         return runWithPromise9(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h, i);
     }
 
-    private native static <T, A, B, C, D, E, F, G, H, I> QFuture<T> runWithPromise9(QThreadPool threadPool,
+    private native static <T, A, B, C, D, E, F, G, H, I> @NonNull QFuture<T> runWithPromise9(@Nullable QThreadPool threadPool,
             RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
 
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static QFuture<Void> run(RunnableWithVoidPromise runnable) {
+    public static @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise runnable) {
         return runWithPromiseVoid0(null, runnable);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static QFuture<Void> run(QThreadPool threadPool, RunnableWithVoidPromise runnable) {
+    public static @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise runnable) {
         return runWithPromiseVoid0(threadPool, runnable);
     }
 
-    private native static QFuture<Void> runWithPromiseVoid0(QThreadPool threadPool, RunnableWithVoidPromise runnable);
+    private native static @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid0(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise runnable);
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A> QFuture<Void> run(RunnableWithVoidPromise1<A> runnable, A a) {
+    public static <A> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise1<A> runnable, A a) {
         return runWithPromiseVoid1(null, Objects.requireNonNull(runnable), a);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A> QFuture<Void> run(QThreadPool threadPool, RunnableWithVoidPromise1<A> runnable, A a) {
+    public static <A> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise1<A> runnable, A a) {
         return runWithPromiseVoid1(threadPool, Objects.requireNonNull(runnable), a);
     }
 
-    private native static <A> QFuture<Void> runWithPromiseVoid1(QThreadPool threadPool, RunnableWithVoidPromise1<A> runnable, A a);
+    private native static <A> @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid1(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise1<A> runnable, A a);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A, B> QFuture<Void> run(RunnableWithVoidPromise2<A, B> runnable, A a, B b) {
+    public static <A, B> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise2<A, B> runnable, A a, B b) {
         return runWithPromiseVoid2(null, Objects.requireNonNull(runnable), a, b);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A, B> QFuture<Void> run(QThreadPool threadPool, RunnableWithVoidPromise2<A, B> runnable, A a, B b) {
+    public static <A, B> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise2<A, B> runnable, A a, B b) {
         return runWithPromiseVoid2(threadPool, Objects.requireNonNull(runnable), a, b);
     }
 
-    private native static <A, B> QFuture<Void> runWithPromiseVoid2(QThreadPool threadPool, RunnableWithVoidPromise2<A, B> runnable, A a, B b);
+    private native static <A, B> @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid2(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise2<A, B> runnable, A a, B b);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A, B, C> QFuture<Void> run(RunnableWithVoidPromise3<A, B, C> runnable, A a, B b, C c) {
+    public static <A, B, C> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise3<A, B, C> runnable, A a, B b, C c) {
         return runWithPromiseVoid3(null, Objects.requireNonNull(runnable), a, b, c);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A, B, C> QFuture<Void> run(QThreadPool threadPool, RunnableWithVoidPromise3<A, B, C> runnable, A a, B b, C c) {
+    public static <A, B, C> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise3<A, B, C> runnable, A a, B b, C c) {
         return runWithPromiseVoid3(threadPool, Objects.requireNonNull(runnable), a, b, c);
     }
 
-    private native static <A, B, C> QFuture<Void> runWithPromiseVoid3(QThreadPool threadPool, RunnableWithVoidPromise3<A, B, C> runnable, A a, B b,
+    private native static <A, B, C> @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid3(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise3<A, B, C> runnable, A a, B b,
             C c);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A, B, C, D> QFuture<Void> run(RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b, C c, D d) {
+    public static <A, B, C, D> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b, C c, D d) {
         return runWithPromiseVoid4(null, Objects.requireNonNull(runnable), a, b, c, d);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A, B, C, D> QFuture<Void> run(QThreadPool threadPool, RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b, C c,
+    public static <A, B, C, D> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b, C c,
             D d) {
         return runWithPromiseVoid4(threadPool, Objects.requireNonNull(runnable), a, b, c, d);
     }
 
-    private native static <A, B, C, D> QFuture<Void> runWithPromiseVoid4(QThreadPool threadPool, RunnableWithVoidPromise4<A, B, C, D> runnable, A a,
+    private native static <A, B, C, D> @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid4(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise4<A, B, C, D> runnable, A a,
             B b, C c, D d);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A, B, C, D, E> QFuture<Void> run(RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
+    public static <A, B, C, D, E> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
         return runWithPromiseVoid5(null, Objects.requireNonNull(runnable), a, b, c, d, e);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A, B, C, D, E> QFuture<Void> run(QThreadPool threadPool, RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b,
+    public static <A, B, C, D, E> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b,
             C c, D d, E e) {
         return runWithPromiseVoid5(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e);
     }
 
-    private native static <A, B, C, D, E> QFuture<Void> runWithPromiseVoid5(QThreadPool threadPool,
+    private native static <A, B, C, D, E> @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid5(@Nullable QThreadPool threadPool,
             RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c, D d, E e);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A, B, C, D, E, F> QFuture<Void> run(RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e,
+    public static <A, B, C, D, E, F> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e,
             F f) {
         return runWithPromiseVoid6(null, Objects.requireNonNull(runnable), a, b, c, d, e, f);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A, B, C, D, E, F> QFuture<Void> run(QThreadPool threadPool, RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a,
+    public static <A, B, C, D, E, F> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a,
             B b, C c, D d, E e, F f) {
         return runWithPromiseVoid6(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f);
     }
 
-    private native static <A, B, C, D, E, F> QFuture<Void> runWithPromiseVoid6(QThreadPool threadPool,
+    private native static <A, B, C, D, E, F> @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid6(@Nullable QThreadPool threadPool,
             RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A, B, C, D, E, F, G> QFuture<Void> run(RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d,
+    public static <A, B, C, D, E, F, G> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d,
             E e, F f, G g) {
         return runWithPromiseVoid7(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A, B, C, D, E, F, G> QFuture<Void> run(QThreadPool threadPool, RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable,
+    public static <A, B, C, D, E, F, G> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable,
             A a, B b, C c, D d, E e, F f, G g) {
         return runWithPromiseVoid7(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g);
     }
 
-    private native static <A, B, C, D, E, F, G> QFuture<Void> runWithPromiseVoid7(QThreadPool threadPool,
+    private native static <A, B, C, D, E, F, G> @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid7(@Nullable QThreadPool threadPool,
             RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A, B, C, D, E, F, G, H> QFuture<Void> run(RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c,
+    public static <A, B, C, D, E, F, G, H> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c,
             D d, E e, F f, G g, H h) {
         return runWithPromiseVoid8(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h);
     }
 
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A, B, C, D, E, F, G, H> QFuture<Void> run(QThreadPool threadPool,
+    public static <A, B, C, D, E, F, G, H> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool,
             RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
         return runWithPromiseVoid8(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h);
     }
 
-    private native static <A, B, C, D, E, F, G, H> QFuture<Void> runWithPromiseVoid8(QThreadPool threadPool,
+    private native static <A, B, C, D, E, F, G, H> @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid8(@Nullable QThreadPool threadPool,
             RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h);
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(Function, ...)</a></p>
      */
-    public static <A, B, C, D, E, F, G, H, I> QFuture<Void> run(RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b,
+    public static <A, B, C, D, E, F, G, H, I> @NonNull QFuture<@QtPrimitiveType Void> run(@StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b,
             C c, D d, E e, F f, G g, H h, I i) {
         return runWithPromiseVoid9(null, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h, i);
     }
     
     /**
-     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(QThreadPool*, Function, ...)</a></p>
+     * <p>See <a href="@docRoot/qtconcurrent.html#run">QtConcurrent::run(@Nullable QThreadPool*, Function, ...)</a></p>
      */
-    public static <A, B, C, D, E, F, G, H, I> QFuture<Void> run(QThreadPool threadPool,
+    public static <A, B, C, D, E, F, G, H, I> @NonNull QFuture<@QtPrimitiveType Void> run(@Nullable QThreadPool threadPool,
             RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
         return runWithPromiseVoid9(threadPool, Objects.requireNonNull(runnable), a, b, c, d, e, f, g, h, i);
     }
 
-    private native static <A, B, C, D, E, F, G, H, I> QFuture<Void> runWithPromiseVoid9(QThreadPool threadPool,
+    private native static <A, B, C, D, E, F, G, H, I> @NonNull QFuture<@QtPrimitiveType Void> runWithPromiseVoid9(@Nullable QThreadPool threadPool,
             RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
 
     /**
@@ -1658,12 +1658,12 @@ public static abstract class QTaskBuilder<T>{
         private QThreadPool threadPool;
         
         final int priority() {return priority;}
-        final QThreadPool threadPool() { return threadPool; }
+        final @Nullable QThreadPool threadPool() { return threadPool; }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             throw new RuntimeException("Unable to spawn due to missing arguments.");
         }
         
@@ -1677,14 +1677,14 @@ public final void spawn(QtConcurrent.FutureResult result) {
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withPriority">QtConcurrent::QTaskBuilder::withPriority(int)</a></p>
          */
-        public QTaskBuilder<T> withPriority(int newPriority) {
+        public @NonNull QTaskBuilder<T> withPriority(int newPriority) {
             this.priority = newPriority;
             return this;
         }
         /**
-         * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#onThreadPool">QtConcurrent::QTaskBuilder::onThreadPool(QThreadPool&)</a></p>
+         * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#onThreadPool">QtConcurrent::QTaskBuilder::onThreadPool(@Nullable QThreadPool&)</a></p>
          */
-        public QTaskBuilder<T> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilder<T> onThreadPool(@Nullable QThreadPool newThreadPool) {
             this.threadPool = Objects.requireNonNull(newThreadPool);
             return this;
         }
@@ -1695,7 +1695,7 @@ public QTaskBuilder<T> onThreadPool(QThreadPool newThreadPool) {
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static abstract class QTypedTaskBuilder<T> extends QTaskBuilder<T>{
-        public QTypedTaskBuilder(int priority, QThreadPool threadPool) {
+        QTypedTaskBuilder(int priority, QThreadPool threadPool) {
             super(priority, threadPool);
         }
     }
@@ -1703,7 +1703,7 @@ public QTypedTaskBuilder(int priority, QThreadPool threadPool) {
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static QTaskBuilderVoid0Arg0 task(Runnable runnable) {
+    public static QTaskBuilderVoid0Arg0 task(@StrictNonNull Runnable runnable) {
         return new QTaskBuilderVoid0Arg0(0, null, runnable);
     }
     
@@ -1711,21 +1711,21 @@ public static QTaskBuilderVoid0Arg0 task(Runnable runnable) {
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTaskBuilderVoid0Arg0 extends QTaskBuilder<Void>{
-        QTaskBuilderVoid0Arg0(int newPriority, QThreadPool threadPool, Runnable runnable) {
+    public static class QTaskBuilderVoid0Arg0 extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid0Arg0(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable runnable) {
             super(newPriority, threadPool);
             this.runnable = runnable;
         }
         private final Runnable runnable;
         
         @Override
-        public QTaskBuilderVoid0Arg0 withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid0Arg0 withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid0Arg0 onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid0Arg0 onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -1734,17 +1734,17 @@ public QTaskBuilderVoid0Arg0 onThreadPool(QThreadPool newThreadPool) {
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable);
         }
         
-        private native static QFuture<Void> spawn(QThreadPool threadPool, int priority, Runnable runnable);
+        private native static @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority, @StrictNonNull Runnable runnable);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A> QTaskBuilderVoid1Arg0<A> task(Runnable1<A> runnable) {
+    public static <A> QTaskBuilderVoid1Arg0<A> task(@StrictNonNull Runnable1<A> runnable) {
         return new QTaskBuilderVoid1Arg0<>(0, null, runnable);
     }
     
@@ -1752,10 +1752,10 @@ public static <A> QTaskBuilderVoid1Arg0<A> task(Runnable1<A> runnable) {
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid1Arg0<A> extends QTaskBuilder<Void>{
+    public static final class QTaskBuilderVoid1Arg0<A> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final Runnable1<A> runnable;
         
-        QTaskBuilderVoid1Arg0(int priority, QThreadPool threadPool, Runnable1<A> runnable) {
+        QTaskBuilderVoid1Arg0(int priority, QThreadPool threadPool, @StrictNonNull Runnable1<A> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -1763,18 +1763,18 @@ public static final class QTaskBuilderVoid1Arg0<A> extends QTaskBuilder<Void>{
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid1Arg1<A> withArguments(A a) {
+        public @NonNull QTaskBuilderVoid1Arg1<A> withArguments(A a) {
             return new QTaskBuilderVoid1Arg1<>(priority(), threadPool(), runnable, a);
         }
         
         @Override
-        public QTaskBuilderVoid1Arg0<A> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid1Arg0<A> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid1Arg0<A> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid1Arg0<A> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -1784,8 +1784,8 @@ public QTaskBuilderVoid1Arg0<A> onThreadPool(QThreadPool newThreadPool) {
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTaskBuilderVoid1Arg1<A> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid1Arg1(int newPriority, QThreadPool threadPool, Runnable1<A> runnable, A a) {
+    public static class QTaskBuilderVoid1Arg1<A> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid1Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable1<A> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -1794,13 +1794,13 @@ public static class QTaskBuilderVoid1Arg1<A> extends QTaskBuilder<Void>{
         private final A a;
         
         @Override
-        public QTaskBuilderVoid1Arg1<A> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid1Arg1<A> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid1Arg1<A> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid1Arg1<A> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -1809,18 +1809,18 @@ public QTaskBuilderVoid1Arg1<A> onThreadPool(QThreadPool newThreadPool) {
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a);
         }
         
-        private native static <A> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 Runnable1<A> runnable, A a);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B> QTaskBuilderVoid2Arg0<A, B> task(Runnable2<A, B> runnable) {
+    public static <A, B> QTaskBuilderVoid2Arg0<A, B> task(@StrictNonNull Runnable2<A, B> runnable) {
         return new QTaskBuilderVoid2Arg0<>(0, null, runnable);
     }
     
@@ -1828,10 +1828,10 @@ public static <A, B> QTaskBuilderVoid2Arg0<A, B> task(Runnable2<A, B> runnable)
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid2Arg0<A, B> extends QTaskBuilder<Void>{
+    public static final class QTaskBuilderVoid2Arg0<A, B> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final Runnable2<A, B> runnable;
         
-        QTaskBuilderVoid2Arg0(int priority, QThreadPool threadPool, Runnable2<A, B> runnable) {
+        QTaskBuilderVoid2Arg0(int priority, QThreadPool threadPool, @StrictNonNull Runnable2<A, B> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -1839,25 +1839,25 @@ public static final class QTaskBuilderVoid2Arg0<A, B> extends QTaskBuilder<Void>
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid2Arg1<A, B> withArguments(A a) {
+        public @NonNull QTaskBuilderVoid2Arg1<A, B> withArguments(A a) {
             return new QTaskBuilderVoid2Arg1<>(priority(), threadPool(), runnable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid2Arg2<A, B> withArguments(A a, B b) {
+        public @NonNull QTaskBuilderVoid2Arg2<A, B> withArguments(A a, B b) {
             return new QTaskBuilderVoid2Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         @Override
-        public QTaskBuilderVoid2Arg0<A, B> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid2Arg0<A, B> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid2Arg0<A, B> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid2Arg0<A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -1867,8 +1867,8 @@ public QTaskBuilderVoid2Arg0<A, B> onThreadPool(QThreadPool newThreadPool) {
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTaskBuilderVoid2Arg1<A, B> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid2Arg1(int newPriority, QThreadPool threadPool, Runnable2<A, B> runnable, A a) {
+    public static class QTaskBuilderVoid2Arg1<A, B> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid2Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable2<A, B> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -1879,18 +1879,18 @@ public static class QTaskBuilderVoid2Arg1<A, B> extends QTaskBuilder<Void>{
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid2Arg2<A, B> withArguments(B b) {
+        public @NonNull QTaskBuilderVoid2Arg2<A, B> withArguments(B b) {
             return new QTaskBuilderVoid2Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         @Override
-        public QTaskBuilderVoid2Arg1<A, B> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid2Arg1<A, B> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid2Arg1<A, B> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid2Arg1<A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -1900,8 +1900,8 @@ public QTaskBuilderVoid2Arg1<A, B> onThreadPool(QThreadPool newThreadPool) {
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid2Arg2<A, B> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid2Arg2(int newPriority, QThreadPool threadPool, Runnable2<A, B> runnable, A a, B b) {
+    public static final class QTaskBuilderVoid2Arg2<A, B> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid2Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable2<A, B> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -1912,13 +1912,13 @@ public static final class QTaskBuilderVoid2Arg2<A, B> extends QTaskBuilder<Void>
         private final B b;
         
         @Override
-        public QTaskBuilderVoid2Arg2<A, B> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid2Arg2<A, B> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid2Arg2<A, B> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid2Arg2<A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -1927,18 +1927,18 @@ public QTaskBuilderVoid2Arg2<A, B> onThreadPool(QThreadPool newThreadPool) {
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b);
         }
         
-        private native static <A, B> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 Runnable2<A, B> runnable, A a, B b);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C> QTaskBuilderVoid3Arg0<A, B, C> task(Runnable3<A, B, C> runnable) {
+    public static <A, B, C> QTaskBuilderVoid3Arg0<A, B, C> task(@StrictNonNull Runnable3<A, B, C> runnable) {
         return new QTaskBuilderVoid3Arg0<>(0, null, runnable);
     }
     
@@ -1946,10 +1946,10 @@ public static <A, B, C> QTaskBuilderVoid3Arg0<A, B, C> task(Runnable3<A, B, C> r
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid3Arg0<A, B, C> extends QTaskBuilder<Void>{
+    public static final class QTaskBuilderVoid3Arg0<A, B, C> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final Runnable3<A, B, C> runnable;
         
-        QTaskBuilderVoid3Arg0(int priority, QThreadPool threadPool, Runnable3<A, B, C> runnable) {
+        QTaskBuilderVoid3Arg0(int priority, QThreadPool threadPool, @StrictNonNull Runnable3<A, B, C> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -1957,32 +1957,32 @@ public static final class QTaskBuilderVoid3Arg0<A, B, C> extends QTaskBuilder<Vo
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid3Arg1<A, B, C> withArguments(A a) {
+        public @NonNull QTaskBuilderVoid3Arg1<A, B, C> withArguments(A a) {
             return new QTaskBuilderVoid3Arg1<>(priority(), threadPool(), runnable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid3Arg2<A, B, C> withArguments(A a, B b) {
+        public @NonNull QTaskBuilderVoid3Arg2<A, B, C> withArguments(A a, B b) {
             return new QTaskBuilderVoid3Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid3Arg3<A, B, C> withArguments(A a, B b, C c) {
+        public @NonNull QTaskBuilderVoid3Arg3<A, B, C> withArguments(A a, B b, C c) {
             return new QTaskBuilderVoid3Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         @Override
-        public QTaskBuilderVoid3Arg0<A, B, C> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid3Arg0<A, B, C> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid3Arg0<A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid3Arg0<A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -1992,8 +1992,8 @@ public QTaskBuilderVoid3Arg0<A, B, C> onThreadPool(QThreadPool newThreadPool) {
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTaskBuilderVoid3Arg1<A, B, C> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid3Arg1(int newPriority, QThreadPool threadPool, Runnable3<A, B, C> runnable, A a) {
+    public static class QTaskBuilderVoid3Arg1<A, B, C> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid3Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable3<A, B, C> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2004,25 +2004,25 @@ public static class QTaskBuilderVoid3Arg1<A, B, C> extends QTaskBuilder<Void>{
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid3Arg2<A, B, C> withArguments(B b) {
+        public @NonNull QTaskBuilderVoid3Arg2<A, B, C> withArguments(B b) {
             return new QTaskBuilderVoid3Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid3Arg3<A, B, C> withArguments(B b, C c) {
+        public @NonNull QTaskBuilderVoid3Arg3<A, B, C> withArguments(B b, C c) {
             return new QTaskBuilderVoid3Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         @Override
-        public QTaskBuilderVoid3Arg1<A, B, C> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid3Arg1<A, B, C> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid3Arg1<A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid3Arg1<A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2032,8 +2032,8 @@ public QTaskBuilderVoid3Arg1<A, B, C> onThreadPool(QThreadPool newThreadPool) {
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid3Arg2<A, B, C> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid3Arg2(int newPriority, QThreadPool threadPool, Runnable3<A, B, C> runnable, A a, B b) {
+    public static final class QTaskBuilderVoid3Arg2<A, B, C> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid3Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable3<A, B, C> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2046,18 +2046,18 @@ public static final class QTaskBuilderVoid3Arg2<A, B, C> extends QTaskBuilder<Vo
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid3Arg3<A, B, C> withArguments(C c) {
+        public @NonNull QTaskBuilderVoid3Arg3<A, B, C> withArguments(C c) {
             return new QTaskBuilderVoid3Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         @Override
-        public QTaskBuilderVoid3Arg2<A, B, C> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid3Arg2<A, B, C> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid3Arg2<A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid3Arg2<A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2067,8 +2067,8 @@ public QTaskBuilderVoid3Arg2<A, B, C> onThreadPool(QThreadPool newThreadPool) {
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid3Arg3<A, B, C> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid3Arg3(int newPriority, QThreadPool threadPool, Runnable3<A, B, C> runnable, A a, B b, C c) {
+    public static final class QTaskBuilderVoid3Arg3<A, B, C> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid3Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable3<A, B, C> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2081,13 +2081,13 @@ public static final class QTaskBuilderVoid3Arg3<A, B, C> extends QTaskBuilder<Vo
         private final C c;
         
         @Override
-        public QTaskBuilderVoid3Arg3<A, B, C> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid3Arg3<A, B, C> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid3Arg3<A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid3Arg3<A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2096,18 +2096,18 @@ public QTaskBuilderVoid3Arg3<A, B, C> onThreadPool(QThreadPool newThreadPool) {
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c);
         }
         
-        private native static <A, B, C> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 Runnable3<A, B, C> runnable, A a, B b, C c);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D> QTaskBuilderVoid4Arg0<A, B, C, D> task(Runnable4<A, B, C, D> runnable) {
+    public static <A, B, C, D> QTaskBuilderVoid4Arg0<A, B, C, D> task(@StrictNonNull Runnable4<A, B, C, D> runnable) {
         return new QTaskBuilderVoid4Arg0<>(0, null, runnable);
     }
     
@@ -2115,10 +2115,10 @@ public static <A, B, C, D> QTaskBuilderVoid4Arg0<A, B, C, D> task(Runnable4<A, B
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid4Arg0<A, B, C, D> extends QTaskBuilder<Void>{
+    public static final class QTaskBuilderVoid4Arg0<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final Runnable4<A, B, C, D> runnable;
         
-        QTaskBuilderVoid4Arg0(int priority, QThreadPool threadPool, Runnable4<A, B, C, D> runnable) {
+        QTaskBuilderVoid4Arg0(int priority, QThreadPool threadPool, @StrictNonNull Runnable4<A, B, C, D> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -2126,39 +2126,39 @@ public static final class QTaskBuilderVoid4Arg0<A, B, C, D> extends QTaskBuilder
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg1<A, B, C, D> withArguments(A a) {
+        public @NonNull QTaskBuilderVoid4Arg1<A, B, C, D> withArguments(A a) {
             return new QTaskBuilderVoid4Arg1<>(priority(), threadPool(), runnable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg2<A, B, C, D> withArguments(A a, B b) {
+        public @NonNull QTaskBuilderVoid4Arg2<A, B, C, D> withArguments(A a, B b) {
             return new QTaskBuilderVoid4Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg3<A, B, C, D> withArguments(A a, B b, C c) {
+        public @NonNull QTaskBuilderVoid4Arg3<A, B, C, D> withArguments(A a, B b, C c) {
             return new QTaskBuilderVoid4Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg4<A, B, C, D> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid4Arg4<A, B, C, D> withArguments(A a, B b, C c, D d) {
             return new QTaskBuilderVoid4Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         @Override
-        public QTaskBuilderVoid4Arg0<A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid4Arg0<A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid4Arg0<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid4Arg0<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2168,8 +2168,8 @@ public QTaskBuilderVoid4Arg0<A, B, C, D> onThreadPool(QThreadPool newThreadPool)
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTaskBuilderVoid4Arg1<A, B, C, D> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid4Arg1(int newPriority, QThreadPool threadPool, Runnable4<A, B, C, D> runnable, A a) {
+    public static class QTaskBuilderVoid4Arg1<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid4Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable4<A, B, C, D> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2180,32 +2180,32 @@ public static class QTaskBuilderVoid4Arg1<A, B, C, D> extends QTaskBuilder<Void>
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg2<A, B, C, D> withArguments(B b) {
+        public @NonNull QTaskBuilderVoid4Arg2<A, B, C, D> withArguments(B b) {
             return new QTaskBuilderVoid4Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg3<A, B, C, D> withArguments(B b, C c) {
+        public @NonNull QTaskBuilderVoid4Arg3<A, B, C, D> withArguments(B b, C c) {
             return new QTaskBuilderVoid4Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg4<A, B, C, D> withArguments(B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid4Arg4<A, B, C, D> withArguments(B b, C c, D d) {
             return new QTaskBuilderVoid4Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         @Override
-        public QTaskBuilderVoid4Arg1<A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid4Arg1<A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid4Arg1<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid4Arg1<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2215,8 +2215,8 @@ public QTaskBuilderVoid4Arg1<A, B, C, D> onThreadPool(QThreadPool newThreadPool)
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid4Arg2<A, B, C, D> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid4Arg2(int newPriority, QThreadPool threadPool, Runnable4<A, B, C, D> runnable, A a, B b) {
+    public static final class QTaskBuilderVoid4Arg2<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid4Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable4<A, B, C, D> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2229,25 +2229,25 @@ public static final class QTaskBuilderVoid4Arg2<A, B, C, D> extends QTaskBuilder
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg3<A, B, C, D> withArguments(C c) {
+        public @NonNull QTaskBuilderVoid4Arg3<A, B, C, D> withArguments(C c) {
             return new QTaskBuilderVoid4Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg4<A, B, C, D> withArguments(C c, D d) {
+        public @NonNull QTaskBuilderVoid4Arg4<A, B, C, D> withArguments(C c, D d) {
             return new QTaskBuilderVoid4Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         @Override
-        public QTaskBuilderVoid4Arg2<A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid4Arg2<A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid4Arg2<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid4Arg2<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2257,8 +2257,8 @@ public QTaskBuilderVoid4Arg2<A, B, C, D> onThreadPool(QThreadPool newThreadPool)
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid4Arg3<A, B, C, D> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid4Arg3(int newPriority, QThreadPool threadPool, Runnable4<A, B, C, D> runnable, A a, B b, C c) {
+    public static final class QTaskBuilderVoid4Arg3<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid4Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable4<A, B, C, D> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2273,18 +2273,18 @@ public static final class QTaskBuilderVoid4Arg3<A, B, C, D> extends QTaskBuilder
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid4Arg4<A, B, C, D> withArguments(D d) {
+        public @NonNull QTaskBuilderVoid4Arg4<A, B, C, D> withArguments(D d) {
             return new QTaskBuilderVoid4Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         @Override
-        public QTaskBuilderVoid4Arg3<A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid4Arg3<A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid4Arg3<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid4Arg3<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2294,8 +2294,8 @@ public QTaskBuilderVoid4Arg3<A, B, C, D> onThreadPool(QThreadPool newThreadPool)
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid4Arg4<A, B, C, D> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid4Arg4(int newPriority, QThreadPool threadPool, Runnable4<A, B, C, D> runnable, A a, B b, C c, D d) {
+    public static final class QTaskBuilderVoid4Arg4<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid4Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable4<A, B, C, D> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2310,13 +2310,13 @@ public static final class QTaskBuilderVoid4Arg4<A, B, C, D> extends QTaskBuilder
         private final D d;
         
         @Override
-        public QTaskBuilderVoid4Arg4<A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid4Arg4<A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid4Arg4<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid4Arg4<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2325,18 +2325,18 @@ public QTaskBuilderVoid4Arg4<A, B, C, D> onThreadPool(QThreadPool newThreadPool)
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d);
         }
         
-        private native static <A, B, C, D> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 Runnable4<A, B, C, D> runnable, A a, B b, C c, D d);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E> QTaskBuilderVoid5Arg0<A, B, C, D, E> task(Runnable5<A, B, C, D, E> runnable) {
+    public static <A, B, C, D, E> QTaskBuilderVoid5Arg0<A, B, C, D, E> task(@StrictNonNull Runnable5<A, B, C, D, E> runnable) {
         return new QTaskBuilderVoid5Arg0<>(0, null, runnable);
     }
     
@@ -2344,10 +2344,10 @@ public static <A, B, C, D, E> QTaskBuilderVoid5Arg0<A, B, C, D, E> task(Runnable
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid5Arg0<A, B, C, D, E> extends QTaskBuilder<Void>{
+    public static final class QTaskBuilderVoid5Arg0<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final Runnable5<A, B, C, D, E> runnable;
         
-        QTaskBuilderVoid5Arg0(int priority, QThreadPool threadPool, Runnable5<A, B, C, D, E> runnable) {
+        QTaskBuilderVoid5Arg0(int priority, QThreadPool threadPool, @StrictNonNull Runnable5<A, B, C, D, E> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -2355,46 +2355,46 @@ public static final class QTaskBuilderVoid5Arg0<A, B, C, D, E> extends QTaskBuil
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg1<A, B, C, D, E> withArguments(A a) {
+        public @NonNull QTaskBuilderVoid5Arg1<A, B, C, D, E> withArguments(A a) {
             return new QTaskBuilderVoid5Arg1<>(priority(), threadPool(), runnable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg2<A, B, C, D, E> withArguments(A a, B b) {
+        public @NonNull QTaskBuilderVoid5Arg2<A, B, C, D, E> withArguments(A a, B b) {
             return new QTaskBuilderVoid5Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg3<A, B, C, D, E> withArguments(A a, B b, C c) {
+        public @NonNull QTaskBuilderVoid5Arg3<A, B, C, D, E> withArguments(A a, B b, C c) {
             return new QTaskBuilderVoid5Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg4<A, B, C, D, E> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid5Arg4<A, B, C, D, E> withArguments(A a, B b, C c, D d) {
             return new QTaskBuilderVoid5Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(A a, B b, C c, D d, E e) {
             return new QTaskBuilderVoid5Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         @Override
-        public QTaskBuilderVoid5Arg0<A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid5Arg0<A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid5Arg0<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid5Arg0<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2404,8 +2404,8 @@ public QTaskBuilderVoid5Arg0<A, B, C, D, E> onThreadPool(QThreadPool newThreadPo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid5Arg1<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid5Arg1(int newPriority, QThreadPool threadPool, Runnable5<A, B, C, D, E> runnable, A a) {
+    public static final class QTaskBuilderVoid5Arg1<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid5Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable5<A, B, C, D, E> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2416,39 +2416,39 @@ public static final class QTaskBuilderVoid5Arg1<A, B, C, D, E> extends QTaskBuil
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg2<A, B, C, D, E> withArguments(B b) {
+        public @NonNull QTaskBuilderVoid5Arg2<A, B, C, D, E> withArguments(B b) {
             return new QTaskBuilderVoid5Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg3<A, B, C, D, E> withArguments(B b, C c) {
+        public @NonNull QTaskBuilderVoid5Arg3<A, B, C, D, E> withArguments(B b, C c) {
             return new QTaskBuilderVoid5Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg4<A, B, C, D, E> withArguments(B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid5Arg4<A, B, C, D, E> withArguments(B b, C c, D d) {
             return new QTaskBuilderVoid5Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(B b, C c, D d, E e) {
             return new QTaskBuilderVoid5Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         @Override
-        public QTaskBuilderVoid5Arg1<A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid5Arg1<A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid5Arg1<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid5Arg1<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2458,8 +2458,8 @@ public QTaskBuilderVoid5Arg1<A, B, C, D, E> onThreadPool(QThreadPool newThreadPo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid5Arg2<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid5Arg2(int newPriority, QThreadPool threadPool, Runnable5<A, B, C, D, E> runnable, A a, B b) {
+    public static final class QTaskBuilderVoid5Arg2<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid5Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable5<A, B, C, D, E> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2472,32 +2472,32 @@ public static final class QTaskBuilderVoid5Arg2<A, B, C, D, E> extends QTaskBuil
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg3<A, B, C, D, E> withArguments(C c) {
+        public @NonNull QTaskBuilderVoid5Arg3<A, B, C, D, E> withArguments(C c) {
             return new QTaskBuilderVoid5Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg4<A, B, C, D, E> withArguments(C c, D d) {
+        public @NonNull QTaskBuilderVoid5Arg4<A, B, C, D, E> withArguments(C c, D d) {
             return new QTaskBuilderVoid5Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(C c, D d, E e) {
             return new QTaskBuilderVoid5Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         @Override
-        public QTaskBuilderVoid5Arg2<A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid5Arg2<A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid5Arg2<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid5Arg2<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2507,8 +2507,8 @@ public QTaskBuilderVoid5Arg2<A, B, C, D, E> onThreadPool(QThreadPool newThreadPo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid5Arg3<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid5Arg3(int newPriority, QThreadPool threadPool, Runnable5<A, B, C, D, E> runnable, A a, B b, C c) {
+    public static final class QTaskBuilderVoid5Arg3<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid5Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable5<A, B, C, D, E> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2523,25 +2523,25 @@ public static final class QTaskBuilderVoid5Arg3<A, B, C, D, E> extends QTaskBuil
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg4<A, B, C, D, E> withArguments(D d) {
+        public @NonNull QTaskBuilderVoid5Arg4<A, B, C, D, E> withArguments(D d) {
             return new QTaskBuilderVoid5Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(D d, E e) {
+        public @NonNull QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(D d, E e) {
             return new QTaskBuilderVoid5Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         @Override
-        public QTaskBuilderVoid5Arg3<A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid5Arg3<A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid5Arg3<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid5Arg3<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2551,8 +2551,8 @@ public QTaskBuilderVoid5Arg3<A, B, C, D, E> onThreadPool(QThreadPool newThreadPo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid5Arg4<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid5Arg4(int newPriority, QThreadPool threadPool, Runnable5<A, B, C, D, E> runnable, A a, B b, C c, D d) {
+    public static final class QTaskBuilderVoid5Arg4<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid5Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable5<A, B, C, D, E> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2569,18 +2569,18 @@ public static final class QTaskBuilderVoid5Arg4<A, B, C, D, E> extends QTaskBuil
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(E e) {
+        public @NonNull QTaskBuilderVoid5Arg5<A, B, C, D, E> withArguments(E e) {
             return new QTaskBuilderVoid5Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         @Override
-        public QTaskBuilderVoid5Arg4<A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid5Arg4<A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid5Arg4<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid5Arg4<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2590,8 +2590,8 @@ public QTaskBuilderVoid5Arg4<A, B, C, D, E> onThreadPool(QThreadPool newThreadPo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid5Arg5<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid5Arg5(int newPriority, QThreadPool threadPool, Runnable5<A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
+    public static final class QTaskBuilderVoid5Arg5<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid5Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable5<A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2608,13 +2608,13 @@ public static final class QTaskBuilderVoid5Arg5<A, B, C, D, E> extends QTaskBuil
         private final E e;
         
         @Override
-        public QTaskBuilderVoid5Arg5<A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid5Arg5<A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid5Arg5<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid5Arg5<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2623,18 +2623,18 @@ public QTaskBuilderVoid5Arg5<A, B, C, D, E> onThreadPool(QThreadPool newThreadPo
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e);
         }
         
-        private native static <A, B, C, D, E> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 Runnable5<A, B, C, D, E> runnable, A a, B b, C c, D d, E e);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E, F> QTaskBuilderVoid6Arg0<A, B, C, D, E, F> task(Runnable6<A, B, C, D, E, F> runnable) {
+    public static <A, B, C, D, E, F> QTaskBuilderVoid6Arg0<A, B, C, D, E, F> task(@StrictNonNull Runnable6<A, B, C, D, E, F> runnable) {
         return new QTaskBuilderVoid6Arg0<>(0, null, runnable);
     }
     
@@ -2642,10 +2642,10 @@ public static <A, B, C, D, E, F> QTaskBuilderVoid6Arg0<A, B, C, D, E, F> task(Ru
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid6Arg0<A, B, C, D, E, F> extends QTaskBuilder<Void>{
+    public static final class QTaskBuilderVoid6Arg0<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final Runnable6<A, B, C, D, E, F> runnable;
         
-        QTaskBuilderVoid6Arg0(int priority, QThreadPool threadPool, Runnable6<A, B, C, D, E, F> runnable) {
+        QTaskBuilderVoid6Arg0(int priority, QThreadPool threadPool, @StrictNonNull Runnable6<A, B, C, D, E, F> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -2653,53 +2653,53 @@ public static final class QTaskBuilderVoid6Arg0<A, B, C, D, E, F> extends QTaskB
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg1<A, B, C, D, E, F> withArguments(A a) {
+        public @NonNull QTaskBuilderVoid6Arg1<A, B, C, D, E, F> withArguments(A a) {
             return new QTaskBuilderVoid6Arg1<>(priority(), threadPool(), runnable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg2<A, B, C, D, E, F> withArguments(A a, B b) {
+        public @NonNull QTaskBuilderVoid6Arg2<A, B, C, D, E, F> withArguments(A a, B b) {
             return new QTaskBuilderVoid6Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg3<A, B, C, D, E, F> withArguments(A a, B b, C c) {
+        public @NonNull QTaskBuilderVoid6Arg3<A, B, C, D, E, F> withArguments(A a, B b, C c) {
             return new QTaskBuilderVoid6Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withArguments(A a, B b, C c, D d) {
             return new QTaskBuilderVoid6Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(A a, B b, C c, D d, E e) {
             return new QTaskBuilderVoid6Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(A a, B b, C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(A a, B b, C c, D d, E e, F f) {
             return new QTaskBuilderVoid6Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTaskBuilderVoid6Arg0<A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid6Arg0<A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid6Arg0<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid6Arg0<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2709,8 +2709,8 @@ public QTaskBuilderVoid6Arg0<A, B, C, D, E, F> onThreadPool(QThreadPool newThrea
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid6Arg1<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid6Arg1(int newPriority, QThreadPool threadPool, Runnable6<A, B, C, D, E, F> runnable, A a) {
+    public static final class QTaskBuilderVoid6Arg1<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid6Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable6<A, B, C, D, E, F> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2721,46 +2721,46 @@ public static final class QTaskBuilderVoid6Arg1<A, B, C, D, E, F> extends QTaskB
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg2<A, B, C, D, E, F> withArguments(B b) {
+        public @NonNull QTaskBuilderVoid6Arg2<A, B, C, D, E, F> withArguments(B b) {
             return new QTaskBuilderVoid6Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg3<A, B, C, D, E, F> withArguments(B b, C c) {
+        public @NonNull QTaskBuilderVoid6Arg3<A, B, C, D, E, F> withArguments(B b, C c) {
             return new QTaskBuilderVoid6Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withArguments(B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withArguments(B b, C c, D d) {
             return new QTaskBuilderVoid6Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(B b, C c, D d, E e) {
             return new QTaskBuilderVoid6Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(B b, C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(B b, C c, D d, E e, F f) {
             return new QTaskBuilderVoid6Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTaskBuilderVoid6Arg1<A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid6Arg1<A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid6Arg1<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid6Arg1<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2770,8 +2770,8 @@ public QTaskBuilderVoid6Arg1<A, B, C, D, E, F> onThreadPool(QThreadPool newThrea
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid6Arg2<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid6Arg2(int newPriority, QThreadPool threadPool, Runnable6<A, B, C, D, E, F> runnable, A a, B b) {
+    public static final class QTaskBuilderVoid6Arg2<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid6Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable6<A, B, C, D, E, F> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2784,39 +2784,39 @@ public static final class QTaskBuilderVoid6Arg2<A, B, C, D, E, F> extends QTaskB
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg3<A, B, C, D, E, F> withArguments(C c) {
+        public @NonNull QTaskBuilderVoid6Arg3<A, B, C, D, E, F> withArguments(C c) {
             return new QTaskBuilderVoid6Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withArguments(C c, D d) {
+        public @NonNull QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withArguments(C c, D d) {
             return new QTaskBuilderVoid6Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(C c, D d, E e) {
             return new QTaskBuilderVoid6Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(C c, D d, E e, F f) {
             return new QTaskBuilderVoid6Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTaskBuilderVoid6Arg2<A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid6Arg2<A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid6Arg2<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid6Arg2<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2826,8 +2826,8 @@ public QTaskBuilderVoid6Arg2<A, B, C, D, E, F> onThreadPool(QThreadPool newThrea
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid6Arg3<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid6Arg3(int newPriority, QThreadPool threadPool, Runnable6<A, B, C, D, E, F> runnable, A a, B b, C c) {
+    public static final class QTaskBuilderVoid6Arg3<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid6Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable6<A, B, C, D, E, F> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2842,32 +2842,32 @@ public static final class QTaskBuilderVoid6Arg3<A, B, C, D, E, F> extends QTaskB
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withArguments(D d) {
+        public @NonNull QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withArguments(D d) {
             return new QTaskBuilderVoid6Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(D d, E e) {
+        public @NonNull QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(D d, E e) {
             return new QTaskBuilderVoid6Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(D d, E e, F f) {
             return new QTaskBuilderVoid6Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTaskBuilderVoid6Arg3<A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid6Arg3<A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid6Arg3<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid6Arg3<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2877,8 +2877,8 @@ public QTaskBuilderVoid6Arg3<A, B, C, D, E, F> onThreadPool(QThreadPool newThrea
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid6Arg4<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid6Arg4(int newPriority, QThreadPool threadPool, Runnable6<A, B, C, D, E, F> runnable, A a, B b, C c, D d) {
+    public static final class QTaskBuilderVoid6Arg4<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid6Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable6<A, B, C, D, E, F> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2895,25 +2895,25 @@ public static final class QTaskBuilderVoid6Arg4<A, B, C, D, E, F> extends QTaskB
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(E e) {
+        public @NonNull QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withArguments(E e) {
             return new QTaskBuilderVoid6Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(E e, F f) {
+        public @NonNull QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(E e, F f) {
             return new QTaskBuilderVoid6Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid6Arg4<A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid6Arg4<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid6Arg4<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2923,8 +2923,8 @@ public QTaskBuilderVoid6Arg4<A, B, C, D, E, F> onThreadPool(QThreadPool newThrea
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid6Arg5<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid6Arg5(int newPriority, QThreadPool threadPool, Runnable6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e) {
+    public static final class QTaskBuilderVoid6Arg5<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid6Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2943,18 +2943,18 @@ public static final class QTaskBuilderVoid6Arg5<A, B, C, D, E, F> extends QTaskB
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(F f) {
+        public @NonNull QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withArguments(F f) {
             return new QTaskBuilderVoid6Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid6Arg5<A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid6Arg5<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid6Arg5<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2964,8 +2964,8 @@ public QTaskBuilderVoid6Arg5<A, B, C, D, E, F> onThreadPool(QThreadPool newThrea
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid6Arg6<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid6Arg6(int newPriority, QThreadPool threadPool, Runnable6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f) {
+    public static final class QTaskBuilderVoid6Arg6<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid6Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -2984,13 +2984,13 @@ public static final class QTaskBuilderVoid6Arg6<A, B, C, D, E, F> extends QTaskB
         private final F f;
         
         @Override
-        public QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid6Arg6<A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid6Arg6<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid6Arg6<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -2999,18 +2999,18 @@ public QTaskBuilderVoid6Arg6<A, B, C, D, E, F> onThreadPool(QThreadPool newThrea
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f);
         }
         
-        private native static <A, B, C, D, E, F> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E, F> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 Runnable6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E, F, G> QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> task(Runnable7<A, B, C, D, E, F, G> runnable) {
+    public static <A, B, C, D, E, F, G> QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> task(@StrictNonNull Runnable7<A, B, C, D, E, F, G> runnable) {
         return new QTaskBuilderVoid7Arg0<>(0, null, runnable);
     }
     
@@ -3018,10 +3018,10 @@ public static <A, B, C, D, E, F, G> QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> t
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
+    public static final class QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final Runnable7<A, B, C, D, E, F, G> runnable;
         
-        QTaskBuilderVoid7Arg0(int priority, QThreadPool threadPool, Runnable7<A, B, C, D, E, F, G> runnable) {
+        QTaskBuilderVoid7Arg0(int priority, QThreadPool threadPool, @StrictNonNull Runnable7<A, B, C, D, E, F, G> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -3029,60 +3029,60 @@ public static final class QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> extends QTa
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> withArguments(A a) {
+        public @NonNull QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> withArguments(A a) {
             return new QTaskBuilderVoid7Arg1<>(priority(), threadPool(), runnable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> withArguments(A a, B b) {
+        public @NonNull QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> withArguments(A a, B b) {
             return new QTaskBuilderVoid7Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> withArguments(A a, B b, C c) {
+        public @NonNull QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> withArguments(A a, B b, C c) {
             return new QTaskBuilderVoid7Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d) {
             return new QTaskBuilderVoid7Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e) {
             return new QTaskBuilderVoid7Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e, F f) {
             return new QTaskBuilderVoid7Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e, F f, G g) {
             return new QTaskBuilderVoid7Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3092,8 +3092,8 @@ public QTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> onThreadPool(QThreadPool newTh
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid7Arg1(int newPriority, QThreadPool threadPool, Runnable7<A, B, C, D, E, F, G> runnable, A a) {
+    public static final class QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid7Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable7<A, B, C, D, E, F, G> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3104,53 +3104,53 @@ public static final class QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> extends QTa
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> withArguments(B b) {
+        public @NonNull QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> withArguments(B b) {
             return new QTaskBuilderVoid7Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> withArguments(B b, C c) {
+        public @NonNull QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> withArguments(B b, C c) {
             return new QTaskBuilderVoid7Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withArguments(B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withArguments(B b, C c, D d) {
             return new QTaskBuilderVoid7Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e) {
             return new QTaskBuilderVoid7Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e, F f) {
             return new QTaskBuilderVoid7Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e, F f, G g) {
             return new QTaskBuilderVoid7Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3160,8 +3160,8 @@ public QTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> onThreadPool(QThreadPool newTh
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid7Arg2(int newPriority, QThreadPool threadPool, Runnable7<A, B, C, D, E, F, G> runnable, A a, B b) {
+    public static final class QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid7Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable7<A, B, C, D, E, F, G> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3174,46 +3174,46 @@ public static final class QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> extends QTa
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> withArguments(C c) {
+        public @NonNull QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> withArguments(C c) {
             return new QTaskBuilderVoid7Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withArguments(C c, D d) {
+        public @NonNull QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withArguments(C c, D d) {
             return new QTaskBuilderVoid7Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(C c, D d, E e) {
             return new QTaskBuilderVoid7Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(C c, D d, E e, F f) {
             return new QTaskBuilderVoid7Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(C c, D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(C c, D d, E e, F f, G g) {
             return new QTaskBuilderVoid7Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3223,8 +3223,8 @@ public QTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> onThreadPool(QThreadPool newTh
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid7Arg3(int newPriority, QThreadPool threadPool, Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c) {
+    public static final class QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid7Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3239,39 +3239,39 @@ public static final class QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> extends QTa
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withArguments(D d) {
+        public @NonNull QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withArguments(D d) {
             return new QTaskBuilderVoid7Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(D d, E e) {
+        public @NonNull QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(D d, E e) {
             return new QTaskBuilderVoid7Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(D d, E e, F f) {
             return new QTaskBuilderVoid7Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(D d, E e, F f, G g) {
             return new QTaskBuilderVoid7Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3281,8 +3281,8 @@ public QTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> onThreadPool(QThreadPool newTh
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid7Arg4(int newPriority, QThreadPool threadPool, Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d) {
+    public static final class QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid7Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3299,32 +3299,32 @@ public static final class QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> extends QTa
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(E e) {
+        public @NonNull QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withArguments(E e) {
             return new QTaskBuilderVoid7Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(E e, F f) {
+        public @NonNull QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(E e, F f) {
             return new QTaskBuilderVoid7Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(E e, F f, G g) {
             return new QTaskBuilderVoid7Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
     
         @Override
-        public QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3334,8 +3334,8 @@ public QTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> onThreadPool(QThreadPool newTh
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid7Arg5(int newPriority, QThreadPool threadPool, Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e) {
+    public static final class QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid7Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3354,25 +3354,25 @@ public static final class QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> extends QTa
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(F f) {
+        public @NonNull QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withArguments(F f) {
             return new QTaskBuilderVoid7Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(F f, G g) {
+        public @NonNull QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(F f, G g) {
             return new QTaskBuilderVoid7Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3382,8 +3382,8 @@ public QTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> onThreadPool(QThreadPool newTh
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid7Arg6(int newPriority, QThreadPool threadPool, Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f) {
+    public static final class QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid7Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3404,18 +3404,18 @@ public static final class QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> extends QTa
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(G g) {
+        public @NonNull QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withArguments(G g) {
             return new QTaskBuilderVoid7Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3425,8 +3425,8 @@ public QTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> onThreadPool(QThreadPool newTh
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid7Arg7(int newPriority, QThreadPool threadPool, Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static final class QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid7Arg7(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3447,13 +3447,13 @@ public static final class QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> extends QTa
         private final G g;
         
         @Override
-        public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3462,18 +3462,18 @@ public QTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> onThreadPool(QThreadPool newTh
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f, g);
         }
         
-        private native static <A, B, C, D, E, F, G> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E, F, G> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 Runnable7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g);
     }
 
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E, F, G, H> QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> task(Runnable8<A, B, C, D, E, F, G, H> runnable) {
+    public static <A, B, C, D, E, F, G, H> QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> task(@StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable) {
         return new QTaskBuilderVoid8Arg0<>(0, null, runnable);
     }
     
@@ -3481,10 +3481,10 @@ public static <A, B, C, D, E, F, G, H> QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
+    public static final class QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final Runnable8<A, B, C, D, E, F, G, H> runnable;
         
-        QTaskBuilderVoid8Arg0(int priority, QThreadPool threadPool, Runnable8<A, B, C, D, E, F, G, H> runnable) {
+        QTaskBuilderVoid8Arg0(int priority, QThreadPool threadPool, @StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -3492,67 +3492,67 @@ public static final class QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> withArguments(A a) {
+        public @NonNull QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> withArguments(A a) {
             return new QTaskBuilderVoid8Arg1<>(priority(), threadPool(), runnable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> withArguments(A a, B b) {
+        public @NonNull QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> withArguments(A a, B b) {
             return new QTaskBuilderVoid8Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c) {
+        public @NonNull QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c) {
             return new QTaskBuilderVoid8Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d) {
             return new QTaskBuilderVoid8Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e) {
             return new QTaskBuilderVoid8Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f) {
             return new QTaskBuilderVoid8Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f, G g) {
             return new QTaskBuilderVoid8Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f, G g, H h) {
             return new QTaskBuilderVoid8Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3562,8 +3562,8 @@ public QTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool ne
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid8Arg1(int newPriority, QThreadPool threadPool, Runnable8<A, B, C, D, E, F, G, H> runnable, A a) {
+    public static final class QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid8Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3574,60 +3574,60 @@ public static final class QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> withArguments(B b) {
+        public @NonNull QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> withArguments(B b) {
             return new QTaskBuilderVoid8Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> withArguments(B b, C c) {
+        public @NonNull QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> withArguments(B b, C c) {
             return new QTaskBuilderVoid8Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d) {
             return new QTaskBuilderVoid8Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e) {
             return new QTaskBuilderVoid8Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f) {
             return new QTaskBuilderVoid8Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f, G g) {
             return new QTaskBuilderVoid8Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f, G g, H h) {
             return new QTaskBuilderVoid8Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3637,8 +3637,8 @@ public QTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool ne
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid8Arg2(int newPriority, QThreadPool threadPool, Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b) {
+    public static final class QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid8Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3651,53 +3651,53 @@ public static final class QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> withArguments(C c) {
+        public @NonNull QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> withArguments(C c) {
             return new QTaskBuilderVoid8Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withArguments(C c, D d) {
+        public @NonNull QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withArguments(C c, D d) {
             return new QTaskBuilderVoid8Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(C c, D d, E e) {
             return new QTaskBuilderVoid8Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f) {
             return new QTaskBuilderVoid8Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f, G g) {
             return new QTaskBuilderVoid8Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f, G g, H h) {
             return new QTaskBuilderVoid8Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3707,8 +3707,8 @@ public QTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool ne
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid8Arg3(int newPriority, QThreadPool threadPool, Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c) {
+    public static final class QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid8Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3723,46 +3723,46 @@ public static final class QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withArguments(D d) {
+        public @NonNull QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withArguments(D d) {
             return new QTaskBuilderVoid8Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(D d, E e) {
+        public @NonNull QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(D d, E e) {
             return new QTaskBuilderVoid8Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(D d, E e, F f) {
             return new QTaskBuilderVoid8Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(D d, E e, F f, G g) {
             return new QTaskBuilderVoid8Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(D d, E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(D d, E e, F f, G g, H h) {
             return new QTaskBuilderVoid8Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3772,8 +3772,8 @@ public QTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool ne
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid8Arg4(int newPriority, QThreadPool threadPool, Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d) {
+    public static final class QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid8Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3790,39 +3790,39 @@ public static final class QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(E e) {
+        public @NonNull QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withArguments(E e) {
             return new QTaskBuilderVoid8Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(E e, F f) {
+        public @NonNull QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(E e, F f) {
             return new QTaskBuilderVoid8Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(E e, F f, G g) {
             return new QTaskBuilderVoid8Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(E e, F f, G g, H h) {
             return new QTaskBuilderVoid8Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3832,8 +3832,8 @@ public QTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool ne
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid8Arg5(int newPriority, QThreadPool threadPool, Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e) {
+    public static final class QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid8Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3852,32 +3852,32 @@ public static final class QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(F f) {
+        public @NonNull QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withArguments(F f) {
             return new QTaskBuilderVoid8Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(F f, G g) {
+        public @NonNull QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(F f, G g) {
             return new QTaskBuilderVoid8Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(F f, G g, H h) {
             return new QTaskBuilderVoid8Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3887,8 +3887,8 @@ public QTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool ne
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid8Arg6(int newPriority, QThreadPool threadPool, Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f) {
+    public static final class QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid8Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3909,25 +3909,25 @@ public static final class QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(G g) {
+        public @NonNull QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withArguments(G g) {
             return new QTaskBuilderVoid8Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(G g, H h) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(G g, H h) {
             return new QTaskBuilderVoid8Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
         
         @Override
-        public QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3937,8 +3937,8 @@ public QTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool ne
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid8Arg7(int newPriority, QThreadPool threadPool, Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static final class QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid8Arg7(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -3961,18 +3961,18 @@ public static final class QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(H h) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withArguments(H h) {
             return new QTaskBuilderVoid8Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
         
         @Override
-        public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -3982,8 +3982,8 @@ public QTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool ne
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid8Arg8(int newPriority, QThreadPool threadPool, Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+    public static final class QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid8Arg8(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4006,13 +4006,13 @@ public static final class QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> extends
         private final H h;
         
         @Override
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4021,18 +4021,18 @@ public QTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool ne
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f, g, h);
         }
         
-        private native static <A, B, C, D, E, F, G, H> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E, F, G, H> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 Runnable8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E, F, G, H, I> QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> task(Runnable9<A, B, C, D, E, F, G, H, I> runnable) {
+    public static <A, B, C, D, E, F, G, H, I> QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> task(@StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable) {
         return new QTaskBuilderVoid9Arg0<>(0, null, runnable);
     }
     
@@ -4040,10 +4040,10 @@ public static <A, B, C, D, E, F, G, H, I> QTaskBuilderVoid9Arg0<A, B, C, D, E, F
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
+    public static final class QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final Runnable9<A, B, C, D, E, F, G, H, I> runnable;
         
-        QTaskBuilderVoid9Arg0(int priority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable) {
+        QTaskBuilderVoid9Arg0(int priority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -4051,74 +4051,74 @@ public static final class QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> exten
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> withArguments(A a) {
+        public @NonNull QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> withArguments(A a) {
             return new QTaskBuilderVoid9Arg1<>(priority(), threadPool(), runnable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> withArguments(A a, B b) {
+        public @NonNull QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> withArguments(A a, B b) {
             return new QTaskBuilderVoid9Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c) {
+        public @NonNull QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c) {
             return new QTaskBuilderVoid9Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d) {
             return new QTaskBuilderVoid9Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e) {
             return new QTaskBuilderVoid9Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f) {
             return new QTaskBuilderVoid9Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g) {
             return new QTaskBuilderVoid9Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g, H h) {
             return new QTaskBuilderVoid9Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g, H h, I i) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g, H h, I i) {
             return new QTaskBuilderVoid9Arg9<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h, i);
         }
 
         @Override
-        public QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4128,8 +4128,8 @@ public QTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid9Arg1(int newPriority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a) {
+    public static final class QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid9Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4140,67 +4140,67 @@ public static final class QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> exten
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> withArguments(B b) {
+        public @NonNull QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> withArguments(B b) {
             return new QTaskBuilderVoid9Arg2<>(priority(), threadPool(), runnable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> withArguments(B b, C c) {
+        public @NonNull QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> withArguments(B b, C c) {
             return new QTaskBuilderVoid9Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d) {
+        public @NonNull QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d) {
             return new QTaskBuilderVoid9Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e) {
             return new QTaskBuilderVoid9Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f) {
             return new QTaskBuilderVoid9Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g) {
             return new QTaskBuilderVoid9Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g, H h) {
             return new QTaskBuilderVoid9Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g, H h, I i) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g, H h, I i) {
             return new QTaskBuilderVoid9Arg9<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4210,8 +4210,8 @@ public QTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid9Arg2(int newPriority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b) {
+    public static final class QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid9Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4224,60 +4224,60 @@ public static final class QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> exten
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> withArguments(C c) {
+        public @NonNull QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> withArguments(C c) {
             return new QTaskBuilderVoid9Arg3<>(priority(), threadPool(), runnable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withArguments(C c, D d) {
+        public @NonNull QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withArguments(C c, D d) {
             return new QTaskBuilderVoid9Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e) {
+        public @NonNull QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e) {
             return new QTaskBuilderVoid9Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f) {
             return new QTaskBuilderVoid9Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g) {
             return new QTaskBuilderVoid9Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g, H h) {
             return new QTaskBuilderVoid9Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g, H h, I i) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g, H h, I i) {
             return new QTaskBuilderVoid9Arg9<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4287,8 +4287,8 @@ public QTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid9Arg3(int newPriority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c) {
+    public static final class QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid9Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4303,53 +4303,53 @@ public static final class QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> exten
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withArguments(D d) {
+        public @NonNull QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withArguments(D d) {
             return new QTaskBuilderVoid9Arg4<>(priority(), threadPool(), runnable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(D d, E e) {
+        public @NonNull QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(D d, E e) {
             return new QTaskBuilderVoid9Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f) {
+        public @NonNull QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f) {
             return new QTaskBuilderVoid9Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g) {
             return new QTaskBuilderVoid9Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g, H h) {
             return new QTaskBuilderVoid9Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g, H h, I i) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g, H h, I i) {
             return new QTaskBuilderVoid9Arg9<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4359,8 +4359,8 @@ public QTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid9Arg4(int newPriority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d) {
+    public static final class QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid9Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4377,46 +4377,46 @@ public static final class QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> exten
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(E e) {
+        public @NonNull QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withArguments(E e) {
             return new QTaskBuilderVoid9Arg5<>(priority(), threadPool(), runnable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(E e, F f) {
+        public @NonNull QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(E e, F f) {
             return new QTaskBuilderVoid9Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g) {
+        public @NonNull QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g) {
             return new QTaskBuilderVoid9Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g, H h) {
             return new QTaskBuilderVoid9Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g, H h, I i) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g, H h, I i) {
             return new QTaskBuilderVoid9Arg9<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4426,8 +4426,8 @@ public QTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid9Arg5(int newPriority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e) {
+    public static final class QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid9Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4446,39 +4446,39 @@ public static final class QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> exten
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(F f) {
+        public @NonNull QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withArguments(F f) {
             return new QTaskBuilderVoid9Arg6<>(priority(), threadPool(), runnable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(F f, G g) {
+        public @NonNull QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(F f, G g) {
             return new QTaskBuilderVoid9Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(F f, G g, H h) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(F f, G g, H h) {
             return new QTaskBuilderVoid9Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(F f, G g, H h, I i) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(F f, G g, H h, I i) {
             return new QTaskBuilderVoid9Arg9<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4488,8 +4488,8 @@ public QTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid9Arg6(int newPriority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f) {
+    public static final class QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid9Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4510,32 +4510,32 @@ public static final class QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> exten
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(G g) {
+        public @NonNull QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withArguments(G g) {
             return new QTaskBuilderVoid9Arg7<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(G g, H h) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(G g, H h) {
             return new QTaskBuilderVoid9Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(G g, H h, I i) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(G g, H h, I i) {
             return new QTaskBuilderVoid9Arg9<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4545,8 +4545,8 @@ public QTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid9Arg7(int newPriority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static final class QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid9Arg7(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4569,25 +4569,25 @@ public static final class QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> exten
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(H h) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withArguments(H h) {
             return new QTaskBuilderVoid9Arg8<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(H h, I i) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(H h, I i) {
             return new QTaskBuilderVoid9Arg9<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4597,8 +4597,8 @@ public QTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid9Arg8(int newPriority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+    public static final class QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid9Arg8(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4623,18 +4623,18 @@ public static final class QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> exten
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(I i) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withArguments(I i) {
             return new QTaskBuilderVoid9Arg9<>(priority(), threadPool(), runnable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4644,8 +4644,8 @@ public QTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QTaskBuilderVoid9Arg9(int newPriority, QThreadPool threadPool, Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
+    public static final class QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QTaskBuilderVoid9Arg9(int newPriority, QThreadPool threadPool, @StrictNonNull Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -4673,29 +4673,29 @@ public static final class QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> exten
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f, g, h, i);
         }
 
         @Override
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
-        private native static <A, B, C, D, E, F, G, H, I> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E, F, G, H, I> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 Runnable9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T> QTypedTaskBuilder0Arg0<T> task(java.util.concurrent.Callable<T> callable) {
+    public static <T> @NonNull QTypedTaskBuilder0Arg0<T> task(java.util.concurrent.@StrictNonNull Callable<T> callable) {
         return new QTypedTaskBuilder0Arg0<>(0, null, callable);
     }
     
@@ -4711,13 +4711,13 @@ public static class QTypedTaskBuilder0Arg0<T> extends QTaskBuilder<T>{
         private final java.util.concurrent.Callable<T> callable;
         
         @Override
-        public QTypedTaskBuilder0Arg0<T> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder0Arg0<T> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder0Arg0<T> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder0Arg0<T> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4726,17 +4726,17 @@ public QTypedTaskBuilder0Arg0<T> onThreadPool(QThreadPool newThreadPool) {
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable);
         }
         
-        private native static <T> QFuture<T> spawn(QThreadPool threadPool, int priority, java.util.concurrent.Callable<T> callable);
+        private native static <T> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority, java.util.concurrent.Callable<T> callable);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A> QTypedTaskBuilder1Arg0<T, A> task(Callable1<T, A> callable) {
+    public static <T, A> @NonNull QTypedTaskBuilder1Arg0<T, A> task(@StrictNonNull Callable1<T, A> callable) {
         return new QTypedTaskBuilder1Arg0<>(0, null, callable);
     }
     
@@ -4755,18 +4755,18 @@ public static final class QTypedTaskBuilder1Arg0<T, A> extends QTaskBuilder<T>{
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder1Arg1<T, A> withArguments(A a) {
+        public @NonNull QTypedTaskBuilder1Arg1<T, A> withArguments(A a) {
             return new QTypedTaskBuilder1Arg1<>(priority(), threadPool(), callable, a);
         }
         
         @Override
-        public QTypedTaskBuilder1Arg0<T, A> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder1Arg0<T, A> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder1Arg0<T, A> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder1Arg0<T, A> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4786,13 +4786,13 @@ public static class QTypedTaskBuilder1Arg1<T, A> extends QTaskBuilder<T>{
         private final A a;
         
         @Override
-        public QTypedTaskBuilder1Arg1<T, A> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder1Arg1<T, A> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder1Arg1<T, A> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder1Arg1<T, A> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4801,18 +4801,18 @@ public QTypedTaskBuilder1Arg1<T, A> onThreadPool(QThreadPool newThreadPool) {
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable, a);
         }
         
-        private native static <T, A> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 Callable1<T, A> callable, A a);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B> QTypedTaskBuilder2Arg0<T, A, B> task(Callable2<T, A, B> callable) {
+    public static <T, A, B> @NonNull QTypedTaskBuilder2Arg0<T, A, B> task(@StrictNonNull Callable2<T, A, B> callable) {
         return new QTypedTaskBuilder2Arg0<>(0, null, callable);
     }
     
@@ -4831,25 +4831,25 @@ public static final class QTypedTaskBuilder2Arg0<T, A, B> extends QTaskBuilder<T
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder2Arg1<T, A, B> withArguments(A a) {
+        public @NonNull QTypedTaskBuilder2Arg1<T, A, B> withArguments(A a) {
             return new QTypedTaskBuilder2Arg1<>(priority(), threadPool(), callable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder2Arg2<T, A, B> withArguments(A a, B b) {
+        public @NonNull QTypedTaskBuilder2Arg2<T, A, B> withArguments(A a, B b) {
             return new QTypedTaskBuilder2Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         @Override
-        public QTypedTaskBuilder2Arg0<T, A, B> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder2Arg0<T, A, B> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder2Arg0<T, A, B> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder2Arg0<T, A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4871,18 +4871,18 @@ public static class QTypedTaskBuilder2Arg1<T, A, B> extends QTaskBuilder<T>{
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder2Arg2<T, A, B> withArguments(B b) {
+        public @NonNull QTypedTaskBuilder2Arg2<T, A, B> withArguments(B b) {
             return new QTypedTaskBuilder2Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         @Override
-        public QTypedTaskBuilder2Arg1<T, A, B> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder2Arg1<T, A, B> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder2Arg1<T, A, B> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder2Arg1<T, A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4904,13 +4904,13 @@ public static final class QTypedTaskBuilder2Arg2<T, A, B> extends QTaskBuilder<T
         private final B b;
         
         @Override
-        public QTypedTaskBuilder2Arg2<T, A, B> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder2Arg2<T, A, B> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder2Arg2<T, A, B> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder2Arg2<T, A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4919,18 +4919,18 @@ public QTypedTaskBuilder2Arg2<T, A, B> onThreadPool(QThreadPool newThreadPool) {
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable, a, b);
         }
         
-        private native static <T, A, B> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 Callable2<T, A, B> callable, A a, B b);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C> QTypedTaskBuilder3Arg0<T, A, B, C> task(Callable3<T, A, B, C> callable) {
+    public static <T, A, B, C> @NonNull QTypedTaskBuilder3Arg0<T, A, B, C> task(@StrictNonNull Callable3<T, A, B, C> callable) {
         return new QTypedTaskBuilder3Arg0<>(0, null, callable);
     }
     
@@ -4949,32 +4949,32 @@ public static final class QTypedTaskBuilder3Arg0<T, A, B, C> extends QTaskBuilde
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder3Arg1<T, A, B, C> withArguments(A a) {
+        public @NonNull QTypedTaskBuilder3Arg1<T, A, B, C> withArguments(A a) {
             return new QTypedTaskBuilder3Arg1<>(priority(), threadPool(), callable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder3Arg2<T, A, B, C> withArguments(A a, B b) {
+        public @NonNull QTypedTaskBuilder3Arg2<T, A, B, C> withArguments(A a, B b) {
             return new QTypedTaskBuilder3Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder3Arg3<T, A, B, C> withArguments(A a, B b, C c) {
+        public @NonNull QTypedTaskBuilder3Arg3<T, A, B, C> withArguments(A a, B b, C c) {
             return new QTypedTaskBuilder3Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         @Override
-        public QTypedTaskBuilder3Arg0<T, A, B, C> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder3Arg0<T, A, B, C> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder3Arg0<T, A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder3Arg0<T, A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -4996,25 +4996,25 @@ public static class QTypedTaskBuilder3Arg1<T, A, B, C> extends QTaskBuilder<T>{
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder3Arg2<T, A, B, C> withArguments(B b) {
+        public @NonNull QTypedTaskBuilder3Arg2<T, A, B, C> withArguments(B b) {
             return new QTypedTaskBuilder3Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder3Arg3<T, A, B, C> withArguments(B b, C c) {
+        public @NonNull QTypedTaskBuilder3Arg3<T, A, B, C> withArguments(B b, C c) {
             return new QTypedTaskBuilder3Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         @Override
-        public QTypedTaskBuilder3Arg1<T, A, B, C> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder3Arg1<T, A, B, C> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder3Arg1<T, A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder3Arg1<T, A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5038,18 +5038,18 @@ public static final class QTypedTaskBuilder3Arg2<T, A, B, C> extends QTaskBuilde
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder3Arg3<T, A, B, C> withArguments(C c) {
+        public @NonNull QTypedTaskBuilder3Arg3<T, A, B, C> withArguments(C c) {
             return new QTypedTaskBuilder3Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         @Override
-        public QTypedTaskBuilder3Arg2<T, A, B, C> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder3Arg2<T, A, B, C> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder3Arg2<T, A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder3Arg2<T, A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5073,13 +5073,13 @@ public static final class QTypedTaskBuilder3Arg3<T, A, B, C> extends QTaskBuilde
         private final C c;
         
         @Override
-        public QTypedTaskBuilder3Arg3<T, A, B, C> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder3Arg3<T, A, B, C> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder3Arg3<T, A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder3Arg3<T, A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5088,18 +5088,18 @@ public QTypedTaskBuilder3Arg3<T, A, B, C> onThreadPool(QThreadPool newThreadPool
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable, a, b, c);
         }
         
-        private native static <T, A, B, C> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 Callable3<T, A, B, C> callable, A a, B b, C c);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D> QTypedTaskBuilder4Arg0<T, A, B, C, D> task(Callable4<T, A, B, C, D> callable) {
+    public static <T, A, B, C, D> @NonNull QTypedTaskBuilder4Arg0<T, A, B, C, D> task(@StrictNonNull Callable4<T, A, B, C, D> callable) {
         return new QTypedTaskBuilder4Arg0<>(0, null, callable);
     }
     
@@ -5118,39 +5118,39 @@ public static final class QTypedTaskBuilder4Arg0<T, A, B, C, D> extends QTaskBui
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg1<T, A, B, C, D> withArguments(A a) {
+        public @NonNull QTypedTaskBuilder4Arg1<T, A, B, C, D> withArguments(A a) {
             return new QTypedTaskBuilder4Arg1<>(priority(), threadPool(), callable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg2<T, A, B, C, D> withArguments(A a, B b) {
+        public @NonNull QTypedTaskBuilder4Arg2<T, A, B, C, D> withArguments(A a, B b) {
             return new QTypedTaskBuilder4Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg3<T, A, B, C, D> withArguments(A a, B b, C c) {
+        public @NonNull QTypedTaskBuilder4Arg3<T, A, B, C, D> withArguments(A a, B b, C c) {
             return new QTypedTaskBuilder4Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg4<T, A, B, C, D> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder4Arg4<T, A, B, C, D> withArguments(A a, B b, C c, D d) {
             return new QTypedTaskBuilder4Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         @Override
-        public QTypedTaskBuilder4Arg0<T, A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder4Arg0<T, A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder4Arg0<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder4Arg0<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5172,32 +5172,32 @@ public static class QTypedTaskBuilder4Arg1<T, A, B, C, D> extends QTaskBuilder<T
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg2<T, A, B, C, D> withArguments(B b) {
+        public @NonNull QTypedTaskBuilder4Arg2<T, A, B, C, D> withArguments(B b) {
             return new QTypedTaskBuilder4Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg3<T, A, B, C, D> withArguments(B b, C c) {
+        public @NonNull QTypedTaskBuilder4Arg3<T, A, B, C, D> withArguments(B b, C c) {
             return new QTypedTaskBuilder4Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg4<T, A, B, C, D> withArguments(B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder4Arg4<T, A, B, C, D> withArguments(B b, C c, D d) {
             return new QTypedTaskBuilder4Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         @Override
-        public QTypedTaskBuilder4Arg1<T, A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder4Arg1<T, A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder4Arg1<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder4Arg1<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5221,25 +5221,25 @@ public static final class QTypedTaskBuilder4Arg2<T, A, B, C, D> extends QTaskBui
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg3<T, A, B, C, D> withArguments(C c) {
+        public @NonNull QTypedTaskBuilder4Arg3<T, A, B, C, D> withArguments(C c) {
             return new QTypedTaskBuilder4Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg4<T, A, B, C, D> withArguments(C c, D d) {
+        public @NonNull QTypedTaskBuilder4Arg4<T, A, B, C, D> withArguments(C c, D d) {
             return new QTypedTaskBuilder4Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         @Override
-        public QTypedTaskBuilder4Arg2<T, A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder4Arg2<T, A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder4Arg2<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder4Arg2<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5265,18 +5265,18 @@ public static final class QTypedTaskBuilder4Arg3<T, A, B, C, D> extends QTaskBui
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder4Arg4<T, A, B, C, D> withArguments(D d) {
+        public @NonNull QTypedTaskBuilder4Arg4<T, A, B, C, D> withArguments(D d) {
             return new QTypedTaskBuilder4Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         @Override
-        public QTypedTaskBuilder4Arg3<T, A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder4Arg3<T, A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder4Arg3<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder4Arg3<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5302,13 +5302,13 @@ public static final class QTypedTaskBuilder4Arg4<T, A, B, C, D> extends QTaskBui
         private final D d;
         
         @Override
-        public QTypedTaskBuilder4Arg4<T, A, B, C, D> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder4Arg4<T, A, B, C, D> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder4Arg4<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder4Arg4<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5317,18 +5317,18 @@ public QTypedTaskBuilder4Arg4<T, A, B, C, D> onThreadPool(QThreadPool newThreadP
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable, a, b, c, d);
         }
         
-        private native static <T, A, B, C, D> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 Callable4<T, A, B, C, D> callable, A a, B b, C c, D d);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E> QTypedTaskBuilder5Arg0<T, A, B, C, D, E> task(Callable5<T, A, B, C, D, E> callable) {
+    public static <T, A, B, C, D, E> @NonNull QTypedTaskBuilder5Arg0<T, A, B, C, D, E> task(@StrictNonNull Callable5<T, A, B, C, D, E> callable) {
         return new QTypedTaskBuilder5Arg0<>(0, null, callable);
     }
     
@@ -5347,46 +5347,46 @@ public static final class QTypedTaskBuilder5Arg0<T, A, B, C, D, E> extends QTask
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg1<T, A, B, C, D, E> withArguments(A a) {
+        public @NonNull QTypedTaskBuilder5Arg1<T, A, B, C, D, E> withArguments(A a) {
             return new QTypedTaskBuilder5Arg1<>(priority(), threadPool(), callable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg2<T, A, B, C, D, E> withArguments(A a, B b) {
+        public @NonNull QTypedTaskBuilder5Arg2<T, A, B, C, D, E> withArguments(A a, B b) {
             return new QTypedTaskBuilder5Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg3<T, A, B, C, D, E> withArguments(A a, B b, C c) {
+        public @NonNull QTypedTaskBuilder5Arg3<T, A, B, C, D, E> withArguments(A a, B b, C c) {
             return new QTypedTaskBuilder5Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withArguments(A a, B b, C c, D d) {
             return new QTypedTaskBuilder5Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(A a, B b, C c, D d, E e) {
             return new QTypedTaskBuilder5Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         @Override
-        public QTypedTaskBuilder5Arg0<T, A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder5Arg0<T, A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder5Arg0<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder5Arg0<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5408,39 +5408,39 @@ public static class QTypedTaskBuilder5Arg1<T, A, B, C, D, E> extends QTaskBuilde
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg2<T, A, B, C, D, E> withArguments(B b) {
+        public @NonNull QTypedTaskBuilder5Arg2<T, A, B, C, D, E> withArguments(B b) {
             return new QTypedTaskBuilder5Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg3<T, A, B, C, D, E> withArguments(B b, C c) {
+        public @NonNull QTypedTaskBuilder5Arg3<T, A, B, C, D, E> withArguments(B b, C c) {
             return new QTypedTaskBuilder5Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withArguments(B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withArguments(B b, C c, D d) {
             return new QTypedTaskBuilder5Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(B b, C c, D d, E e) {
             return new QTypedTaskBuilder5Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         @Override
-        public QTypedTaskBuilder5Arg1<T, A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder5Arg1<T, A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder5Arg1<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder5Arg1<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5464,32 +5464,32 @@ public static final class QTypedTaskBuilder5Arg2<T, A, B, C, D, E> extends QTask
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg3<T, A, B, C, D, E> withArguments(C c) {
+        public @NonNull QTypedTaskBuilder5Arg3<T, A, B, C, D, E> withArguments(C c) {
             return new QTypedTaskBuilder5Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withArguments(C c, D d) {
+        public @NonNull QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withArguments(C c, D d) {
             return new QTypedTaskBuilder5Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(C c, D d, E e) {
             return new QTypedTaskBuilder5Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         @Override
-        public QTypedTaskBuilder5Arg2<T, A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder5Arg2<T, A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder5Arg2<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder5Arg2<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5515,25 +5515,25 @@ public static final class QTypedTaskBuilder5Arg3<T, A, B, C, D, E> extends QTask
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withArguments(D d) {
+        public @NonNull QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withArguments(D d) {
             return new QTypedTaskBuilder5Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(D d, E e) {
+        public @NonNull QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(D d, E e) {
             return new QTypedTaskBuilder5Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         @Override
-        public QTypedTaskBuilder5Arg3<T, A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder5Arg3<T, A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder5Arg3<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder5Arg3<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5561,18 +5561,18 @@ public static final class QTypedTaskBuilder5Arg4<T, A, B, C, D, E> extends QTask
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(E e) {
+        public @NonNull QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withArguments(E e) {
             return new QTypedTaskBuilder5Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         @Override
-        public QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder5Arg4<T, A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder5Arg4<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder5Arg4<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5600,13 +5600,13 @@ public static final class QTypedTaskBuilder5Arg5<T, A, B, C, D, E> extends QTask
         private final E e;
         
         @Override
-        public QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder5Arg5<T, A, B, C, D, E> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder5Arg5<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder5Arg5<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5615,18 +5615,18 @@ public QTypedTaskBuilder5Arg5<T, A, B, C, D, E> onThreadPool(QThreadPool newThre
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable, a, b, c, d, e);
         }
         
-        private native static <T, A, B, C, D, E> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 Callable5<T, A, B, C, D, E> callable, A a, B b, C c, D d, E e);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E, F> QTypedTaskBuilder6Arg0<T, A, B, C, D, E, F> task(Callable6<T, A, B, C, D, E, F> callable) {
+    public static <T, A, B, C, D, E, F> @NonNull QTypedTaskBuilder6Arg0<T, A, B, C, D, E, F> task(@StrictNonNull Callable6<T, A, B, C, D, E, F> callable) {
         return new QTypedTaskBuilder6Arg0<>(0, null, callable);
     }
     
@@ -5645,53 +5645,53 @@ public static class QTypedTaskBuilder6Arg0<T, A, B, C, D, E, F> extends QTaskBui
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg1<T, A, B, C, D, E, F> withArguments(A a) {
+        public @NonNull QTypedTaskBuilder6Arg1<T, A, B, C, D, E, F> withArguments(A a) {
             return new QTypedTaskBuilder6Arg1<>(priority(), threadPool(), callable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg2<T, A, B, C, D, E, F> withArguments(A a, B b) {
+        public @NonNull QTypedTaskBuilder6Arg2<T, A, B, C, D, E, F> withArguments(A a, B b) {
             return new QTypedTaskBuilder6Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> withArguments(A a, B b, C c) {
+        public @NonNull QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> withArguments(A a, B b, C c) {
             return new QTypedTaskBuilder6Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withArguments(A a, B b, C c, D d) {
             return new QTypedTaskBuilder6Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(A a, B b, C c, D d, E e) {
             return new QTypedTaskBuilder6Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(A a, B b, C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(A a, B b, C c, D d, E e, F f) {
             return new QTypedTaskBuilder6Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTypedTaskBuilder6Arg0<T, A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder6Arg0<T, A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder6Arg0<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder6Arg0<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5713,46 +5713,46 @@ public static class QTypedTaskBuilder6Arg1<T, A, B, C, D, E, F> extends QTaskBui
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg2<T, A, B, C, D, E, F> withArguments(B b) {
+        public @NonNull QTypedTaskBuilder6Arg2<T, A, B, C, D, E, F> withArguments(B b) {
             return new QTypedTaskBuilder6Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> withArguments(B b, C c) {
+        public @NonNull QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> withArguments(B b, C c) {
             return new QTypedTaskBuilder6Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withArguments(B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withArguments(B b, C c, D d) {
             return new QTypedTaskBuilder6Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(B b, C c, D d, E e) {
             return new QTypedTaskBuilder6Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(B b, C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(B b, C c, D d, E e, F f) {
             return new QTypedTaskBuilder6Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTypedTaskBuilder6Arg1<T, A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder6Arg1<T, A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder6Arg1<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder6Arg1<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5776,39 +5776,39 @@ public static final class QTypedTaskBuilder6Arg2<T, A, B, C, D, E, F> extends QT
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> withArguments(C c) {
+        public @NonNull QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> withArguments(C c) {
             return new QTypedTaskBuilder6Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withArguments(C c, D d) {
+        public @NonNull QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withArguments(C c, D d) {
             return new QTypedTaskBuilder6Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(C c, D d, E e) {
             return new QTypedTaskBuilder6Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(C c, D d, E e, F f) {
             return new QTypedTaskBuilder6Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTypedTaskBuilder6Arg2<T, A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder6Arg2<T, A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder6Arg2<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder6Arg2<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5834,32 +5834,32 @@ public static final class QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> extends QT
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withArguments(D d) {
+        public @NonNull QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withArguments(D d) {
             return new QTypedTaskBuilder6Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(D d, E e) {
+        public @NonNull QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(D d, E e) {
             return new QTypedTaskBuilder6Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(D d, E e, F f) {
             return new QTypedTaskBuilder6Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder6Arg3<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5887,25 +5887,25 @@ public static final class QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> extends QT
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(E e) {
+        public @NonNull QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withArguments(E e) {
             return new QTypedTaskBuilder6Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(E e, F f) {
+        public @NonNull QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(E e, F f) {
             return new QTypedTaskBuilder6Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder6Arg4<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5935,18 +5935,18 @@ public static final class QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> extends QT
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(F f) {
+        public @NonNull QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withArguments(F f) {
             return new QTypedTaskBuilder6Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         @Override
-        public QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder6Arg5<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5976,13 +5976,13 @@ public static final class QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> extends QT
         private final F f;
         
         @Override
-        public QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -5991,18 +5991,18 @@ public QTypedTaskBuilder6Arg6<T, A, B, C, D, E, F> onThreadPool(QThreadPool newT
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable, a, b, c, d, e, f);
         }
         
-        private native static <T, A, B, C, D, E, F> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E, F> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 Callable6<T, A, B, C, D, E, F> callable, A a, B b, C c, D d, E e, F f);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G> QTypedTaskBuilder7Arg0<T, A, B, C, D, E, F, G> task(Callable7<T, A, B, C, D, E, F, G> callable) {
+    public static <T, A, B, C, D, E, F, G> @NonNull QTypedTaskBuilder7Arg0<T, A, B, C, D, E, F, G> task(@StrictNonNull Callable7<T, A, B, C, D, E, F, G> callable) {
         return new QTypedTaskBuilder7Arg0<>(0, null, callable);
     }
     
@@ -6021,60 +6021,60 @@ public static class QTypedTaskBuilder7Arg0<T, A, B, C, D, E, F, G> extends QTask
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg1<T, A, B, C, D, E, F, G> withArguments(A a) {
+        public @NonNull QTypedTaskBuilder7Arg1<T, A, B, C, D, E, F, G> withArguments(A a) {
             return new QTypedTaskBuilder7Arg1<>(priority(), threadPool(), callable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg2<T, A, B, C, D, E, F, G> withArguments(A a, B b) {
+        public @NonNull QTypedTaskBuilder7Arg2<T, A, B, C, D, E, F, G> withArguments(A a, B b) {
             return new QTypedTaskBuilder7Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c) {
+        public @NonNull QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c) {
             return new QTypedTaskBuilder7Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d) {
             return new QTypedTaskBuilder7Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e) {
             return new QTypedTaskBuilder7Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e, F f) {
             return new QTypedTaskBuilder7Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(A a, B b, C c, D d, E e, F f, G g) {
             return new QTypedTaskBuilder7Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTypedTaskBuilder7Arg0<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder7Arg0<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder7Arg0<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder7Arg0<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6096,53 +6096,53 @@ public static class QTypedTaskBuilder7Arg1<T, A, B, C, D, E, F, G> extends QTask
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg2<T, A, B, C, D, E, F, G> withArguments(B b) {
+        public @NonNull QTypedTaskBuilder7Arg2<T, A, B, C, D, E, F, G> withArguments(B b) {
             return new QTypedTaskBuilder7Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> withArguments(B b, C c) {
+        public @NonNull QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> withArguments(B b, C c) {
             return new QTypedTaskBuilder7Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withArguments(B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withArguments(B b, C c, D d) {
             return new QTypedTaskBuilder7Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e) {
             return new QTypedTaskBuilder7Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e, F f) {
             return new QTypedTaskBuilder7Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(B b, C c, D d, E e, F f, G g) {
             return new QTypedTaskBuilder7Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTypedTaskBuilder7Arg1<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder7Arg1<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder7Arg1<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder7Arg1<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6166,46 +6166,46 @@ public static final class QTypedTaskBuilder7Arg2<T, A, B, C, D, E, F, G> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> withArguments(C c) {
+        public @NonNull QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> withArguments(C c) {
             return new QTypedTaskBuilder7Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withArguments(C c, D d) {
+        public @NonNull QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withArguments(C c, D d) {
             return new QTypedTaskBuilder7Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(C c, D d, E e) {
             return new QTypedTaskBuilder7Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(C c, D d, E e, F f) {
             return new QTypedTaskBuilder7Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(C c, D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(C c, D d, E e, F f, G g) {
             return new QTypedTaskBuilder7Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTypedTaskBuilder7Arg2<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder7Arg2<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder7Arg2<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder7Arg2<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6231,39 +6231,39 @@ public static final class QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withArguments(D d) {
+        public @NonNull QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withArguments(D d) {
             return new QTypedTaskBuilder7Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(D d, E e) {
+        public @NonNull QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(D d, E e) {
             return new QTypedTaskBuilder7Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(D d, E e, F f) {
             return new QTypedTaskBuilder7Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(D d, E e, F f, G g) {
             return new QTypedTaskBuilder7Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder7Arg3<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6291,32 +6291,32 @@ public static final class QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(E e) {
+        public @NonNull QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withArguments(E e) {
             return new QTypedTaskBuilder7Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(E e, F f) {
+        public @NonNull QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(E e, F f) {
             return new QTypedTaskBuilder7Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(E e, F f, G g) {
             return new QTypedTaskBuilder7Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
     
         @Override
-        public QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder7Arg4<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6346,25 +6346,25 @@ public static final class QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(F f) {
+        public @NonNull QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withArguments(F f) {
             return new QTypedTaskBuilder7Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(F f, G g) {
+        public @NonNull QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(F f, G g) {
             return new QTypedTaskBuilder7Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder7Arg5<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6396,18 +6396,18 @@ public static final class QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(G g) {
+        public @NonNull QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withArguments(G g) {
             return new QTypedTaskBuilder7Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         @Override
-        public QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder7Arg6<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6439,13 +6439,13 @@ public static final class QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> extends
         private final G g;
         
         @Override
-        public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6454,18 +6454,18 @@ public QTypedTaskBuilder7Arg7<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool n
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable, a, b, c, d, e, f, g);
         }
         
-        private native static <T, A, B, C, D, E, F, G> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E, F, G> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 Callable7<T, A, B, C, D, E, F, G> callable, A a, B b, C c, D d, E e, F f, G g);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G, H> QTypedTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> task(Callable8<T, A, B, C, D, E, F, G, H> callable) {
+    public static <T, A, B, C, D, E, F, G, H> @NonNull QTypedTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> task(@StrictNonNull Callable8<T, A, B, C, D, E, F, G, H> callable) {
         return new QTypedTaskBuilder8Arg0<>(0, null, callable);
     }
     
@@ -6484,67 +6484,67 @@ public static class QTypedTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> extends QT
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> withArguments(A a) {
+        public @NonNull QTypedTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> withArguments(A a) {
             return new QTypedTaskBuilder8Arg1<>(priority(), threadPool(), callable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> withArguments(A a, B b) {
+        public @NonNull QTypedTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> withArguments(A a, B b) {
             return new QTypedTaskBuilder8Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c) {
+        public @NonNull QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c) {
             return new QTypedTaskBuilder8Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d) {
             return new QTypedTaskBuilder8Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e) {
             return new QTypedTaskBuilder8Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f) {
             return new QTypedTaskBuilder8Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f, G g) {
             return new QTypedTaskBuilder8Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(A a, B b, C c, D d, E e, F f, G g, H h) {
             return new QTypedTaskBuilder8Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTypedTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6566,60 +6566,60 @@ public static class QTypedTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> extends QT
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> withArguments(B b) {
+        public @NonNull QTypedTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> withArguments(B b) {
             return new QTypedTaskBuilder8Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> withArguments(B b, C c) {
+        public @NonNull QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> withArguments(B b, C c) {
             return new QTypedTaskBuilder8Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d) {
             return new QTypedTaskBuilder8Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e) {
             return new QTypedTaskBuilder8Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f) {
             return new QTypedTaskBuilder8Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f, G g) {
             return new QTypedTaskBuilder8Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(B b, C c, D d, E e, F f, G g, H h) {
             return new QTypedTaskBuilder8Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTypedTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6643,53 +6643,53 @@ public static final class QTypedTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> exte
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> withArguments(C c) {
+        public @NonNull QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> withArguments(C c) {
             return new QTypedTaskBuilder8Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withArguments(C c, D d) {
+        public @NonNull QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withArguments(C c, D d) {
             return new QTypedTaskBuilder8Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(C c, D d, E e) {
             return new QTypedTaskBuilder8Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f) {
             return new QTypedTaskBuilder8Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f, G g) {
             return new QTypedTaskBuilder8Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(C c, D d, E e, F f, G g, H h) {
             return new QTypedTaskBuilder8Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTypedTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6715,46 +6715,46 @@ public static final class QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> exte
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withArguments(D d) {
+        public @NonNull QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withArguments(D d) {
             return new QTypedTaskBuilder8Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(D d, E e) {
+        public @NonNull QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(D d, E e) {
             return new QTypedTaskBuilder8Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(D d, E e, F f) {
             return new QTypedTaskBuilder8Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(D d, E e, F f, G g) {
             return new QTypedTaskBuilder8Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(D d, E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(D d, E e, F f, G g, H h) {
             return new QTypedTaskBuilder8Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6782,39 +6782,39 @@ public static final class QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> exte
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(E e) {
+        public @NonNull QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withArguments(E e) {
             return new QTypedTaskBuilder8Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(E e, F f) {
+        public @NonNull QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(E e, F f) {
             return new QTypedTaskBuilder8Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(E e, F f, G g) {
             return new QTypedTaskBuilder8Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(E e, F f, G g, H h) {
             return new QTypedTaskBuilder8Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6844,32 +6844,32 @@ public static final class QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> exte
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(F f) {
+        public @NonNull QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withArguments(F f) {
             return new QTypedTaskBuilder8Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(F f, G g) {
+        public @NonNull QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(F f, G g) {
             return new QTypedTaskBuilder8Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(F f, G g, H h) {
             return new QTypedTaskBuilder8Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         @Override
-        public QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6901,25 +6901,25 @@ public static final class QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> exte
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(G g) {
+        public @NonNull QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withArguments(G g) {
             return new QTypedTaskBuilder8Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(G g, H h) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(G g, H h) {
             return new QTypedTaskBuilder8Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
         
         @Override
-        public QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6953,18 +6953,18 @@ public static final class QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> exte
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(H h) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withArguments(H h) {
             return new QTypedTaskBuilder8Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
         
         @Override
-        public QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -6998,13 +6998,13 @@ public static final class QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> exte
         private final H h;
         
         @Override
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7013,18 +7013,18 @@ public QTypedTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPoo
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable, a, b, c, d, e, f, g, h);
         }
         
-        private native static <T, A, B, C, D, E, F, G, H> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E, F, G, H> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 Callable8<T, A, B, C, D, E, F, G, H> callable, A a, B b, C c, D d, E e, F f, G g, H h);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G, H, I> QTypedTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> task(Callable9<T, A, B, C, D, E, F, G, H, I> callable) {
+    public static <T, A, B, C, D, E, F, G, H, I> @NonNull QTypedTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> task(@StrictNonNull Callable9<T, A, B, C, D, E, F, G, H, I> callable) {
         return new QTypedTaskBuilder9Arg0<>(0, null, callable);
     }
     
@@ -7043,74 +7043,74 @@ public static class QTypedTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> withArguments(A a) {
+        public @NonNull QTypedTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> withArguments(A a) {
             return new QTypedTaskBuilder9Arg1<>(priority(), threadPool(), callable, a);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b) {
+        public @NonNull QTypedTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b) {
             return new QTypedTaskBuilder9Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c) {
+        public @NonNull QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c) {
             return new QTypedTaskBuilder9Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d) {
             return new QTypedTaskBuilder9Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e) {
             return new QTypedTaskBuilder9Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f) {
             return new QTypedTaskBuilder9Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g) {
             return new QTypedTaskBuilder9Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g, H h) {
             return new QTypedTaskBuilder9Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g, H h, I i) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(A a, B b, C c, D d, E e, F f, G g, H h, I i) {
             return new QTypedTaskBuilder9Arg9<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h, i);
         }
 
         @Override
-        public QTypedTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7132,67 +7132,67 @@ public static class QTypedTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> extends
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> withArguments(B b) {
+        public @NonNull QTypedTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> withArguments(B b) {
             return new QTypedTaskBuilder9Arg2<>(priority(), threadPool(), callable, a, b);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c) {
+        public @NonNull QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c) {
             return new QTypedTaskBuilder9Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d) {
+        public @NonNull QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d) {
             return new QTypedTaskBuilder9Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e) {
             return new QTypedTaskBuilder9Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f) {
             return new QTypedTaskBuilder9Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g) {
             return new QTypedTaskBuilder9Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g, H h) {
             return new QTypedTaskBuilder9Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g, H h, I i) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(B b, C c, D d, E e, F f, G g, H h, I i) {
             return new QTypedTaskBuilder9Arg9<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTypedTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7216,60 +7216,60 @@ public static final class QTypedTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> e
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> withArguments(C c) {
+        public @NonNull QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> withArguments(C c) {
             return new QTypedTaskBuilder9Arg3<>(priority(), threadPool(), callable, a, b, c);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d) {
+        public @NonNull QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d) {
             return new QTypedTaskBuilder9Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e) {
+        public @NonNull QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e) {
             return new QTypedTaskBuilder9Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f) {
             return new QTypedTaskBuilder9Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g) {
             return new QTypedTaskBuilder9Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g, H h) {
             return new QTypedTaskBuilder9Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g, H h, I i) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(C c, D d, E e, F f, G g, H h, I i) {
             return new QTypedTaskBuilder9Arg9<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTypedTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7295,53 +7295,53 @@ public static final class QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> e
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withArguments(D d) {
+        public @NonNull QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withArguments(D d) {
             return new QTypedTaskBuilder9Arg4<>(priority(), threadPool(), callable, a, b, c, d);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e) {
+        public @NonNull QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e) {
             return new QTypedTaskBuilder9Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f) {
+        public @NonNull QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f) {
             return new QTypedTaskBuilder9Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g) {
             return new QTypedTaskBuilder9Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g, H h) {
             return new QTypedTaskBuilder9Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g, H h, I i) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(D d, E e, F f, G g, H h, I i) {
             return new QTypedTaskBuilder9Arg9<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7369,46 +7369,46 @@ public static final class QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> e
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(E e) {
+        public @NonNull QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withArguments(E e) {
             return new QTypedTaskBuilder9Arg5<>(priority(), threadPool(), callable, a, b, c, d, e);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(E e, F f) {
+        public @NonNull QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(E e, F f) {
             return new QTypedTaskBuilder9Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g) {
+        public @NonNull QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g) {
             return new QTypedTaskBuilder9Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g, H h) {
             return new QTypedTaskBuilder9Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g, H h, I i) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(E e, F f, G g, H h, I i) {
             return new QTypedTaskBuilder9Arg9<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7438,39 +7438,39 @@ public static final class QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> e
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(F f) {
+        public @NonNull QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withArguments(F f) {
             return new QTypedTaskBuilder9Arg6<>(priority(), threadPool(), callable, a, b, c, d, e, f);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(F f, G g) {
+        public @NonNull QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(F f, G g) {
             return new QTypedTaskBuilder9Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(F f, G g, H h) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(F f, G g, H h) {
             return new QTypedTaskBuilder9Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
     
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(F f, G g, H h, I i) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(F f, G g, H h, I i) {
             return new QTypedTaskBuilder9Arg9<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7502,32 +7502,32 @@ public static final class QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> e
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(G g) {
+        public @NonNull QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withArguments(G g) {
             return new QTypedTaskBuilder9Arg7<>(priority(), threadPool(), callable, a, b, c, d, e, f, g);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(G g, H h) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(G g, H h) {
             return new QTypedTaskBuilder9Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(G g, H h, I i) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(G g, H h, I i) {
             return new QTypedTaskBuilder9Arg9<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7561,25 +7561,25 @@ public static final class QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> e
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(H h) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withArguments(H h) {
             return new QTypedTaskBuilder9Arg8<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h);
         }
         
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(H h, I i) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(H h, I i) {
             return new QTypedTaskBuilder9Arg9<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7615,18 +7615,18 @@ public static final class QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> e
         /**
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#withArguments">QtConcurrent::QTaskBuilder::withArguments(ExtraArgs &&...)</a></p>
          */
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(I i) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withArguments(I i) {
             return new QTypedTaskBuilder9Arg9<>(priority(), threadPool(), callable, a, b, c, d, e, f, g, h, i);
         }
         
         @Override
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7665,29 +7665,29 @@ public static final class QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> e
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), callable, a, b, c, d, e, f, g, h, i);
         }
 
         @Override
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withPriority(int newPriority) {
             super.withPriority(newPriority);
             return this;
         }
 
         @Override
-        public QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public @NonNull QTypedTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
-        private native static <T, A, B, C, D, E, F, G, H, I> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E, F, G, H, I> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 Callable9<T, A, B, C, D, E, F, G, H, I> callable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
     }
         
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static QPromiseTaskBuilderVoid0Arg0 task(RunnableWithVoidPromise runnable) {
+    public static QPromiseTaskBuilderVoid0Arg0 task(@StrictNonNull RunnableWithVoidPromise runnable) {
         return new QPromiseTaskBuilderVoid0Arg0(0, null, runnable);
     }
     
@@ -7695,8 +7695,8 @@ public static QPromiseTaskBuilderVoid0Arg0 task(RunnableWithVoidPromise runnable
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid0Arg0 extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid0Arg0(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise runnable) {
+    public static final class QPromiseTaskBuilderVoid0Arg0 extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid0Arg0(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise runnable) {
             super(newPriority, threadPool);
             this.runnable = runnable;
         }
@@ -7709,7 +7709,7 @@ public QPromiseTaskBuilderVoid0Arg0 withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid0Arg0 onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid0Arg0 onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7718,17 +7718,17 @@ public QPromiseTaskBuilderVoid0Arg0 onThreadPool(QThreadPool newThreadPool) {
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable);
         }
         
-        private native static QFuture<Void> spawn(QThreadPool threadPool, int priority, RunnableWithVoidPromise runnable);
+        private native static @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority, @StrictNonNull RunnableWithVoidPromise runnable);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A> QPromiseTaskBuilderVoid1Arg0<A> task(RunnableWithVoidPromise1<A> runnable) {
+    public static <A> QPromiseTaskBuilderVoid1Arg0<A> task(@StrictNonNull RunnableWithVoidPromise1<A> runnable) {
         return new QPromiseTaskBuilderVoid1Arg0<>(0, null, runnable);
     }
     
@@ -7736,10 +7736,10 @@ public static <A> QPromiseTaskBuilderVoid1Arg0<A> task(RunnableWithVoidPromise1<
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid1Arg0<A> extends QTaskBuilder<Void>{
+    public static final class QPromiseTaskBuilderVoid1Arg0<A> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final RunnableWithVoidPromise1<A> runnable;
         
-        QPromiseTaskBuilderVoid1Arg0(int priority, QThreadPool threadPool, RunnableWithVoidPromise1<A> runnable) {
+        QPromiseTaskBuilderVoid1Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise1<A> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -7758,7 +7758,7 @@ public QPromiseTaskBuilderVoid1Arg0<A> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid1Arg0<A> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid1Arg0<A> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7768,8 +7768,8 @@ public QPromiseTaskBuilderVoid1Arg0<A> onThreadPool(QThreadPool newThreadPool) {
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid1Arg1<A> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid1Arg1(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise1<A> runnable, A a) {
+    public static final class QPromiseTaskBuilderVoid1Arg1<A> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid1Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise1<A> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -7784,7 +7784,7 @@ public QPromiseTaskBuilderVoid1Arg1<A> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid1Arg1<A> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid1Arg1<A> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7793,18 +7793,18 @@ public QPromiseTaskBuilderVoid1Arg1<A> onThreadPool(QThreadPool newThreadPool) {
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a);
         }
         
-        private native static <A> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithVoidPromise1<A> runnable, A a);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B> QPromiseTaskBuilderVoid2Arg0<A, B> task(RunnableWithVoidPromise2<A, B> runnable) {
+    public static <A, B> QPromiseTaskBuilderVoid2Arg0<A, B> task(@StrictNonNull RunnableWithVoidPromise2<A, B> runnable) {
         return new QPromiseTaskBuilderVoid2Arg0<>(0, null, runnable);
     }
     
@@ -7812,10 +7812,10 @@ public static <A, B> QPromiseTaskBuilderVoid2Arg0<A, B> task(RunnableWithVoidPro
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid2Arg0<A, B> extends QTaskBuilder<Void>{
+    public static final class QPromiseTaskBuilderVoid2Arg0<A, B> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final RunnableWithVoidPromise2<A, B> runnable;
         
-        QPromiseTaskBuilderVoid2Arg0(int priority, QThreadPool threadPool, RunnableWithVoidPromise2<A, B> runnable) {
+        QPromiseTaskBuilderVoid2Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise2<A, B> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -7841,7 +7841,7 @@ public QPromiseTaskBuilderVoid2Arg0<A, B> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid2Arg0<A, B> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid2Arg0<A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7851,8 +7851,8 @@ public QPromiseTaskBuilderVoid2Arg0<A, B> onThreadPool(QThreadPool newThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid2Arg1<A, B> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid2Arg1(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise2<A, B> runnable, A a) {
+    public static class QPromiseTaskBuilderVoid2Arg1<A, B> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid2Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise2<A, B> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -7874,7 +7874,7 @@ public QPromiseTaskBuilderVoid2Arg1<A, B> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid2Arg1<A, B> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid2Arg1<A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7884,8 +7884,8 @@ public QPromiseTaskBuilderVoid2Arg1<A, B> onThreadPool(QThreadPool newThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid2Arg2<A, B> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid2Arg2(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise2<A, B> runnable, A a, B b) {
+    public static final class QPromiseTaskBuilderVoid2Arg2<A, B> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid2Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise2<A, B> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -7902,7 +7902,7 @@ public QPromiseTaskBuilderVoid2Arg2<A, B> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid2Arg2<A, B> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid2Arg2<A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7911,18 +7911,18 @@ public QPromiseTaskBuilderVoid2Arg2<A, B> onThreadPool(QThreadPool newThreadPool
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b);
         }
         
-        private native static <A, B> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithVoidPromise2<A, B> runnable, A a, B b);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C> QPromiseTaskBuilderVoid3Arg0<A, B, C> task(RunnableWithVoidPromise3<A, B, C> runnable) {
+    public static <A, B, C> QPromiseTaskBuilderVoid3Arg0<A, B, C> task(@StrictNonNull RunnableWithVoidPromise3<A, B, C> runnable) {
         return new QPromiseTaskBuilderVoid3Arg0<>(0, null, runnable);
     }
     
@@ -7930,10 +7930,10 @@ public static <A, B, C> QPromiseTaskBuilderVoid3Arg0<A, B, C> task(RunnableWithV
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid3Arg0<A, B, C> extends QTaskBuilder<Void>{
+    public static final class QPromiseTaskBuilderVoid3Arg0<A, B, C> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final RunnableWithVoidPromise3<A, B, C> runnable;
         
-        QPromiseTaskBuilderVoid3Arg0(int priority, QThreadPool threadPool, RunnableWithVoidPromise3<A, B, C> runnable) {
+        QPromiseTaskBuilderVoid3Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise3<A, B, C> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -7966,7 +7966,7 @@ public QPromiseTaskBuilderVoid3Arg0<A, B, C> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid3Arg0<A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid3Arg0<A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -7976,8 +7976,8 @@ public QPromiseTaskBuilderVoid3Arg0<A, B, C> onThreadPool(QThreadPool newThreadP
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid3Arg1<A, B, C> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid3Arg1(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise3<A, B, C> runnable, A a) {
+    public static class QPromiseTaskBuilderVoid3Arg1<A, B, C> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid3Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise3<A, B, C> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8006,7 +8006,7 @@ public QPromiseTaskBuilderVoid3Arg1<A, B, C> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid3Arg1<A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid3Arg1<A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8016,8 +8016,8 @@ public QPromiseTaskBuilderVoid3Arg1<A, B, C> onThreadPool(QThreadPool newThreadP
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid3Arg2<A, B, C> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid3Arg2(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise3<A, B, C> runnable, A a, B b) {
+    public static final class QPromiseTaskBuilderVoid3Arg2<A, B, C> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid3Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise3<A, B, C> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8041,7 +8041,7 @@ public QPromiseTaskBuilderVoid3Arg2<A, B, C> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid3Arg2<A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid3Arg2<A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8051,8 +8051,8 @@ public QPromiseTaskBuilderVoid3Arg2<A, B, C> onThreadPool(QThreadPool newThreadP
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid3Arg3<A, B, C> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid3Arg3(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise3<A, B, C> runnable, A a, B b, C c) {
+    public static final class QPromiseTaskBuilderVoid3Arg3<A, B, C> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid3Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise3<A, B, C> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8071,7 +8071,7 @@ public QPromiseTaskBuilderVoid3Arg3<A, B, C> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid3Arg3<A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid3Arg3<A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8080,18 +8080,18 @@ public QPromiseTaskBuilderVoid3Arg3<A, B, C> onThreadPool(QThreadPool newThreadP
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c);
         }
         
-        private native static <A, B, C> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithVoidPromise3<A, B, C> runnable, A a, B b, C c);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D> QPromiseTaskBuilderVoid4Arg0<A, B, C, D> task(RunnableWithVoidPromise4<A, B, C, D> runnable) {
+    public static <A, B, C, D> QPromiseTaskBuilderVoid4Arg0<A, B, C, D> task(@StrictNonNull RunnableWithVoidPromise4<A, B, C, D> runnable) {
         return new QPromiseTaskBuilderVoid4Arg0<>(0, null, runnable);
     }
     
@@ -8099,10 +8099,10 @@ public static <A, B, C, D> QPromiseTaskBuilderVoid4Arg0<A, B, C, D> task(Runnabl
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid4Arg0<A, B, C, D> extends QTaskBuilder<Void>{
+    public static final class QPromiseTaskBuilderVoid4Arg0<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final RunnableWithVoidPromise4<A, B, C, D> runnable;
         
-        QPromiseTaskBuilderVoid4Arg0(int priority, QThreadPool threadPool, RunnableWithVoidPromise4<A, B, C, D> runnable) {
+        QPromiseTaskBuilderVoid4Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise4<A, B, C, D> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -8142,7 +8142,7 @@ public QPromiseTaskBuilderVoid4Arg0<A, B, C, D> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid4Arg0<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid4Arg0<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8152,8 +8152,8 @@ public QPromiseTaskBuilderVoid4Arg0<A, B, C, D> onThreadPool(QThreadPool newThre
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid4Arg1<A, B, C, D> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid4Arg1(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise4<A, B, C, D> runnable, A a) {
+    public static class QPromiseTaskBuilderVoid4Arg1<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid4Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise4<A, B, C, D> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8189,7 +8189,7 @@ public QPromiseTaskBuilderVoid4Arg1<A, B, C, D> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid4Arg1<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid4Arg1<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8199,8 +8199,8 @@ public QPromiseTaskBuilderVoid4Arg1<A, B, C, D> onThreadPool(QThreadPool newThre
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid4Arg2<A, B, C, D> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid4Arg2(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b) {
+    public static final class QPromiseTaskBuilderVoid4Arg2<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid4Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8231,7 +8231,7 @@ public QPromiseTaskBuilderVoid4Arg2<A, B, C, D> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid4Arg2<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid4Arg2<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8241,8 +8241,8 @@ public QPromiseTaskBuilderVoid4Arg2<A, B, C, D> onThreadPool(QThreadPool newThre
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid4Arg3<A, B, C, D> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid4Arg3(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b, C c) {
+    public static final class QPromiseTaskBuilderVoid4Arg3<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid4Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8268,7 +8268,7 @@ public QPromiseTaskBuilderVoid4Arg3<A, B, C, D> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid4Arg3<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid4Arg3<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8278,8 +8278,8 @@ public QPromiseTaskBuilderVoid4Arg3<A, B, C, D> onThreadPool(QThreadPool newThre
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid4Arg4<A, B, C, D> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid4Arg4(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b, C c, D d) {
+    public static final class QPromiseTaskBuilderVoid4Arg4<A, B, C, D> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid4Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8300,7 +8300,7 @@ public QPromiseTaskBuilderVoid4Arg4<A, B, C, D> withPriority(int newPriority) {
         }
 
         @Override
-        public QPromiseTaskBuilderVoid4Arg4<A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid4Arg4<A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8309,18 +8309,18 @@ public QPromiseTaskBuilderVoid4Arg4<A, B, C, D> onThreadPool(QThreadPool newThre
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d);
         }
         
-        private native static <A, B, C, D> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithVoidPromise4<A, B, C, D> runnable, A a, B b, C c, D d);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E> QPromiseTaskBuilderVoid5Arg0<A, B, C, D, E> task(RunnableWithVoidPromise5<A, B, C, D, E> runnable) {
+    public static <A, B, C, D, E> QPromiseTaskBuilderVoid5Arg0<A, B, C, D, E> task(@StrictNonNull RunnableWithVoidPromise5<A, B, C, D, E> runnable) {
         return new QPromiseTaskBuilderVoid5Arg0<>(0, null, runnable);
     }
     
@@ -8328,10 +8328,10 @@ public static <A, B, C, D, E> QPromiseTaskBuilderVoid5Arg0<A, B, C, D, E> task(R
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid5Arg0<A, B, C, D, E> extends QTaskBuilder<Void>{
+    public static final class QPromiseTaskBuilderVoid5Arg0<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final RunnableWithVoidPromise5<A, B, C, D, E> runnable;
         
-        QPromiseTaskBuilderVoid5Arg0(int priority, QThreadPool threadPool, RunnableWithVoidPromise5<A, B, C, D, E> runnable) {
+        QPromiseTaskBuilderVoid5Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise5<A, B, C, D, E> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -8378,7 +8378,7 @@ public QPromiseTaskBuilderVoid5Arg0<A, B, C, D, E> withPriority(int newPriority)
         }
 
         @Override
-        public QPromiseTaskBuilderVoid5Arg0<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid5Arg0<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8388,8 +8388,8 @@ public QPromiseTaskBuilderVoid5Arg0<A, B, C, D, E> onThreadPool(QThreadPool newT
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid5Arg1<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid5Arg1(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a) {
+    public static class QPromiseTaskBuilderVoid5Arg1<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid5Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8432,7 +8432,7 @@ public QPromiseTaskBuilderVoid5Arg1<A, B, C, D, E> withPriority(int newPriority)
         }
 
         @Override
-        public QPromiseTaskBuilderVoid5Arg1<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid5Arg1<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8442,8 +8442,8 @@ public QPromiseTaskBuilderVoid5Arg1<A, B, C, D, E> onThreadPool(QThreadPool newT
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid5Arg2<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid5Arg2(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b) {
+    public static final class QPromiseTaskBuilderVoid5Arg2<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid5Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8481,7 +8481,7 @@ public QPromiseTaskBuilderVoid5Arg2<A, B, C, D, E> withPriority(int newPriority)
         }
 
         @Override
-        public QPromiseTaskBuilderVoid5Arg2<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid5Arg2<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8491,8 +8491,8 @@ public QPromiseTaskBuilderVoid5Arg2<A, B, C, D, E> onThreadPool(QThreadPool newT
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid5Arg3<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid5Arg3(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c) {
+    public static final class QPromiseTaskBuilderVoid5Arg3<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid5Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8525,7 +8525,7 @@ public QPromiseTaskBuilderVoid5Arg3<A, B, C, D, E> withPriority(int newPriority)
         }
 
         @Override
-        public QPromiseTaskBuilderVoid5Arg3<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid5Arg3<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8535,8 +8535,8 @@ public QPromiseTaskBuilderVoid5Arg3<A, B, C, D, E> onThreadPool(QThreadPool newT
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid5Arg4<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid5Arg4(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c, D d) {
+    public static final class QPromiseTaskBuilderVoid5Arg4<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid5Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8564,7 +8564,7 @@ public QPromiseTaskBuilderVoid5Arg4<A, B, C, D, E> withPriority(int newPriority)
         }
 
         @Override
-        public QPromiseTaskBuilderVoid5Arg4<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid5Arg4<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8574,8 +8574,8 @@ public QPromiseTaskBuilderVoid5Arg4<A, B, C, D, E> onThreadPool(QThreadPool newT
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid5Arg5<A, B, C, D, E> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid5Arg5(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
+    public static final class QPromiseTaskBuilderVoid5Arg5<A, B, C, D, E> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid5Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8598,7 +8598,7 @@ public QPromiseTaskBuilderVoid5Arg5<A, B, C, D, E> withPriority(int newPriority)
         }
 
         @Override
-        public QPromiseTaskBuilderVoid5Arg5<A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid5Arg5<A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8607,18 +8607,18 @@ public QPromiseTaskBuilderVoid5Arg5<A, B, C, D, E> onThreadPool(QThreadPool newT
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e);
         }
         
-        private native static <A, B, C, D, E> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithVoidPromise5<A, B, C, D, E> runnable, A a, B b, C c, D d, E e);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E, F> QPromiseTaskBuilderVoid6Arg0<A, B, C, D, E, F> task(RunnableWithVoidPromise6<A, B, C, D, E, F> runnable) {
+    public static <A, B, C, D, E, F> QPromiseTaskBuilderVoid6Arg0<A, B, C, D, E, F> task(@StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable) {
         return new QPromiseTaskBuilderVoid6Arg0<>(0, null, runnable);
     }
     
@@ -8626,10 +8626,10 @@ public static <A, B, C, D, E, F> QPromiseTaskBuilderVoid6Arg0<A, B, C, D, E, F>
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid6Arg0<A, B, C, D, E, F> extends QTaskBuilder<Void>{
+    public static class QPromiseTaskBuilderVoid6Arg0<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final RunnableWithVoidPromise6<A, B, C, D, E, F> runnable;
         
-        QPromiseTaskBuilderVoid6Arg0(int priority, QThreadPool threadPool, RunnableWithVoidPromise6<A, B, C, D, E, F> runnable) {
+        QPromiseTaskBuilderVoid6Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -8683,7 +8683,7 @@ public QPromiseTaskBuilderVoid6Arg0<A, B, C, D, E, F> withPriority(int newPriori
         }
 
         @Override
-        public QPromiseTaskBuilderVoid6Arg0<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid6Arg0<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8693,8 +8693,8 @@ public QPromiseTaskBuilderVoid6Arg0<A, B, C, D, E, F> onThreadPool(QThreadPool n
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid6Arg1<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid6Arg1(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a) {
+    public static class QPromiseTaskBuilderVoid6Arg1<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid6Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8744,7 +8744,7 @@ public QPromiseTaskBuilderVoid6Arg1<A, B, C, D, E, F> withPriority(int newPriori
         }
 
         @Override
-        public QPromiseTaskBuilderVoid6Arg1<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid6Arg1<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8754,8 +8754,8 @@ public QPromiseTaskBuilderVoid6Arg1<A, B, C, D, E, F> onThreadPool(QThreadPool n
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid6Arg2<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid6Arg2(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b) {
+    public static final class QPromiseTaskBuilderVoid6Arg2<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid6Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8800,7 +8800,7 @@ public QPromiseTaskBuilderVoid6Arg2<A, B, C, D, E, F> withPriority(int newPriori
         }
 
         @Override
-        public QPromiseTaskBuilderVoid6Arg2<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid6Arg2<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8810,8 +8810,8 @@ public QPromiseTaskBuilderVoid6Arg2<A, B, C, D, E, F> onThreadPool(QThreadPool n
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid6Arg3<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid6Arg3(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c) {
+    public static final class QPromiseTaskBuilderVoid6Arg3<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid6Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8851,7 +8851,7 @@ public QPromiseTaskBuilderVoid6Arg3<A, B, C, D, E, F> withPriority(int newPriori
         }
 
         @Override
-        public QPromiseTaskBuilderVoid6Arg3<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid6Arg3<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8861,8 +8861,8 @@ public QPromiseTaskBuilderVoid6Arg3<A, B, C, D, E, F> onThreadPool(QThreadPool n
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid6Arg4<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid6Arg4(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d) {
+    public static final class QPromiseTaskBuilderVoid6Arg4<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid6Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8897,7 +8897,7 @@ public QPromiseTaskBuilderVoid6Arg4<A, B, C, D, E, F> withPriority(int newPriori
         }
 
         @Override
-        public QPromiseTaskBuilderVoid6Arg4<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid6Arg4<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8907,8 +8907,8 @@ public QPromiseTaskBuilderVoid6Arg4<A, B, C, D, E, F> onThreadPool(QThreadPool n
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid6Arg5<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid6Arg5(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e) {
+    public static final class QPromiseTaskBuilderVoid6Arg5<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid6Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8938,7 +8938,7 @@ public QPromiseTaskBuilderVoid6Arg5<A, B, C, D, E, F> withPriority(int newPriori
         }
 
         @Override
-        public QPromiseTaskBuilderVoid6Arg5<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid6Arg5<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8948,8 +8948,8 @@ public QPromiseTaskBuilderVoid6Arg5<A, B, C, D, E, F> onThreadPool(QThreadPool n
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid6Arg6<A, B, C, D, E, F> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid6Arg6(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f) {
+    public static final class QPromiseTaskBuilderVoid6Arg6<A, B, C, D, E, F> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid6Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -8974,7 +8974,7 @@ public QPromiseTaskBuilderVoid6Arg6<A, B, C, D, E, F> withPriority(int newPriori
         }
 
         @Override
-        public QPromiseTaskBuilderVoid6Arg6<A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid6Arg6<A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -8983,18 +8983,18 @@ public QPromiseTaskBuilderVoid6Arg6<A, B, C, D, E, F> onThreadPool(QThreadPool n
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f);
         }
         
-        private native static <A, B, C, D, E, F> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E, F> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithVoidPromise6<A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E, F, G> QPromiseTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> task(RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable) {
+    public static <A, B, C, D, E, F, G> QPromiseTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> task(@StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable) {
         return new QPromiseTaskBuilderVoid7Arg0<>(0, null, runnable);
     }
     
@@ -9002,10 +9002,10 @@ public static <A, B, C, D, E, F, G> QPromiseTaskBuilderVoid7Arg0<A, B, C, D, E,
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
+    public static class QPromiseTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable;
         
-        QPromiseTaskBuilderVoid7Arg0(int priority, QThreadPool threadPool, RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable) {
+        QPromiseTaskBuilderVoid7Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -9066,7 +9066,7 @@ public QPromiseTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> withPriority(int newPri
         }
 
         @Override
-        public QPromiseTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9076,8 +9076,8 @@ public QPromiseTaskBuilderVoid7Arg0<A, B, C, D, E, F, G> onThreadPool(QThreadPoo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid7Arg1(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a) {
+    public static class QPromiseTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid7Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9134,7 +9134,7 @@ public QPromiseTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> withPriority(int newPri
         }
 
         @Override
-        public QPromiseTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9144,8 +9144,8 @@ public QPromiseTaskBuilderVoid7Arg1<A, B, C, D, E, F, G> onThreadPool(QThreadPoo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid7Arg2(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b) {
+    public static final class QPromiseTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid7Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9197,7 +9197,7 @@ public QPromiseTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> withPriority(int newPri
         }
 
         @Override
-        public QPromiseTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9207,8 +9207,8 @@ public QPromiseTaskBuilderVoid7Arg2<A, B, C, D, E, F, G> onThreadPool(QThreadPoo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid7Arg3(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c) {
+    public static final class QPromiseTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid7Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9255,7 +9255,7 @@ public QPromiseTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> withPriority(int newPri
         }
 
         @Override
-        public QPromiseTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9265,8 +9265,8 @@ public QPromiseTaskBuilderVoid7Arg3<A, B, C, D, E, F, G> onThreadPool(QThreadPoo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid7Arg4(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d) {
+    public static final class QPromiseTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid7Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9308,7 +9308,7 @@ public QPromiseTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> withPriority(int newPri
         }
 
         @Override
-        public QPromiseTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9318,8 +9318,8 @@ public QPromiseTaskBuilderVoid7Arg4<A, B, C, D, E, F, G> onThreadPool(QThreadPoo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid7Arg5(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e) {
+    public static final class QPromiseTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid7Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9356,7 +9356,7 @@ public QPromiseTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> withPriority(int newPri
         }
 
         @Override
-        public QPromiseTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9366,8 +9366,8 @@ public QPromiseTaskBuilderVoid7Arg5<A, B, C, D, E, F, G> onThreadPool(QThreadPoo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid7Arg6(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f) {
+    public static final class QPromiseTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid7Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9399,7 +9399,7 @@ public QPromiseTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> withPriority(int newPri
         }
 
         @Override
-        public QPromiseTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9409,8 +9409,8 @@ public QPromiseTaskBuilderVoid7Arg6<A, B, C, D, E, F, G> onThreadPool(QThreadPoo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid7Arg7(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static final class QPromiseTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid7Arg7(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9437,7 +9437,7 @@ public QPromiseTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> withPriority(int newPri
         }
 
         @Override
-        public QPromiseTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9446,18 +9446,18 @@ public QPromiseTaskBuilderVoid7Arg7<A, B, C, D, E, F, G> onThreadPool(QThreadPoo
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f, g);
         }
         
-        private native static <A, B, C, D, E, F, G> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E, F, G> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithVoidPromise7<A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E, F, G, H> QPromiseTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> task(RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable) {
+    public static <A, B, C, D, E, F, G, H> QPromiseTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> task(@StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable) {
         return new QPromiseTaskBuilderVoid8Arg0<>(0, null, runnable);
     }
     
@@ -9465,10 +9465,10 @@ public static <A, B, C, D, E, F, G, H> QPromiseTaskBuilderVoid8Arg0<A, B, C, D,
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
+    public static class QPromiseTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable;
         
-        QPromiseTaskBuilderVoid8Arg0(int priority, QThreadPool threadPool, RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable) {
+        QPromiseTaskBuilderVoid8Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -9536,7 +9536,7 @@ public QPromiseTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> withPriority(int new
         }
 
         @Override
-        public QPromiseTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9546,8 +9546,8 @@ public QPromiseTaskBuilderVoid8Arg0<A, B, C, D, E, F, G, H> onThreadPool(QThread
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid8Arg1(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a) {
+    public static class QPromiseTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid8Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9611,7 +9611,7 @@ public QPromiseTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> withPriority(int new
         }
 
         @Override
-        public QPromiseTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9621,8 +9621,8 @@ public QPromiseTaskBuilderVoid8Arg1<A, B, C, D, E, F, G, H> onThreadPool(QThread
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid8Arg2(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b) {
+    public static final class QPromiseTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid8Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9681,7 +9681,7 @@ public QPromiseTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> withPriority(int new
         }
 
         @Override
-        public QPromiseTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9691,8 +9691,8 @@ public QPromiseTaskBuilderVoid8Arg2<A, B, C, D, E, F, G, H> onThreadPool(QThread
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid8Arg3(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c) {
+    public static final class QPromiseTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid8Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9746,7 +9746,7 @@ public QPromiseTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> withPriority(int new
         }
 
         @Override
-        public QPromiseTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9756,8 +9756,8 @@ public QPromiseTaskBuilderVoid8Arg3<A, B, C, D, E, F, G, H> onThreadPool(QThread
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid8Arg4(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d) {
+    public static final class QPromiseTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid8Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9806,7 +9806,7 @@ public QPromiseTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> withPriority(int new
         }
 
         @Override
-        public QPromiseTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9816,8 +9816,8 @@ public QPromiseTaskBuilderVoid8Arg4<A, B, C, D, E, F, G, H> onThreadPool(QThread
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid8Arg5(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e) {
+    public static final class QPromiseTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid8Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9861,7 +9861,7 @@ public QPromiseTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> withPriority(int new
         }
 
         @Override
-        public QPromiseTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9871,8 +9871,8 @@ public QPromiseTaskBuilderVoid8Arg5<A, B, C, D, E, F, G, H> onThreadPool(QThread
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid8Arg6(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f) {
+    public static final class QPromiseTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid8Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9911,7 +9911,7 @@ public QPromiseTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> withPriority(int new
         }
 
         @Override
-        public QPromiseTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9921,8 +9921,8 @@ public QPromiseTaskBuilderVoid8Arg6<A, B, C, D, E, F, G, H> onThreadPool(QThread
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid8Arg7(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static final class QPromiseTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid8Arg7(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9956,7 +9956,7 @@ public QPromiseTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> withPriority(int new
         }
 
         @Override
-        public QPromiseTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -9966,8 +9966,8 @@ public QPromiseTaskBuilderVoid8Arg7<A, B, C, D, E, F, G, H> onThreadPool(QThread
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid8Arg8(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+    public static final class QPromiseTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid8Arg8(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -9996,7 +9996,7 @@ public QPromiseTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> withPriority(int new
         }
 
         @Override
-        public QPromiseTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10005,18 +10005,18 @@ public QPromiseTaskBuilderVoid8Arg8<A, B, C, D, E, F, G, H> onThreadPool(QThread
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f, g, h);
         }
         
-        private native static <A, B, C, D, E, F, G, H> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E, F, G, H> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithVoidPromise8<A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <A, B, C, D, E, F, G, H, I> QPromiseTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> task(RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable) {
+    public static <A, B, C, D, E, F, G, H, I> QPromiseTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> task(@StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable) {
         return new QPromiseTaskBuilderVoid9Arg0<>(0, null, runnable);
     }
     
@@ -10024,10 +10024,10 @@ public static <A, B, C, D, E, F, G, H, I> QPromiseTaskBuilderVoid9Arg0<A, B, C,
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
+    public static class QPromiseTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
         private final RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable;
         
-        QPromiseTaskBuilderVoid9Arg0(int priority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable) {
+        QPromiseTaskBuilderVoid9Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -10102,7 +10102,7 @@ public QPromiseTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10112,8 +10112,8 @@ public QPromiseTaskBuilderVoid9Arg0<A, B, C, D, E, F, G, H, I> onThreadPool(QThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QPromiseTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid9Arg1(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a) {
+    public static class QPromiseTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid9Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10184,7 +10184,7 @@ public QPromiseTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10194,8 +10194,8 @@ public QPromiseTaskBuilderVoid9Arg1<A, B, C, D, E, F, G, H, I> onThreadPool(QThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid9Arg2(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b) {
+    public static final class QPromiseTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid9Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10261,7 +10261,7 @@ public QPromiseTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10271,8 +10271,8 @@ public QPromiseTaskBuilderVoid9Arg2<A, B, C, D, E, F, G, H, I> onThreadPool(QThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid9Arg3(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c) {
+    public static final class QPromiseTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid9Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10333,7 +10333,7 @@ public QPromiseTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10343,8 +10343,8 @@ public QPromiseTaskBuilderVoid9Arg3<A, B, C, D, E, F, G, H, I> onThreadPool(QThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid9Arg4(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d) {
+    public static final class QPromiseTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid9Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10400,7 +10400,7 @@ public QPromiseTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10410,8 +10410,8 @@ public QPromiseTaskBuilderVoid9Arg4<A, B, C, D, E, F, G, H, I> onThreadPool(QThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid9Arg5(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e) {
+    public static final class QPromiseTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid9Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10462,7 +10462,7 @@ public QPromiseTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10472,8 +10472,8 @@ public QPromiseTaskBuilderVoid9Arg5<A, B, C, D, E, F, G, H, I> onThreadPool(QThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid9Arg6(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f) {
+    public static final class QPromiseTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid9Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10519,7 +10519,7 @@ public QPromiseTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10529,8 +10529,8 @@ public QPromiseTaskBuilderVoid9Arg6<A, B, C, D, E, F, G, H, I> onThreadPool(QThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid9Arg7(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g) {
+    public static final class QPromiseTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid9Arg7(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10571,7 +10571,7 @@ public QPromiseTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10581,8 +10581,8 @@ public QPromiseTaskBuilderVoid9Arg7<A, B, C, D, E, F, G, H, I> onThreadPool(QThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid9Arg8(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+    public static final class QPromiseTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid9Arg8(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10618,7 +10618,7 @@ public QPromiseTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10628,8 +10628,8 @@ public QPromiseTaskBuilderVoid9Arg8<A, B, C, D, E, F, G, H, I> onThreadPool(QThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static final class QPromiseTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<Void>{
-        QPromiseTaskBuilderVoid9Arg9(int newPriority, QThreadPool threadPool, RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
+    public static final class QPromiseTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> extends QTaskBuilder<@QtPrimitiveType Void>{
+        QPromiseTaskBuilderVoid9Arg9(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10657,7 +10657,7 @@ public static final class QPromiseTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<Void> spawn() {
+        public @NonNull QFuture<@QtPrimitiveType Void> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f, g, h, i);
         }
 
@@ -10668,18 +10668,18 @@ public QPromiseTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> withPriority(int
         }
 
         @Override
-        public QPromiseTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QPromiseTaskBuilderVoid9Arg9<A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
-        private native static <A, B, C, D, E, F, G, H, I> QFuture<Void> spawn(QThreadPool threadPool, int priority,
+        private native static <A, B, C, D, E, F, G, H, I> @NonNull QFuture<@QtPrimitiveType Void> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithVoidPromise9<A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T> QTypedPromiseTaskBuilder0Arg0<T> task(RunnableWithPromise<T> callable) {
+    public static <T> QTypedPromiseTaskBuilder0Arg0<T> task(@StrictNonNull RunnableWithPromise<T> callable) {
         return new QTypedPromiseTaskBuilder0Arg0<>(0, null, callable);
     }
     
@@ -10687,8 +10687,8 @@ public static <T> QTypedPromiseTaskBuilder0Arg0<T> task(RunnableWithPromise<T> c
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder0Arg0<T> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder0Arg0(int newPriority, QThreadPool threadPool, RunnableWithPromise<T> runnable) {
+    public static final class QTypedPromiseTaskBuilder0Arg0<T> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder0Arg0(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise<T> runnable) {
             super(newPriority, threadPool);
             this.runnable = runnable;
         }
@@ -10701,7 +10701,7 @@ public QTypedPromiseTaskBuilder0Arg0<T> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder0Arg0<T> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder0Arg0<T> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10710,17 +10710,17 @@ public QTypedPromiseTaskBuilder0Arg0<T> onThreadPool(QThreadPool newThreadPool)
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable);
         }
         
-        private native static <T> QFuture<T> spawn(QThreadPool threadPool, int priority, RunnableWithPromise<T> runnable);
+        private native static <T> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority, @StrictNonNull RunnableWithPromise<T> runnable);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A> QTypedPromiseTaskBuilder1Arg0<T, A> task(RunnableWithPromise1<T, A> runnable) {
+    public static <T, A> QTypedPromiseTaskBuilder1Arg0<T, A> task(@StrictNonNull RunnableWithPromise1<T, A> runnable) {
         return new QTypedPromiseTaskBuilder1Arg0<>(0, null, runnable);
     }
     
@@ -10731,7 +10731,7 @@ public static <T, A> QTypedPromiseTaskBuilder1Arg0<T, A> task(RunnableWithPromis
     public static final class QTypedPromiseTaskBuilder1Arg0<T, A> extends QTaskBuilder<T>{
         private final RunnableWithPromise1<T, A> runnable;
         
-        QTypedPromiseTaskBuilder1Arg0(int priority, QThreadPool threadPool, RunnableWithPromise1<T, A> runnable) {
+        QTypedPromiseTaskBuilder1Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise1<T, A> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -10750,7 +10750,7 @@ public QTypedPromiseTaskBuilder1Arg0<T, A> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder1Arg0<T, A> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder1Arg0<T, A> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10760,8 +10760,8 @@ public QTypedPromiseTaskBuilder1Arg0<T, A> onThreadPool(QThreadPool newThreadPoo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder1Arg1<T, A> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder1Arg1(int newPriority, QThreadPool threadPool, RunnableWithPromise1<T, A> runnable, A a) {
+    public static final class QTypedPromiseTaskBuilder1Arg1<T, A> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder1Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise1<T, A> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10776,7 +10776,7 @@ public QTypedPromiseTaskBuilder1Arg1<T, A> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder1Arg1<T, A> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder1Arg1<T, A> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10785,18 +10785,18 @@ public QTypedPromiseTaskBuilder1Arg1<T, A> onThreadPool(QThreadPool newThreadPoo
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable, a);
         }
         
-        private native static <T, A> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithPromise1<T, A> runnable, A a);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B> QTypedPromiseTaskBuilder2Arg0<T, A, B> task(RunnableWithPromise2<T, A, B> runnable) {
+    public static <T, A, B> QTypedPromiseTaskBuilder2Arg0<T, A, B> task(@StrictNonNull RunnableWithPromise2<T, A, B> runnable) {
         return new QTypedPromiseTaskBuilder2Arg0<>(0, null, runnable);
     }
     
@@ -10807,7 +10807,7 @@ public static <T, A, B> QTypedPromiseTaskBuilder2Arg0<T, A, B> task(RunnableWith
     public static final class QTypedPromiseTaskBuilder2Arg0<T, A, B> extends QTaskBuilder<T>{
         private final RunnableWithPromise2<T, A, B> runnable;
         
-        QTypedPromiseTaskBuilder2Arg0(int priority, QThreadPool threadPool, RunnableWithPromise2<T, A, B> runnable) {
+        QTypedPromiseTaskBuilder2Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise2<T, A, B> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -10833,7 +10833,7 @@ public QTypedPromiseTaskBuilder2Arg0<T, A, B> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder2Arg0<T, A, B> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder2Arg0<T, A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10843,8 +10843,8 @@ public QTypedPromiseTaskBuilder2Arg0<T, A, B> onThreadPool(QThreadPool newThread
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder2Arg1<T, A, B> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder2Arg1(int newPriority, QThreadPool threadPool, RunnableWithPromise2<T, A, B> runnable, A a) {
+    public static final class QTypedPromiseTaskBuilder2Arg1<T, A, B> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder2Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise2<T, A, B> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10866,7 +10866,7 @@ public QTypedPromiseTaskBuilder2Arg1<T, A, B> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder2Arg1<T, A, B> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder2Arg1<T, A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10877,7 +10877,7 @@ public QTypedPromiseTaskBuilder2Arg1<T, A, B> onThreadPool(QThreadPool newThread
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder2Arg2<T, A, B> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder2Arg2(int newPriority, QThreadPool threadPool, RunnableWithPromise2<T, A, B> runnable, A a, B b) {
+        QTypedPromiseTaskBuilder2Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise2<T, A, B> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10894,7 +10894,7 @@ public QTypedPromiseTaskBuilder2Arg2<T, A, B> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder2Arg2<T, A, B> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder2Arg2<T, A, B> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10903,18 +10903,18 @@ public QTypedPromiseTaskBuilder2Arg2<T, A, B> onThreadPool(QThreadPool newThread
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b);
         }
         
-        private native static <T, A, B> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithPromise2<T, A, B> runnable, A a, B b);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C> QTypedPromiseTaskBuilder3Arg0<T, A, B, C> task(RunnableWithPromise3<T, A, B, C> runnable) {
+    public static <T, A, B, C> QTypedPromiseTaskBuilder3Arg0<T, A, B, C> task(@StrictNonNull RunnableWithPromise3<T, A, B, C> runnable) {
         return new QTypedPromiseTaskBuilder3Arg0<>(0, null, runnable);
     }
     
@@ -10925,7 +10925,7 @@ public static <T, A, B, C> QTypedPromiseTaskBuilder3Arg0<T, A, B, C> task(Runnab
     public static final class QTypedPromiseTaskBuilder3Arg0<T, A, B, C> extends QTaskBuilder<T>{
         private final RunnableWithPromise3<T, A, B, C> runnable;
         
-        QTypedPromiseTaskBuilder3Arg0(int priority, QThreadPool threadPool, RunnableWithPromise3<T, A, B, C> runnable) {
+        QTypedPromiseTaskBuilder3Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise3<T, A, B, C> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -10958,7 +10958,7 @@ public QTypedPromiseTaskBuilder3Arg0<T, A, B, C> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder3Arg0<T, A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder3Arg0<T, A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -10968,8 +10968,8 @@ public QTypedPromiseTaskBuilder3Arg0<T, A, B, C> onThreadPool(QThreadPool newThr
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder3Arg1<T, A, B, C> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder3Arg1(int newPriority, QThreadPool threadPool, RunnableWithPromise3<T, A, B, C> runnable, A a) {
+    public static final class QTypedPromiseTaskBuilder3Arg1<T, A, B, C> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder3Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise3<T, A, B, C> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -10998,7 +10998,7 @@ public QTypedPromiseTaskBuilder3Arg1<T, A, B, C> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder3Arg1<T, A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder3Arg1<T, A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11009,7 +11009,7 @@ public QTypedPromiseTaskBuilder3Arg1<T, A, B, C> onThreadPool(QThreadPool newThr
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder3Arg2<T, A, B, C> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder3Arg2(int newPriority, QThreadPool threadPool, RunnableWithPromise3<T, A, B, C> runnable, A a, B b) {
+        QTypedPromiseTaskBuilder3Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise3<T, A, B, C> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11033,7 +11033,7 @@ public QTypedPromiseTaskBuilder3Arg2<T, A, B, C> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder3Arg2<T, A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder3Arg2<T, A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11044,7 +11044,7 @@ public QTypedPromiseTaskBuilder3Arg2<T, A, B, C> onThreadPool(QThreadPool newThr
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder3Arg3<T, A, B, C> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder3Arg3(int newPriority, QThreadPool threadPool, RunnableWithPromise3<T, A, B, C> runnable, A a, B b, C c) {
+        QTypedPromiseTaskBuilder3Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise3<T, A, B, C> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11063,7 +11063,7 @@ public QTypedPromiseTaskBuilder3Arg3<T, A, B, C> withPriority(int newPriority) {
         }
 
         @Override
-        public QTypedPromiseTaskBuilder3Arg3<T, A, B, C> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder3Arg3<T, A, B, C> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11072,18 +11072,18 @@ public QTypedPromiseTaskBuilder3Arg3<T, A, B, C> onThreadPool(QThreadPool newThr
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c);
         }
         
-        private native static <T, A, B, C> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithPromise3<T, A, B, C> runnable, A a, B b, C c);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D> QTypedPromiseTaskBuilder4Arg0<T, A, B, C, D> task(RunnableWithPromise4<T, A, B, C, D> runnable) {
+    public static <T, A, B, C, D> QTypedPromiseTaskBuilder4Arg0<T, A, B, C, D> task(@StrictNonNull RunnableWithPromise4<T, A, B, C, D> runnable) {
         return new QTypedPromiseTaskBuilder4Arg0<>(0, null, runnable);
     }
     
@@ -11094,7 +11094,7 @@ public static <T, A, B, C, D> QTypedPromiseTaskBuilder4Arg0<T, A, B, C, D> task(
     public static final class QTypedPromiseTaskBuilder4Arg0<T, A, B, C, D> extends QTaskBuilder<T>{
         private final RunnableWithPromise4<T, A, B, C, D> runnable;
         
-        QTypedPromiseTaskBuilder4Arg0(int priority, QThreadPool threadPool, RunnableWithPromise4<T, A, B, C, D> runnable) {
+        QTypedPromiseTaskBuilder4Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise4<T, A, B, C, D> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -11134,7 +11134,7 @@ public QTypedPromiseTaskBuilder4Arg0<T, A, B, C, D> withPriority(int newPriority
         }
 
         @Override
-        public QTypedPromiseTaskBuilder4Arg0<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder4Arg0<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11144,8 +11144,8 @@ public QTypedPromiseTaskBuilder4Arg0<T, A, B, C, D> onThreadPool(QThreadPool new
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder4Arg1<T, A, B, C, D> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder4Arg1(int newPriority, QThreadPool threadPool, RunnableWithPromise4<T, A, B, C, D> runnable, A a) {
+    public static final class QTypedPromiseTaskBuilder4Arg1<T, A, B, C, D> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder4Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise4<T, A, B, C, D> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11181,7 +11181,7 @@ public QTypedPromiseTaskBuilder4Arg1<T, A, B, C, D> withPriority(int newPriority
         }
 
         @Override
-        public QTypedPromiseTaskBuilder4Arg1<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder4Arg1<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11192,7 +11192,7 @@ public QTypedPromiseTaskBuilder4Arg1<T, A, B, C, D> onThreadPool(QThreadPool new
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder4Arg2<T, A, B, C, D> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder4Arg2(int newPriority, QThreadPool threadPool, RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b) {
+        QTypedPromiseTaskBuilder4Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11223,7 +11223,7 @@ public QTypedPromiseTaskBuilder4Arg2<T, A, B, C, D> withPriority(int newPriority
         }
 
         @Override
-        public QTypedPromiseTaskBuilder4Arg2<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder4Arg2<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11234,7 +11234,7 @@ public QTypedPromiseTaskBuilder4Arg2<T, A, B, C, D> onThreadPool(QThreadPool new
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder4Arg3<T, A, B, C, D> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder4Arg3(int newPriority, QThreadPool threadPool, RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b, C c) {
+        QTypedPromiseTaskBuilder4Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11260,7 +11260,7 @@ public QTypedPromiseTaskBuilder4Arg3<T, A, B, C, D> withPriority(int newPriority
         }
 
         @Override
-        public QTypedPromiseTaskBuilder4Arg3<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder4Arg3<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11271,7 +11271,7 @@ public QTypedPromiseTaskBuilder4Arg3<T, A, B, C, D> onThreadPool(QThreadPool new
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder4Arg4<T, A, B, C, D> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder4Arg4(int newPriority, QThreadPool threadPool, RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b, C c, D d) {
+        QTypedPromiseTaskBuilder4Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11292,7 +11292,7 @@ public QTypedPromiseTaskBuilder4Arg4<T, A, B, C, D> withPriority(int newPriority
         }
 
         @Override
-        public QTypedPromiseTaskBuilder4Arg4<T, A, B, C, D> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder4Arg4<T, A, B, C, D> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11301,18 +11301,18 @@ public QTypedPromiseTaskBuilder4Arg4<T, A, B, C, D> onThreadPool(QThreadPool new
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d);
         }
         
-        private native static <T, A, B, C, D> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithPromise4<T, A, B, C, D> runnable, A a, B b, C c, D d);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E> QTypedPromiseTaskBuilder5Arg0<T, A, B, C, D, E> task(RunnableWithPromise5<T, A, B, C, D, E> runnable) {
+    public static <T, A, B, C, D, E> QTypedPromiseTaskBuilder5Arg0<T, A, B, C, D, E> task(@StrictNonNull RunnableWithPromise5<T, A, B, C, D, E> runnable) {
         return new QTypedPromiseTaskBuilder5Arg0<>(0, null, runnable);
     }
     
@@ -11323,7 +11323,7 @@ public static <T, A, B, C, D, E> QTypedPromiseTaskBuilder5Arg0<T, A, B, C, D, E>
     public static final class QTypedPromiseTaskBuilder5Arg0<T, A, B, C, D, E> extends QTaskBuilder<T>{
         private final RunnableWithPromise5<T, A, B, C, D, E> runnable;
         
-        QTypedPromiseTaskBuilder5Arg0(int priority, QThreadPool threadPool, RunnableWithPromise5<T, A, B, C, D, E> runnable) {
+        QTypedPromiseTaskBuilder5Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise5<T, A, B, C, D, E> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -11370,7 +11370,7 @@ public QTypedPromiseTaskBuilder5Arg0<T, A, B, C, D, E> withPriority(int newPrior
         }
 
         @Override
-        public QTypedPromiseTaskBuilder5Arg0<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder5Arg0<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11380,8 +11380,8 @@ public QTypedPromiseTaskBuilder5Arg0<T, A, B, C, D, E> onThreadPool(QThreadPool
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder5Arg1<T, A, B, C, D, E> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder5Arg1(int newPriority, QThreadPool threadPool, RunnableWithPromise5<T, A, B, C, D, E> runnable, A a) {
+    public static final class QTypedPromiseTaskBuilder5Arg1<T, A, B, C, D, E> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder5Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise5<T, A, B, C, D, E> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11424,7 +11424,7 @@ public QTypedPromiseTaskBuilder5Arg1<T, A, B, C, D, E> withPriority(int newPrior
         }
 
         @Override
-        public QTypedPromiseTaskBuilder5Arg1<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder5Arg1<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11435,7 +11435,7 @@ public QTypedPromiseTaskBuilder5Arg1<T, A, B, C, D, E> onThreadPool(QThreadPool
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder5Arg2<T, A, B, C, D, E> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder5Arg2(int newPriority, QThreadPool threadPool, RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b) {
+        QTypedPromiseTaskBuilder5Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11473,7 +11473,7 @@ public QTypedPromiseTaskBuilder5Arg2<T, A, B, C, D, E> withPriority(int newPrior
         }
 
         @Override
-        public QTypedPromiseTaskBuilder5Arg2<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder5Arg2<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11484,7 +11484,7 @@ public QTypedPromiseTaskBuilder5Arg2<T, A, B, C, D, E> onThreadPool(QThreadPool
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder5Arg3<T, A, B, C, D, E> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder5Arg3(int newPriority, QThreadPool threadPool, RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c) {
+        QTypedPromiseTaskBuilder5Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11517,7 +11517,7 @@ public QTypedPromiseTaskBuilder5Arg3<T, A, B, C, D, E> withPriority(int newPrior
         }
 
         @Override
-        public QTypedPromiseTaskBuilder5Arg3<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder5Arg3<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11528,7 +11528,7 @@ public QTypedPromiseTaskBuilder5Arg3<T, A, B, C, D, E> onThreadPool(QThreadPool
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder5Arg4<T, A, B, C, D, E> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder5Arg4(int newPriority, QThreadPool threadPool, RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c, D d) {
+        QTypedPromiseTaskBuilder5Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11556,7 +11556,7 @@ public QTypedPromiseTaskBuilder5Arg4<T, A, B, C, D, E> withPriority(int newPrior
         }
 
         @Override
-        public QTypedPromiseTaskBuilder5Arg4<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder5Arg4<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11567,7 +11567,7 @@ public QTypedPromiseTaskBuilder5Arg4<T, A, B, C, D, E> onThreadPool(QThreadPool
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder5Arg5<T, A, B, C, D, E> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder5Arg5(int newPriority, QThreadPool threadPool, RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
+        QTypedPromiseTaskBuilder5Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11590,7 +11590,7 @@ public QTypedPromiseTaskBuilder5Arg5<T, A, B, C, D, E> withPriority(int newPrior
         }
 
         @Override
-        public QTypedPromiseTaskBuilder5Arg5<T, A, B, C, D, E> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder5Arg5<T, A, B, C, D, E> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11599,18 +11599,18 @@ public QTypedPromiseTaskBuilder5Arg5<T, A, B, C, D, E> onThreadPool(QThreadPool
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e);
         }
         
-        private native static <T, A, B, C, D, E> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithPromise5<T, A, B, C, D, E> runnable, A a, B b, C c, D d, E e);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E, F> QTypedPromiseTaskBuilder6Arg0<T, A, B, C, D, E, F> task(RunnableWithPromise6<T, A, B, C, D, E, F> runnable) {
+    public static <T, A, B, C, D, E, F> QTypedPromiseTaskBuilder6Arg0<T, A, B, C, D, E, F> task(@StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable) {
         return new QTypedPromiseTaskBuilder6Arg0<>(0, null, runnable);
     }
     
@@ -11618,10 +11618,10 @@ public static <T, A, B, C, D, E, F> QTypedPromiseTaskBuilder6Arg0<T, A, B, C, D,
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder6Arg0<T, A, B, C, D, E, F> extends QTaskBuilder<T>{
+    public static final class QTypedPromiseTaskBuilder6Arg0<T, A, B, C, D, E, F> extends QTaskBuilder<T>{
         private final RunnableWithPromise6<T, A, B, C, D, E, F> runnable;
         
-        QTypedPromiseTaskBuilder6Arg0(int priority, QThreadPool threadPool, RunnableWithPromise6<T, A, B, C, D, E, F> runnable) {
+        QTypedPromiseTaskBuilder6Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -11675,7 +11675,7 @@ public QTypedPromiseTaskBuilder6Arg0<T, A, B, C, D, E, F> withPriority(int newPr
         }
 
         @Override
-        public QTypedPromiseTaskBuilder6Arg0<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder6Arg0<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11685,8 +11685,8 @@ public QTypedPromiseTaskBuilder6Arg0<T, A, B, C, D, E, F> onThreadPool(QThreadPo
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder6Arg1<T, A, B, C, D, E, F> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder6Arg1(int newPriority, QThreadPool threadPool, RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a) {
+    public static final class QTypedPromiseTaskBuilder6Arg1<T, A, B, C, D, E, F> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder6Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11736,7 +11736,7 @@ public QTypedPromiseTaskBuilder6Arg1<T, A, B, C, D, E, F> withPriority(int newPr
         }
 
         @Override
-        public QTypedPromiseTaskBuilder6Arg1<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder6Arg1<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11747,7 +11747,7 @@ public QTypedPromiseTaskBuilder6Arg1<T, A, B, C, D, E, F> onThreadPool(QThreadPo
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder6Arg2<T, A, B, C, D, E, F> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder6Arg2(int newPriority, QThreadPool threadPool, RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b) {
+        QTypedPromiseTaskBuilder6Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11792,7 +11792,7 @@ public QTypedPromiseTaskBuilder6Arg2<T, A, B, C, D, E, F> withPriority(int newPr
         }
 
         @Override
-        public QTypedPromiseTaskBuilder6Arg2<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder6Arg2<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11803,7 +11803,7 @@ public QTypedPromiseTaskBuilder6Arg2<T, A, B, C, D, E, F> onThreadPool(QThreadPo
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder6Arg3<T, A, B, C, D, E, F> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder6Arg3(int newPriority, QThreadPool threadPool, RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c) {
+        QTypedPromiseTaskBuilder6Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11843,7 +11843,7 @@ public QTypedPromiseTaskBuilder6Arg3<T, A, B, C, D, E, F> withPriority(int newPr
         }
 
         @Override
-        public QTypedPromiseTaskBuilder6Arg3<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder6Arg3<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11854,7 +11854,7 @@ public QTypedPromiseTaskBuilder6Arg3<T, A, B, C, D, E, F> onThreadPool(QThreadPo
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder6Arg4<T, A, B, C, D, E, F> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder6Arg4(int newPriority, QThreadPool threadPool, RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d) {
+        QTypedPromiseTaskBuilder6Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11889,7 +11889,7 @@ public QTypedPromiseTaskBuilder6Arg4<T, A, B, C, D, E, F> withPriority(int newPr
         }
 
         @Override
-        public QTypedPromiseTaskBuilder6Arg4<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder6Arg4<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11900,7 +11900,7 @@ public QTypedPromiseTaskBuilder6Arg4<T, A, B, C, D, E, F> onThreadPool(QThreadPo
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder6Arg5<T, A, B, C, D, E, F> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder6Arg5(int newPriority, QThreadPool threadPool, RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e) {
+        QTypedPromiseTaskBuilder6Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11930,7 +11930,7 @@ public QTypedPromiseTaskBuilder6Arg5<T, A, B, C, D, E, F> withPriority(int newPr
         }
 
         @Override
-        public QTypedPromiseTaskBuilder6Arg5<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder6Arg5<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11941,7 +11941,7 @@ public QTypedPromiseTaskBuilder6Arg5<T, A, B, C, D, E, F> onThreadPool(QThreadPo
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder6Arg6<T, A, B, C, D, E, F> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder6Arg6(int newPriority, QThreadPool threadPool, RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f) {
+        QTypedPromiseTaskBuilder6Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -11966,7 +11966,7 @@ public QTypedPromiseTaskBuilder6Arg6<T, A, B, C, D, E, F> withPriority(int newPr
         }
 
         @Override
-        public QTypedPromiseTaskBuilder6Arg6<T, A, B, C, D, E, F> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder6Arg6<T, A, B, C, D, E, F> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -11975,18 +11975,18 @@ public QTypedPromiseTaskBuilder6Arg6<T, A, B, C, D, E, F> onThreadPool(QThreadPo
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f);
         }
         
-        private native static <T, A, B, C, D, E, F> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E, F> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithPromise6<T, A, B, C, D, E, F> runnable, A a, B b, C c, D d, E e, F f);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G> QTypedPromiseTaskBuilder7Arg0<T, A, B, C, D, E, F, G> task(RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable) {
+    public static <T, A, B, C, D, E, F, G> QTypedPromiseTaskBuilder7Arg0<T, A, B, C, D, E, F, G> task(@StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable) {
         return new QTypedPromiseTaskBuilder7Arg0<>(0, null, runnable);
     }
     
@@ -11994,10 +11994,10 @@ public static <T, A, B, C, D, E, F, G> QTypedPromiseTaskBuilder7Arg0<T, A, B, C,
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder7Arg0<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
+    public static final class QTypedPromiseTaskBuilder7Arg0<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
         private final RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable;
         
-        QTypedPromiseTaskBuilder7Arg0(int priority, QThreadPool threadPool, RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable) {
+        QTypedPromiseTaskBuilder7Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -12058,7 +12058,7 @@ public QTypedPromiseTaskBuilder7Arg0<T, A, B, C, D, E, F, G> withPriority(int ne
         }
 
         @Override
-        public QTypedPromiseTaskBuilder7Arg0<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder7Arg0<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12068,8 +12068,8 @@ public QTypedPromiseTaskBuilder7Arg0<T, A, B, C, D, E, F, G> onThreadPool(QThrea
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder7Arg1<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder7Arg1(int newPriority, QThreadPool threadPool, RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a) {
+    public static final class QTypedPromiseTaskBuilder7Arg1<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder7Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12126,7 +12126,7 @@ public QTypedPromiseTaskBuilder7Arg1<T, A, B, C, D, E, F, G> withPriority(int ne
         }
 
         @Override
-        public QTypedPromiseTaskBuilder7Arg1<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder7Arg1<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12137,7 +12137,7 @@ public QTypedPromiseTaskBuilder7Arg1<T, A, B, C, D, E, F, G> onThreadPool(QThrea
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder7Arg2<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder7Arg2(int newPriority, QThreadPool threadPool, RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b) {
+        QTypedPromiseTaskBuilder7Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12189,7 +12189,7 @@ public QTypedPromiseTaskBuilder7Arg2<T, A, B, C, D, E, F, G> withPriority(int ne
         }
 
         @Override
-        public QTypedPromiseTaskBuilder7Arg2<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder7Arg2<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12200,7 +12200,7 @@ public QTypedPromiseTaskBuilder7Arg2<T, A, B, C, D, E, F, G> onThreadPool(QThrea
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder7Arg3<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder7Arg3(int newPriority, QThreadPool threadPool, RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c) {
+        QTypedPromiseTaskBuilder7Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12247,7 +12247,7 @@ public QTypedPromiseTaskBuilder7Arg3<T, A, B, C, D, E, F, G> withPriority(int ne
         }
 
         @Override
-        public QTypedPromiseTaskBuilder7Arg3<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder7Arg3<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12258,7 +12258,7 @@ public QTypedPromiseTaskBuilder7Arg3<T, A, B, C, D, E, F, G> onThreadPool(QThrea
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder7Arg4<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder7Arg4(int newPriority, QThreadPool threadPool, RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d) {
+        QTypedPromiseTaskBuilder7Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12300,7 +12300,7 @@ public QTypedPromiseTaskBuilder7Arg4<T, A, B, C, D, E, F, G> withPriority(int ne
         }
 
         @Override
-        public QTypedPromiseTaskBuilder7Arg4<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder7Arg4<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12311,7 +12311,7 @@ public QTypedPromiseTaskBuilder7Arg4<T, A, B, C, D, E, F, G> onThreadPool(QThrea
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder7Arg5<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder7Arg5(int newPriority, QThreadPool threadPool, RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e) {
+        QTypedPromiseTaskBuilder7Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12348,7 +12348,7 @@ public QTypedPromiseTaskBuilder7Arg5<T, A, B, C, D, E, F, G> withPriority(int ne
         }
 
         @Override
-        public QTypedPromiseTaskBuilder7Arg5<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder7Arg5<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12359,7 +12359,7 @@ public QTypedPromiseTaskBuilder7Arg5<T, A, B, C, D, E, F, G> onThreadPool(QThrea
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder7Arg6<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder7Arg6(int newPriority, QThreadPool threadPool, RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f) {
+        QTypedPromiseTaskBuilder7Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12391,7 +12391,7 @@ public QTypedPromiseTaskBuilder7Arg6<T, A, B, C, D, E, F, G> withPriority(int ne
         }
 
         @Override
-        public QTypedPromiseTaskBuilder7Arg6<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder7Arg6<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12402,7 +12402,7 @@ public QTypedPromiseTaskBuilder7Arg6<T, A, B, C, D, E, F, G> onThreadPool(QThrea
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder7Arg7<T, A, B, C, D, E, F, G> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder7Arg7(int newPriority, QThreadPool threadPool, RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g) {
+        QTypedPromiseTaskBuilder7Arg7(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12429,7 +12429,7 @@ public QTypedPromiseTaskBuilder7Arg7<T, A, B, C, D, E, F, G> withPriority(int ne
         }
 
         @Override
-        public QTypedPromiseTaskBuilder7Arg7<T, A, B, C, D, E, F, G> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder7Arg7<T, A, B, C, D, E, F, G> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12438,18 +12438,18 @@ public QTypedPromiseTaskBuilder7Arg7<T, A, B, C, D, E, F, G> onThreadPool(QThrea
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f, g);
         }
         
-        private native static <T, A, B, C, D, E, F, G> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E, F, G> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithPromise7<T, A, B, C, D, E, F, G> runnable, A a, B b, C c, D d, E e, F f, G g);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G, H> QTypedPromiseTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> task(RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable) {
+    public static <T, A, B, C, D, E, F, G, H> QTypedPromiseTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> task(@StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable) {
         return new QTypedPromiseTaskBuilder8Arg0<>(0, null, runnable);
     }
     
@@ -12457,10 +12457,10 @@ public static <T, A, B, C, D, E, F, G, H> QTypedPromiseTaskBuilder8Arg0<T, A, B,
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
+    public static final class QTypedPromiseTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
         private final RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable;
         
-        QTypedPromiseTaskBuilder8Arg0(int priority, QThreadPool threadPool, RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable) {
+        QTypedPromiseTaskBuilder8Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -12528,7 +12528,7 @@ public QTypedPromiseTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> withPriority(int
         }
 
         @Override
-        public QTypedPromiseTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12538,8 +12538,8 @@ public QTypedPromiseTaskBuilder8Arg0<T, A, B, C, D, E, F, G, H> onThreadPool(QTh
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder8Arg1(int newPriority, QThreadPool threadPool, RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a) {
+    public static final class QTypedPromiseTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder8Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12603,7 +12603,7 @@ public QTypedPromiseTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> withPriority(int
         }
 
         @Override
-        public QTypedPromiseTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12614,7 +12614,7 @@ public QTypedPromiseTaskBuilder8Arg1<T, A, B, C, D, E, F, G, H> onThreadPool(QTh
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder8Arg2(int newPriority, QThreadPool threadPool, RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b) {
+        QTypedPromiseTaskBuilder8Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12673,7 +12673,7 @@ public QTypedPromiseTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> withPriority(int
         }
 
         @Override
-        public QTypedPromiseTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12684,7 +12684,7 @@ public QTypedPromiseTaskBuilder8Arg2<T, A, B, C, D, E, F, G, H> onThreadPool(QTh
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder8Arg3(int newPriority, QThreadPool threadPool, RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c) {
+        QTypedPromiseTaskBuilder8Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12738,7 +12738,7 @@ public QTypedPromiseTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> withPriority(int
         }
 
         @Override
-        public QTypedPromiseTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12749,7 +12749,7 @@ public QTypedPromiseTaskBuilder8Arg3<T, A, B, C, D, E, F, G, H> onThreadPool(QTh
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder8Arg4(int newPriority, QThreadPool threadPool, RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d) {
+        QTypedPromiseTaskBuilder8Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12798,7 +12798,7 @@ public QTypedPromiseTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> withPriority(int
         }
 
         @Override
-        public QTypedPromiseTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12809,7 +12809,7 @@ public QTypedPromiseTaskBuilder8Arg4<T, A, B, C, D, E, F, G, H> onThreadPool(QTh
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder8Arg5(int newPriority, QThreadPool threadPool, RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e) {
+        QTypedPromiseTaskBuilder8Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12853,7 +12853,7 @@ public QTypedPromiseTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> withPriority(int
         }
 
         @Override
-        public QTypedPromiseTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12864,7 +12864,7 @@ public QTypedPromiseTaskBuilder8Arg5<T, A, B, C, D, E, F, G, H> onThreadPool(QTh
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder8Arg6(int newPriority, QThreadPool threadPool, RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f) {
+        QTypedPromiseTaskBuilder8Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12903,7 +12903,7 @@ public QTypedPromiseTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> withPriority(int
         }
 
         @Override
-        public QTypedPromiseTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12914,7 +12914,7 @@ public QTypedPromiseTaskBuilder8Arg6<T, A, B, C, D, E, F, G, H> onThreadPool(QTh
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder8Arg7(int newPriority, QThreadPool threadPool, RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g) {
+        QTypedPromiseTaskBuilder8Arg7(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12948,7 +12948,7 @@ public QTypedPromiseTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> withPriority(int
         }
 
         @Override
-        public QTypedPromiseTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12959,7 +12959,7 @@ public QTypedPromiseTaskBuilder8Arg7<T, A, B, C, D, E, F, G, H> onThreadPool(QTh
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder8Arg8(int newPriority, QThreadPool threadPool, RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+        QTypedPromiseTaskBuilder8Arg8(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -12988,7 +12988,7 @@ public QTypedPromiseTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> withPriority(int
         }
 
         @Override
-        public QTypedPromiseTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -12997,18 +12997,18 @@ public QTypedPromiseTaskBuilder8Arg8<T, A, B, C, D, E, F, G, H> onThreadPool(QTh
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f, g, h);
         }
         
-        private native static <T, A, B, C, D, E, F, G, H> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E, F, G, H> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithPromise8<T, A, B, C, D, E, F, G, H> runnable, A a, B b, C c, D d, E e, F f, G g, H h);
     }
     
     /**
      * <p>See <a href="@docRoot/qtconcurrent.html#task">QtConcurrent::task(Task&&)</a></p>
      */
-    public static <T, A, B, C, D, E, F, G, H, I> QTypedPromiseTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> task(RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable) {
+    public static <T, A, B, C, D, E, F, G, H, I> QTypedPromiseTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> task(@StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable) {
         return new QTypedPromiseTaskBuilder9Arg0<>(0, null, runnable);
     }
     
@@ -13016,10 +13016,10 @@ public static <T, A, B, C, D, E, F, G, H, I> QTypedPromiseTaskBuilder9Arg0<T, A,
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
+    public static final class QTypedPromiseTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
         private final RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable;
         
-        QTypedPromiseTaskBuilder9Arg0(int priority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable) {
+        QTypedPromiseTaskBuilder9Arg0(int priority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable) {
             super(priority, threadPool);
             this.runnable = runnable;
         }
@@ -13094,7 +13094,7 @@ public QTypedPromiseTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -13104,8 +13104,8 @@ public QTypedPromiseTaskBuilder9Arg0<T, A, B, C, D, E, F, G, H, I> onThreadPool(
      * The QTaskBuilder class is used for adjusting task parameters.
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
-    public static class QTypedPromiseTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder9Arg1(int newPriority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a) {
+    public static final class QTypedPromiseTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
+        QTypedPromiseTaskBuilder9Arg1(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -13176,7 +13176,7 @@ public QTypedPromiseTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -13187,7 +13187,7 @@ public QTypedPromiseTaskBuilder9Arg1<T, A, B, C, D, E, F, G, H, I> onThreadPool(
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder9Arg2(int newPriority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b) {
+        QTypedPromiseTaskBuilder9Arg2(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -13253,7 +13253,7 @@ public QTypedPromiseTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -13264,7 +13264,7 @@ public QTypedPromiseTaskBuilder9Arg2<T, A, B, C, D, E, F, G, H, I> onThreadPool(
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder9Arg3(int newPriority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c) {
+        QTypedPromiseTaskBuilder9Arg3(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -13325,7 +13325,7 @@ public QTypedPromiseTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -13336,7 +13336,7 @@ public QTypedPromiseTaskBuilder9Arg3<T, A, B, C, D, E, F, G, H, I> onThreadPool(
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder9Arg4(int newPriority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d) {
+        QTypedPromiseTaskBuilder9Arg4(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -13392,7 +13392,7 @@ public QTypedPromiseTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -13403,7 +13403,7 @@ public QTypedPromiseTaskBuilder9Arg4<T, A, B, C, D, E, F, G, H, I> onThreadPool(
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder9Arg5(int newPriority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e) {
+        QTypedPromiseTaskBuilder9Arg5(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -13454,7 +13454,7 @@ public QTypedPromiseTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -13465,7 +13465,7 @@ public QTypedPromiseTaskBuilder9Arg5<T, A, B, C, D, E, F, G, H, I> onThreadPool(
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder9Arg6(int newPriority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f) {
+        QTypedPromiseTaskBuilder9Arg6(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -13511,7 +13511,7 @@ public QTypedPromiseTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -13522,7 +13522,7 @@ public QTypedPromiseTaskBuilder9Arg6<T, A, B, C, D, E, F, G, H, I> onThreadPool(
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder9Arg7(int newPriority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g) {
+        QTypedPromiseTaskBuilder9Arg7(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -13563,7 +13563,7 @@ public QTypedPromiseTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -13574,7 +13574,7 @@ public QTypedPromiseTaskBuilder9Arg7<T, A, B, C, D, E, F, G, H, I> onThreadPool(
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder9Arg8(int newPriority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
+        QTypedPromiseTaskBuilder9Arg8(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -13613,7 +13613,7 @@ public QTypedPromiseTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
@@ -13624,7 +13624,7 @@ public QTypedPromiseTaskBuilder9Arg8<T, A, B, C, D, E, F, G, H, I> onThreadPool(
      * <p>Java wrapper for Qt's class <a href="@docRoot/qtconcurrent-qtaskbuilder.html">QtConcurrent::QTaskBuilder</a></p>
      */
     public static final class QTypedPromiseTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> extends QTaskBuilder<T>{
-        QTypedPromiseTaskBuilder9Arg9(int newPriority, QThreadPool threadPool, RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
+        QTypedPromiseTaskBuilder9Arg9(int newPriority, QThreadPool threadPool, @StrictNonNull RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i) {
             super(newPriority, threadPool);
             this.runnable = runnable;
             this.a = a;
@@ -13652,7 +13652,7 @@ public static final class QTypedPromiseTaskBuilder9Arg9<T, A, B, C, D, E, F, G,
          * <p>See <a href="@docRoot/qtconcurrent-qtaskbuilder.html#spawn">QtConcurrent::QTaskBuilder::spawn()</a></p>
          */
         @Override
-        public QFuture<T> spawn() {
+        public @NonNull QFuture<T> spawn() {
             return spawn(threadPool(), priority(), runnable, a, b, c, d, e, f, g, h, i);
         }
 
@@ -13663,11 +13663,11 @@ public QTypedPromiseTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> withPriority(
         }
 
         @Override
-        public QTypedPromiseTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> onThreadPool(QThreadPool newThreadPool) {
+        public QTypedPromiseTaskBuilder9Arg9<T, A, B, C, D, E, F, G, H, I> onThreadPool(@Nullable QThreadPool newThreadPool) {
             super.onThreadPool(newThreadPool);
             return this;
         }
-        private native static <T, A, B, C, D, E, F, G, H, I> QFuture<T> spawn(QThreadPool threadPool, int priority,
+        private native static <T, A, B, C, D, E, F, G, H, I> @NonNull QFuture<T> spawn(@Nullable QThreadPool threadPool, int priority,
                 RunnableWithPromise9<T, A, B, C, D, E, F, G, H, I> runnable, A a, B b, C c, D d, E e, F f, G g, H h, I i);
     }
 }// class
@@ -13677,23 +13677,23 @@ class QtConcurrent_DISMISS__ extends QtConcurrent {
     
     static class ThreadEngine<T> extends ThreadEngineBase
     {
-        ThreadEngine(QThreadPool pool) {
+        ThreadEngine(@Nullable QThreadPool pool) {
             super(pool);
             Objects.requireNonNull(pool);
         }
 
-        @io.qt.QtUninvokable
+        @QtUninvokable
         T result() { return null; }
 
         @SuppressWarnings("unchecked")
-        @io.qt.QtUninvokable
+        @QtUninvokable
         final QFutureInterface<T> futureInterfaceTyped()
         {
             return (QFutureInterface<T>)futureInterface();
         }
 
         // Runs the user algorithm using a single thread.
-        @io.qt.QtUninvokable
+        @QtUninvokable
         final T startSingleThreaded()
         {
             super._startSingleThreaded();
@@ -13702,7 +13702,7 @@ final T startSingleThreaded()
 
         // Runs the user algorithm using multiple threads.
         // Does not block, returns a future.
-        @io.qt.QtUninvokable
+        @QtUninvokable
         final QFuture<T> startAsynchronously()
         {
             QFutureInterface<T> futureInterface = new QFutureInterface<>();
@@ -13720,8 +13720,8 @@ final QFuture<T> startAsynchronously()
             return future;
         }
 
-        @io.qt.QtPrivateOverride
-        @io.qt.QtUninvokable
+        @QtPrivateOverride
+        @QtUninvokable
         final void asynchronousFinish()
         {
             finish();
@@ -13732,12 +13732,12 @@ final void asynchronousFinish()
             dispose();
         }
 
-        @io.qt.QtUninvokable
+        @QtUninvokable
         final void reportResult(T _result) {
             reportResult(_result, -1);
         }
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         final void reportResult(T _result, int index)
         {
             QFutureInterface<T> futureInterface = futureInterfaceTyped();
@@ -13745,17 +13745,17 @@ final void reportResult(T _result, int index)
                 futureInterface.reportResult(_result, index);
         }
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         final void reportResults(Collection<T> _result) {
             reportResults(_result, -1, -1);
         }
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         final void reportResults(Collection<T> _result, int index) {
             reportResults(_result, index, -1);
         }
 
-        @io.qt.QtUninvokable
+        @QtUninvokable
         final void reportResults(Collection<T> _result, int index, int count)
         {
             QFutureInterface<T> futureInterface = futureInterfaceTyped();
@@ -13777,7 +13777,7 @@ public final QFuture<T> startAsynchronously(){
     }
     
     static class IterateKernel<M,T> extends ThreadEngine<T>{
-        IterateKernel(QThreadPool pool, Collection<M> collection)
+        IterateKernel(@Nullable QThreadPool pool, Collection<M> collection)
         {
             super(pool);
             this.collection = collection;
@@ -13967,7 +13967,7 @@ private void resizeList(int size)
     
     static final class MapKernel<T> extends IterateKernel<T, Void>
     {
-        MapKernel(QThreadPool pool, Collection<T> collection, MapFunctor<T> map) {
+        MapKernel(@Nullable QThreadPool pool, Collection<T> collection, MapFunctor<T> map) {
             super(pool, collection);
             this.map = map;
         }
@@ -13991,7 +13991,7 @@ boolean runIterations(List<T> collection, int index, int count, Object[] values)
     
     static final class MapEachKernel<U,T> extends IterateKernel<T,U>
     {
-        MapEachKernel(QThreadPool pool, Collection<T> collection, MappedFunctor<U,T> map) {
+        MapEachKernel(@Nullable QThreadPool pool, Collection<T> collection, MappedFunctor<U,T> map) {
             super(pool, collection);
             this.map = map;
         }
@@ -14034,7 +14034,7 @@ static final class IntermediateResults<T>
     
     static final class ReduceKernel<U,T>
     {
-        ReduceKernel(QThreadPool pool, ReduceOptions reduceOptions) {
+        ReduceKernel(@Nullable QThreadPool pool, @NonNull ReduceOptions reduceOptions) {
             this.reduceOptions = reduceOptions;
             this.threadCount = pool.maxThreadCount();
         }
@@ -14166,7 +14166,7 @@ boolean shouldStartThread()
     
     static final class MappedReducedKernel<U,V,T> extends IterateKernel<T,U>
     {
-        MappedReducedKernel(QThreadPool pool, Collection<T> collection, MappedFunctor<V,T> map, ReduceFunctor<U,V> reduce, ReduceOptions reduceOptions) {
+        MappedReducedKernel(@Nullable QThreadPool pool, Collection<T> collection, MappedFunctor<V,T> map, @StrictNonNull ReduceFunctor<U,V> reduce, @NonNull ReduceOptions reduceOptions) {
             super(pool, collection);
             this.map = map;
             this.reduce = reduce;
@@ -14229,7 +14229,7 @@ static final class FilteredReducedKernel<T,U> extends IterateKernel<T,U>{
         private final ReduceFunctor<U,T> reduce;
         private final ReduceKernel<U,T> reducer;
 
-        FilteredReducedKernel(QThreadPool pool, Collection<T> sequence, FilteredFunctor<T> keep, ReduceFunctor<U, T> reduce, ReduceOptions options) {
+        FilteredReducedKernel(@Nullable QThreadPool pool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> keep, @StrictNonNull ReduceFunctor<U, T> reduce, @NonNull ReduceOptions options) {
             super(pool, sequence);
             this.keep = keep;
             this.reduce = reduce;
@@ -14283,7 +14283,7 @@ protected boolean shouldThrottleThread() {
     static final class FilteredEachKernel<T> extends IterateKernel<T,T>{
         private final FilteredFunctor<T> keep;
 
-        FilteredEachKernel(QThreadPool pool, Collection<T> sequence, FilteredFunctor<T> keep) {
+        FilteredEachKernel(@Nullable QThreadPool pool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> keep) {
             super(pool, sequence);
             this.keep = keep;
         }
@@ -14328,7 +14328,7 @@ static final class FilterKernel<T> extends IterateKernel<T,Void>{
         private final ReduceFunctor<Collection<T>,T> reduce;
         private final ReduceKernel<Collection<T>,T> reducer;
 
-        FilterKernel(QThreadPool pool, Collection<T> sequence, FilteredFunctor<T> keep, ReduceFunctor<Collection<T>, T> reduce, ReduceOptions options) {
+        FilterKernel(@Nullable QThreadPool pool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> keep, @StrictNonNull ReduceFunctor<Collection<T>, T> reduce, @NonNull ReduceOptions options) {
             super(pool, sequence);
             this.sequence = sequence;
             this.keep = keep;
@@ -14378,7 +14378,7 @@ protected void finish() {
     /**
      *  Calls function once for each item in sequence. The function is passed a reference to the item, so that any modifications done to the item will appear in sequence.
      */
-    public static <T> ThreadEngineStarter<Void> startMap(QThreadPool threadPool, Collection<T> sequence, MapFunctor<T> functor) {
+    public static <T> @NonNull ThreadEngineStarter<@QtPrimitiveType Void> startMap(@Nullable QThreadPool threadPool, Collection<T> sequence, MapFunctor<T> functor) {
         return new ThreadEngineStarter<>(new MapKernel<>(Objects.requireNonNull(threadPool), Objects.requireNonNull(sequence), Objects.requireNonNull(functor)));
     }
     
@@ -14386,8 +14386,8 @@ public static <T> ThreadEngineStarter<Void> startMap(QThreadPool threadPool, Col
      * Calls function once for each item in sequence and returns a future with each mapped item as a result. You can QFutureIterator to iterate through the results.
      *
      */
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startMapped(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<U, T> functor){
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startMapped(@Nullable QThreadPool threadPool, Collection<T> sequence, MappedFunctor<U, T> functor){
         return new ThreadEngineStarter<>(new MapEachKernel<>(Objects.requireNonNull(threadPool), Objects.requireNonNull(sequence), Objects.requireNonNull(functor)));
     }
     
@@ -14397,8 +14397,8 @@ public static <U, T> ThreadEngineStarter<U> startMapped(QThreadPool threadPool,
      * Note that while mapFunction is called concurrently, only one thread at a time will call reduceFunction. The order in which reduceFunction is called is determined by reduceOptions.
      *
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, @NonNull ReduceOptions options) {
         return new ThreadEngineStarter<>(new MappedReducedKernel<>(Objects.requireNonNull(threadPool), Objects.requireNonNull(sequence), Objects.requireNonNull(functor), Objects.requireNonNull(reduceFunctor), options));
     }
     
@@ -14408,8 +14408,8 @@ public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool th
      * Note that while mapFunction is called concurrently, only one thread at a time will call reduceFunction. The order in which reduceFunction is called is determined by reduceOptions.
      *
      */
-    @io.qt.QtUninvokable
-    public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, ReduceFunctor<U, V> reduceFunctor, ReduceOption... options) {
+    @QtUninvokable
+    public static <U, V, T> @NonNull ThreadEngineStarter<U> startMappedReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, MappedFunctor<V, T> functor, @StrictNonNull ReduceFunctor<U, V> reduceFunctor, ReduceOption... options) {
         return startMappedReduced(threadPool, sequence, functor, reduceFunctor, new ReduceOptions(options));
     }
     
@@ -14418,8 +14418,8 @@ public static <U, V, T> ThreadEngineStarter<U> startMappedReduced(QThreadPool th
      * <p>
      * Note that while filterFunction is called concurrently, only one thread at a time will call reduceFunction. The order in which reduceFunction is called is undefined if reduceOptions is QtConcurrent::UnorderedReduce. If reduceOptions is QtConcurrent::OrderedReduce, reduceFunction is called in the order of the original sequence.
      */
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOption ... options) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOption @NonNull... options) {
         return startFilteredReduced(threadPool, sequence, filteredFunctor, reduceFunctor, new ReduceOptions(options));
     }
     
@@ -14428,24 +14428,24 @@ public static <U, T> ThreadEngineStarter<U> startFilteredReduced(QThreadPool thr
      * <p>
      * Note that while filterFunction is called concurrently, only one thread at a time will call reduceFunction. The order in which reduceFunction is called is undefined if reduceOptions is QtConcurrent::UnorderedReduce. If reduceOptions is QtConcurrent::OrderedReduce, reduceFunction is called in the order of the original sequence.
      */
-    @io.qt.QtUninvokable
-    public static <U, T> ThreadEngineStarter<U> startFilteredReduced(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<U, T> reduceFunctor, ReduceOptions options) {
+    @QtUninvokable
+    public static <U, T> @NonNull ThreadEngineStarter<U> startFilteredReduced(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<U, T> reduceFunctor, @NonNull ReduceOptions options) {
         return new ThreadEngineStarter<>(new FilteredReducedKernel<>(Objects.requireNonNull(threadPool), Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor), Objects.requireNonNull(reduceFunctor), options));
     }
     
     /**
      * Calls filterFunctor's filter() method once for each item in sequence and returns a new Sequence of kept items. If filterFunction returns true, a copy of the item is put in the new Sequence. Otherwise, the item will not appear in the new Sequence.
      */
-    @io.qt.QtUninvokable
-    public static <T> ThreadEngineStarter<T> startFiltered(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor){
+    @QtUninvokable
+    public static <T> @NonNull ThreadEngineStarter<T> startFiltered(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor){
         return new ThreadEngineStarter<>(new FilteredEachKernel<>(Objects.requireNonNull(threadPool), Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor)));
     }
     
     /**
      * Calls filterFunctor's filter() method once for each item in sequence and returns a new Sequence of kept items. If filterFunction returns true, a copy of the item is put in the new Sequence. Otherwise, the item will not appear in the new Sequence.
      */
-    @io.qt.QtUninvokable
-    static <T> ThreadEngineStarter<Void> filterInternal(QThreadPool threadPool, Collection<T> sequence, FilteredFunctor<T> filteredFunctor, ReduceFunctor<Collection<T>, T> reduceFunctor){
+    @QtUninvokable
+    static <T> @NonNull ThreadEngineStarter<@QtPrimitiveType Void> filterInternal(@Nullable QThreadPool threadPool, Collection<T> sequence, @StrictNonNull FilteredFunctor<T> filteredFunctor, @StrictNonNull ReduceFunctor<Collection<T>, T> reduceFunctor){
         return new ThreadEngineStarter<>(new FilterKernel<>(Objects.requireNonNull(threadPool), Objects.requireNonNull(sequence), Objects.requireNonNull(filteredFunctor), Objects.requireNonNull(reduceFunctor), new ReduceOptions()));
     }
     
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiCore.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiCore.java
index 38db11e1..16c9809d 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiCore.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiCore.java
@@ -46,13 +46,13 @@ class QtJambi_LibraryUtilities_2_{
     try{
         java.io.File qtjambiLib = LibraryUtility.loadQtJambiLibrary();
         if(LibraryUtility.operatingSystem!=LibraryUtility.OperatingSystem.Android) {
-            java.util.List<String> paths = new java.util.ArrayList<>();
+            List<String> paths = new ArrayList<>();
             String path;
             switch(LibraryUtility.operatingSystem) {
             case MacOS:
-                path = io.qt.QtUtilities.getenv("DYLD_LIBRARY_PATH");
-                String path2 = io.qt.QtUtilities.getenv("DYLD_FRAMEWORK_PATH");
-                java.util.List<String> paths2 = new java.util.ArrayList<>();
+                path = QtUtilities.getenv("DYLD_LIBRARY_PATH");
+                String path2 = QtUtilities.getenv("DYLD_FRAMEWORK_PATH");
+                List<String> paths2 = new ArrayList<>();
                 paths2.add(qtjambiLib.getParentFile().getAbsolutePath());
                 if(path2!=null && !path2.isEmpty()) {
                     for(String p : path2.split("\\"+java.io.File.pathSeparator)) {
@@ -61,13 +61,13 @@ class QtJambi_LibraryUtilities_2_{
                     }
                 }
                 path2 = String.join(java.io.File.pathSeparator, paths2);
-                io.qt.QtUtilities.putenv("DYLD_FRAMEWORK_PATH", path2);
+                QtUtilities.putenv("DYLD_FRAMEWORK_PATH", path2);
                 break;
             case Windows:
-                path = io.qt.QtUtilities.getenv("PATH");
+                path = QtUtilities.getenv("PATH");
                 break;
             default:
-                path = io.qt.QtUtilities.getenv("LD_LIBRARY_PATH");
+                path = QtUtilities.getenv("LD_LIBRARY_PATH");
                 break;
             }
             if(LibraryUtility.operatingSystem!=LibraryUtility.OperatingSystem.MacOS)
@@ -83,13 +83,13 @@ class QtJambi_LibraryUtilities_2_{
             path = String.join(java.io.File.pathSeparator, paths);
             switch(LibraryUtility.operatingSystem) {
             case MacOS:
-                io.qt.QtUtilities.putenv("DYLD_LIBRARY_PATH", path);
+                QtUtilities.putenv("DYLD_LIBRARY_PATH", path);
                 break;
             case Windows:
-                io.qt.QtUtilities.putenv("PATH", path);
+                QtUtilities.putenv("PATH", path);
                 break;
             default:
-                io.qt.QtUtilities.putenv("LD_LIBRARY_PATH", path);
+                QtUtilities.putenv("LD_LIBRARY_PATH", path);
                 break;
             }
         }
@@ -99,7 +99,7 @@ class QtJambi_LibraryUtilities_2_{
             if(coreLib!=null) {
                 java.io.File prl = new java.io.File(coreLib.getParentFile(), "Resources/QtCore.prl");
                 if(prl.exists()) {
-                    java.util.Properties prlProp = new java.util.Properties();
+                    Properties prlProp = new Properties();
                     try(java.io.FileInputStream inStream = new java.io.FileInputStream(prl)){
                         prlProp.load(inStream);
                     } catch(Throwable t2) {}
@@ -119,7 +119,7 @@ class QtJambi_LibraryUtilities_2_{
                     prl = new java.io.File(coreLib.getParentFile().getParentFile(), "lib\\Qt"+qtMajorVersion+"Core.prl");
                 }
                 if(prl.exists()) {
-                    java.util.Properties prlProp = new java.util.Properties();
+                    Properties prlProp = new Properties();
                     try(java.io.FileInputStream inStream = new java.io.FileInputStream(prl)){
                         prlProp.load(inStream);
                     } catch(Throwable t2) {}
@@ -141,7 +141,7 @@ class QtJambi_LibraryUtilities_2_{
             if(coreLib!=null) {
                 java.io.File prl = new java.io.File(coreLib.getParentFile(), "Qt"+qtMajorVersion+"Core.prl");
                 if(prl.exists()) {
-                    java.util.Properties prlProp = new java.util.Properties();
+                    Properties prlProp = new Properties();
                     try(java.io.FileInputStream inStream = new java.io.FileInputStream(prl)){
                         prlProp.load(inStream);
                     } catch(Throwable t2) {}
@@ -167,9 +167,9 @@ class QObject___ extends QObject {
      */
     protected static final class QDeclarativeConstructor { 
         private QDeclarativeConstructor(Class<?> cls, long placement) { this.placement = placement; this.cls = cls; }
-        @io.qt.NativeAccess
+        @NativeAccess
         private final long placement;
-        @io.qt.NativeAccess
+        @NativeAccess
         private final Class<?> cls;
     }
     
@@ -199,7 +199,7 @@ private static String classToScope(Class<?> cls) {
      * @return translated version of the source text.
      * @see <a href="@docRoot/qobject.html#tr">QObject::tr(const char *, const char *, int)</a>
      */
-    public static String tr(String source) {
+    public static @NonNull String tr(@Nullable String source) {
         String scope = classToScope(QtJambi_LibraryUtilities.internal.callerClassProvider().get());
         return QCoreApplication.translate(scope, source);
     }
@@ -215,7 +215,7 @@ public static String tr(String source) {
      * @return translated version of the source text.
      * @see <a href="@docRoot/qobject.html#tr">QObject::tr(const char *, const char *, int)</a>
      */
-    public static String tr(String source, String comment) {
+    public static @NonNull String tr(@Nullable String source, @Nullable String comment) {
         String scope = classToScope(QtJambi_LibraryUtilities.internal.callerClassProvider().get());
         return QCoreApplication.translate(scope, source, comment);
     }
@@ -233,7 +233,7 @@ public static String tr(String source, String comment) {
      * @return translated version of the source text.
      * @see <a href="@docRoot/qobject.html#tr">QObject::tr(const char *, const char *, int)</a>
      */
-    public static String tr(String source, String comment, int count) {
+    public static @NonNull String tr(@Nullable String source, @Nullable String comment, int count) {
         String scope = classToScope(QtJambi_LibraryUtilities.internal.callerClassProvider().get());
         return QCoreApplication.translate(scope, source, comment, count);
     }
@@ -250,7 +250,7 @@ public final class Signal0 extends QMetaObject.AbstractPublicSignal0 {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -269,7 +269,7 @@ public final class Signal1<A> extends QMetaObject.AbstractPublicSignal1<A> {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -289,7 +289,7 @@ public final class Signal2<A, B> extends QMetaObject.AbstractPublicSignal2<A, B>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -310,7 +310,7 @@ public final class Signal3<A, B, C> extends QMetaObject.AbstractPublicSignal3<A,
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -333,7 +333,7 @@ public final class Signal4<A, B, C, D> extends QMetaObject.AbstractPublicSignal4
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -356,7 +356,7 @@ public final class Signal5<A, B, C, D, E> extends QMetaObject.AbstractPublicSign
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -380,7 +380,7 @@ public final class Signal6<A, B, C, D, E, F> extends QMetaObject.AbstractPublicS
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -405,7 +405,7 @@ public final class Signal7<A, B, C, D, E, F, G> extends QMetaObject.AbstractPubl
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -431,7 +431,7 @@ public final class Signal8<A, B, C, D, E, F, G, H> extends QMetaObject.AbstractP
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -458,7 +458,7 @@ public final class Signal9<A, B, C, D, E, F, G, H, I> extends QMetaObject.Abstra
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -477,7 +477,7 @@ private Signal1Default1() {
             this.arg1Default = null;
         }
         
-        public Signal1Default1(Supplier<? extends A> arg1Default){
+        public Signal1Default1(@StrictNonNull Supplier<? extends A> arg1Default){
             super();
             if(arg1Default!=null){
                 this.arg1Default = arg1Default;
@@ -498,7 +498,7 @@ public final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -518,7 +518,7 @@ private Signal2Default1() {
             super();
         }
 
-        public Signal2Default1(Supplier<? extends B> arg2Default) {
+        public Signal2Default1(@StrictNonNull Supplier<? extends B> arg2Default) {
             super(arg2Default);
         }
         
@@ -527,7 +527,7 @@ public Signal2Default1(Supplier<? extends B> arg2Default) {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -547,7 +547,7 @@ private Signal2Default2() {
             this.arg1Default = null;
         }
         
-        public Signal2Default2(Supplier<? extends A> arg1Default, Supplier<? extends B> arg2Default){
+        public Signal2Default2(@StrictNonNull Supplier<? extends A> arg1Default, @StrictNonNull Supplier<? extends B> arg2Default){
             super(arg2Default);
             if(arg1Default!=null){
                 this.arg1Default = arg1Default;
@@ -568,7 +568,7 @@ public final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -588,7 +588,7 @@ public final class Signal3Default1<A, B, C> extends QMetaObject.AbstractSignal3D
         private Signal3Default1() {
         }
         
-        public Signal3Default1(Supplier<? extends C> arg3Default) {
+        public Signal3Default1(@StrictNonNull Supplier<? extends C> arg3Default) {
             super(arg3Default);
         }
         
@@ -597,7 +597,7 @@ public Signal3Default1(Supplier<? extends C> arg3Default) {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -617,7 +617,7 @@ public final class Signal3Default2<A, B, C> extends QMetaObject.AbstractSignal3D
         private Signal3Default2() {
         }
         
-        public Signal3Default2(Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default){
+        public Signal3Default2(@StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default){
             super(arg2Default, arg3Default);
         }
         
@@ -626,7 +626,7 @@ public Signal3Default2(Supplier<? extends B> arg2Default, Supplier<? extends C>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -647,7 +647,7 @@ private Signal3Default3() {
             this.arg1Default = null;
         }
         
-        public Signal3Default3(Supplier<? extends A> arg1Default, Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default){
+        public Signal3Default3(@StrictNonNull Supplier<? extends A> arg1Default, @StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default){
             super(arg2Default, arg3Default);
             if(arg2Default!=null){
                 this.arg1Default = arg1Default;
@@ -668,7 +668,7 @@ public final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -689,12 +689,12 @@ public final class Signal4Default1<A, B, C, D> extends QMetaObject.AbstractSigna
         private Signal4Default1() {
         }
         
-        public Signal4Default1(Supplier<? extends D> arg4Default){
+        public Signal4Default1(@StrictNonNull Supplier<? extends D> arg4Default){
             super(arg4Default);
         }
         
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -715,7 +715,7 @@ public final class Signal4Default2<A, B, C, D> extends QMetaObject.AbstractSigna
         private Signal4Default2() {
         }
         
-        public Signal4Default2(Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default){
+        public Signal4Default2(@StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default){
             super(arg3Default, arg4Default);
         }
         
@@ -724,7 +724,7 @@ public Signal4Default2(Supplier<? extends C> arg3Default, Supplier<? extends D>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -745,7 +745,7 @@ public final class Signal4Default3<A, B, C, D> extends QMetaObject.AbstractSigna
         private Signal4Default3() {
         }
         
-        public Signal4Default3(Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default){
+        public Signal4Default3(@StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default){
             super(arg2Default, arg3Default, arg4Default);
         }
         
@@ -754,7 +754,7 @@ public Signal4Default3(Supplier<? extends B> arg2Default, Supplier<? extends C>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -776,8 +776,8 @@ private Signal4Default4() {
             this.arg1Default = null;
         }
         
-        public Signal4Default4(Supplier<? extends A> arg1Default, Supplier<? extends B> arg2Default, 
-                Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default){
+        public Signal4Default4(@StrictNonNull Supplier<? extends A> arg1Default, @StrictNonNull Supplier<? extends B> arg2Default,
+                Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default){
             super(arg2Default, arg3Default, arg4Default);
             if(arg1Default!=null){
                 this.arg1Default = arg1Default;
@@ -798,7 +798,7 @@ public final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -820,7 +820,7 @@ public final class Signal5Default1<A, B, C, D, E> extends QMetaObject.AbstractSi
         private Signal5Default1() {
         }
         
-        public Signal5Default1(Supplier<? extends E> arg5Default){
+        public Signal5Default1(@StrictNonNull Supplier<? extends E> arg5Default){
             super(arg5Default);
         }
         
@@ -829,7 +829,7 @@ public Signal5Default1(Supplier<? extends E> arg5Default){
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -851,7 +851,7 @@ public final class Signal5Default2<A, B, C, D, E> extends QMetaObject.AbstractSi
         private Signal5Default2() {
         }
         
-        public Signal5Default2(Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default){
+        public Signal5Default2(@StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default){
             super(arg4Default, arg5Default);
         }
         
@@ -860,7 +860,7 @@ public Signal5Default2(Supplier<? extends D> arg4Default, Supplier<? extends E>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -882,7 +882,7 @@ public final class Signal5Default3<A, B, C, D, E> extends QMetaObject.AbstractSi
         private Signal5Default3() {
         }
         
-        public Signal5Default3(Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default){
+        public Signal5Default3(@StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default){
             super(arg3Default, arg4Default, arg5Default);
         }
         
@@ -891,7 +891,7 @@ public Signal5Default3(Supplier<? extends C> arg3Default, Supplier<? extends D>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -913,7 +913,7 @@ public final class Signal5Default4<A, B, C, D, E> extends QMetaObject.AbstractSi
         private Signal5Default4() {
         }
         
-        public Signal5Default4(Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default){
+        public Signal5Default4(@StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default);
         }
         
@@ -922,7 +922,7 @@ public Signal5Default4(Supplier<? extends B> arg2Default, Supplier<? extends C>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -945,7 +945,7 @@ private Signal5Default5() {
             this.arg1Default = null;
         }
         
-        public Signal5Default5(Supplier<? extends A> arg1Default, Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default){
+        public Signal5Default5(@StrictNonNull Supplier<? extends A> arg1Default, @StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default);
             if(arg1Default!=null){
                 this.arg1Default = arg1Default;
@@ -966,7 +966,7 @@ public final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -989,7 +989,7 @@ public final class Signal6Default1<A, B, C, D, E, F> extends QMetaObject.Abstrac
         private Signal6Default1() {
         }
         
-        public Signal6Default1(Supplier<? extends F> arg6Default){
+        public Signal6Default1(@StrictNonNull Supplier<? extends F> arg6Default){
             super(arg6Default);
         }
         
@@ -998,7 +998,7 @@ public Signal6Default1(Supplier<? extends F> arg6Default){
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1021,7 +1021,7 @@ public final class Signal6Default2<A, B, C, D, E, F> extends QMetaObject.Abstrac
         private Signal6Default2() {
         }
         
-        public Signal6Default2(Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default){
+        public Signal6Default2(@StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default){
             super(arg5Default, arg6Default);
         }
         
@@ -1030,7 +1030,7 @@ public Signal6Default2(Supplier<? extends E> arg5Default, Supplier<? extends F>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1053,7 +1053,7 @@ public final class Signal6Default3<A, B, C, D, E, F> extends QMetaObject.Abstrac
         private Signal6Default3() {
         }
         
-        public Signal6Default3(Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default){
+        public Signal6Default3(@StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default){
             super(arg4Default, arg5Default, arg6Default);
         }
         
@@ -1062,7 +1062,7 @@ public Signal6Default3(Supplier<? extends D> arg4Default, Supplier<? extends E>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1085,7 +1085,7 @@ public final class Signal6Default4<A, B, C, D, E, F> extends QMetaObject.Abstrac
         private Signal6Default4() {
         }
         
-        public Signal6Default4(Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default){
+        public Signal6Default4(@StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default){
             super(arg3Default, arg4Default, arg5Default, arg6Default);
         }
         
@@ -1094,7 +1094,7 @@ public Signal6Default4(Supplier<? extends C> arg3Default, Supplier<? extends D>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1117,7 +1117,7 @@ public final class Signal6Default5<A, B, C, D, E, F> extends QMetaObject.Abstrac
         private Signal6Default5() {
         }
         
-        public Signal6Default5(Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default){
+        public Signal6Default5(@StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default, arg6Default);
         }
         
@@ -1126,7 +1126,7 @@ public Signal6Default5(Supplier<? extends B> arg2Default, Supplier<? extends C>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1150,7 +1150,7 @@ private Signal6Default6() {
             this.arg1Default = null;
         }
         
-        public Signal6Default6(Supplier<? extends A> arg1Default, Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default){
+        public Signal6Default6(@StrictNonNull Supplier<? extends A> arg1Default, @StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default, arg6Default);
             this.arg1Default = arg1Default;
             if(this.arg1Default==null){
@@ -1170,7 +1170,7 @@ public final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1194,7 +1194,7 @@ public final class Signal7Default1<A, B, C, D, E, F, G> extends QMetaObject.Abst
         private Signal7Default1() {
         }
         
-        public Signal7Default1(Supplier<? extends G> arg7Default){
+        public Signal7Default1(@StrictNonNull Supplier<? extends G> arg7Default){
             super(arg7Default);
         }
         
@@ -1203,7 +1203,7 @@ public Signal7Default1(Supplier<? extends G> arg7Default){
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1227,7 +1227,7 @@ public final class Signal7Default2<A, B, C, D, E, F, G> extends QMetaObject.Abst
         private Signal7Default2() {
         }
         
-        public Signal7Default2(Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default){
+        public Signal7Default2(@StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default){
             super(arg6Default, arg7Default);
         }
         
@@ -1236,7 +1236,7 @@ public Signal7Default2(Supplier<? extends F> arg6Default, Supplier<? extends G>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1260,7 +1260,7 @@ public final class Signal7Default3<A, B, C, D, E, F, G> extends QMetaObject.Abst
         private Signal7Default3() {
         }
         
-        public Signal7Default3(Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default){
+        public Signal7Default3(@StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default){
             super(arg5Default, arg6Default, arg7Default);
         }
         
@@ -1269,7 +1269,7 @@ public Signal7Default3(Supplier<? extends E> arg5Default, Supplier<? extends F>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1293,7 +1293,7 @@ public final class Signal7Default4<A, B, C, D, E, F, G> extends QMetaObject.Abst
         private Signal7Default4() {
         }
         
-        public Signal7Default4(Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default){
+        public Signal7Default4(@StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default){
             super(arg4Default, arg5Default, arg6Default, arg7Default);
         }
         
@@ -1302,7 +1302,7 @@ public Signal7Default4(Supplier<? extends D> arg4Default, Supplier<? extends E>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1326,7 +1326,7 @@ public final class Signal7Default5<A, B, C, D, E, F, G> extends QMetaObject.Abst
         private Signal7Default5() {
         }
         
-        public Signal7Default5(Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default){
+        public Signal7Default5(@StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default){
             super(arg3Default, arg4Default, arg5Default, arg6Default, arg7Default);
         }
         
@@ -1335,7 +1335,7 @@ public Signal7Default5(Supplier<? extends C> arg3Default, Supplier<? extends D>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1359,7 +1359,7 @@ public final class Signal7Default6<A, B, C, D, E, F, G> extends QMetaObject.Abst
         private Signal7Default6() {
         }
         
-        public Signal7Default6(Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default){
+        public Signal7Default6(@StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default, arg6Default, arg7Default);
         }
         
@@ -1368,7 +1368,7 @@ public Signal7Default6(Supplier<? extends B> arg2Default, Supplier<? extends C>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1393,7 +1393,7 @@ private Signal7Default7() {
             this.arg1Default = null;
         }
         
-        public Signal7Default7(Supplier<? extends A> arg1Default, Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default){
+        public Signal7Default7(@StrictNonNull Supplier<? extends A> arg1Default, @StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default, arg6Default, arg7Default);
             this.arg1Default = arg1Default;
             if(this.arg1Default==null){
@@ -1413,7 +1413,7 @@ public final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1438,7 +1438,7 @@ public final class Signal8Default1<A, B, C, D, E, F, G, H> extends QMetaObject.A
         private Signal8Default1() {
         }
         
-        public Signal8Default1(Supplier<? extends H> arg8Default){
+        public Signal8Default1(@StrictNonNull Supplier<? extends H> arg8Default){
             super(arg8Default);
         }
         
@@ -1447,7 +1447,7 @@ public Signal8Default1(Supplier<? extends H> arg8Default){
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1472,7 +1472,7 @@ public final class Signal8Default2<A, B, C, D, E, F, G, H> extends QMetaObject.A
         private Signal8Default2() {
         }
         
-        public Signal8Default2(Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default){
+        public Signal8Default2(@StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default){
             super(arg7Default, arg8Default);
         }
         
@@ -1481,7 +1481,7 @@ public Signal8Default2(Supplier<? extends G> arg7Default, Supplier<? extends H>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1506,7 +1506,7 @@ public final class Signal8Default3<A, B, C, D, E, F, G, H> extends QMetaObject.A
         private Signal8Default3() {
         }
         
-        public Signal8Default3(Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default){
+        public Signal8Default3(@StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default){
             super(arg6Default, arg7Default, arg8Default);
         }
         
@@ -1515,7 +1515,7 @@ public Signal8Default3(Supplier<? extends F> arg6Default, Supplier<? extends G>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1540,7 +1540,7 @@ public final class Signal8Default4<A, B, C, D, E, F, G, H> extends QMetaObject.A
         private Signal8Default4() {
         }
         
-        public Signal8Default4(Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default){
+        public Signal8Default4(@StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default){
             super(arg5Default, arg6Default, arg7Default, arg8Default);
         }
         
@@ -1549,7 +1549,7 @@ public Signal8Default4(Supplier<? extends E> arg5Default, Supplier<? extends F>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1574,7 +1574,7 @@ public final class Signal8Default5<A, B, C, D, E, F, G, H> extends QMetaObject.A
         private Signal8Default5() {
         }
         
-        public Signal8Default5(Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default){
+        public Signal8Default5(@StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default){
             super(arg4Default, arg5Default, arg6Default, arg7Default, arg8Default);
         }
         
@@ -1583,7 +1583,7 @@ public Signal8Default5(Supplier<? extends D> arg4Default, Supplier<? extends E>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1608,7 +1608,7 @@ public final class Signal8Default6<A, B, C, D, E, F, G, H> extends QMetaObject.A
         private Signal8Default6() {
         }
         
-        public Signal8Default6(Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default){
+        public Signal8Default6(@StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default){
             super(arg3Default, arg4Default, arg5Default, arg6Default, arg7Default, arg8Default);
         }
         
@@ -1617,7 +1617,7 @@ public Signal8Default6(Supplier<? extends C> arg3Default, Supplier<? extends D>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1642,7 +1642,7 @@ public final class Signal8Default7<A, B, C, D, E, F, G, H> extends QMetaObject.A
         private Signal8Default7() {
         }
         
-        public Signal8Default7(Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default){
+        public Signal8Default7(@StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default, arg6Default, arg7Default, arg8Default);
         }
         
@@ -1651,7 +1651,7 @@ public Signal8Default7(Supplier<? extends B> arg2Default, Supplier<? extends C>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1677,7 +1677,7 @@ private Signal8Default8() {
             this.arg1Default = null;
         }
         
-        public Signal8Default8(Supplier<? extends A> arg1Default, Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default){
+        public Signal8Default8(@StrictNonNull Supplier<? extends A> arg1Default, @StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default, arg6Default, arg7Default, arg8Default);
             this.arg1Default = arg1Default;
             if(this.arg1Default==null){
@@ -1697,7 +1697,7 @@ public final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1723,7 +1723,7 @@ public final class Signal9Default1<A, B, C, D, E, F, G, H, I> extends QMetaObjec
         private Signal9Default1() {
         }
         
-        public Signal9Default1(Supplier<? extends I> arg9Default){
+        public Signal9Default1(@StrictNonNull Supplier<? extends I> arg9Default){
             super(arg9Default);
         }
         
@@ -1732,7 +1732,7 @@ public Signal9Default1(Supplier<? extends I> arg9Default){
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1758,7 +1758,7 @@ public final class Signal9Default2<A, B, C, D, E, F, G, H, I> extends QMetaObjec
         private Signal9Default2() {
         }
         
-        public Signal9Default2(Supplier<? extends H> arg8Default, Supplier<? extends I> arg9Default){
+        public Signal9Default2(@StrictNonNull Supplier<? extends H> arg8Default, @StrictNonNull Supplier<? extends I> arg9Default){
             super(arg8Default, arg9Default);
         }
         
@@ -1767,7 +1767,7 @@ public Signal9Default2(Supplier<? extends H> arg8Default, Supplier<? extends I>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1793,7 +1793,7 @@ public final class Signal9Default3<A, B, C, D, E, F, G, H, I> extends QMetaObjec
         private Signal9Default3() {
         }
         
-        public Signal9Default3(Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default, Supplier<? extends I> arg9Default){
+        public Signal9Default3(@StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default, @StrictNonNull Supplier<? extends I> arg9Default){
             super(arg7Default, arg8Default, arg9Default);
         }
         
@@ -1802,7 +1802,7 @@ public Signal9Default3(Supplier<? extends G> arg7Default, Supplier<? extends H>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1828,7 +1828,7 @@ public final class Signal9Default4<A, B, C, D, E, F, G, H, I> extends QMetaObjec
         private Signal9Default4() {
         }
         
-        public Signal9Default4(Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default, Supplier<? extends I> arg9Default){
+        public Signal9Default4(@StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default, @StrictNonNull Supplier<? extends I> arg9Default){
             super(arg6Default, arg7Default, arg8Default, arg9Default);
         }
         
@@ -1837,7 +1837,7 @@ public Signal9Default4(Supplier<? extends F> arg6Default, Supplier<? extends G>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1863,7 +1863,7 @@ public final class Signal9Default5<A, B, C, D, E, F, G, H, I> extends QMetaObjec
         private Signal9Default5() {
         }
         
-        public Signal9Default5(Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default, Supplier<? extends I> arg9Default){
+        public Signal9Default5(@StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default, @StrictNonNull Supplier<? extends I> arg9Default){
             super(arg5Default, arg6Default, arg7Default, arg8Default, arg9Default);
         }
         
@@ -1872,7 +1872,7 @@ public Signal9Default5(Supplier<? extends E> arg5Default, Supplier<? extends F>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1898,7 +1898,7 @@ public final class Signal9Default6<A, B, C, D, E, F, G, H, I> extends QMetaObjec
         private Signal9Default6() {
         }
         
-        public Signal9Default6(Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default, Supplier<? extends I> arg9Default){
+        public Signal9Default6(@StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default, @StrictNonNull Supplier<? extends I> arg9Default){
             super(arg4Default, arg5Default, arg6Default, arg7Default, arg8Default, arg9Default);
         }
         
@@ -1907,7 +1907,7 @@ public Signal9Default6(Supplier<? extends D> arg4Default, Supplier<? extends E>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1933,7 +1933,7 @@ public final class Signal9Default7<A, B, C, D, E, F, G, H, I> extends QMetaObjec
         private Signal9Default7() {
         }
         
-        public Signal9Default7(Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default, Supplier<? extends I> arg9Default){
+        public Signal9Default7(@StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default, @StrictNonNull Supplier<? extends I> arg9Default){
             super(arg3Default, arg4Default, arg5Default, arg6Default, arg7Default, arg8Default, arg9Default);
         }
         
@@ -1942,7 +1942,7 @@ public Signal9Default7(Supplier<? extends C> arg3Default, Supplier<? extends D>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -1968,7 +1968,7 @@ public final class Signal9Default8<A, B, C, D, E, F, G, H, I> extends QMetaObjec
         private Signal9Default8() {
         }
         
-        public Signal9Default8(Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default, Supplier<? extends I> arg9Default){
+        public Signal9Default8(@StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default, @StrictNonNull Supplier<? extends I> arg9Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default, arg6Default, arg7Default, arg8Default, arg9Default);
         }
         
@@ -1977,7 +1977,7 @@ public Signal9Default8(Supplier<? extends B> arg2Default, Supplier<? extends C>
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2004,7 +2004,7 @@ private Signal9Default9() {
             this.arg1Default = null;
         }
         
-        public Signal9Default9(Supplier<? extends A> arg1Default, Supplier<? extends B> arg2Default, Supplier<? extends C> arg3Default, Supplier<? extends D> arg4Default, Supplier<? extends E> arg5Default, Supplier<? extends F> arg6Default, Supplier<? extends G> arg7Default, Supplier<? extends H> arg8Default, Supplier<? extends I> arg9Default){
+        public Signal9Default9(@StrictNonNull Supplier<? extends A> arg1Default, @StrictNonNull Supplier<? extends B> arg2Default, @StrictNonNull Supplier<? extends C> arg3Default, @StrictNonNull Supplier<? extends D> arg4Default, @StrictNonNull Supplier<? extends E> arg5Default, @StrictNonNull Supplier<? extends F> arg6Default, @StrictNonNull Supplier<? extends G> arg7Default, @StrictNonNull Supplier<? extends H> arg8Default, @StrictNonNull Supplier<? extends I> arg9Default){
             super(arg2Default, arg3Default, arg4Default, arg5Default, arg6Default, arg7Default, arg8Default, arg9Default);
             this.arg1Default = arg1Default;
             if(this.arg1Default==null){
@@ -2024,7 +2024,7 @@ public final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2046,7 +2046,7 @@ public PrivateSignal0() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit() {
             emitSignal();
         }
@@ -2056,7 +2056,7 @@ private final void emit() {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2080,7 +2080,7 @@ public PrivateSignal1() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit(A arg1) {
             emitSignal(arg1);
         }
@@ -2090,7 +2090,7 @@ private final void emit(A arg1) {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2115,7 +2115,7 @@ public PrivateSignal2() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit(A arg1, B arg2) {
             emitSignal(arg1, arg2);
         }
@@ -2125,7 +2125,7 @@ private final void emit(A arg1, B arg2) {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2151,7 +2151,7 @@ public PrivateSignal3() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit(A arg1, B arg2, C arg3) {
             emitSignal(arg1, arg2, arg3);
         }
@@ -2161,7 +2161,7 @@ private final void emit(A arg1, B arg2, C arg3) {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2189,7 +2189,7 @@ public PrivateSignal4() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit(A arg1, B arg2, C arg3, D arg4) {
             emitSignal(arg1, arg2, arg3, arg4);
         }
@@ -2199,7 +2199,7 @@ private final void emit(A arg1, B arg2, C arg3, D arg4) {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2227,7 +2227,7 @@ public PrivateSignal5() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5) {
             emitSignal(arg1, arg2, arg3, arg4, arg5);
         }
@@ -2237,7 +2237,7 @@ private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5) {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2266,7 +2266,7 @@ public PrivateSignal6() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5, F arg6) {
             emitSignal(arg1, arg2, arg3, arg4, arg5, arg6);
         }
@@ -2276,7 +2276,7 @@ private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5, F arg6) {
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2306,7 +2306,7 @@ public PrivateSignal7() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7) {
             emitSignal(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
@@ -2316,7 +2316,7 @@ private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7)
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2347,7 +2347,7 @@ public PrivateSignal8() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5, F arg6,
                 G arg7, H arg8) {
             emitSignal(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -2358,7 +2358,7 @@ private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5, F arg6,
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2390,7 +2390,7 @@ public PrivateSignal9() {
         /**
          * Emits the signal.
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5, F arg6,
                 G arg7, H arg8, I arg9) {
             emitSignal(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -2401,7 +2401,7 @@ private final void emit(A arg1, B arg2, C arg3, D arg4, E arg5, F arg6,
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     }
@@ -2410,15 +2410,15 @@ public final QObject containingObject() {
      * Emits a private signal. This method may only be called from inside the signal owning object.
      * 
      * @param signal the signal to be emitted
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static void emit(PrivateSignal0 signal) throws io.qt.QSignalAccessException {
+    protected static void emit(@StrictNonNull PrivateSignal0 signal) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit();
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2428,15 +2428,15 @@ protected static void emit(PrivateSignal0 signal) throws io.qt.QSignalAccessExce
      * @param <A> The type of the first parameter of the signal.
      * @param signal the signal to be emitted
      * @param arg1 The argument for the first parameter of the signal.
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static <A> void emit(PrivateSignal1<A> signal, A arg1) throws io.qt.QSignalAccessException {
+    protected static <A> void emit(@StrictNonNull PrivateSignal1<A> signal, A arg1) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit(arg1);
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2448,15 +2448,15 @@ protected static <A> void emit(PrivateSignal1<A> signal, A arg1) throws io.qt.QS
      * @param signal the signal to be emitted
      * @param arg1 The argument for the first parameter of the signal.
      * @param arg2 The argument for the second parameter of the signal.
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static <A,B> void emit(PrivateSignal2<A,B> signal, A arg1, B arg2) throws io.qt.QSignalAccessException {
+    protected static <A,B> void emit(@StrictNonNull PrivateSignal2<A,B> signal, A arg1, B arg2) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit(arg1, arg2);
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2470,15 +2470,15 @@ protected static <A,B> void emit(PrivateSignal2<A,B> signal, A arg1, B arg2) thr
      * @param arg1 The argument for the first parameter of the signal.
      * @param arg2 The argument for the second parameter of the signal.
      * @param arg3 The argument for the third parameter of the signal.
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static <A,B,C> void emit(PrivateSignal3<A,B,C> signal, A arg1, B arg2, C arg3) throws io.qt.QSignalAccessException {
+    protected static <A,B,C> void emit(@StrictNonNull PrivateSignal3<A,B,C> signal, A arg1, B arg2, C arg3) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit(arg1, arg2, arg3);
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2494,15 +2494,15 @@ protected static <A,B,C> void emit(PrivateSignal3<A,B,C> signal, A arg1, B arg2,
      * @param arg2 The argument for the second parameter of the signal.
      * @param arg3 The argument for the third parameter of the signal.
      * @param arg4 The argument for the fourth parameter of the signal.
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static <A,B,C,D> void emit(PrivateSignal4<A,B,C,D> signal, A arg1, B arg2, C arg3, D arg4) throws io.qt.QSignalAccessException {
+    protected static <A,B,C,D> void emit(@StrictNonNull PrivateSignal4<A,B,C,D> signal, A arg1, B arg2, C arg3, D arg4) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit(arg1, arg2, arg3, arg4);
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2520,15 +2520,15 @@ protected static <A,B,C,D> void emit(PrivateSignal4<A,B,C,D> signal, A arg1, B a
      * @param arg3 The argument for the third parameter of the signal.
      * @param arg4 The argument for the fourth parameter of the signal.
      * @param arg5 The argument for the fifth parameter of the signal.
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static <A,B,C,D,E> void emit(PrivateSignal5<A,B,C,D,E> signal, A arg1, B arg2, C arg3, D arg4, E arg5) throws io.qt.QSignalAccessException {
+    protected static <A,B,C,D,E> void emit(@StrictNonNull PrivateSignal5<A,B,C,D,E> signal, A arg1, B arg2, C arg3, D arg4, E arg5) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit(arg1, arg2, arg3, arg4, arg5);
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2548,15 +2548,15 @@ protected static <A,B,C,D,E> void emit(PrivateSignal5<A,B,C,D,E> signal, A arg1,
      * @param arg4 The argument for the fourth parameter of the signal.
      * @param arg5 The argument for the fifth parameter of the signal.
      * @param arg6 The argument for the sixth parameter of the signal.
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static <A,B,C,D,E,F> void emit(PrivateSignal6<A,B,C,D,E,F> signal, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6) throws io.qt.QSignalAccessException {
+    protected static <A,B,C,D,E,F> void emit(@StrictNonNull PrivateSignal6<A,B,C,D,E,F> signal, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit(arg1, arg2, arg3, arg4, arg5, arg6);
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2578,15 +2578,15 @@ protected static <A,B,C,D,E,F> void emit(PrivateSignal6<A,B,C,D,E,F> signal, A a
      * @param arg5 The argument for the fifth parameter of the signal.
      * @param arg6 The argument for the sixth parameter of the signal.
      * @param arg7 The argument for the seventh parameter of the signal.
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static <A,B,C,D,E,F,G> void emit(PrivateSignal7<A,B,C,D,E,F,G> signal, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7) throws io.qt.QSignalAccessException {
+    protected static <A,B,C,D,E,F,G> void emit(@StrictNonNull PrivateSignal7<A,B,C,D,E,F,G> signal, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2610,15 +2610,15 @@ protected static <A,B,C,D,E,F,G> void emit(PrivateSignal7<A,B,C,D,E,F,G> signal,
      * @param arg6 The argument for the sixth parameter of the signal.
      * @param arg7 The argument for the seventh parameter of the signal.
      * @param arg8 The argument for the eighth parameter of the signal.
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static <A,B,C,D,E,F,G,H> void emit(PrivateSignal8<A,B,C,D,E,F,G,H> signal, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7, H arg8) throws io.qt.QSignalAccessException {
+    protected static <A,B,C,D,E,F,G,H> void emit(@StrictNonNull PrivateSignal8<A,B,C,D,E,F,G,H> signal, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7, H arg8) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2644,15 +2644,15 @@ protected static <A,B,C,D,E,F,G,H> void emit(PrivateSignal8<A,B,C,D,E,F,G,H> sig
      * @param arg7 The argument for the seventh parameter of the signal.
      * @param arg8 The argument for the eighth parameter of the signal.
      * @param arg9 The argument for the ninth parameter of the signal.
-     * @throws io.qt.QSignalAccessException if signal is emitted from outside the declaring class.
+     * @throws QSignalAccessException if signal is emitted from outside the declaring class.
      */
-    protected static <A,B,C,D,E,F,G,H,I> void emit(PrivateSignal9<A,B,C,D,E,F,G,H,I> signal, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7, H arg8, I arg9) throws io.qt.QSignalAccessException {
+    protected static <A,B,C,D,E,F,G,H,I> void emit(@StrictNonNull PrivateSignal9<A,B,C,D,E,F,G,H,I> signal, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7, H arg8, I arg9) throws QSignalAccessException {
         Class<?> callerClass = QtJambi_LibraryUtilities.internal.callerClassProvider().get();
         Class<?> signalDeclaringClass = signal.signalDeclaringClass();
         if(callerClass==signalDeclaringClass || (MultiSignal.class.isAssignableFrom(callerClass) && callerClass.getEnclosingClass()==signalDeclaringClass)) {
             signal.emit(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
         }else {
-            throw new io.qt.QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
+            throw new QSignalAccessException(signalDeclaringClass, signal.name(), callerClass);
         }
     }
     
@@ -2670,7 +2670,7 @@ protected MultiSignal(){
          * @return the signal containing object
          */
         @Override
-        public final QObject containingObject() {
+        public final @NonNull QObject containingObject() {
             return QObject.this;
         }
     
@@ -2680,7 +2680,7 @@ public final QObject containingObject() {
          * @param connection the connection to be removed
          * @return <code>true</code> if the disconnection was successful.
          */
-        public final boolean disconnect(QMetaObject.Connection connection) {
+        public final boolean disconnect(QMetaObject.@NonNull Connection connection) {
             return super.disconnect(connection);
         }
         
@@ -2704,7 +2704,7 @@ public final boolean disconnectAll() {
          * @throws java.lang.RuntimeException Raised if the signal object could not be successfully introspected or if the
          *                                    signatures of the signal and slot are incompatible.
          */
-        public final QMetaObject.Connection connect(Object receiver, String method, Qt.ConnectionType... type) {
+        public final QMetaObject.@NonNull Connection connect(@StrictNonNull Object receiver, @StrictNonNull String method, Qt.@NonNull ConnectionType @NonNull... type) {
             if (receiver == null)
                 throw new NullPointerException("Receiver must be non-null");
             if (method == null)
@@ -2733,10 +2733,10 @@ public final boolean disconnect(Object receiver, String method) {
          * @param slot the slot to be connected
          * @param connectionType type of connection
          * @return connection if successful or <code>null</code> otherwise
-         * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-         * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+         * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+         * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
          */
-        public final io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.Slot0 slot, io.qt.core.Qt.ConnectionType... connectionType) throws io.qt.QNoSuchSignalException{
+        public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull Slot0 slot, Qt.@NonNull ConnectionType @NonNull... connectionType) throws QNoSuchSignalException{
             return super.connect(slot, connectionType);
         }
 
@@ -2746,7 +2746,7 @@ public final io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.Sl
          * @param slot the slot to be disconnected
          * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
          */
-        public final boolean disconnect(io.qt.core.QMetaObject.Slot0 slot) {
+        public final boolean disconnect(QMetaObject.@NonNull Slot0 slot) {
             return super.disconnect(slot);
         }
         
@@ -2756,9 +2756,9 @@ public final boolean disconnect(io.qt.core.QMetaObject.Slot0 slot) {
          * @param signal the signal to be connected
          * @param connectionType type of connection
          * @return connection if successful or <code>null</code> otherwise
-         * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+         * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
          */
-        public final io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.Connectable0 signal, io.qt.core.Qt.ConnectionType... connectionType) throws io.qt.QNoSuchSignalException{
+        public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull Connectable0 signal, Qt.@NonNull ConnectionType @NonNull... connectionType) throws QNoSuchSignalException{
             return super.connect((QMetaObject.AbstractSignal)signal, connectionType);
         }
     
@@ -2768,7 +2768,7 @@ public final io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.Co
          * @param signal the signal to be disconnected
          * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
          */
-        public final boolean disconnect(io.qt.core.QMetaObject.Connectable0 signal) {
+        public final boolean disconnect(QMetaObject.@NonNull Connectable0 signal) {
             return super.disconnect((QMetaObject.AbstractSignal)signal);
         }
         
@@ -2778,9 +2778,9 @@ public final boolean disconnect(io.qt.core.QMetaObject.Connectable0 signal) {
          * @param signal the signal to be connected
          * @param connectionType type of connection
          * @return connection if successful or <code>null</code> otherwise
-         * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+         * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
          */
-        public final io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.AbstractPublicSignal0 signal, io.qt.core.Qt.ConnectionType... connectionType) throws io.qt.QNoSuchSignalException{
+        public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPublicSignal0 signal, Qt.@NonNull ConnectionType @NonNull... connectionType) throws QNoSuchSignalException{
             return super.connect(signal, connectionType);
         }
     
@@ -2790,26 +2790,26 @@ public final io.qt.core.QMetaObject.Connection connect(io.qt.core.QMetaObject.Ab
          * @param signal the signal to be disconnected
          * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
          */
-        public final boolean disconnect(io.qt.core.QMetaObject.AbstractPublicSignal0 signal) {
+        public final boolean disconnect(QMetaObject.@StrictNonNull AbstractPublicSignal0 signal) {
             return super.disconnect(signal);
         }
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private QMetaObject.Connection connectSlot(QMetaObject.AbstractSlot slotObject, Qt.ConnectionType[] connectionType) {
             return super.connect(slotObject, connectionType);
         }
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private boolean disconnectSlot(QMetaObject.AbstractSlot slotObject) {
             return super.disconnect(slotObject);
         }
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private QMetaObject.Connection connectSignal(QMetaObject.AbstractSignal slotObject, Qt.ConnectionType[] connectionType) {
             return super.connect(slotObject, connectionType);
         }
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         private boolean disconnectSignal(QMetaObject.AbstractSignal slotObject) {
             return super.disconnect(slotObject);
         }
@@ -2822,10 +2822,10 @@ private boolean disconnectSignal(QMetaObject.AbstractSignal slotObject) {
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal0 signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal0 signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2836,10 +2836,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal0
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal1<?> signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal1<?> signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2851,10 +2851,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal1<
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal1<A> signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal1<A> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2865,10 +2865,10 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal2<?,?> signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal2<?,?> signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2880,10 +2880,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal2<
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal2<A,?> signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal2<A,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2896,10 +2896,10 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal2<A,B> signal, QMetaObject.Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal2<A,B> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2910,10 +2910,10 @@ public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal3<?,?,?> signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2925,10 +2925,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal3<
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal3<A,?,?> signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<A,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2941,10 +2941,10 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal3<A,B,?> signal, QMetaObject.Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<A,B,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2958,10 +2958,10 @@ public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal3<A,B,C> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<A,B,C> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2972,10 +2972,10 @@ public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivate
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal4<?,?,?,?> signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -2987,10 +2987,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal4<
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal4<A,?,?,?> signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3003,10 +3003,10 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal4<A,B,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,B,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3020,10 +3020,10 @@ public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal4<A,B,C,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,B,C,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3038,10 +3038,10 @@ public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivate
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal4<A,B,C,D> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,B,C,D> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3052,10 +3052,10 @@ public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPriva
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal5<?,?,?,?,?> signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3067,10 +3067,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal5<
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal5<A,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3083,10 +3083,10 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal5<A,B,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3100,10 +3100,10 @@ public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal5<A,B,C,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,C,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3118,10 +3118,10 @@ public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivate
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal5<A,B,C,D,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,C,D,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3137,10 +3137,10 @@ public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPriva
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal5<A,B,C,D,E> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,C,D,E> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3151,10 +3151,10 @@ public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPri
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal6<?,?,?,?,?,?> signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3166,10 +3166,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal6<
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal6<A,?,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3182,10 +3182,10 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal6<A,B,?,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3199,10 +3199,10 @@ public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal6<A,B,C,?,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,?,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3217,10 +3217,10 @@ public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivate
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal6<A,B,C,D,?,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,D,?,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3236,10 +3236,10 @@ public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPriva
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal6<A,B,C,D,E,?> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,D,E,?> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3256,10 +3256,10 @@ public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPri
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal6<A,B,C,D,E,F> signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,D,E,F> signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3270,10 +3270,10 @@ public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractP
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<?,?,?,?,?,?,?> signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3285,10 +3285,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<A,?,?,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3301,10 +3301,10 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<A,B,?,?,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3318,10 +3318,10 @@ public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<A,B,C,?,?,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3336,10 +3336,10 @@ public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivate
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,?,?,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,?,?,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3355,10 +3355,10 @@ public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPriva
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,E,?,?> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,E,?,?> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3375,10 +3375,10 @@ public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPri
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,E,F,?> signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,E,F,?> signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3396,10 +3396,10 @@ public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractP
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,E,F,G> signal, QMetaObject.Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,E,F,G> signal, QMetaObject.@StrictNonNull Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3410,10 +3410,10 @@ public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(QMetaObject.Abstrac
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<?,?,?,?,?,?,?,?> signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<?,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3425,10 +3425,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<A,?,?,?,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3441,10 +3441,10 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<A,B,?,?,?,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3458,10 +3458,10 @@ public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<A,B,C,?,?,?,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3476,10 +3476,10 @@ public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivate
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,?,?,?,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3495,10 +3495,10 @@ public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPriva
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,?,?,?> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,?,?,?> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3515,10 +3515,10 @@ public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPri
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,F,?,?> signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,F,?,?> signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3536,10 +3536,10 @@ public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractP
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,F,G,?> signal, QMetaObject.Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,F,G,?> signal, QMetaObject.@StrictNonNull Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3558,10 +3558,10 @@ public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(QMetaObject.Abstrac
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal, QMetaObject.Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G,H> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal, QMetaObject.@StrictNonNull Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3572,10 +3572,10 @@ public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(QMetaObject.Abstr
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<?,?,?,?,?,?,?,?,?> signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<?,?,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3587,10 +3587,10 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,?,?,?,?,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,?,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3603,10 +3603,10 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,B,?,?,?,?,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3620,10 +3620,10 @@ public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,B,C,?,?,?,?,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3638,10 +3638,10 @@ public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivate
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,?,?,?,?,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3657,10 +3657,10 @@ public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPriva
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,?,?,?,?> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3677,10 +3677,10 @@ public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPri
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,?,?,?> signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,?,?,?> signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3698,10 +3698,10 @@ public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractP
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,G,?,?> signal, QMetaObject.Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,G,?,?> signal, QMetaObject.@StrictNonNull Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3720,10 +3720,10 @@ public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(QMetaObject.Abstrac
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,G,H,?> signal, QMetaObject.Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G,H> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,G,H,?> signal, QMetaObject.@StrictNonNull Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3743,10 +3743,10 @@ public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(QMetaObject.Abstr
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
      */
-    public static <A,B,C,D,E,F,G,H,I> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal, QMetaObject.Slot9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G,H,I> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal, QMetaObject.@StrictNonNull Slot9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> slot, Qt.ConnectionType... connectionType) {
         return signal.connect(slot, connectionType);
     }
     
@@ -3757,7 +3757,7 @@ public static <A,B,C,D,E,F,G,H,I> QMetaObject.Connection connect(QMetaObject.Abs
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal0 signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal0 signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -3768,7 +3768,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal0 signal, QMet
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal1<?> signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal1<?> signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -3780,7 +3780,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal1<?> signal, Q
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal1<A> signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal1<A> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3791,7 +3791,7 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal1<A> signa
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal2<?,?> signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal2<?,?> signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -3803,7 +3803,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal2<?,?> signal,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal2<A,?> signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal2<A,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3816,7 +3816,7 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal2<A,?> sig
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal2<A,B> signal, QMetaObject.Slot2<? super A,? super B> slot) {
+    public static <A,B> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal2<A,B> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3827,7 +3827,7 @@ public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal2<A,B> s
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal3<?,?,?> signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -3839,7 +3839,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal3<?,?,?> signa
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal3<A,?,?> signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<A,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3852,7 +3852,7 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal3<A,?,?> s
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal3<A,B,?> signal, QMetaObject.Slot2<? super A,? super B> slot) {
+    public static <A,B> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<A,B,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3866,7 +3866,7 @@ public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal3<A,B,?>
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal3<A,B,C> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot) {
+    public static <A,B,C> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<A,B,C> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3877,7 +3877,7 @@ public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal3<A,B,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal4<?,?,?,?> signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -3889,7 +3889,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal4<?,?,?,?> sig
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,?,?,?> signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3902,7 +3902,7 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,?,?,?>
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,B,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot) {
+    public static <A,B> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,B,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3916,7 +3916,7 @@ public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,B,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,B,C,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot) {
+    public static <A,B,C> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,B,C,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3931,7 +3931,7 @@ public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,B,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,B,C,D> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot) {
+    public static <A,B,C,D> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,B,C,D> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3942,7 +3942,7 @@ public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal5<?,?,?,?,?> signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -3954,7 +3954,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal5<?,?,?,?,?> s
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3967,7 +3967,7 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,?,?,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,B,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot) {
+    public static <A,B> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3981,7 +3981,7 @@ public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,B,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,B,C,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot) {
+    public static <A,B,C> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,C,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot) {
         return signal.disconnect(slot);
     }
     
@@ -3996,7 +3996,7 @@ public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,B,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,B,C,D,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot) {
+    public static <A,B,C,D> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,C,D,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4012,7 +4012,7 @@ public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,B,C,D,E> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
+    public static <A,B,C,D,E> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,C,D,E> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4023,7 +4023,7 @@ public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal5<
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal6<?,?,?,?,?,?> signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -4035,7 +4035,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal6<?,?,?,?,?,?>
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,?,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4048,7 +4048,7 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,?,?,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,B,?,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot) {
+    public static <A,B> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4062,7 +4062,7 @@ public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,B,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,B,C,?,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot) {
+    public static <A,B,C> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,?,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4077,7 +4077,7 @@ public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,B,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,B,C,D,?,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot) {
+    public static <A,B,C,D> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,D,?,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4093,7 +4093,7 @@ public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,B,C,D,E,?> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
+    public static <A,B,C,D,E> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,D,E,?> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4110,7 +4110,7 @@ public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal6<
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,B,C,D,E,F> signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
+    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,D,E,F> signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4121,7 +4121,7 @@ public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal7<?,?,?,?,?,?,?> signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -4133,7 +4133,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal7<?,?,?,?,?,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,?,?,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4146,7 +4146,7 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,?,?,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,B,?,?,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot) {
+    public static <A,B> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4160,7 +4160,7 @@ public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,B,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,B,C,?,?,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot) {
+    public static <A,B,C> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4175,7 +4175,7 @@ public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,B,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,?,?,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot) {
+    public static <A,B,C,D> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,?,?,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4191,7 +4191,7 @@ public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,E,?,?> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
+    public static <A,B,C,D,E> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,E,?,?> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4208,7 +4208,7 @@ public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal7<
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,E,F,?> signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
+    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,E,F,?> signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4226,7 +4226,7 @@ public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,E,F,G> signal, QMetaObject.Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot) {
+    public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,E,F,G> signal, QMetaObject.@StrictNonNull Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4237,7 +4237,7 @@ public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal8<?,?,?,?,?,?,?,?> signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<?,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -4249,7 +4249,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal8<?,?,?,?,?,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,?,?,?,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4262,7 +4262,7 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,?,?,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,?,?,?,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot) {
+    public static <A,B> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4276,7 +4276,7 @@ public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,C,?,?,?,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot) {
+    public static <A,B,C> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4291,7 +4291,7 @@ public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,?,?,?,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot) {
+    public static <A,B,C,D> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4307,7 +4307,7 @@ public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,?,?,?> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
+    public static <A,B,C,D,E> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,?,?,?> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4324,7 +4324,7 @@ public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal8<
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,F,?,?> signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
+    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,F,?,?> signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4342,7 +4342,7 @@ public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,F,G,?> signal, QMetaObject.Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot) {
+    public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,F,G,?> signal, QMetaObject.@StrictNonNull Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4361,7 +4361,7 @@ public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G,H> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal, QMetaObject.Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot) {
+    public static <A,B,C,D,E,F,G,H> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal, QMetaObject.@StrictNonNull Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4372,7 +4372,7 @@ public static <A,B,C,D,E,F,G,H> boolean disconnect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal9<?,?,?,?,?,?,?,?,?> signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<?,?,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnect(slot);
     }
     
@@ -4384,7 +4384,7 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal9<?,?,?,?,?,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,?,?,?,?,?,?,?,?> signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,?,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4397,7 +4397,7 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,?,?,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,?,?,?,?,?,?,?> signal, QMetaObject.Slot2<? super A,? super B> slot) {
+    public static <A,B> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,?,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4411,7 +4411,7 @@ public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,?,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,C,?,?,?,?,?,?> signal, QMetaObject.Slot3<? super A,? super B,? super C> slot) {
+    public static <A,B,C> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,?,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4426,7 +4426,7 @@ public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,?,?,?,?,?> signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot) {
+    public static <A,B,C,D> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,?,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4442,7 +4442,7 @@ public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,?,?,?,?> signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
+    public static <A,B,C,D,E> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,?,?,?,?> signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4459,7 +4459,7 @@ public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal9<
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,?,?,?> signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
+    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,?,?,?> signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4477,7 +4477,7 @@ public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,G,?,?> signal, QMetaObject.Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot) {
+    public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,G,?,?> signal, QMetaObject.@StrictNonNull Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4496,7 +4496,7 @@ public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.AbstractPrivateSign
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G,H> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,G,H,?> signal, QMetaObject.Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot) {
+    public static <A,B,C,D,E,F,G,H> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,G,H,?> signal, QMetaObject.@StrictNonNull Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4516,7 +4516,7 @@ public static <A,B,C,D,E,F,G,H> boolean disconnect(QMetaObject.AbstractPrivateSi
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G,H,I> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal, QMetaObject.Slot9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> slot) {
+    public static <A,B,C,D,E,F,G,H,I> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal, QMetaObject.@StrictNonNull Slot9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> slot) {
         return signal.disconnect(slot);
     }
     
@@ -4527,9 +4527,9 @@ public static <A,B,C,D,E,F,G,H,I> boolean disconnect(QMetaObject.AbstractPrivate
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal0 signal, QMetaObject.Connectable0 connectSignal, Qt.ConnectionType... connectionType) {
+    public final QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal0 signal, QMetaObject.Connectable0 connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4540,7 +4540,7 @@ public static QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal0
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QMetaObject.AbstractPrivateSignal0 signal, QMetaObject.Connectable0 connectSignal) {
+    public static boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal0 signal, QMetaObject.Connectable0 connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4552,9 +4552,9 @@ public static boolean disconnect(QMetaObject.AbstractPrivateSignal0 signal, QMet
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal1<A> signal, QMetaObject.Connectable1<? super A> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal1<A> signal, QMetaObject.Connectable1<? super A> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4566,7 +4566,7 @@ public static <A> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSign
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal1<A> signal, QMetaObject.Connectable1<? super A> connectSignal) {
+    public static <A> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal1<A> signal, QMetaObject.Connectable1<? super A> connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4579,9 +4579,9 @@ public static <A> boolean disconnect(QMetaObject.AbstractPrivateSignal1<A> signa
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal2<A,B> signal, QMetaObject.Connectable2<? super A,? super B> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal2<A,B> signal, QMetaObject.Connectable2<? super A,? super B> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4594,7 +4594,7 @@ public static <A,B> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSi
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal2<A,B> signal, QMetaObject.Connectable2<? super A,? super B> connectSignal) {
+    public static <A,B> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal2<A,B> signal, QMetaObject.Connectable2<? super A,? super B> connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4608,9 +4608,9 @@ public static <A,B> boolean disconnect(QMetaObject.AbstractPrivateSignal2<A,B> s
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal3<A,B,C> signal, QMetaObject.Connectable3<? super A,? super B,? super C> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<A,B,C> signal, QMetaObject.Connectable3<? super A,? super B,? super C> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4624,7 +4624,7 @@ public static <A,B,C> QMetaObject.Connection connect(QMetaObject.AbstractPrivate
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal3<A,B,C> signal, QMetaObject.Connectable3<? super A,? super B,? super C> connectSignal) {
+    public static <A,B,C> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<A,B,C> signal, QMetaObject.Connectable3<? super A,? super B,? super C> connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4639,9 +4639,9 @@ public static <A,B,C> boolean disconnect(QMetaObject.AbstractPrivateSignal3<A,B,
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal4<A,B,C,D> signal, QMetaObject.Connectable4<? super A,? super B,? super C,? super D> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,B,C,D> signal, QMetaObject.Connectable4<? super A,? super B,? super C,? super D> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4656,7 +4656,7 @@ public static <A,B,C,D> QMetaObject.Connection connect(QMetaObject.AbstractPriva
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,B,C,D> signal, QMetaObject.Connectable4<? super A,? super B,? super C,? super D> connectSignal) {
+    public static <A,B,C,D> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,B,C,D> signal, QMetaObject.Connectable4<? super A,? super B,? super C,? super D> connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4672,9 +4672,9 @@ public static <A,B,C,D> boolean disconnect(QMetaObject.AbstractPrivateSignal4<A,
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal5<A,B,C,D,E> signal, QMetaObject.Connectable5<? super A,? super B,? super C,? super D,? super E> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,C,D,E> signal, QMetaObject.Connectable5<? super A,? super B,? super C,? super D,? super E> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4690,7 +4690,7 @@ public static <A,B,C,D,E> QMetaObject.Connection connect(QMetaObject.AbstractPri
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal5<A,B,C,D,E> signal, QMetaObject.Connectable5<? super A,? super B,? super C,? super D,? super E> connectSignal) {
+    public static <A,B,C,D,E> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,C,D,E> signal, QMetaObject.Connectable5<? super A,? super B,? super C,? super D,? super E> connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4707,9 +4707,9 @@ public static <A,B,C,D,E> boolean disconnect(QMetaObject.AbstractPrivateSignal5<
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal6<A,B,C,D,E,F> signal, QMetaObject.Connectable6<? super A,? super B,? super C,? super D,? super E,? super F> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,D,E,F> signal, QMetaObject.Connectable6<? super A,? super B,? super C,? super D,? super E,? super F> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4726,7 +4726,7 @@ public static <A,B,C,D,E,F> QMetaObject.Connection connect(QMetaObject.AbstractP
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal6<A,B,C,D,E,F> signal, QMetaObject.Connectable6<? super A,? super B,? super C,? super D,? super E,? super F> connectSignal) {
+    public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,D,E,F> signal, QMetaObject.Connectable6<? super A,? super B,? super C,? super D,? super E,? super F> connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4744,9 +4744,9 @@ public static <A,B,C,D,E,F> boolean disconnect(QMetaObject.AbstractPrivateSignal
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,E,F,G> signal, QMetaObject.Connectable7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,E,F,G> signal, QMetaObject.Connectable7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4764,7 +4764,7 @@ public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(QMetaObject.Abstrac
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,E,F,G> signal, QMetaObject.Connectable7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> connectSignal) {
+    public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,E,F,G> signal, QMetaObject.Connectable7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4783,9 +4783,9 @@ public static <A,B,C,D,E,F,G> boolean disconnect(QMetaObject.AbstractPrivateSign
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal, QMetaObject.Connectable8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G,H> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal, QMetaObject.Connectable8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4804,7 +4804,7 @@ public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(QMetaObject.Abstr
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G,H> boolean disconnect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal, QMetaObject.Connectable8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> connectSignal) {
+    public static <A,B,C,D,E,F,G,H> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal, QMetaObject.Connectable8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4824,9 +4824,9 @@ public static <A,B,C,D,E,F,G,H> boolean disconnect(QMetaObject.AbstractPrivateSi
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
      */
-    public static <A,B,C,D,E,F,G,H,I> QMetaObject.Connection connect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal, QMetaObject.Connectable9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G,H,I> QMetaObject.@NonNull Connection connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal, QMetaObject.Connectable9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connect(connectSignal, connectionType);
     }
     
@@ -4846,7 +4846,7 @@ public static <A,B,C,D,E,F,G,H,I> QMetaObject.Connection connect(QMetaObject.Abs
      * @param connectSignal the signal to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G,H,I> boolean disconnect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal, QMetaObject.Connectable9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> connectSignal) {
+    public static <A,B,C,D,E,F,G,H,I> boolean disconnect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal, QMetaObject.Connectable9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> connectSignal) {
         return signal.disconnect(connectSignal);
     }
     
@@ -4857,11 +4857,11 @@ public static <A,B,C,D,E,F,G,H,I> boolean disconnect(QMetaObject.AbstractPrivate
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot0 slot, Qt.ConnectionType... connectionType) {
+    public static QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot0 slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -4873,11 +4873,11 @@ public static QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slo
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static <A> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot1<? super A> slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -4890,11 +4890,11 @@ public static <A> QMetaObject.Connection connect(MultiSignal signal, QMetaObject
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static <A,B> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -4908,11 +4908,11 @@ public static <A,B> QMetaObject.Connection connect(MultiSignal signal, QMetaObje
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static <A,B,C> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -4927,11 +4927,11 @@ public static <A,B,C> QMetaObject.Connection connect(MultiSignal signal, QMetaOb
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static <A,B,C,D> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -4947,11 +4947,11 @@ public static <A,B,C,D> QMetaObject.Connection connect(MultiSignal signal, QMeta
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static <A,B,C,D,E> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -4968,11 +4968,11 @@ public static <A,B,C,D,E> QMetaObject.Connection connect(MultiSignal signal, QMe
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static <A,B,C,D,E,F> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -4990,11 +4990,11 @@ public static <A,B,C,D,E,F> QMetaObject.Connection connect(MultiSignal signal, Q
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -5013,11 +5013,11 @@ public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(MultiSignal signal,
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G,H> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -5037,11 +5037,11 @@ public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(MultiSignal signa
      * @param slot the slot to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
-     * @throws io.qt.QMisfittingSignatureException Raised if slot does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QUninvokableSlotException Raised if slot is annotated <code>&commat;QtUninvokable</code>.
+     * @throws QMisfittingSignatureException Raised if slot does not match to any of the signatures.
      */
-    public static <A,B,C,D,E,F,G,H,I> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Slot9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> slot, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G,H,I> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> slot, Qt.ConnectionType... connectionType) {
         return signal.connectSlot(slot, connectionType);
     }
     
@@ -5052,10 +5052,10 @@ public static <A,B,C,D,E,F,G,H,I> QMetaObject.Connection connect(MultiSignal sig
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable0 connectSignal, Qt.ConnectionType... connectionType) {
+    public static QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable0 connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5067,10 +5067,10 @@ public static QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Con
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static <A> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable1<? super A> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable1<? super A> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5083,10 +5083,10 @@ public static <A> QMetaObject.Connection connect(MultiSignal signal, QMetaObject
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static <A,B> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable2<? super A,? super B> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable2<? super A,? super B> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5100,10 +5100,10 @@ public static <A,B> QMetaObject.Connection connect(MultiSignal signal, QMetaObje
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static <A,B,C> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable3<? super A,? super B,? super C> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable3<? super A,? super B,? super C> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5118,10 +5118,10 @@ public static <A,B,C> QMetaObject.Connection connect(MultiSignal signal, QMetaOb
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static <A,B,C,D> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable4<? super A,? super B,? super C,? super D> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable4<? super A,? super B,? super C,? super D> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5137,10 +5137,10 @@ public static <A,B,C,D> QMetaObject.Connection connect(MultiSignal signal, QMeta
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static <A,B,C,D,E> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable5<? super A,? super B,? super C,? super D,? super E> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable5<? super A,? super B,? super C,? super D,? super E> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5157,10 +5157,10 @@ public static <A,B,C,D,E> QMetaObject.Connection connect(MultiSignal signal, QMe
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static <A,B,C,D,E,F> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable6<? super A,? super B,? super C,? super D,? super E,? super F> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable6<? super A,? super B,? super C,? super D,? super E,? super F> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5178,10 +5178,10 @@ public static <A,B,C,D,E,F> QMetaObject.Connection connect(MultiSignal signal, Q
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5200,10 +5200,10 @@ public static <A,B,C,D,E,F,G> QMetaObject.Connection connect(MultiSignal signal,
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G,H> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5223,10 +5223,10 @@ public static <A,B,C,D,E,F,G,H> QMetaObject.Connection connect(MultiSignal signa
      * @param connectSignal the signal to be connected
      * @param connectionType type of connection
      * @return connection if successful or <code>null</code> otherwise
-     * @throws io.qt.QMisfittingSignatureException Raised if their signatures are incompatible.
-     * @throws io.qt.QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
+     * @throws QMisfittingSignatureException Raised if their signatures are incompatible.
+     * @throws QMisfittingSignatureException Raised if connectSignal does not match to any of the signatures.
      */
-    public static <A,B,C,D,E,F,G,H,I> QMetaObject.Connection connect(MultiSignal signal, QMetaObject.Connectable9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> connectSignal, Qt.ConnectionType... connectionType) {
+    public static <A,B,C,D,E,F,G,H,I> QMetaObject.@NonNull Connection connect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> connectSignal, Qt.ConnectionType... connectionType) {
         return signal.connectSignal((QMetaObject.AbstractSignal)connectSignal, connectionType);
     }
     
@@ -5237,7 +5237,7 @@ public static <A,B,C,D,E,F,G,H,I> QMetaObject.Connection connect(MultiSignal sig
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(MultiSignal signal, QMetaObject.Slot0 slot) {
+    public static boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot0 slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5249,7 +5249,7 @@ public static boolean disconnect(MultiSignal signal, QMetaObject.Slot0 slot) {
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(MultiSignal signal, QMetaObject.Slot1<? super A> slot) {
+    public static <A> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot1<? super A> slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5262,7 +5262,7 @@ public static <A> boolean disconnect(MultiSignal signal, QMetaObject.Slot1<? sup
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(MultiSignal signal, QMetaObject.Slot2<? super A,? super B> slot) {
+    public static <A,B> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot2<? super A,? super B> slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5276,7 +5276,7 @@ public static <A,B> boolean disconnect(MultiSignal signal, QMetaObject.Slot2<? s
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(MultiSignal signal, QMetaObject.Slot3<? super A,? super B,? super C> slot) {
+    public static <A,B,C> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot3<? super A,? super B,? super C> slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5291,7 +5291,7 @@ public static <A,B,C> boolean disconnect(MultiSignal signal, QMetaObject.Slot3<?
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D> boolean disconnect(MultiSignal signal, QMetaObject.Slot4<? super A,? super B,? super C,? super D> slot) {
+    public static <A,B,C,D> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot4<? super A,? super B,? super C,? super D> slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5307,7 +5307,7 @@ public static <A,B,C,D> boolean disconnect(MultiSignal signal, QMetaObject.Slot4
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E> boolean disconnect(MultiSignal signal, QMetaObject.Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
+    public static <A,B,C,D,E> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot5<? super A,? super B,? super C,? super D,? super E> slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5324,7 +5324,7 @@ public static <A,B,C,D,E> boolean disconnect(MultiSignal signal, QMetaObject.Slo
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F> boolean disconnect(MultiSignal signal, QMetaObject.Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
+    public static <A,B,C,D,E,F> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot6<? super A,? super B,? super C,? super D,? super E,? super F> slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5342,7 +5342,7 @@ public static <A,B,C,D,E,F> boolean disconnect(MultiSignal signal, QMetaObject.S
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G> boolean disconnect(MultiSignal signal, QMetaObject.Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot) {
+    public static <A,B,C,D,E,F,G> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5361,7 +5361,7 @@ public static <A,B,C,D,E,F,G> boolean disconnect(MultiSignal signal, QMetaObject
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G,H> boolean disconnect(MultiSignal signal, QMetaObject.Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot) {
+    public static <A,B,C,D,E,F,G,H> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5381,7 +5381,7 @@ public static <A,B,C,D,E,F,G,H> boolean disconnect(MultiSignal signal, QMetaObje
      * @param slot the slot to be disconnected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G,H,I> boolean disconnect(MultiSignal signal, QMetaObject.Slot9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> slot) {
+    public static <A,B,C,D,E,F,G,H,I> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Slot9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> slot) {
         return signal.disconnectSlot(slot);
     }
     
@@ -5392,7 +5392,7 @@ public static <A,B,C,D,E,F,G,H,I> boolean disconnect(MultiSignal signal, QMetaOb
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(MultiSignal signal, QMetaObject.Connectable0 connectSignal) {
+    public static boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable0 connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5404,7 +5404,7 @@ public static boolean disconnect(MultiSignal signal, QMetaObject.Connectable0 co
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A> boolean disconnect(MultiSignal signal, QMetaObject.Connectable1<? super A> connectSignal) {
+    public static <A> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable1<? super A> connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5417,7 +5417,7 @@ public static <A> boolean disconnect(MultiSignal signal, QMetaObject.Connectable
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B> boolean disconnect(MultiSignal signal, QMetaObject.Connectable2<? super A,? super B> connectSignal) {
+    public static <A,B> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable2<? super A,? super B> connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5431,7 +5431,7 @@ public static <A,B> boolean disconnect(MultiSignal signal, QMetaObject.Connectab
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C> boolean disconnect(MultiSignal signal, QMetaObject.Connectable3<? super A,? super B,? super C> connectSignal) {
+    public static <A,B,C> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable3<? super A,? super B,? super C> connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5446,7 +5446,7 @@ public static <A,B,C> boolean disconnect(MultiSignal signal, QMetaObject.Connect
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D> boolean disconnect(MultiSignal signal, QMetaObject.Connectable4<? super A,? super B,? super C,? super D> connectSignal) {
+    public static <A,B,C,D> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable4<? super A,? super B,? super C,? super D> connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5462,7 +5462,7 @@ public static <A,B,C,D> boolean disconnect(MultiSignal signal, QMetaObject.Conne
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E> boolean disconnect(MultiSignal signal, QMetaObject.Connectable5<? super A,? super B,? super C,? super D,? super E> connectSignal) {
+    public static <A,B,C,D,E> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable5<? super A,? super B,? super C,? super D,? super E> connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5479,7 +5479,7 @@ public static <A,B,C,D,E> boolean disconnect(MultiSignal signal, QMetaObject.Con
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F> boolean disconnect(MultiSignal signal, QMetaObject.Connectable6<? super A,? super B,? super C,? super D,? super E,? super F> connectSignal) {
+    public static <A,B,C,D,E,F> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable6<? super A,? super B,? super C,? super D,? super E,? super F> connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5497,7 +5497,7 @@ public static <A,B,C,D,E,F> boolean disconnect(MultiSignal signal, QMetaObject.C
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G> boolean disconnect(MultiSignal signal, QMetaObject.Connectable7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> connectSignal) {
+    public static <A,B,C,D,E,F,G> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable7<? super A,? super B,? super C,? super D,? super E,? super F,? super G> connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5516,7 +5516,7 @@ public static <A,B,C,D,E,F,G> boolean disconnect(MultiSignal signal, QMetaObject
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G,H> boolean disconnect(MultiSignal signal, QMetaObject.Connectable8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> connectSignal) {
+    public static <A,B,C,D,E,F,G,H> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable8<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H> connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5536,7 +5536,7 @@ public static <A,B,C,D,E,F,G,H> boolean disconnect(MultiSignal signal, QMetaObje
      * @param connectSignal the signal to be connected
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static <A,B,C,D,E,F,G,H,I> boolean disconnect(MultiSignal signal, QMetaObject.Connectable9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> connectSignal) {
+    public static <A,B,C,D,E,F,G,H,I> boolean disconnect(@StrictNonNull MultiSignal signal, QMetaObject.@StrictNonNull Connectable9<? super A,? super B,? super C,? super D,? super E,? super F,? super G,? super H,? super I> connectSignal) {
         return signal.disconnectSignal((QMetaObject.AbstractSignal)connectSignal);
     }
     
@@ -5633,7 +5633,7 @@ public static <A,B,C,D,E,F,G,H,I> boolean disconnect(MultiSignal signal, QMetaOb
      * @see #sender()
      * @see QMetaType#registerMetaType(Class)
      */
-    public static QMetaObject.Connection connect(QObject sender, String signal, QObject receiver, String slot, Qt.ConnectionType... connectionType) {
+    public static QMetaObject.@NonNull Connection connect(@StrictNonNull QObject sender, @StrictNonNull String signal, @StrictNonNull QObject receiver, @StrictNonNull String slot, Qt.ConnectionType... connectionType) {
         if(signal.isEmpty())
             throw new IllegalArgumentException("Empty string not allowed as signal.");
         if(slot.isEmpty())
@@ -5663,12 +5663,12 @@ public static QMetaObject.Connection connect(QObject sender, String signal, QObj
      * You can check {@link QMetaObject.Connection#isConnected()} on the returned connection object.</p>
      *
      * <p>This function works in the same way as
-     * {@link #connect(QObject, String, QObject, String, io.qt.core.Qt.ConnectionType...)}
+     * {@link #connect(QObject, String, QObject, String, Qt.ConnectionType...)}
      * but it uses QMetaMethod to specify signal and method.</p>
      *
-     * @see #connect(QObject, String, QObject, String, io.qt.core.Qt.ConnectionType...)
+     * @see #connect(QObject, String, QObject, String, Qt.ConnectionType...)
      */
-    public static QMetaObject.Connection connect(QObject sender, QMetaMethod signal, QObject receiver, QMetaMethod slot, Qt.ConnectionType... connectionType) {
+    public static QMetaObject.@NonNull Connection connect(@StrictNonNull QObject sender, @StrictNonNull QMetaMethod signal, QObject receiver, @StrictNonNull QMetaMethod slot, Qt.ConnectionType... connectionType) {
         java.util.Objects.requireNonNull(signal);
         java.util.Objects.requireNonNull(slot);
         byte flags = 0;
@@ -5735,7 +5735,7 @@ public static QMetaObject.Connection connect(QObject sender, QMetaMethod signal,
      * any signal. If not, only the specified signal is disconnected.</p>
      * 
      * <p>If <i>receiver</i> is 0, it disconnects anything connected to
-     * <i>signal</i>. If not, QMetaObject.Slots in objects other than <i>receiver</i> are not
+     * <i>signal</i>. If not, QMetaObject.@StrictNonNull Slots in objects other than <i>receiver</i> are not
      * disconnected.</p>
      * 
      * <p>If <i>method</i> is 0, it disconnects anything that is connected to
@@ -5746,7 +5746,7 @@ public static QMetaObject.Connection connect(QObject sender, QMetaMethod signal,
      * 
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QObject sender, String signal, QObject receiver, String slot) {
+    public static boolean disconnect(@StrictNonNull QObject sender, String signal, QObject receiver, String slot) {
         if(signal!=null && signal.isEmpty())
             throw new IllegalArgumentException("Empty string not allowed as signal.");
         if(slot!=null && slot.isEmpty())
@@ -5793,7 +5793,7 @@ public static boolean disconnect(QObject sender, String signal, QObject receiver
      * @see #disconnect(QObject, String, QObject, String)
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      */
-    public static boolean disconnect(QObject sender, QMetaMethod signal, QObject receiver, QMetaMethod slot) {
+    public static boolean disconnect(@StrictNonNull QObject sender, QMetaMethod signal, QObject receiver, QMetaMethod slot) {
         return QMetaObject.disconnectMethods(
                 java.util.Objects.requireNonNull(sender),
                 signal==null ? -1 : signal.methodIndex(),
@@ -5813,7 +5813,7 @@ public static boolean disconnect(QObject sender, QMetaMethod signal, QObject rec
      * @return <code>true</code> if successfully disconnected, or <code>false</code> otherwise.
      * 
      */
-    public static boolean disconnect(QMetaObject.Connection connection) {
+    public static boolean disconnect(QMetaObject.@NonNull Connection connection) {
         return CoreUtility.disconnectOne(connection);
     }
     
@@ -5841,7 +5841,7 @@ public final boolean disconnect(Object receiver) {
      * Returns a pointer to the meta-object of this object.
      * @return the object's meta-object
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public native final QMetaObject metaObject();
         
     /**
@@ -5850,8 +5850,8 @@ public final boolean disconnect(Object receiver) {
      * @param targetType
      * @return the object as targetType or null
      */
-    @io.qt.QtUninvokable
-    public final <T extends QtObjectInterface> T qt_metacast(Class<T> targetType) {
+    @QtUninvokable
+    public final <T extends QtObjectInterface> T qt_metacast(@StrictNonNull Class<T> targetType) {
         return QMetaObject.cast(targetType, this);
     }
     
@@ -5861,16 +5861,16 @@ public final <T extends QtObjectInterface> T qt_metacast(Class<T> targetType) {
      * @param targetType
      * @return <code>true</code> if object instance of targetType
      */
-    @io.qt.QtUninvokable
-    public final boolean inherits(Class<?> targetType){
+    @QtUninvokable
+    public final boolean inherits(@StrictNonNull Class<?> targetType){
         return targetType.isInstance(this) || inherits(QMetaObject.internalNameOfType(targetType).replace("*", ""));
     }
     
     /**
      * @see #receivers(String)
      */
-    @io.qt.QtUninvokable
-    protected final int receivers(io.qt.core.QMetaObject.AbstractSignal signalObject){
+    @QtUninvokable
+    protected final int receivers(QMetaObject.@StrictNonNull AbstractSignal signalObject){
         if(signalObject.methodIndex()>=0 && signalObject.containingObject()==this) {
             QMetaMethod method = metaObject().methods().get(signalObject.methodIndex());
             return receivers("2" + method.cppMethodSignature());
@@ -5882,7 +5882,7 @@ protected final int receivers(io.qt.core.QMetaObject.AbstractSignal signalObject
      * <p>See <a href="@docRoot/qobject.html#qobject_cast">qobject_cast&lt;T>(QObject *)</a></p>
      */
     @QtUninvokable
-    public static <T extends QtObjectInterface> T qobject_cast(Class<T> targetType, QObject object) {
+    public static <T extends @Nullable QtObjectInterface> T qobject_cast(@StrictNonNull Class<T> targetType, @Nullable QObject object) {
         return QMetaObject.cast(targetType, object);
     }
     
@@ -6220,7 +6220,7 @@ void initialize(QProperty<T> property) {
      * "<code>public final Signal0 fooChanged</code>" as it's notify signal and 
      * "<code>public QBindable&lt;T> bindableFoo()</code>" as it's bindable supplier.
      * </p>
-     * <p>Instead of meeting these naming conventions you can use the <code>io.qt.QtProperty...</code> annotations
+     * <p>Instead of meeting these naming conventions you can use the <code>QtProperty...</code> annotations
      * to make the fields and methods identified as property:</p>
      * <code>
      * public class MyObject extends QObject{<br>
@@ -6312,7 +6312,7 @@ public QProperty(QUntypedPropertyBinding binding) {
          * Otherwise, a default value is used.</p>
          * @param functor
          */
-        public QProperty(QtUtilities.Supplier<? extends T> functor) {
+        public QProperty(QtUtilities.@StrictNonNull Supplier<? extends T> functor) {
             this(new QPropertyBinding<>(functor));
         }
         
@@ -6357,7 +6357,7 @@ public final void setValue(T newValue)
          */
         @SuppressWarnings("unchecked")
         @QtUninvokable
-        public final QPropertyBinding<T> setBinding(QPropertyBinding<T> newBinding)
+        public final @NonNull QPropertyBinding<T> setBinding(QPropertyBinding<T> newBinding)
         {
             if(newBinding!=null && !io.qt.core.QProperty.checkType(core.valueMetaType(this), newBinding.valueMetaType()))
                 return new QPropertyBinding<>();
@@ -6399,7 +6399,7 @@ public final boolean setBinding(QUntypedPropertyBinding newBinding)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QPropertyBinding<T> setBinding(QtUtilities.Supplier<? extends T> functor)
+        public final @NonNull QPropertyBinding<T> setBinding(QtUtilities.@StrictNonNull Supplier<? extends T> functor)
         {
             try {
                 QPropertyBinding.setPendingMetaType(this::valueMetaType);
@@ -6410,7 +6410,7 @@ public final QPropertyBinding<T> setBinding(QtUtilities.Supplier<? extends T> fu
         }
         
         @QtUninvokable
-        private QPropertyBinding<T> makeBinding()
+        private @NonNull QPropertyBinding<T> makeBinding()
         {
             core.initialize(this);
             try {
@@ -6437,7 +6437,7 @@ public final boolean hasBinding() {
          * @return binding
          */
         @QtUninvokable
-        public final QPropertyBinding<T> binding()
+        public final @NonNull QPropertyBinding<T> binding()
         {
             return new QPropertyBinding<>(this);
         }
@@ -6448,7 +6448,7 @@ public final QPropertyBinding<T> binding()
          * @return the removed binding
          */
         @QtUninvokable
-        public final QPropertyBinding<T> takeBinding()
+        public final @NonNull QPropertyBinding<T> takeBinding()
         {
             return setBinding(new QPropertyBinding<>());
         }
@@ -6463,7 +6463,7 @@ public final QPropertyBinding<T> takeBinding()
          * @see QPropertyChangeHandler
          */
         @QtUninvokable
-        public final QPropertyChangeHandler onValueChanged(Runnable f)
+        public final @NonNull QPropertyChangeHandler onValueChanged(Runnable f)
         {
             return new QPropertyChangeHandler(bindingData(), f);
         }
@@ -6476,7 +6476,7 @@ public final QPropertyChangeHandler onValueChanged(Runnable f)
          * @see #onValueChanged(Runnable)
          */
         @QtUninvokable
-        public final QPropertyChangeHandler subscribe(Runnable f)
+        public final @NonNull QPropertyChangeHandler subscribe(Runnable f)
         {
             f.run();
             return onValueChanged(f);
@@ -6491,8 +6491,8 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
-        public final QPropertyNotifier addNotifier(Runnable f)
+        @QtUninvokable
+        public final @NonNull QPropertyNotifier addNotifier(Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
         }
@@ -6529,7 +6529,7 @@ private boolean hasSignal() {
             return core.hasSignal(this);
         }
         
-        QMetaType valueMetaType() {
+        @NonNull QMetaType valueMetaType() {
             return core.valueMetaType(this);
         }
         
@@ -6595,7 +6595,7 @@ public QBooleanProperty(QBooleanPropertyBinding binding) {
          * Constructs a <code>boolean</code>-typed property with the provided binding.
          * @param binding
          */
-        public QBooleanProperty(QPropertyBinding<@QtPrimitiveType Boolean> binding) {
+        public QBooleanProperty(QPropertyBinding<@QtPrimitiveType@StrictNonNull Boolean> binding) {
             super();
             if(io.qt.core.QBooleanProperty.checkType(binding.valueMetaType())){
                 Runnable signal = this.signal;
@@ -6667,7 +6667,7 @@ public final QBooleanPropertyBinding setBinding(QBooleanPropertyBinding newBindi
          * @return oldBinding
          */
         @QtUninvokable
-        public final QBooleanPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType Boolean> newBinding)
+        public final QBooleanPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType@StrictNonNull Boolean> newBinding)
         {
             if(!io.qt.core.QBooleanProperty.checkType(newBinding.valueMetaType()))
                 return new QBooleanPropertyBinding();
@@ -6792,7 +6792,7 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QPropertyNotifier addNotifier(Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
@@ -6891,7 +6891,7 @@ public QByteProperty(QBytePropertyBinding binding) {
          * Constructs a <code>byte</code>-typed property with the provided binding.
          * @param binding
          */
-        public QByteProperty(QPropertyBinding<@QtPrimitiveType Byte> binding) {
+        public QByteProperty(QPropertyBinding<@QtPrimitiveType@StrictNonNull Byte> binding) {
             super();
             if(io.qt.core.QByteProperty.checkType(binding.valueMetaType())){
                 Runnable signal = this.signal;
@@ -6905,7 +6905,7 @@ public QByteProperty(QPropertyBinding<@QtPrimitiveType Byte> binding) {
          * <p>Constructs a <code>byte</code>-typed property bound to the provided <code>functor</code>.</p>
          * @param functor
          */
-        public QByteProperty(io.qt.QtUtilities.ByteSupplier functor) {
+        public QByteProperty(QtUtilities.ByteSupplier functor) {
             this(new QBytePropertyBinding(functor));
         }
         
@@ -6963,7 +6963,7 @@ public final QBytePropertyBinding setBinding(QBytePropertyBinding newBinding)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QBytePropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType Byte> newBinding)
+        public final QBytePropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType@StrictNonNull Byte> newBinding)
         {
             if(!io.qt.core.QByteProperty.checkType(newBinding.valueMetaType()))
                 return new QBytePropertyBinding();
@@ -7007,7 +7007,7 @@ public final boolean setBinding(QUntypedPropertyBinding newBinding)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QBytePropertyBinding setBinding(io.qt.QtUtilities.ByteSupplier functor)
+        public final QBytePropertyBinding setBinding(QtUtilities.ByteSupplier functor)
         {
             return setBinding(new QBytePropertyBinding(functor));
         }
@@ -7088,7 +7088,7 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QPropertyNotifier addNotifier(Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
@@ -7187,7 +7187,7 @@ public QShortProperty(QShortPropertyBinding binding) {
          * Constructs a <code>short</code>-typed property with the provided binding.
          * @param binding
          */
-        public QShortProperty(QPropertyBinding<@QtPrimitiveType Short> binding) {
+        public QShortProperty(QPropertyBinding<@QtPrimitiveType@StrictNonNull Short> binding) {
             super();
             if(io.qt.core.QShortProperty.checkType(binding.valueMetaType())){
                 Runnable signal = this.signal;
@@ -7238,7 +7238,7 @@ public final void setValue(short newValue)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QShortPropertyBinding setBinding(io.qt.QtUtilities.ShortSupplier functor)
+        public final QShortPropertyBinding setBinding(QtUtilities.ShortSupplier functor)
         {
             return setBinding(new QShortPropertyBinding(functor));
         }
@@ -7274,7 +7274,7 @@ public final QShortPropertyBinding setBinding(QShortPropertyBinding newBinding)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QShortPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType Short> newBinding)
+        public final QShortPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType@StrictNonNull Short> newBinding)
         {
             if(!io.qt.core.QShortProperty.checkType(newBinding.valueMetaType()))
                 return new QShortPropertyBinding();
@@ -7386,7 +7386,7 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QPropertyNotifier addNotifier(Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
@@ -7485,7 +7485,7 @@ public QIntProperty(QIntPropertyBinding binding) {
          * Constructs an <code>int</code>-typed property with the provided binding.
          * @param binding
          */
-        public QIntProperty(QPropertyBinding<@QtPrimitiveType Integer> binding) {
+        public QIntProperty(QPropertyBinding<@QtPrimitiveType@StrictNonNull Integer> binding) {
             super();
             if(io.qt.core.QIntProperty.checkType(binding.valueMetaType())){
                 Runnable signal = this.signal;
@@ -7557,7 +7557,7 @@ public final QIntPropertyBinding setBinding(QIntPropertyBinding newBinding)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QIntPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType Integer> newBinding)
+        public final QIntPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType@StrictNonNull Integer> newBinding)
         {
             if(!io.qt.core.QIntProperty.checkType(newBinding.valueMetaType()))
                 return new QIntPropertyBinding();
@@ -7682,7 +7682,7 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QPropertyNotifier addNotifier(Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
@@ -7781,7 +7781,7 @@ public QLongProperty(QLongPropertyBinding binding) {
          * Constructs a <code>long</code>-typed property with the provided binding.
          * @param binding
          */
-        public QLongProperty(QPropertyBinding<@QtPrimitiveType Long> binding) {
+        public QLongProperty(QPropertyBinding<@QtPrimitiveType@StrictNonNull Long> binding) {
             super();
             if(io.qt.core.QLongProperty.checkType(binding.valueMetaType())){
                 Runnable signal = this.signal;
@@ -7853,7 +7853,7 @@ public final QLongPropertyBinding setBinding(QLongPropertyBinding newBinding)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QLongPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType Long> newBinding)
+        public final QLongPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType@StrictNonNull Long> newBinding)
         {
             if(!io.qt.core.QLongProperty.checkType(newBinding.valueMetaType()))
                 return new QLongPropertyBinding();
@@ -7978,7 +7978,7 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QPropertyNotifier addNotifier(Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
@@ -8077,7 +8077,7 @@ public QFloatProperty(QFloatPropertyBinding binding) {
          * Constructs a <code>float</code>-typed property with the provided binding.
          * @param binding
          */
-        public QFloatProperty(QPropertyBinding<@QtPrimitiveType Float> binding) {
+        public QFloatProperty(QPropertyBinding<@QtPrimitiveType@StrictNonNull Float> binding) {
             super();
             if(io.qt.core.QFloatProperty.checkType(binding.valueMetaType())){
                 Runnable signal = this.signal;
@@ -8091,7 +8091,7 @@ public QFloatProperty(QPropertyBinding<@QtPrimitiveType Float> binding) {
          * <p>Constructs a <code>float</code>-typed property bound to the provided <code>functor</code>.</p>
          * @param functor
          */
-        public QFloatProperty(io.qt.QtUtilities.FloatSupplier functor) {
+        public QFloatProperty(QtUtilities.FloatSupplier functor) {
             this(new QFloatPropertyBinding(functor));
         }
         
@@ -8149,7 +8149,7 @@ public final QFloatPropertyBinding setBinding(QFloatPropertyBinding newBinding)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QFloatPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType Float> newBinding)
+        public final QFloatPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType@StrictNonNull Float> newBinding)
         {
             if(!io.qt.core.QFloatProperty.checkType(newBinding.valueMetaType()))
                 return new QFloatPropertyBinding();
@@ -8187,13 +8187,13 @@ public final boolean setBinding(QUntypedPropertyBinding newBinding)
         
         /**
          * <p>Associates the value of this property with the provided <code>functor</code> and returns the previously associated binding.</p>
-         * <p>The first time the property value is read, the binding is evaluated by invoking {@link io.qt.QtUtilities.FloatSupplier#getAsFloat()} of <code>functor</code>.
+         * <p>The first time the property value is read, the binding is evaluated by invoking {@link QtUtilities.FloatSupplier#getAsFloat()} of <code>functor</code>.
          * Whenever a dependency of the binding changes, the binding will be re-evaluated the next time the value of this property is read.</p>
          * @param functor
          * @return oldBinding
          */
         @QtUninvokable
-        public final QFloatPropertyBinding setBinding(io.qt.QtUtilities.FloatSupplier functor)
+        public final QFloatPropertyBinding setBinding(QtUtilities.FloatSupplier functor)
         {
             return setBinding(new QFloatPropertyBinding(functor));
         }
@@ -8274,7 +8274,7 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QPropertyNotifier addNotifier(Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
@@ -8373,7 +8373,7 @@ public QDoubleProperty(QDoublePropertyBinding binding) {
          * Constructs a <code>double</code>-typed property with the provided binding.
          * @param binding
          */
-        public QDoubleProperty(QPropertyBinding<@QtPrimitiveType Double> binding) {
+        public QDoubleProperty(QPropertyBinding<@QtPrimitiveType@StrictNonNull Double> binding) {
             super();
             if(io.qt.core.QDoubleProperty.checkType(binding.valueMetaType())){
                 Runnable signal = this.signal;
@@ -8445,7 +8445,7 @@ public final QDoublePropertyBinding setBinding(QDoublePropertyBinding newBinding
          * @return oldBinding
          */
         @QtUninvokable
-        public final QDoublePropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType Double> newBinding)
+        public final QDoublePropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType@StrictNonNull Double> newBinding)
         {
             if(!io.qt.core.QDoubleProperty.checkType(newBinding.valueMetaType()))
                 return new QDoublePropertyBinding();
@@ -8570,7 +8570,7 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QPropertyNotifier addNotifier(Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
@@ -8669,7 +8669,7 @@ public QCharProperty(QCharPropertyBinding binding) {
          * Constructs a <code>char</code>-typed property with the provided binding.
          * @param binding
          */
-        public QCharProperty(QPropertyBinding<@QtPrimitiveType Character> binding) {
+        public QCharProperty(QPropertyBinding<@QtPrimitiveType@NonNull Character> binding) {
             super();
             if(io.qt.core.QCharProperty.checkType(binding.valueMetaType())){
                 Runnable signal = this.signal;
@@ -8683,7 +8683,7 @@ public QCharProperty(QPropertyBinding<@QtPrimitiveType Character> binding) {
          * <p>Constructs a <code>char</code>-typed property bound to the provided <code>functor</code>.</p>
          * @param functor
          */
-        public QCharProperty(io.qt.QtUtilities.CharSupplier functor) {
+        public QCharProperty(QtUtilities.@NonNull CharSupplier functor) {
             this(new QCharPropertyBinding(functor));
         }
         
@@ -8720,7 +8720,7 @@ public final void setValue(char newValue)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QCharPropertyBinding setBinding(QCharPropertyBinding newBinding)
+        public final @NonNull QCharPropertyBinding setBinding(QCharPropertyBinding newBinding)
         {
             QPropertyBindingData bd = bindingData();
             QUntypedPropertyBinding oldBinding = bd.setBinding(newBinding, this);
@@ -8741,7 +8741,7 @@ public final QCharPropertyBinding setBinding(QCharPropertyBinding newBinding)
          * @return oldBinding
          */
         @QtUninvokable
-        public final QCharPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType Character> newBinding)
+        public final @NonNull QCharPropertyBinding setBinding(QPropertyBinding<@QtPrimitiveType@NonNull Character> newBinding)
         {
             if(!io.qt.core.QCharProperty.checkType(newBinding.valueMetaType()))
                 return new QCharPropertyBinding();
@@ -8779,19 +8779,19 @@ public final boolean setBinding(QUntypedPropertyBinding newBinding)
         
         /**
          * <p>Associates the value of this property with the provided <code>functor</code> and returns the previously associated binding.</p>
-         * <p>The first time the property value is read, the binding is evaluated by invoking {@link io.qt.QtUtilities.CharSupplier#getAsChar()} of <code>functor</code>.
+         * <p>The first time the property value is read, the binding is evaluated by invoking {@link QtUtilities.CharSupplier#getAsChar()} of <code>functor</code>.
          * Whenever a dependency of the binding changes, the binding will be re-evaluated the next time the value of this property is read.</p>
          * @param functor
          * @return oldBinding
          */
         @QtUninvokable
-        public final QCharPropertyBinding setBinding(io.qt.QtUtilities.CharSupplier functor)
+        public final @NonNull QCharPropertyBinding setBinding(QtUtilities.@NonNull CharSupplier functor)
         {
             return setBinding(new QCharPropertyBinding(functor));
         }
         
         @QtUninvokable
-        private QCharPropertyBinding makeBinding()
+        private @NonNull QCharPropertyBinding makeBinding()
         {
             return new QCharPropertyBinding(this::value);
         }
@@ -8812,7 +8812,7 @@ public final boolean hasBinding() {
          * @return binding
          */
         @QtUninvokable
-        public final QCharPropertyBinding binding()
+        public final @NonNull QCharPropertyBinding binding()
         {
             return new QCharPropertyBinding(this);
         }
@@ -8823,7 +8823,7 @@ public final QCharPropertyBinding binding()
          * @return the removed binding
          */
         @QtUninvokable
-        public final QCharPropertyBinding takeBinding()
+        public final @NonNull QCharPropertyBinding takeBinding()
         {
             return setBinding(new QCharPropertyBinding());
         }
@@ -8838,7 +8838,7 @@ public final QCharPropertyBinding takeBinding()
          * @see QPropertyChangeHandler
          */
         @QtUninvokable
-        public final QPropertyChangeHandler onValueChanged(Runnable f)
+        public final @NonNull QPropertyChangeHandler onValueChanged(@StrictNonNull Runnable f)
         {
             return new QPropertyChangeHandler(bindingData(), f);
         }
@@ -8851,7 +8851,7 @@ public final QPropertyChangeHandler onValueChanged(Runnable f)
          * @see #onValueChanged(Runnable)
          */
         @QtUninvokable
-        public final QPropertyChangeHandler subscribe(Runnable f)
+        public final @NonNull QPropertyChangeHandler subscribe(@StrictNonNull Runnable f)
         {
             f.run();
             return onValueChanged(f);
@@ -8866,8 +8866,8 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
-        public final QPropertyNotifier addNotifier(Runnable f)
+        @QtUninvokable
+        public final @NonNull QPropertyNotifier addNotifier(@StrictNonNull Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
         }
@@ -8943,7 +8943,7 @@ QObject owner() {
          * @see QPropertyChangeHandler
          */
         @QtUninvokable
-        public final QPropertyChangeHandler onValueChanged(Runnable f)
+        public final @NonNull QPropertyChangeHandler onValueChanged(@StrictNonNull Runnable f)
         {
             return new QPropertyChangeHandler(bindingData(), f);
         }
@@ -8956,7 +8956,7 @@ public final QPropertyChangeHandler onValueChanged(Runnable f)
          * @see #onValueChanged(Runnable)
          */
         @QtUninvokable
-        public final QPropertyChangeHandler subscribe(Runnable f)
+        public final @NonNull QPropertyChangeHandler subscribe(@StrictNonNull Runnable f)
         {
             f.run();
             return onValueChanged(f);
@@ -8971,8 +8971,8 @@ public final QPropertyChangeHandler subscribe(Runnable f)
          * @return property notifier
          * @see QPropertyNotifier
          */
-        @io.qt.QtUninvokable
-        public final QPropertyNotifier addNotifier(Runnable f)
+        @QtUninvokable
+        public final @NonNull QPropertyNotifier addNotifier(@StrictNonNull Runnable f)
         {
             return new QPropertyNotifier(bindingData(), f);
         }
@@ -8983,7 +8983,7 @@ final QPropertyBindingData bindingData() {
         }
         
         @QtUninvokable
-        public abstract QMetaType valueMetaType();
+        public abstract @NonNull QMetaType valueMetaType();
         
         /**
          * Programmatically signals a change of the property. Any binding which depend on it will be notified, and if the property has a signal, it will be emitted.
@@ -9026,7 +9026,7 @@ public final class QComputedProperty<T> extends QAbstractComputedProperty {
          * Constructs a computed-value property whose type corresponds to the given value supplier.
          * @param getter supplying the computed value
          */
-        public QComputedProperty(QtUtilities.Supplier<? extends T> getter) {
+        public QComputedProperty(QtUtilities.@StrictNonNull Supplier<? extends T> getter) {
             super();
             QPropertyBinding.analyzeMetaType(getter);
             this.getter = getter;
@@ -9042,9 +9042,15 @@ public final T value()
             bindingStorage().registerDependency(this);
             return getter.get();
         }
+
+        @QtUninvokable
+        private @NonNull QPropertyBinding<T> makeBinding()
+        {
+            return new QPropertyBinding<>(this::value);
+        }
         
         @QtUninvokable
-        public final QMetaType valueMetaType() {
+        public final @NonNull QMetaType valueMetaType() {
             return QPropertyBinding.analyzeMetaType(getter);
         }
     }
@@ -9061,7 +9067,7 @@ public final class QComputedBooleanProperty extends QAbstractComputedProperty {
          * Constructs a <code>boolean</code>-typed computed-value property according to the given value supplier.
          * @param getter supplying the computed value
          */
-        public QComputedBooleanProperty(java.util.function.BooleanSupplier getter) {
+        public QComputedBooleanProperty(java.util.function.@NonNull BooleanSupplier getter) {
             super();
             this.getter = getter;
         }
@@ -9076,9 +9082,15 @@ public final boolean value()
             bindingStorage().registerDependency(this);
             return getter.getAsBoolean();
         }
+
+        @QtUninvokable
+        private @NonNull QBooleanPropertyBinding makeBinding()
+        {
+            return new QBooleanPropertyBinding(this::value);
+        }
         
         @QtUninvokable
-        public final QMetaType valueMetaType() {
+        public final @NonNull QMetaType valueMetaType() {
             return new QMetaType(QMetaType.Type.Bool);
         }
     }
@@ -9095,7 +9107,7 @@ public final class QComputedByteProperty extends QAbstractComputedProperty {
          * Constructs a <code>byte</code>-typed computed-value property according to the given value supplier.
          * @param getter supplying the computed value
          */
-        public QComputedByteProperty(QtUtilities.ByteSupplier getter) {
+        public QComputedByteProperty(QtUtilities.@NonNull ByteSupplier getter) {
             super();
             this.getter = getter;
         }
@@ -9112,13 +9124,13 @@ public final byte value()
         }
         
         @QtUninvokable
-        private QBytePropertyBinding makeBinding()
+        private @NonNull QBytePropertyBinding makeBinding()
         {
             return new QBytePropertyBinding(this::value);
         }
         
         @QtUninvokable
-        public final QMetaType valueMetaType() {
+        public final @NonNull QMetaType valueMetaType() {
             return new QMetaType(QMetaType.Type.SChar);
         }
     }
@@ -9135,7 +9147,7 @@ public final class QComputedShortProperty extends QAbstractComputedProperty {
          * Constructs a <code>short</code>-typed computed-value property according to the given value supplier.
          * @param getter supplying the computed value
          */
-        public QComputedShortProperty(QtUtilities.ShortSupplier getter) {
+        public QComputedShortProperty(QtUtilities.@NonNull ShortSupplier getter) {
             super();
             this.getter = getter;
         }
@@ -9152,13 +9164,13 @@ public final short value()
         }
         
         @QtUninvokable
-        private QShortPropertyBinding makeBinding()
+        private @NonNull QShortPropertyBinding makeBinding()
         {
             return new QShortPropertyBinding(this::value);
         }
         
         @QtUninvokable
-        public final QMetaType valueMetaType() {
+        public final @NonNull QMetaType valueMetaType() {
             return new QMetaType(QMetaType.Type.Short);
         }
     }
@@ -9175,7 +9187,7 @@ public final class QComputedIntProperty extends QAbstractComputedProperty {
          * Constructs a <code>int</code>-typed computed-value property according to the given value supplier.
          * @param getter supplying the computed value
          */
-        public QComputedIntProperty(java.util.function.IntSupplier getter) {
+        public QComputedIntProperty(java.util.function.@NonNull IntSupplier getter) {
             super();
             this.getter = getter;
         }
@@ -9192,13 +9204,13 @@ public final int value()
         }
         
         @QtUninvokable
-        private QIntPropertyBinding makeBinding()
+        private @NonNull QIntPropertyBinding makeBinding()
         {
             return new QIntPropertyBinding(this::value);
         }
         
         @QtUninvokable
-        public final QMetaType valueMetaType() {
+        public final @NonNull QMetaType valueMetaType() {
             return new QMetaType(QMetaType.Type.Int);
         }
     }
@@ -9215,7 +9227,7 @@ public final class QComputedLongProperty extends QAbstractComputedProperty {
          * Constructs a <code>long</code>-typed computed-value property according to the given value supplier.
          * @param getter supplying the computed value
          */
-        public QComputedLongProperty(java.util.function.LongSupplier getter) {
+        public QComputedLongProperty(java.util.function.@NonNull LongSupplier getter) {
             super();
             this.getter = getter;
         }
@@ -9232,13 +9244,13 @@ public final long value()
         }
         
         @QtUninvokable
-        private QLongPropertyBinding makeBinding()
+        private @NonNull QLongPropertyBinding makeBinding()
         {
             return new QLongPropertyBinding(this::value);
         }
         
         @QtUninvokable
-        public final QMetaType valueMetaType() {
+        public final @NonNull QMetaType valueMetaType() {
             return new QMetaType(QMetaType.Type.LongLong);
         }
     }
@@ -9255,7 +9267,7 @@ public final class QComputedFloatProperty extends QAbstractComputedProperty {
          * Constructs a <code>float</code>-typed computed-value property according to the given value supplier.
          * @param getter supplying the computed value
          */
-        public QComputedFloatProperty(QtUtilities.FloatSupplier getter) {
+        public QComputedFloatProperty(QtUtilities.@NonNull FloatSupplier getter) {
             super();
             this.getter = getter;
         }
@@ -9272,13 +9284,13 @@ public final float value()
         }
         
         @QtUninvokable
-        private QFloatPropertyBinding makeBinding()
+        private @NonNull QFloatPropertyBinding makeBinding()
         {
             return new QFloatPropertyBinding(this::value);
         }
         
         @QtUninvokable
-        public final QMetaType valueMetaType() {
+        public final @NonNull QMetaType valueMetaType() {
             return new QMetaType(QMetaType.Type.Float);
         }
     }
@@ -9295,7 +9307,7 @@ public final class QComputedDoubleProperty extends QAbstractComputedProperty {
          * Constructs a <code>double</code>-typed computed-value property according to the given value supplier.
          * @param getter supplying the computed value
          */
-        public QComputedDoubleProperty(java.util.function.DoubleSupplier getter) {
+        public QComputedDoubleProperty(java.util.function.@NonNull DoubleSupplier getter) {
             super();
             this.getter = getter;
         }
@@ -9312,13 +9324,13 @@ public final double value()
         }
         
         @QtUninvokable
-        private QDoublePropertyBinding makeBinding()
+        private @NonNull QDoublePropertyBinding makeBinding()
         {
             return new QDoublePropertyBinding(this::value);
         }
         
         @QtUninvokable
-        public final QMetaType valueMetaType() {
+        public final @NonNull QMetaType valueMetaType() {
             return new QMetaType(QMetaType.Type.Double);
         }
     }
@@ -9335,7 +9347,7 @@ public final class QComputedCharProperty extends QAbstractComputedProperty {
          * Constructs a <code>char</code>-typed computed-value property according to the given value supplier.
          * @param getter supplying the computed value
          */
-        public QComputedCharProperty(QtUtilities.CharSupplier getter) {
+        public QComputedCharProperty(QtUtilities.@NonNull CharSupplier getter) {
             super();
             this.getter = getter;
         }
@@ -9352,13 +9364,13 @@ public final char value()
         }
         
         @QtUninvokable
-        private QCharPropertyBinding makeBinding()
+        private @NonNull QCharPropertyBinding makeBinding()
         {
             return new QCharPropertyBinding(this::value);
         }
         
         @QtUninvokable
-        public final QMetaType valueMetaType() {
+        public final @NonNull QMetaType valueMetaType() {
             return new QMetaType(QMetaType.Type.QChar);
         }
     }
@@ -9487,7 +9499,7 @@ public QSignalTransition(io.qt.core.QMetaObject.AbstractSignal signal, QState so
     /**
      * Sets the signal associated with this signal transition.
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setSignal(io.qt.core.QMetaObject.AbstractSignal signal){
         if(signal.containingObject() instanceof io.qt.core.QObject) {
             io.qt.core.QObject sender = (io.qt.core.QObject)signal.containingObject();
@@ -9507,7 +9519,7 @@ class QState___{
      * Adds a transition associated with the given signal of the given sender object, and returns the new QSignalTransition object. 
      * The transition has this state as the source, and the given target as the target state.
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QSignalTransition addTransition(io.qt.core.QMetaObject.AbstractSignal signal, QAbstractState target) {
         if(signal.containingObject() instanceof io.qt.core.QObject && signal.methodIndex()!=0) {
             io.qt.core.QObject sender = (io.qt.core.QObject)signal.containingObject();
@@ -9526,46 +9538,46 @@ abstract class QUrl___ extends QUrl{
      * Supertype interface for {@link UrlFormattingOption} and {@link ComponentFormattingOption}
      * to be joined in QFiags type {@link FormattingOptions}
      */
-    public interface FormattingOption extends io.qt.QtFlagEnumerator{
-        
-        public final static FormattingOption None                   = UrlFormattingOption.None;
-        public final static FormattingOption RemoveScheme           = UrlFormattingOption.RemoveScheme;
-        public final static FormattingOption RemovePassword         = UrlFormattingOption.RemovePassword;
-        public final static FormattingOption RemoveUserInfo         = UrlFormattingOption.RemoveUserInfo;
-        public final static FormattingOption RemovePort             = UrlFormattingOption.RemovePort;
-        public final static FormattingOption RemoveAuthority        = UrlFormattingOption.RemoveAuthority;
-        public final static FormattingOption RemovePath             = UrlFormattingOption.RemovePath;
-        public final static FormattingOption RemoveQuery            = UrlFormattingOption.RemoveQuery;
-        public final static FormattingOption RemoveFragment         = UrlFormattingOption.RemoveFragment;
-        public final static FormattingOption PreferLocalFile        = UrlFormattingOption.PreferLocalFile;
-        public final static FormattingOption StripTrailingSlash     = UrlFormattingOption.StripTrailingSlash;
-        public final static FormattingOption RemoveFilename         = UrlFormattingOption.RemoveFilename;
-        public final static FormattingOption NormalizePathSegments  = UrlFormattingOption.NormalizePathSegments;
-        public final static FormattingOption EncodeSpaces           = ComponentFormattingOption.EncodeSpaces;
-        public final static FormattingOption EncodeUnicode          = ComponentFormattingOption.EncodeUnicode;
-        public final static FormattingOption EncodeDelimiters       = ComponentFormattingOption.EncodeDelimiters;
-        public final static FormattingOption EncodeReserved         = ComponentFormattingOption.EncodeReserved;
-        public final static FormattingOption DecodeReserved         = ComponentFormattingOption.DecodeReserved;
-        public final static FormattingOption FullyEncoded           = ComponentFormattingOption.FullyEncoded;
-        public final static FormattingOption FullyDecoded           = ComponentFormattingOption.FullyDecoded;
+    public interface FormattingOption extends QtFlagEnumerator{
+        
+        public final static @NonNull FormattingOption None                   = UrlFormattingOption.None;
+        public final static @NonNull FormattingOption RemoveScheme           = UrlFormattingOption.RemoveScheme;
+        public final static @NonNull FormattingOption RemovePassword         = UrlFormattingOption.RemovePassword;
+        public final static @NonNull FormattingOption RemoveUserInfo         = UrlFormattingOption.RemoveUserInfo;
+        public final static @NonNull FormattingOption RemovePort             = UrlFormattingOption.RemovePort;
+        public final static @NonNull FormattingOption RemoveAuthority        = UrlFormattingOption.RemoveAuthority;
+        public final static @NonNull FormattingOption RemovePath             = UrlFormattingOption.RemovePath;
+        public final static @NonNull FormattingOption RemoveQuery            = UrlFormattingOption.RemoveQuery;
+        public final static @NonNull FormattingOption RemoveFragment         = UrlFormattingOption.RemoveFragment;
+        public final static @NonNull FormattingOption PreferLocalFile        = UrlFormattingOption.PreferLocalFile;
+        public final static @NonNull FormattingOption StripTrailingSlash     = UrlFormattingOption.StripTrailingSlash;
+        public final static @NonNull FormattingOption RemoveFilename         = UrlFormattingOption.RemoveFilename;
+        public final static @NonNull FormattingOption NormalizePathSegments  = UrlFormattingOption.NormalizePathSegments;
+        public final static @NonNull FormattingOption EncodeSpaces           = ComponentFormattingOption.EncodeSpaces;
+        public final static @NonNull FormattingOption EncodeUnicode          = ComponentFormattingOption.EncodeUnicode;
+        public final static @NonNull FormattingOption EncodeDelimiters       = ComponentFormattingOption.EncodeDelimiters;
+        public final static @NonNull FormattingOption EncodeReserved         = ComponentFormattingOption.EncodeReserved;
+        public final static @NonNull FormattingOption DecodeReserved         = ComponentFormattingOption.DecodeReserved;
+        public final static @NonNull FormattingOption FullyEncoded           = ComponentFormattingOption.FullyEncoded;
+        public final static @NonNull FormattingOption FullyDecoded           = ComponentFormattingOption.FullyDecoded;
             
-        public static FormattingOptions flags(FormattingOption... values) {
+        public static @NonNull FormattingOptions flags(@NonNull FormattingOption @NonNull... values) {
             return new FormattingOptions(values);
         }
         
-        public default io.qt.QFlags<?> asFlags() {
+        public default @NonNull QFlags<?> asFlags() {
             return new FormattingOptions(value());
         }
         
-        public static FormattingOption resolve(int value) {
+        public static @NonNull FormattingOption resolve(int value) {
             try {
                 return UrlFormattingOption.resolve(value);
-            }catch(io.qt.QNoSuchEnumValueException e){
+            }catch(QNoSuchEnumValueException e){
                 return ComponentFormattingOption.resolve(value);
             }
         }
         
-        public static FormattingOption[] values() {
+        public static @NonNull FormattingOption @NonNull[] values() {
             UrlFormattingOption[] v1 = UrlFormattingOption.values();
             ComponentFormattingOption[] v2 = ComponentFormattingOption.values();
             FormattingOption[] values = new FormattingOption[v1.length + v2.length];
@@ -9578,10 +9590,10 @@ public static FormattingOption[] values() {
     /**
      * QFlags type for joining {@link UrlFormattingOption} and {@link ComponentFormattingOption}.
      */
-    public static final class FormattingOptions extends io.qt.QFlags<FormattingOption> implements Comparable<FormattingOptions> {
+    public static final class FormattingOptions extends QFlags<FormattingOption> implements Comparable<FormattingOptions> {
         private static final long serialVersionUID = -4458464052834800982L;
 
-        public FormattingOptions(FormattingOption ... args) {
+        public FormattingOptions(@NonNull FormattingOption @NonNull... args) {
             super(args); 
             for (FormattingOption arg : args) {
                 if( !(arg instanceof UrlFormattingOption) 
@@ -9596,12 +9608,12 @@ public FormattingOptions(int value) {
         }
         
         @Override
-        public FormattingOptions clone() {
+        public @NonNull FormattingOptions clone() {
             return new FormattingOptions(value());
         }
         
         @Override
-        public FormattingOptions combined(FormattingOption flag) {
+        public @NonNull FormattingOptions combined(FormattingOption flag) {
             if( !(flag instanceof UrlFormattingOption) 
                     && !(flag instanceof ComponentFormattingOption) ) {
                 throw new IllegalArgumentException("Custom implementations of FormattingOption (" + QtJambi_LibraryUtilities.internal.getClass(flag).getName() + ") are not allowed.");
@@ -9610,7 +9622,7 @@ public FormattingOptions combined(FormattingOption flag) {
         }
         
         @Override
-        public FormattingOption[] flags() {
+        public @NonNull FormattingOption @NonNull[] flags() {
             return super.flags(FormattingOption.values());
         }
 
@@ -9623,47 +9635,47 @@ public int compareTo(FormattingOptions o) {
     /**
      * <p>See <a href="@docRoot/qurl.html#toDisplayString">QUrl::toDisplayString(QUrl::FormattingOptions)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final java.lang.String toDisplayString(FormattingOption... options)    {
+    @QtUninvokable
+    public final java.lang.@NonNull String toDisplayString(@NonNull FormattingOption @NonNull... options)    {
         return toDisplayString(new FormattingOptions(options));
     }
 
     /**
      * <p>See <a href="@docRoot/qurl.html#toString">QUrl::toString(QUrl::FormattingOptions)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final java.lang.String toString(FormattingOption... options)    {
+    @QtUninvokable
+    public final java.lang.@NonNull String toString(@NonNull FormattingOption @NonNull... options)    {
         return toString(new FormattingOptions(options));
     }
     
     /**
      * <p>See <a href="@docRoot/qurl.html#url">QUrl::url(QUrl::FormattingOptions)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final java.lang.String url(FormattingOption... options)    {
+    @QtUninvokable
+    public final java.lang.@NonNull String url(@NonNull FormattingOption @NonNull... options)    {
         return url(new FormattingOptions(options));
     }
 
     /**
      * <p>See <a href="@docRoot/qurl.html#toEncoded">QUrl::toEncoded(QUrl::FormattingOptions)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QByteArray toEncoded(FormattingOption... options)    {
+    @QtUninvokable
+    public final io.qt.core.@NonNull QByteArray toEncoded(@NonNull FormattingOption @NonNull... options)    {
         return toEncoded(new FormattingOptions(options));
     }
     
     /**
      * <p>See <a href="@docRoot/qurl.html#toStringList">QUrl::toStringList(QList&lt;QUrl&gt;,QUrl::FormattingOptions)</a></p>
      */
-    public static QStringList toStringList(java.util.Collection<? extends io.qt.core.QUrl> uris, FormattingOption... options){
+    public static @NonNull QStringList toStringList(java.util.Collection<? extends io.qt.core.@NonNull QUrl> uris, @NonNull FormattingOption @NonNull... options){
         return toStringList(uris, new FormattingOptions(options));
     }
     
     /**
      * <p>See <a href="@docRoot/qurl.html#adjusted">QUrl::adjusted(QUrl::FormattingOptions)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QUrl adjusted(io.qt.core.QUrl.FormattingOption... options){
+    @QtUninvokable
+    public final io.qt.core.@NonNull QUrl adjusted(io.qt.core.QUrl.@NonNull FormattingOption @NonNull... options){
         return adjusted(new FormattingOptions(options));
     }
     
@@ -9671,7 +9683,7 @@ public final io.qt.core.QUrl adjusted(io.qt.core.QUrl.FormattingOption... option
      * @deprecated Use <code>new QUrl("qrc:path")</code> instead.
      */
     @Deprecated
-    public static io.qt.core.QUrl fromClassPath(java.lang.String classpath){
+    public static io.qt.core.@NonNull QUrl fromClassPath(java.lang.@NonNull String classpath){
         return new io.qt.core.QUrl("qrc:"+classpath);
     }
 }// class
@@ -9681,39 +9693,39 @@ abstract class QAbstractItemModel___ extends QAbstractItemModel {
     /**
      * <p>See <a href="@docRoot/qabstractitemmodel.html#setData">QAbstractItemModel::setData(QModelIndex,QVariant,int)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final boolean setData(int row, int col, Object value) {
+    @QtUninvokable
+    public final boolean setData(int row, int col, @Nullable Object value) {
         return setData(this.index(row, col), value, io.qt.core.Qt.ItemDataRole.DisplayRole);
     }
     
     /**
      * <p>See <a href="@docRoot/qabstractitemmodel.html#setData">QAbstractItemModel::setData(QModelIndex,QVariant,int)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final boolean setData(int row, int col, Object value, int role) {
+    @QtUninvokable
+    public final boolean setData(int row, int col, @Nullable Object value, int role) {
         return setData(this.index(row, col), value, role);
     }
 
     /**
      * <p>See <a href="@docRoot/qabstractitemmodel.html#data">QAbstractItemModel::data(QModelIndex,int)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final Object data(int row, int col) {
+    @QtUninvokable
+    public final @Nullable Object data(int row, int col) {
         return data(this.index(row, col), Qt.ItemDataRole.DisplayRole);
     }
     
     /**
      * <p>See <a href="@docRoot/qabstractitemmodel.html#data">QAbstractItemModel::data(QModelIndex,int)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final Object data(int row, int col, int role) {
+    @QtUninvokable
+    public final @Nullable Object data(int row, int col, int role) {
         return data(this.index(row, col), role);
     }
 
     /**
      * <p>See <a href="@docRoot/qabstractitemmodel.html#createIndex-1">QAbstractItemModel::createIndex(int,int,quintptr)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     protected final io.qt.core.QModelIndex createIndex(int row, int column){
         return createIndex(row, column, 0);
     }
@@ -9792,7 +9804,7 @@ protected void timerEvent(QTimerEvent e) {
      * @see #start()
      * @see <a href="@docRoot/qtimer.html#singleShot">QTimer::singleShot(int,const QObject*,const char *)</a>
      */
-     public static void singleShot(int msec, QObject obj, String method) {
+     public static void singleShot(int msec, @Nullable QObject obj, @NonNull String method) {
         singleShot(msec, defaultTypeFor(msec), obj, method);
     }
 
@@ -9812,7 +9824,7 @@ public static void singleShot(int msec, QObject obj, String method) {
      * @since 5.4
      * @see <a href="@docRoot/qtimer.html#singleShot-6">QTimer::singleShot(int,const QObject*,Functor)</a>
      */    
-    public static void singleShot(int msec, QObject context, QMetaObject.Slot0 slot) {
+    public static void singleShot(int msec, @Nullable QObject context, QMetaObject.@NonNull Slot0 slot) {
         singleShot(msec, defaultTypeFor(msec), context, slot);
     }
 
@@ -9829,7 +9841,7 @@ public static void singleShot(int msec, QObject context, QMetaObject.Slot0 slot)
      * @see #start()
      * @see <a href="@docRoot/qtimer.html#singleShot-1">QTimer::singleShot(int,Qt::TimerType,const QObject*,const char *)</a>
      */
-    public static void singleShot(int msec, Qt.TimerType timeType, QObject obj, String method) {
+    public static void singleShot(int msec, Qt.@NonNull TimerType timeType, @Nullable QObject obj, @NonNull String method) {
         new QSingleShotTimer(msec, timeType, obj, method);
     }
 
@@ -9846,7 +9858,7 @@ public static void singleShot(int msec, Qt.TimerType timeType, QObject obj, Stri
      * @since 5.4
      * @see <a href="@docRoot/qtimer.html#singleShot-2">QTimer::singleShot(int,Qt::TimerType,PointerToMemberFunction)</a>
      */
-    public static void singleShot(int msec, QMetaObject.Slot0 slot) {
+    public static void singleShot(int msec, QMetaObject.@NonNull Slot0 slot) {
         singleShot(msec, defaultTypeFor(msec), null, slot);
     }
 
@@ -9864,7 +9876,7 @@ public static void singleShot(int msec, QMetaObject.Slot0 slot) {
      * @since 5.4
      * @see <a href="@docRoot/qtimer.html#singleShot-3">QTimer::singleShot(int,Qt::TimerType,PointerToMemberFunction)</a>
      */
-    public static void singleShot(int msec, Qt.TimerType timeType, QMetaObject.Slot0 slot) {
+    public static void singleShot(int msec, Qt.@NonNull TimerType timeType, QMetaObject.@NonNull Slot0 slot) {
         singleShot(msec, timeType, null, slot);
     }
 
@@ -9886,7 +9898,7 @@ public static void singleShot(int msec, Qt.TimerType timeType, QMetaObject.Slot0
      * @since 5.4
      * @see <a href="@docRoot/qtimer.html#singleShot-7">QTimer::singleShot(int,Qt::TimerType,const QObject*,Functor)</a>
      */
-    public static void singleShot(int msec, Qt.TimerType timeType, QObject context, QMetaObject.Slot0 slot) {
+    public static void singleShot(int msec, Qt.@NonNull TimerType timeType, @Nullable QObject context, QMetaObject.@NonNull Slot0 slot) {
         new QSingleShotTimer(msec, timeType, context, slot);
     }
     
@@ -9897,21 +9909,21 @@ private static Qt.TimerType defaultTypeFor(int msecs){
     /**
      * <p>See <a href="@docRoot/qtimer.html#callOnTimeout">QObject::callOnTimeout(Args&amp&;amp;...)</a></p>
      */
-    public final QMetaObject.Connection callOnTimeout(QMetaObject.Slot0 slot, Qt.ConnectionType... type){
+    public final QMetaObject.@NonNull Connection callOnTimeout(QMetaObject.@NonNull Slot0 slot, Qt.@NonNull ConnectionType @NonNull... type){
         return timeout.connect(slot, type);
     }
 
     /**
      * <p>See <a href="@docRoot/qtimer.html#callOnTimeout">QObject::callOnTimeout(Args&amp&;amp;...)</a></p>
      */
-    public final QMetaObject.Connection callOnTimeout(QMetaObject.Connectable0 connectable, Qt.ConnectionType... type){
+    public final QMetaObject.@NonNull Connection callOnTimeout(QMetaObject.@NonNull Connectable0 connectable, Qt.@NonNull ConnectionType @NonNull... type){
         return timeout.connect(connectable, type);
     }
 
     /**
      * <p>See <a href="@docRoot/qtimer.html#callOnTimeout">QObject::callOnTimeout(Args&amp&;amp;...)</a></p>
      */
-    public final QMetaObject.Connection callOnTimeout(QObject receiver, String method, Qt.ConnectionType... type){
+    public final QMetaObject.@NonNull Connection callOnTimeout(@Nullable QObject receiver, @NonNull String method, Qt.@NonNull ConnectionType @NonNull... type){
         return timeout.connect(receiver, method, type);
     }
     
@@ -9921,7 +9933,7 @@ class QCoreApplication___ extends QCoreApplication {
     
     private static boolean __qt_isInitializing = false;
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static native void preinit();
 
     /**
@@ -9936,8 +9948,8 @@ public static void sendPostedEvents(io.qt.core.QObject receiver, QEvent.Type eve
      * @param args
      * @return QCoreApplication instance
      */
-    @io.qt.QtUninvokable
-    public static QCoreApplication initialize(String args[]) {
+    @QtUninvokable
+    public static @NonNull QCoreApplication initialize(String args @StrictNonNull[]) {
         return initialize(null, args, QCoreApplication::new);
     }
 
@@ -9947,8 +9959,8 @@ public static QCoreApplication initialize(String args[]) {
      * @param args
      * @return QCoreApplication instance
      */
-    @io.qt.QtUninvokable
-    public static QCoreApplication initialize(String applicationName, String args[]) {
+    @QtUninvokable
+    public static @NonNull QCoreApplication initialize(String applicationName, String args @StrictNonNull[]) {
         return initialize(applicationName, args, QCoreApplication::new);
     }
 
@@ -9959,8 +9971,8 @@ public static QCoreApplication initialize(String applicationName, String args[])
      * @param constructor
      * @return T instance
      */
-    @io.qt.QtUninvokable
-    public static <T extends QCoreApplication> T initialize(String args[], java.util.function.Function<String[],T> constructor) {
+    @QtUninvokable
+    public static <T extends @NonNull QCoreApplication> T initialize(String args @StrictNonNull[], java.util.function.@NonNull Function<String[],T> constructor) {
         return initialize(null, args, constructor);
     }
     
@@ -9972,8 +9984,8 @@ public static <T extends QCoreApplication> T initialize(String args[], java.util
      * @param constructor
      * @return T instance
      */
-    @io.qt.QtUninvokable
-    public static <T extends QCoreApplication> T initialize(String applicationName, String args[], java.util.function.Function<String[],T> constructor) {
+    @QtUninvokable
+    public static <T extends @NonNull QCoreApplication> T initialize(String applicationName, String args @StrictNonNull[], java.util.function.@NonNull Function<String[],T> constructor) {
         if (instance() != null)
             throw new RuntimeException("QCoreApplication can only be initialized once");
         preinit();
@@ -10010,13 +10022,13 @@ public static <T extends QCoreApplication> T initialize(String applicationName,
      * Destroys the QCoreApplication instance and purges Qt.
      * @see <a href="@docRoot/qcoreapplication.html#dtor.QCoreApplication">~QCoreApplication()</a>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void shutdown() {
         QCoreApplication app = instance();
         if(app != null) {
             QThread currentThread = QThread.currentThread();
             if(currentThread!=app.thread())
-                throw new io.qt.QThreadAffinityException("Must not call QCoreApplication.shutdown() from outside main thread.", null, app.thread(), currentThread);
+                throw new QThreadAffinityException("Must not call QCoreApplication.shutdown() from outside main thread.", null, app.thread(), currentThread);
             if(app.thread().loopLevel()>0)
                 throw new IllegalStateException("Must not call QCoreApplication.shutdown() in event loop.");
             System.gc();
@@ -10088,8 +10100,8 @@ public static void shutdown() {
      * Adds a pre-routine to be executed before initializing QCoreApplication.
      * @see initialize(String[])
      */
-    @io.qt.QtUninvokable
-    public static void addPreRoutine(Runnable startUpFunction) {
+    @QtUninvokable
+    public static void addPreRoutine(@NonNull Runnable startUpFunction) {
         preRoutines.add(startUpFunction);
     }
 
@@ -10098,8 +10110,8 @@ public static void addPreRoutine(Runnable startUpFunction) {
      * @see <a href="@docRoot/qcoreapplication.html#qAddPostRoutine">qAddPostRoutine(QtCleanUpFunction)</a>
      * @see shutdown()
      */
-    @io.qt.QtUninvokable
-    public static void addPostRoutine(Runnable cleanUpFunction) {
+    @QtUninvokable
+    public static void addPostRoutine(@NonNull Runnable cleanUpFunction) {
         postRoutines.add(cleanUpFunction);
     }
 
@@ -10109,8 +10121,8 @@ public static void addPostRoutine(Runnable cleanUpFunction) {
      * @see addPostRoutine(Runnable)
      * @see shutdown()
      */
-    @io.qt.QtUninvokable
-    public static void removePostRoutine(Runnable cleanUpFunction){
+    @QtUninvokable
+    public static void removePostRoutine(@NonNull Runnable cleanUpFunction){
         postRoutines.remove(cleanUpFunction);
     }
 
@@ -10118,8 +10130,8 @@ public static void removePostRoutine(Runnable cleanUpFunction){
 
     private static final java.util.List<Runnable> postRoutines = java.util.Collections.synchronizedList(new java.util.ArrayList<>());
 
-    @io.qt.NativeAccess
-    @io.qt.QtUninvokable
+    @NativeAccess
+    @QtUninvokable
     private static void execPreRoutines() {
         for(Runnable preRoutine : new java.util.ArrayList<>(preRoutines)) {
             try {
@@ -10131,8 +10143,8 @@ private static void execPreRoutines() {
         preRoutines.clear();
     }
 
-    @io.qt.NativeAccess
-    @io.qt.QtUninvokable
+    @NativeAccess
+    @QtUninvokable
     private static void execPostRoutines() {
         for(Runnable postRoutine : new java.util.ArrayList<>(postRoutines)) {
             try {
@@ -10146,66 +10158,86 @@ private static void execPostRoutines() {
 }// class
     
 class QCoreApplication__62_ {
-    @io.qt.QtUninvokable
-    public final <QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface nativeInterface(Class<QNativeInterface> nativeInterfaceClass) {
+    @QtUninvokable
+    public final <QNativeInterface extends QtObjectInterface> QNativeInterface nativeInterface(Class<QNativeInterface> nativeInterfaceClass) {
         return resolveInterface(nativeInterfaceClass);
     }
 }// class
 
 class QCoreApplication__65_ {
+    private <T extends QPermission> T createPermission(Class<T> permissionType) {
+        try {
+            return permissionType.cast(QtJambi_LibraryUtilities.internal.invokeContructor(permissionType.getConstructor()));
+        } catch (Throwable e) {
+            return permissionType.cast(QMetaType.fromType(permissionType).create());
+        }
+    }
+
     /**
-     * <p>See <a href="https://doc.qt.io/qt/qcoreapplication.html#requestPermission">QCoreApplication::requestPermission&lt;Functor>(const QPermission, Functor functor)</a></p>
+     * <p>See <a href="https://doc.qt.io/qt/qcoreapplication.html#checkPermission">QCoreApplication::checkPermission(QPermission)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void requestPermission(io.qt.core.QPermission.Request permission, QMetaObject.Slot0 functor){
-        requestPermission(new QPermission(permission), functor);
+    @QtUninvokable
+    public final io.qt.core.Qt.@NonNull PermissionStatus checkPermission(@StrictNonNull Class<? extends QPermission> permissionType){
+        return checkPermission(createPermission(permissionType));
     }
 
     /**
      * <p>See <a href="https://doc.qt.io/qt/qcoreapplication.html#requestPermission">QCoreApplication::requestPermission&lt;Functor>(const QPermission, Functor functor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void requestPermission(io.qt.core.QPermission.Request permission, QMetaObject.Slot1<QPermission> functor){
-        requestPermission(new QPermission(permission), functor);
+    @QtUninvokable
+    public final <T extends QPermission> void requestPermission(@StrictNonNull Class<T> permissionType, QMetaObject.@StrictNonNull Slot2<@NonNull T, Qt.@NonNull PermissionStatus> functor){
+        QPermission permission = createPermission(permissionType);
+                QObject context = QtJambi_LibraryUtilities.internal.lambdaContext(functor);
+        requestPermissionSlot2(
+                        QtJambi_LibraryUtilities.internal.nativeId(this),
+                        java.util.Objects.requireNonNull(permission),
+                        context==null ? 0 : QtJambi_LibraryUtilities.internal.checkedNativeId(context),
+                                functor);
     }
 
     /**
      * <p>See <a href="https://doc.qt.io/qt/qcoreapplication.html#requestPermission">QCoreApplication::requestPermission&lt;Functor>(const QPermission, Functor functor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void requestPermission(io.qt.core.QPermission permission, QMetaObject.Slot0 functor){
+    @QtUninvokable
+    public final void requestPermission(@StrictNonNull Class<? extends QPermission> permissionType, QMetaObject.@StrictNonNull Slot1<Qt.@NonNull PermissionStatus> functor){
+        QPermission permission = createPermission(permissionType);
         QObject context = QtJambi_LibraryUtilities.internal.lambdaContext(functor);
-        requestPermissionSlot0(
+        requestPermissionSlot1(
                         QtJambi_LibraryUtilities.internal.nativeId(this),
-                        QtJambi_LibraryUtilities.internal.checkedNativeId(permission),
-                        context==null ? 0 : QtJambi_LibraryUtilities.internal.nativeId(context),
+                        java.util.Objects.requireNonNull(permission),
+                        context==null ? 0 : QtJambi_LibraryUtilities.internal.checkedNativeId(context),
                                 functor);
     }
 
     /**
      * <p>See <a href="https://doc.qt.io/qt/qcoreapplication.html#requestPermission">QCoreApplication::requestPermission&lt;Functor>(const QPermission, Functor functor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void requestPermission(io.qt.core.QPermission permission, QMetaObject.Slot1<QPermission> functor){
+    @QtUninvokable
+    public final <T extends QPermission> void requestPermission(@StrictNonNull T permission, QMetaObject.@StrictNonNull Slot2<@NonNull T, Qt.@NonNull PermissionStatus> functor){
         QObject context = QtJambi_LibraryUtilities.internal.lambdaContext(functor);
-        requestPermissionSlot1(
+        requestPermissionSlot2(
                         QtJambi_LibraryUtilities.internal.nativeId(this),
-                        QtJambi_LibraryUtilities.internal.checkedNativeId(permission),
-                        context==null ? 0 : QtJambi_LibraryUtilities.internal.nativeId(context),
+                        java.util.Objects.requireNonNull(permission),
+                        context==null ? 0 : QtJambi_LibraryUtilities.internal.checkedNativeId(context),
                                 functor);
     }
 
-    private native final void requestPermissionSlot1(long __this__nativeId, long permission, long context, QMetaObject.Slot1<QPermission> functor);
-
-    private native final void requestPermissionSlot0(long __this__nativeId, long permission, long context, QMetaObject.Slot0 functor);
-
     /**
-     * <p>See <a href="@docRoot/qcoreapplication.html#checkPermission">QCoreApplication::checkPermission(QPermission)</a></p>
+     * <p>See <a href="https://doc.qt.io/qt/qcoreapplication.html#requestPermission">QCoreApplication::requestPermission&lt;Functor>(const QPermission, Functor functor)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.Qt.PermissionStatus checkPermission(io.qt.core.QPermission.Request permission){
-        return checkPermission(new QPermission(permission));
+    @QtUninvokable
+    public final void requestPermission(@StrictNonNull QPermission permission, QMetaObject.@StrictNonNull Slot1<Qt.@NonNull PermissionStatus> functor){
+        QObject context = QtJambi_LibraryUtilities.internal.lambdaContext(functor);
+        requestPermissionSlot1(
+                        QtJambi_LibraryUtilities.internal.nativeId(this),
+                        java.util.Objects.requireNonNull(permission),
+                        context==null ? 0 : QtJambi_LibraryUtilities.internal.checkedNativeId(context),
+                                functor);
     }
+
+    private native final void requestPermissionSlot1(long __this__nativeId, QPermission permission, long context, QMetaObject.Slot1<Qt.PermissionStatus> functor);
+
+    private native final void requestPermissionSlot2(long __this__nativeId, QPermission permission, long context, QMetaObject.Slot2<? extends QPermission, Qt.PermissionStatus> functor);
 }// class
 
 class QPermission___{
@@ -10213,7 +10245,7 @@ class QPermission___{
     /**
      * interface type for permission requests
      */
-    public interface Request extends io.qt.QtObjectInterface{
+    public interface Request extends QtObjectInterface{
     }
 
     /**
@@ -10253,7 +10285,7 @@ public QItemSelection(java.util.Collection<? extends QItemSelectionRange> other)
 
 class QXmlStreamAttributes___ extends QXmlStreamAttributes {
     
-    public QXmlStreamAttributes(java.util.Collection<io.qt.core.QXmlStreamAttribute> collection){
+    public QXmlStreamAttributes(java.util.Collection<QXmlStreamAttribute> collection){
         this();
         append(collection);
     }
@@ -10275,332 +10307,332 @@ class QDebug___ extends QDebug {
      * {@inheritDoc}
      */
     @Override
-    public QDebug append(CharSequence csq, int start, int end) {
+    public final @NonNull QDebug append(CharSequence csq, int start, int end) {
         return append(csq==null ? "null" : csq.subSequence(start, end));
     }
 
     /**
      * <p>See <a href="@docRoot/qt.html#endl">Qt::endl</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug endl(){
+    @QtUninvokable
+    public final @NonNull QDebug endl(){
         endl(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void endl(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#flush">Qt::flush</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug flush(){
+    @QtUninvokable
+    public final @NonNull QDebug flush(){
         flush(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void flush(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#reset">Qt::reset</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug reset(){
+    @QtUninvokable
+    public final @NonNull QDebug reset(){
         reset(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void reset(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#bin">Qt::bin</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug bin(){
+    @QtUninvokable
+    public final @NonNull QDebug bin(){
         bin(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void bin(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#oct">Qt::oct</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug oct(){
+    @QtUninvokable
+    public final @NonNull QDebug oct(){
         oct(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void oct(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#hex">Qt::hex</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug hex(){
+    @QtUninvokable
+    public final @NonNull QDebug hex(){
         hex(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void hex(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#dec">Qt::dec</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug dec(){
+    @QtUninvokable
+    public final @NonNull QDebug dec(){
         dec(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void dec(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#showbase">Qt::showbase</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug showbase(){
+    @QtUninvokable
+    public final @NonNull QDebug showbase(){
         showbase(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void showbase(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#forcesign">Qt::forcesign</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug forcesign(){
+    @QtUninvokable
+    public final @NonNull QDebug forcesign(){
         forcesign(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void forcesign(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#forcepoint">Qt::forcepoint</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug forcepoint(){
+    @QtUninvokable
+    public final @NonNull QDebug forcepoint(){
         forcepoint(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void forcepoint(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#noshowbase">Qt::noshowbase</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug noshowbase(){
+    @QtUninvokable
+    public final @NonNull QDebug noshowbase(){
         noshowbase(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void noshowbase(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#noforcesign">Qt::noforcesign</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug noforcesign(){
+    @QtUninvokable
+    public final @NonNull QDebug noforcesign(){
         noforcesign(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void noforcesign(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#noforcepoint">Qt::noforcepoint</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug noforcepoint(){
+    @QtUninvokable
+    public final @NonNull QDebug noforcepoint(){
         noforcepoint(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void noforcepoint(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#uppercasebase">Qt::uppercasebase</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug uppercasebase(){
+    @QtUninvokable
+    public final @NonNull QDebug uppercasebase(){
         uppercasebase(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void uppercasebase(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#uppercasedigits">Qt::uppercasedigits</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug uppercasedigits(){
+    @QtUninvokable
+    public final @NonNull QDebug uppercasedigits(){
         uppercasedigits(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void uppercasedigits(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#lowercasebase">Qt::lowercasebase</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug lowercasebase(){
+    @QtUninvokable
+    public final @NonNull QDebug lowercasebase(){
         lowercasebase(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void lowercasebase(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#lowercasedigits">Qt::lowercasedigits</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug lowercasedigits(){
+    @QtUninvokable
+    public final @NonNull QDebug lowercasedigits(){
         lowercasedigits(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void lowercasedigits(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#fixed">Qt::fixed</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug fixed(){
+    @QtUninvokable
+    public final @NonNull QDebug fixed(){
         fixed(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void fixed(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#scientific">Qt::scientific</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug scientific(){
+    @QtUninvokable
+    public final @NonNull QDebug scientific(){
         scientific(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void scientific(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#left">Qt::left</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug left(){
+    @QtUninvokable
+    public final @NonNull QDebug left(){
         left(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void left(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#right">Qt::right</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug right(){
+    @QtUninvokable
+    public final @NonNull QDebug right(){
         right(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void right(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#center">Qt::center</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug center(){
+    @QtUninvokable
+    public final @NonNull QDebug center(){
         center(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void center(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#bom">Qt::bom</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug bom(){
+    @QtUninvokable
+    public final @NonNull QDebug bom(){
         bom(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void bom(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#ws">Qt::ws</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug ws(){
+    @QtUninvokable
+    public final @NonNull QDebug ws(){
         ws(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void ws(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#qSetFieldWidth">qSetFieldWidth(int width)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug qSetFieldWidth(int width){
+    @QtUninvokable
+    public final @NonNull QDebug qSetFieldWidth(int width){
         setFieldWidth(QtJambi_LibraryUtilities.internal.nativeId(this), width);
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void setFieldWidth(long __this__nativeId, int width);
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#qSetRealNumberPrecision">qSetRealNumberPrecision(int precision)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug qSetRealNumberPrecision(int precision){
+    @QtUninvokable
+    public final @NonNull QDebug qSetRealNumberPrecision(int precision){
         setRealNumberPrecision(QtJambi_LibraryUtilities.internal.nativeId(this), precision);
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void setRealNumberPrecision(long __this__nativeId, int precision);
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#qSetPadChar">qSetPadChar(QChar ch)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug qSetPadChar(char ch){
+    @QtUninvokable
+    public final @NonNull QDebug qSetPadChar(char ch){
         setPadChar(QtJambi_LibraryUtilities.internal.nativeId(this), ch);
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void setPadChar(long __this__nativeId, char ch);
     
     /**
@@ -10608,17 +10640,17 @@ public final io.qt.core.QDebug qSetPadChar(char ch){
      */
     @SuppressWarnings("hiding")
     public <String extends Object & Appendable & CharSequence> QDebug(String string){
-        this(new QTextStream.StringDevice<String>(java.util.Objects.requireNonNull(string, "Argument 'string': null not expected."), io.qt.core.QIODevice.OpenModeFlag.WriteOnly.asFlags()));
+        this(new QTextStream.StringDevice<String>(java.util.Objects.requireNonNull(string, "Argument 'string': null not expected."), QIODevice.OpenModeFlag.WriteOnly.asFlags()));
     }
     
-    @io.qt.QtUninvokable
-    public final io.qt.core.QDebug append(java.lang.Object obj){
+    @QtUninvokable
+    public final @NonNull QDebug append(java.lang.Object obj){
         QMetaType metaType = QList.getMetaType(obj);
         debugStream(QtJambi_LibraryUtilities.internal.nativeId(this), QtJambi_LibraryUtilities.internal.checkedNativeId(metaType), obj);
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native static void debugStream(long debug, long metaType, Object value);
 }// class
 
@@ -10626,12 +10658,16 @@ class QTextStream___ extends QTextStream {
     /**
      * <p>See <a href="@docRoot/qtextstream.html#string">QTextStream::string() const</a></p>
      */
-    public final CharSequence string() {
+    public final @Nullable CharSequence string() {
         QIODevice device = device_private();
         if(device instanceof StringDevice) {
             flush();
             return ((StringDevice<?>) device).string;
         }
+        if(device instanceof CharSequence) {
+            flush();
+            return (CharSequence) device;
+        }
         return null;
     }
     
@@ -10639,16 +10675,16 @@ public final CharSequence string() {
      * {@inheritDoc}
      */
     @Override
-    public QTextStream append(CharSequence csq, int start, int end) {
+    public final @NonNull QTextStream append(CharSequence csq, int start, int end) {
         return append(csq==null ? "null" : csq.subSequence(start, end));
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#device">QTextStream::device()const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QIODevice device(){
-        io.qt.core.QIODevice __qt_return_value = device_private();
+    @QtUninvokable
+    public final @Nullable QIODevice device(){
+        QIODevice __qt_return_value = device_private();
         if(__qt_return_value instanceof StringDevice)
             return null;
         return __qt_return_value;
@@ -10658,23 +10694,23 @@ public final io.qt.core.QIODevice device(){
      * <p>See <a href="@docRoot/qtextstream.html#setString">QTextStream::setString(QString *, QIODeviceBase::OpenMode)</a></p>
      */
     @SuppressWarnings("hiding")
-    public <String extends Object & Appendable & CharSequence> void setString(String string, io.qt.core.QIODevice.OpenModeFlag ... openMode) {
-        setString(string, new io.qt.core.QIODevice.OpenMode(openMode));
+    public <String extends @NonNull Object & Appendable & CharSequence> void setString(String string, QIODevice.@NonNull OpenModeFlag @NonNull... openMode) {
+        setString(string, new QIODevice.OpenMode(openMode));
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#setString">QTextStream::setString(QString *, QIODeviceBase::OpenMode)</a></p>
      */
     @SuppressWarnings("hiding")
-    public <String extends Object & Appendable & CharSequence> void setString(String string) {
-        setString(string, new io.qt.core.QIODevice.OpenMode(4));
+    public <String extends @NonNull Object & Appendable & CharSequence> void setString(String string) {
+        setString(string, new QIODevice.OpenMode(4));
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#setString">QTextStream::setString(QString *, QIODeviceBase::OpenMode)</a></p>
      */
     @SuppressWarnings("hiding")
-    public <String extends Object & Appendable & CharSequence> void setString(String string, io.qt.core.QIODevice.OpenMode openMode) {
+    public <String extends @NonNull Object & Appendable & CharSequence> void setString(String string, QIODevice.@NonNull OpenMode openMode) {
         flush();
         setDevice(new StringDevice<String>(java.util.Objects.requireNonNull(string, "Argument 'string': null not expected."), openMode));
     }
@@ -10682,21 +10718,21 @@ public <String extends Object & Appendable & CharSequence> void setString(String
     /**
      * <p>See <a href="@docRoot/qtextstream.html#setString">QTextStream::setString(QString *, QIODeviceBase::OpenMode)</a></p>
      */
-    public void setString(String string, io.qt.core.QIODevice.OpenModeFlag ... openMode) {
-        setString(string, new io.qt.core.QIODevice.OpenMode(openMode));
+    public void setString(@NonNull String string, QIODevice.OpenModeFlag ... openMode) {
+        setString(string, new QIODevice.OpenMode(openMode));
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#setString">QTextStream::setString(QString *, QIODeviceBase::OpenMode)</a></p>
      */
-    public void setString(String string) {
-        setString(string, new io.qt.core.QIODevice.OpenMode(4));
+    public void setString(@NonNull String string) {
+        setString(string, new QIODevice.OpenMode(4));
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#setString">QTextStream::setString(QString *, QIODeviceBase::OpenMode)</a></p>
      */
-    public void setString(String string, io.qt.core.QIODevice.OpenMode openMode) {
+    public void setString(@NonNull String string, QIODevice.OpenMode openMode) {
         setString(string==null ? new StringBuilder() : new StringBuilder(string), openMode);
     }
     
@@ -10704,50 +10740,50 @@ public void setString(String string, io.qt.core.QIODevice.OpenMode openMode) {
      * <p>See <a href="@docRoot/qtextstream.html#QTextStream-3">QTextStream::QTextStream(QString *, QIODeviceBase::OpenMode)</a></p>
      */
     @SuppressWarnings("hiding")
-    public <String extends Object & Appendable & CharSequence> QTextStream(String string, io.qt.core.QIODevice.OpenModeFlag ... openMode) {
-        this(string, new io.qt.core.QIODevice.OpenMode(openMode));
+    public <String extends @NonNull Object & Appendable & CharSequence> QTextStream(String string, QIODevice.@NonNull OpenModeFlag @NonNull... openMode) {
+        this(string, new QIODevice.OpenMode(openMode));
     }
     /**
      * <p>See <a href="@docRoot/qtextstream.html#QTextStream-3">QTextStream::QTextStream(QString *, QIODeviceBase::OpenMode)</a></p>
      */
     @SuppressWarnings("hiding")
-    public <String extends Object & Appendable & CharSequence> QTextStream(String string) {
-        this(string, new io.qt.core.QIODevice.OpenMode(3));
+    public <String extends @NonNull Object & Appendable & CharSequence> QTextStream(String string) {
+        this(string, new QIODevice.OpenMode(3));
     }
     /**
      * <p>See <a href="@docRoot/qtextstream.html#QTextStream-3">QTextStream::QTextStream(QString *, QIODeviceBase::OpenMode)</a></p>
      */
     @SuppressWarnings("hiding")
-    public <String extends Object & Appendable & CharSequence> QTextStream(String string, io.qt.core.QIODevice.OpenMode openMode){
+    public <String extends @NonNull Object & Appendable & CharSequence> QTextStream(String string, QIODevice.@NonNull OpenMode openMode){
         this(new StringDevice<String>(java.util.Objects.requireNonNull(string, "Argument 'string': null not expected."), openMode));
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#QTextStream-3">QTextStream::QTextStream(QString *, QIODeviceBase::OpenMode)</a></p>
      */
-    public QTextStream(String string, io.qt.core.QIODevice.OpenModeFlag ... openMode) {
-        this(string, new io.qt.core.QIODevice.OpenMode(openMode));
+    public QTextStream(@NonNull String string, QIODevice.@NonNull OpenModeFlag @NonNull... openMode) {
+        this(string, new QIODevice.OpenMode(openMode));
     }
     /**
      * <p>See <a href="@docRoot/qtextstream.html#QTextStream-3">QTextStream::QTextStream(QString *, QIODeviceBase::OpenMode)</a></p>
      */
-    public QTextStream(String string) {
-        this(string, new io.qt.core.QIODevice.OpenMode(3));
+    public QTextStream(@NonNull String string) {
+        this(string, new QIODevice.OpenMode(3));
     }
     /**
      * <p>See <a href="@docRoot/qtextstream.html#QTextStream-3">QTextStream::QTextStream(QString *, QIODeviceBase::OpenMode)</a></p>
      */
-    public QTextStream(String string, io.qt.core.QIODevice.OpenMode openMode){
+    public QTextStream(@NonNull String string, QIODevice.@NonNull OpenMode openMode){
         this(string==null ? new StringBuilder() : new StringBuilder(string), openMode);
     }
     
     @SuppressWarnings("hiding")
     static final class StringDevice<String extends Object & Appendable & CharSequence> extends QIODevice{
-        StringDevice(String string, io.qt.core.QIODevice.OpenModeFlag... openMode) {
-            this(string, io.qt.core.QIODevice.OpenModeFlag.flags(openMode));
+        StringDevice(String string, QIODevice.OpenModeFlag... openMode) {
+            this(string, QIODevice.OpenModeFlag.flags(openMode));
         }
         
-        StringDevice(String string, io.qt.core.QIODevice.OpenMode openMode) {
+        StringDevice(String string, QIODevice.OpenMode openMode) {
             super();
             this.string = string;
             openMode.set(QIODevice.OpenModeFlag.Text);
@@ -10809,412 +10845,412 @@ public boolean seek(long pos) {
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(java.lang.String s){
-        return writeString(s);
+    @QtUninvokable
+    public final @NonNull QTextStream writeString(java.lang.String s){
+        return append(s);
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(java.lang.CharSequence s){
-        return writeString(s);
+    @QtUninvokable
+    public final @NonNull QTextStream writeString(java.lang.CharSequence s){
+        return append(s);
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(double v){
-        return writeDouble(v);
+    @QtUninvokable
+    public final @NonNull QTextStream writeDouble(double v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(byte v){
-        return writeByte(v);
+    @QtUninvokable
+    public final @NonNull QTextStream writeByte(byte v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(io.qt.core.QByteArray v){
-        return writeBytes(v);
+    @QtUninvokable
+    public final @NonNull QTextStream writeBytes(QByteArray v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(char v){
-        return writeChar(v);
+    @QtUninvokable
+    public final @NonNull QTextStream writeChar(char v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(float v){
-        return writeFloat(v);
+    @QtUninvokable
+    public final @NonNull QTextStream writeFloat(float v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(int v){
-        return writeInt(v);
+    @QtUninvokable
+    public final @NonNull QTextStream writeInt(int v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(long v){
-        return writeLong(v);
+    @QtUninvokable
+    public final @NonNull QTextStream writeLong(long v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#operator-lt-lt-1">QTextStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QTextStream append(short v){
-        return writeShort(v);
+    @QtUninvokable
+    public final @NonNull QTextStream writeShort(short v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qt.html#endl">Qt::endl</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream endl(){
+    @QtUninvokable
+    public final @NonNull QTextStream endl(){
         endl(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void endl(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#flush">Qt::flush</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream flush(){
+    @QtUninvokable
+    public final @NonNull QTextStream flush(){
         flush(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void flush(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#reset">Qt::reset</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream reset(){
+    @QtUninvokable
+    public final @NonNull QTextStream reset(){
         reset(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void reset(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#bin">Qt::bin</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream bin(){
+    @QtUninvokable
+    public final @NonNull QTextStream bin(){
         bin(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void bin(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#oct">Qt::oct</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream oct(){
+    @QtUninvokable
+    public final @NonNull QTextStream oct(){
         oct(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void oct(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#hex">Qt::hex</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream hex(){
+    @QtUninvokable
+    public final @NonNull QTextStream hex(){
         hex(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void hex(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#dec">Qt::dec</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream dec(){
+    @QtUninvokable
+    public final @NonNull QTextStream dec(){
         dec(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void dec(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#showbase">Qt::showbase</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream showbase(){
+    @QtUninvokable
+    public final @NonNull QTextStream showbase(){
         showbase(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void showbase(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#forcesign">Qt::forcesign</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream forcesign(){
+    @QtUninvokable
+    public final @NonNull QTextStream forcesign(){
         forcesign(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void forcesign(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#forcepoint">Qt::forcepoint</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream forcepoint(){
+    @QtUninvokable
+    public final @NonNull QTextStream forcepoint(){
         forcepoint(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void forcepoint(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#noshowbase">Qt::noshowbase</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream noshowbase(){
+    @QtUninvokable
+    public final @NonNull QTextStream noshowbase(){
         noshowbase(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void noshowbase(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#noforcesign">Qt::noforcesign</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream noforcesign(){
+    @QtUninvokable
+    public final @NonNull QTextStream noforcesign(){
         noforcesign(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void noforcesign(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#noforcepoint">Qt::noforcepoint</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream noforcepoint(){
+    @QtUninvokable
+    public final @NonNull QTextStream noforcepoint(){
         noforcepoint(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void noforcepoint(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#uppercasebase">Qt::uppercasebase</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream uppercasebase(){
+    @QtUninvokable
+    public final @NonNull QTextStream uppercasebase(){
         uppercasebase(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void uppercasebase(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#uppercasedigits">Qt::uppercasedigits</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream uppercasedigits(){
+    @QtUninvokable
+    public final @NonNull QTextStream uppercasedigits(){
         uppercasedigits(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void uppercasedigits(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#lowercasebase">Qt::lowercasebase</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream lowercasebase(){
+    @QtUninvokable
+    public final @NonNull QTextStream lowercasebase(){
         lowercasebase(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void lowercasebase(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#lowercasedigits">Qt::lowercasedigits</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream lowercasedigits(){
+    @QtUninvokable
+    public final @NonNull QTextStream lowercasedigits(){
         lowercasedigits(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void lowercasedigits(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#fixed">Qt::fixed</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream fixed(){
+    @QtUninvokable
+    public final @NonNull QTextStream fixed(){
         fixed(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void fixed(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#scientific">Qt::scientific</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream scientific(){
+    @QtUninvokable
+    public final @NonNull QTextStream scientific(){
         scientific(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void scientific(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#left">Qt::left</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream left(){
+    @QtUninvokable
+    public final @NonNull QTextStream left(){
         left(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void left(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#right">Qt::right</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream right(){
+    @QtUninvokable
+    public final @NonNull QTextStream right(){
         right(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void right(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#center">Qt::center</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream center(){
+    @QtUninvokable
+    public final @NonNull QTextStream center(){
         center(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void center(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#bom">Qt::bom</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream bom(){
+    @QtUninvokable
+    public final @NonNull QTextStream bom(){
         bom(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void bom(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qt.html#ws">Qt::ws</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream ws(){
+    @QtUninvokable
+    public final @NonNull QTextStream ws(){
         ws(QtJambi_LibraryUtilities.internal.nativeId(this));
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void ws(long __this__nativeId);
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#qSetFieldWidth">qSetFieldWidth(int width)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream qSetFieldWidth(int width){
+    @QtUninvokable
+    public final @NonNull QTextStream qSetFieldWidth(int width){
         setFieldWidth(QtJambi_LibraryUtilities.internal.nativeId(this), width);
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void setFieldWidth(long __this__nativeId, int width);
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#qSetRealNumberPrecision">qSetRealNumberPrecision(int precision)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream qSetRealNumberPrecision(int precision){
+    @QtUninvokable
+    public final @NonNull QTextStream qSetRealNumberPrecision(int precision){
         setRealNumberPrecision(QtJambi_LibraryUtilities.internal.nativeId(this), precision);
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void setRealNumberPrecision(long __this__nativeId, int precision);
     
     /**
      * <p>See <a href="@docRoot/qtextstream.html#qSetPadChar">qSetPadChar(QChar ch)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QTextStream qSetPadChar(char ch){
+    @QtUninvokable
+    public final @NonNull QTextStream qSetPadChar(char ch){
         setPadChar(QtJambi_LibraryUtilities.internal.nativeId(this), ch);
         return this;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void setPadChar(long __this__nativeId, char ch);
     
 }// class
 
 class QBitArray___ extends QBitArray {
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean[] toBitArray() {
         long size = size();
         if(size>Integer.MAX_VALUE)
@@ -11227,8 +11263,8 @@ public final boolean[] toBitArray() {
         return res;
     }
     
-    public static io.qt.core.QBitArray fromBits(boolean[] data){
-        io.qt.core.QBitArray array = new io.qt.core.QBitArray(data.length);
+    public static QBitArray fromBits(boolean[] data){
+        QBitArray array = new QBitArray(data.length);
         for (int i = 0; i < data.length; i++) {
             if(data[i])
                 array.setBit(i);
@@ -11236,7 +11272,7 @@ public static io.qt.core.QBitArray fromBits(boolean[] data){
         return array;
     }
     
-    public static io.qt.core.QBitArray fromBits(byte[] data){
+    public static QBitArray fromBits(byte[] data){
         return fromBits(java.nio.ByteBuffer.wrap(data), data.length*8);
     }
 }// class
@@ -11261,10 +11297,10 @@ private Week(int weekNumber, int yearNumber){
 class QByteArray_5_12__ extends QByteArray {
 
     /**
-     * <p>Overloaded function for {@link #compare(byte[], io.qt.core.Qt.CaseSensitivity)}
-     *  with <code>cs = io.qt.core.Qt.CaseSensitivity.CaseSensitive</code>.</p>
+     * <p>Overloaded function for {@link #compare(byte[], Qt.CaseSensitivity)}
+     *  with <code>cs = Qt.CaseSensitivity.CaseSensitive</code>.</p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int compare(byte[] b) {
         return compare(new QByteArray(b));
     }
@@ -11272,16 +11308,16 @@ public final int compare(byte[] b) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#compare">QByteArray::compare(const char*,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(byte[] b, io.qt.core.Qt.CaseSensitivity cs) {
+    @QtUninvokable
+    public final int compare(byte[] b, Qt.CaseSensitivity cs) {
         return compare(new QByteArray(b), cs);
     }
     
     /**
-     * <p>Overloaded function for {@link #compare(String, io.qt.core.Qt.CaseSensitivity)}
-     *  with <code>cs = io.qt.core.Qt.CaseSensitivity.CaseSensitive</code>.</p>
+     * <p>Overloaded function for {@link #compare(String, Qt.CaseSensitivity)}
+     *  with <code>cs = Qt.CaseSensitivity.CaseSensitive</code>.</p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int compare(String str) {
         return compare(new QByteArray(str));
     }
@@ -11289,19 +11325,19 @@ public final int compare(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#compare">QByteArray::compare(const char*,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(String str, io.qt.core.Qt.CaseSensitivity cs) {
+    @QtUninvokable
+    public final int compare(String str, Qt.CaseSensitivity cs) {
         return compare(new QByteArray(str), cs);
     }
 }// class
 
 class QByteArray_5_15__ extends QByteArray {
     /**
-     * Result class for {@link #fromBase64Encoding(io.qt.core.QByteArray, io.qt.core.QByteArray.Base64Options)}
+     * Result class for {@link #fromBase64Encoding(QByteArray, QByteArray.Base64Options)}
      */
     public static class FromBase64Result{
-        public final io.qt.core.QByteArray decoded;
-        public final io.qt.core.QByteArray.Base64DecodingStatus decodingStatus;
+        public final QByteArray decoded;
+        public final QByteArray.Base64DecodingStatus decodingStatus;
         private FromBase64Result(QByteArray decoded, int decodingStatus) {
             super();
             this.decoded = decoded;
@@ -11322,7 +11358,7 @@ public QByteArray(byte data[]) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#prepend">QByteArray::prepend(const char *)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray prepend(byte[] data) {
         return this.prepend(java.nio.ByteBuffer.wrap(data), data.length);
     }
@@ -11330,43 +11366,61 @@ public final QByteArray prepend(byte[] data) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#append">QByteArray::append(const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QByteArray append(byte[] a){
+    @QtUninvokable
+    public final QByteArray append(byte[] a){
         return append(java.nio.ByteBuffer.wrap(a), a.length);
     }
-    
+
     /**
      * <p>See <a href="@docRoot/qbytearray.html#operator-eq-1">QByteArray::operator=(const char*)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QByteArray set(byte[] data){
-        return set(java.nio.ByteBuffer.wrap(data));
+    @QtUninvokable
+    public final void assign(byte[] data){
+        assign(java.nio.ByteBuffer.wrap(data));
     }
-    
+
     /**
      * <p>See <a href="@docRoot/qbytearray.html#operator-eq-1">QByteArray::operator=(const char*)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QByteArray set(String data){
-        return set(new QByteArray(data));
+    @QtUninvokable
+    public final void assign(String data){
+        assign(new QByteArray(data));
+    }
+    
+    /**
+     * @deprecated Use {@link #assign(io.qt.core.QByteArray)} instead.
+     */
+     @Deprecated
+    @QtUninvokable
+    public final void set(byte[] data){
+        set(java.nio.ByteBuffer.wrap(data));
+    }
+    
+    /**
+     * @deprecated Use {@link #assign(String)} instead.
+     */
+     @Deprecated
+    @QtUninvokable
+    public final void set(String data){
+        set(new QByteArray(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearraylist.html#join">QByteArrayList::join()</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public native static QByteArray join(java.util.Collection<QByteArray> stringList);
     
     /**
      * <p>See <a href="@docRoot/qbytearraylist.html#join">QByteArrayList::join(char)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public native static QByteArray join(java.util.Collection<QByteArray> stringList, byte sep);
     
     /**
      * <p>See <a href="@docRoot/qbytearraylist.html#join">QByteArrayList::join(QByteArray)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public native static QByteArray join(java.util.Collection<QByteArray> stringList, QByteArray sep);
     
 }// class
@@ -11391,7 +11445,7 @@ public QByteArray(byte data[], int size) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#prepend">QByteArray::prepend(const char *,int)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray prepend(byte[] data, int size) {
         return this.prepend(java.nio.ByteBuffer.wrap(data), size==-1 ? data.length : Math.min(size, data.length));
     }
@@ -11399,15 +11453,15 @@ public final QByteArray prepend(byte[] data, int size) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#append">QByteArray::append(const char *,int)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QByteArray append(byte[] a, int size){
+    @QtUninvokable
+    public final QByteArray append(byte[] a, int size){
         return append(java.nio.ByteBuffer.wrap(a), size==-1 ? a.length : Math.min(size, a.length));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#count-2">QByteArray::count(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int count(byte data[]) {
         return count(java.nio.ByteBuffer.wrap(data));
     }
@@ -11415,7 +11469,7 @@ public final int count(byte data[]) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#contains-2">QByteArray::contains(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean contains(byte data[]) {
         return contains(java.nio.ByteBuffer.wrap(data));
     }
@@ -11423,7 +11477,7 @@ public final boolean contains(byte data[]) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#startsWith-2">QByteArray::startsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean startsWith(String str) {
         return startsWith(new QByteArray(str));
     }
@@ -11431,7 +11485,7 @@ public final boolean startsWith(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#contains-2">QByteArray::contains(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean contains(String str) {
         return contains(new QByteArray(str));
     }
@@ -11439,7 +11493,7 @@ public final boolean contains(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#contains-2">QByteArray::contains(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int count(String str) {
         return count(new QByteArray(str));
     }
@@ -11447,7 +11501,7 @@ public final int count(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#endsWith-2">QByteArray::endsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean endsWith(String str) {
         return endsWith(new QByteArray(str));
     }
@@ -11455,7 +11509,7 @@ public final boolean endsWith(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#prepend-3">QByteArray::prepend(const char*)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray prepend(String str) {
         return prepend(new QByteArray(str));
     }
@@ -11463,7 +11517,7 @@ public final QByteArray prepend(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-1">QByteArray::replace(int,int,const char*)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(int index, int len, byte[] data) {
         this.replace(index, len, java.nio.ByteBuffer.wrap(data), data.length);
         return this;
@@ -11472,7 +11526,7 @@ public final QByteArray replace(int index, int len, byte[] data) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#insert-3">QByteArray::insert(int,const char*)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray insert(int i, byte[] data) {
         this.insert(i, java.nio.ByteBuffer.wrap(data), data.length);
         return this;
@@ -11481,7 +11535,7 @@ public final QByteArray insert(int i, byte[] data) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-8">QByteArray::replace(QByteArray,const char*)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(QByteArray before, String after) {
         return replace(before, new QByteArray(after));
     }
@@ -11489,7 +11543,7 @@ public final QByteArray replace(QByteArray before, String after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-8">QByteArray::replace(const char*,QByteArray)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(byte[] before, QByteArray after) {
         return replace(new QByteArray(before), after);
     }
@@ -11497,7 +11551,7 @@ public final QByteArray replace(byte[] before, QByteArray after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-8">QByteArray::replace(QByteArray,const char*)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(QByteArray before, byte[] after) {
         return replace(before, new QByteArray(after));
     }
@@ -11505,7 +11559,7 @@ public final QByteArray replace(QByteArray before, byte[] after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-5">QByteArray::replace(const char*,const char*)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(String before, String after) {
         return replace(new QByteArray(before), new QByteArray(after));
     }
@@ -11513,7 +11567,7 @@ public final QByteArray replace(String before, String after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-5">QByteArray::replace(const char*,const char*)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(byte[] before, byte[] after) {
         return replace(new QByteArray(before), new QByteArray(after));
     }
@@ -11548,7 +11602,7 @@ public QByteArray(byte data[], long size) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#prepend">QByteArray::prepend(const char *,qsizetype)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray prepend(byte[] data, long size) {
         return this.prepend(java.nio.ByteBuffer.wrap(data), size==-1 ? data.length : Math.min(size, data.length));
     }
@@ -11556,15 +11610,15 @@ public final QByteArray prepend(byte[] data, long size) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#append">QByteArray::append(const char *,qsizetype)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QByteArray append(byte[] a, long size){
+    @QtUninvokable
+    public final QByteArray append(byte[] a, long size){
         return append(java.nio.ByteBuffer.wrap(a), size==-1 ? a.length : Math.min(size, a.length));
     }
 
     /**
      * <p>See <a href="@docRoot/qbytearray.html#contains">QByteArray::contains(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean contains(String str) {
         return contains(new QByteArrayView(str));
     }
@@ -11572,7 +11626,7 @@ public final boolean contains(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#count">QByteArray::count(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long count(String str) {
         return count(new QByteArrayView(str));
     }
@@ -11580,7 +11634,7 @@ public final long count(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#endsWith">QByteArray::endsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean endsWith(String str) {
         return endsWith(new QByteArrayView(str));
     }
@@ -11588,7 +11642,7 @@ public final boolean endsWith(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#endsWith">QByteArray::endsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean endsWith(byte[] str) {
         return endsWith(new QByteArrayView(str));
     }
@@ -11596,7 +11650,7 @@ public final boolean endsWith(byte[] str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#endsWith">QByteArray::endsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean endsWith(java.nio.ByteBuffer str) {
         return endsWith(new QByteArrayView(str));
     }
@@ -11604,7 +11658,7 @@ public final boolean endsWith(java.nio.ByteBuffer str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#prepend">QByteArray::prepend(const char*)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray prepend(String str) {
         return prepend(getBytes(str));
     }
@@ -11612,7 +11666,7 @@ public final QByteArray prepend(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#startsWith">QByteArray::startsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean startsWith(String str) {
         return startsWith(new QByteArrayView(str));
     }
@@ -11620,7 +11674,7 @@ public final boolean startsWith(String str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#startsWith">QByteArray::startsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean startsWith(byte[] str) {
         return startsWith(new QByteArrayView(str));
     }
@@ -11628,7 +11682,7 @@ public final boolean startsWith(byte[] str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#startsWith">QByteArray::startsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean startsWith(java.nio.ByteBuffer str) {
         return startsWith(new QByteArrayView(str));
     }
@@ -11636,31 +11690,31 @@ public final boolean startsWith(java.nio.ByteBuffer str) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#append">QByteArray::append(const char*)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QByteArray append(String a){
+    @QtUninvokable
+    public final QByteArray append(String a){
         return append(getBytes(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#compare">QByteArray::compare(const char*, Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int compare(String str) {
-        return compare(str, io.qt.core.Qt.CaseSensitivity.CaseSensitive);
+        return compare(str, Qt.CaseSensitivity.CaseSensitive);
     }
 
     /**
      * <p>See <a href="@docRoot/qbytearray.html#compare">QByteArray::compare(const char*, Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(String str, io.qt.core.Qt.CaseSensitivity cs) {
+    @QtUninvokable
+    public final int compare(String str, Qt.CaseSensitivity cs) {
         return compare(new QByteArrayView(str), cs);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#count">QByteArray::count(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long count(byte data[]) {
         return count(new QByteArrayView(data));
     }
@@ -11668,7 +11722,7 @@ public final long count(byte data[]) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#contains">QByteArray::contains(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean contains(byte data[]) {
         return contains(new QByteArrayView(data));
     }
@@ -11676,23 +11730,23 @@ public final boolean contains(byte data[]) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#compare">QByteArray::compare(const char*, Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int compare(byte[] b) {
-        return compare(b, io.qt.core.Qt.CaseSensitivity.CaseSensitive);
+        return compare(b, Qt.CaseSensitivity.CaseSensitive);
     }
 
     /**
      * <p>See <a href="@docRoot/qbytearray.html#compare">QByteArray::compare(const char*, Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(byte[] b, io.qt.core.Qt.CaseSensitivity cs) {
+    @QtUninvokable
+    public final int compare(byte[] b, Qt.CaseSensitivity cs) {
         return compare(new QByteArrayView(b), cs);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#count">QByteArray::count(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long count(java.nio.ByteBuffer data) {
         return count(new QByteArrayView(data));
     }
@@ -11700,7 +11754,7 @@ public final long count(java.nio.ByteBuffer data) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#contains">QByteArray::contains(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean contains(java.nio.ByteBuffer data) {
         return contains(new QByteArrayView(data));
     }
@@ -11708,23 +11762,23 @@ public final boolean contains(java.nio.ByteBuffer data) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#compare">QByteArray::compare(const char*, Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int compare(java.nio.ByteBuffer b) {
-        return compare(b, io.qt.core.Qt.CaseSensitivity.CaseSensitive);
+        return compare(b, Qt.CaseSensitivity.CaseSensitive);
     }
 
     /**
      * <p>See <a href="@docRoot/qbytearray.html#compare">QByteArray::compare(const char*, Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(java.nio.ByteBuffer b, io.qt.core.Qt.CaseSensitivity cs) {
+    @QtUninvokable
+    public final int compare(java.nio.ByteBuffer b, Qt.CaseSensitivity cs) {
         return compare(new QByteArrayView(b), cs);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#indexOf">QByteArray::indexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(String strg) {
         return indexOf(strg, (int)0);
     }
@@ -11732,15 +11786,15 @@ public final long indexOf(String strg) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#indexOf">QByteArray::indexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(String strg, long from){
-        return indexOf(new io.qt.core.QByteArrayView(strg), from);
+        return indexOf(new QByteArrayView(strg), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#indexOf">QByteArray::indexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(byte[] other) {
         return indexOf(other, (int)0);
     }
@@ -11748,15 +11802,15 @@ public final long indexOf(byte[] other) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#indexOf">QByteArray::indexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(byte[] other, long from){
-        return indexOf(new io.qt.core.QByteArrayView(other), from);
+        return indexOf(new QByteArrayView(other), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#indexOf">QByteArray::indexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(java.nio.ByteBuffer other) {
         return indexOf(other, (int)0);
     }
@@ -11764,15 +11818,15 @@ public final long indexOf(java.nio.ByteBuffer other) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#indexOf">QByteArray::indexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(java.nio.ByteBuffer other, long from){
-        return indexOf(new io.qt.core.QByteArrayView(other), from);
+        return indexOf(new QByteArrayView(other), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#indexOf">QByteArray::indexOf(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(QByteArray other) {
         return indexOf(other, (long)0);
     }
@@ -11780,15 +11834,15 @@ public final long indexOf(QByteArray other) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#indexOf">QByteArray::indexOf(QByteArray,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(QByteArray other, long from){
-        return indexOf(new io.qt.core.QByteArrayView(other), from);
+        return indexOf(new QByteArrayView(other), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#lastIndexOf">QByteArray::lastIndexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(String strg) {
         return lastIndexOf(strg, (long)0);
     }
@@ -11796,15 +11850,15 @@ public final long lastIndexOf(String strg) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#lastIndexOf">QByteArray::lastIndexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(String strg, long from){
-        return lastIndexOf(new io.qt.core.QByteArrayView(strg), from);
+        return lastIndexOf(new QByteArrayView(strg), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#lastIndexOf">QByteArray::lastIndexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(byte[] other) {
         return lastIndexOf(other, (long)0);
     }
@@ -11812,15 +11866,15 @@ public final long lastIndexOf(byte[] other) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#lastIndexOf">QByteArray::lastIndexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(byte[] other, long from){
-        return lastIndexOf(new io.qt.core.QByteArrayView(other), from);
+        return lastIndexOf(new QByteArrayView(other), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#lastIndexOf">QByteArray::lastIndexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(java.nio.ByteBuffer other) {
         return lastIndexOf(other, (long)0);
     }
@@ -11828,15 +11882,15 @@ public final long lastIndexOf(java.nio.ByteBuffer other) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#lastIndexOf">QByteArray::lastIndexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(java.nio.ByteBuffer other, long from){
-        return lastIndexOf(new io.qt.core.QByteArrayView(other), from);
+        return lastIndexOf(new QByteArrayView(other), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearray.html#lastIndexOf">QByteArray::lastIndexOf(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(QByteArray other) {
         return lastIndexOf(other, (long)0);
     }
@@ -11844,15 +11898,15 @@ public final long lastIndexOf(QByteArray other) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#lastIndexOf">QByteArray::lastIndexOf(QByteArray,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(QByteArray other, long from){
-        return lastIndexOf(new io.qt.core.QByteArrayView(other), from);
+        return lastIndexOf(new QByteArrayView(other), from);
     }
 
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace">QByteArray::replace(qsizetype,qsizetype,QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(long index, long len, byte[] data) {
         this.replace(index, len, java.nio.ByteBuffer.wrap(data), data.length);
         return this;
@@ -11861,7 +11915,7 @@ public final QByteArray replace(long index, long len, byte[] data) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#insert">QByteArray::insert(qsizetype,QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray insert(long i, byte[] data) {
         this.insert(i, java.nio.ByteBuffer.wrap(data), data.length);
         return this;
@@ -11870,7 +11924,7 @@ public final QByteArray insert(long i, byte[] data) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-4">QByteArray::replace(QByteArrayView,QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(QByteArray before, byte[] after) {
         return replace(new QByteArrayView(before), new QByteArrayView(after));
     }
@@ -11878,7 +11932,7 @@ public final QByteArray replace(QByteArray before, byte[] after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-4">QByteArray::replace(QByteArrayView,QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(QByteArray before, String after) {
         return replace(new QByteArrayView(before), new QByteArrayView(after));
     }
@@ -11886,7 +11940,7 @@ public final QByteArray replace(QByteArray before, String after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-4">QByteArray::replace(QByteArrayView,QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(byte[] before, String after) {
         return replace(new QByteArrayView(before), new QByteArrayView(after));
     }
@@ -11894,7 +11948,7 @@ public final QByteArray replace(byte[] before, String after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-4">QByteArray::replace(QByteArrayView,QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(byte[] before, QByteArray after) {
         return replace(new QByteArrayView(before), new QByteArrayView(after));
     }
@@ -11902,7 +11956,7 @@ public final QByteArray replace(byte[] before, QByteArray after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-4">QByteArray::replace(QByteArrayView,QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(String before, QByteArray after) {
         return replace(new QByteArrayView(before), new QByteArrayView(after));
     }
@@ -11910,7 +11964,7 @@ public final QByteArray replace(String before, QByteArray after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-4">QByteArray::replace(QByteArrayView,QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(String before, byte[] after) {
         return replace(new QByteArrayView(before), new QByteArrayView(after));
     }
@@ -11918,7 +11972,7 @@ public final QByteArray replace(String before, byte[] after) {
     /**
      * <p>See <a href="@docRoot/qbytearray.html#replace-4">QByteArray::replace(QByteArrayView,QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QByteArray replace(String before, String after) {
         return replace(new QByteArrayView(before), new QByteArrayView(after));
     }
@@ -11928,7 +11982,7 @@ class QByteArray_63__ extends QByteArray {
     /**
      * <p>See <a href="@docRoot/qbytearraylist.html#join">QByteArrayList::join(QByteArrayView)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public native static QByteArray join(java.util.Collection<QByteArray> stringList, QByteArrayView sep);
 }// class
 
@@ -11944,7 +11998,7 @@ public QByteArrayView(byte[] data){
         if(pointerOut[0]!=null) {
             long pointer = pointerOut[0];
             purgeTask = ()->purgeBytes(pointer);
-            io.qt.QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);                
+            QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);                
         }
     }
     private native static void initialize_native(QByteArrayView instance, byte[] data, Long[] pointerOut);
@@ -11960,7 +12014,7 @@ public QByteArrayView(String data){
         if(pointerOut[0]!=null) {
             long pointer = pointerOut[0];
             purgeTask = ()->purgeString(pointer);
-            io.qt.QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);                
+            QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);                
         }
     }
     private native static void initialize_native(QByteArrayView instance, String data, Long[] pointerOut);
@@ -11974,14 +12028,14 @@ public QByteArrayView(java.nio.ByteBuffer data){
         if(data.isDirect()) {
             initialize_native(this, data);
             purgeTask = data::hashCode;
-            io.qt.QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);
+            QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);
         }else {
             Long[] pointerOut = {null};
             initialize_native(this, data, pointerOut);
             if(pointerOut[0]!=null) {
                 long pointer = pointerOut[0];
                 purgeTask = ()->purgeBuffer(pointer);
-                io.qt.QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);
+                QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);
             }
         }
     }
@@ -11997,7 +12051,7 @@ public QByteArrayView(QByteArray data){
         if(data!=null) {
             initialize_native(this, data);
             purgeTask = data::isDisposed;
-            io.qt.QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);
+            QtUtilities.getSignalOnDispose(this).connect(purgeTask::run);
         }else {
             initialize_native(this);
         }
@@ -12009,321 +12063,321 @@ public QByteArrayView(QByteArray data){
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#compare">QByteArrayView::compare(QByteArray,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(io.qt.core.QByteArray a){
-        return compare(new io.qt.core.QByteArrayView(a));
+    @QtUninvokable
+    public final int compare(QByteArray a){
+        return compare(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#compare">QByteArrayView::compare(QByteArray,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(io.qt.core.QByteArray a, io.qt.core.Qt.CaseSensitivity cs){
-        return compare(new io.qt.core.QByteArrayView(a), cs);
+    @QtUninvokable
+    public final int compare(QByteArray a, Qt.CaseSensitivity cs){
+        return compare(new QByteArrayView(a), cs);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#compare">QByteArrayView::compare(const char*,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int compare(byte[] a){
-        return compare(new io.qt.core.QByteArrayView(a));
+        return compare(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#compare">QByteArrayView::compare(const char*,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(byte[] a, io.qt.core.Qt.CaseSensitivity cs){
-        return compare(new io.qt.core.QByteArrayView(a), cs);
+    @QtUninvokable
+    public final int compare(byte[] a, Qt.CaseSensitivity cs){
+        return compare(new QByteArrayView(a), cs);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#compare">QByteArrayView::compare(const char*,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int compare(java.nio.ByteBuffer a){
-        return compare(new io.qt.core.QByteArrayView(a));
+        return compare(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#compare">QByteArrayView::compare(const char*,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(java.nio.ByteBuffer a, io.qt.core.Qt.CaseSensitivity cs){
-        return compare(new io.qt.core.QByteArrayView(a), cs);
+    @QtUninvokable
+    public final int compare(java.nio.ByteBuffer a, Qt.CaseSensitivity cs){
+        return compare(new QByteArrayView(a), cs);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#compare">QByteArrayView::compare(const char*,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int compare(String a){
-        return compare(new io.qt.core.QByteArrayView(a));
+        return compare(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#compare">QByteArrayView::compare(const char*,Qt::CaseSensitivity)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final int compare(String a, io.qt.core.Qt.CaseSensitivity cs){
-        return compare(new io.qt.core.QByteArrayView(a), cs);
+    @QtUninvokable
+    public final int compare(String a, Qt.CaseSensitivity cs){
+        return compare(new QByteArrayView(a), cs);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#contains">QByteArrayView::contains(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final boolean contains(io.qt.core.QByteArray a){
-        return contains(new io.qt.core.QByteArrayView(a));
+    @QtUninvokable
+    public final boolean contains(QByteArray a){
+        return contains(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#contains">QByteArrayView::contains(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean contains(byte[] a){
-        return contains(new io.qt.core.QByteArrayView(a));
+        return contains(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#contains">QByteArrayView::contains(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean contains(String a){
-        return contains(new io.qt.core.QByteArrayView(a));
+        return contains(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#contains">QByteArrayView::contains(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean contains(java.nio.ByteBuffer a){
-        return contains(new io.qt.core.QByteArrayView(a));
+        return contains(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#QtUninvokable">QByteArrayView::QtUninvokable(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final boolean endsWith(io.qt.core.QByteArray a){
-        return endsWith(new io.qt.core.QByteArrayView(a));
+    @QtUninvokable
+    public final boolean endsWith(QByteArray a){
+        return endsWith(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#endsWith">QByteArrayView::endsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean endsWith(byte[] a){
-        return endsWith(new io.qt.core.QByteArrayView(a));
+        return endsWith(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#endsWith">QByteArrayView::endsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean endsWith(String a){
-        return endsWith(new io.qt.core.QByteArrayView(a));
+        return endsWith(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#endsWith">QByteArrayView::endsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean endsWith(java.nio.ByteBuffer a){
-        return endsWith(new io.qt.core.QByteArrayView(a));
+        return endsWith(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#startsWith">QByteArrayView::startsWith(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final boolean startsWith(io.qt.core.QByteArray a){
-        return startsWith(new io.qt.core.QByteArrayView(a));
+    @QtUninvokable
+    public final boolean startsWith(QByteArray a){
+        return startsWith(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#startsWith">QByteArrayView::startsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean startsWith(byte[] a){
-        return startsWith(new io.qt.core.QByteArrayView(a));
+        return startsWith(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#startsWith">QByteArrayView::startsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean startsWith(String a){
-        return startsWith(new io.qt.core.QByteArrayView(a));
+        return startsWith(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#startsWith">QByteArrayView::startsWith(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean startsWith(java.nio.ByteBuffer a){
-        return startsWith(new io.qt.core.QByteArrayView(a));
+        return startsWith(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#count">QByteArrayView::count(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final long count(io.qt.core.QByteArray a){
-        return count(new io.qt.core.QByteArrayView(a));
+    @QtUninvokable
+    public final long count(QByteArray a){
+        return count(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#count">QByteArrayView::count(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long count(byte[] a){
-        return count(new io.qt.core.QByteArrayView(a));
+        return count(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#count">QByteArrayView::count(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long count(String a){
-        return count(new io.qt.core.QByteArrayView(a));
+        return count(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#count">QByteArrayView::count(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long count(java.nio.ByteBuffer a){
-        return count(new io.qt.core.QByteArrayView(a));
+        return count(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#indexOf">QByteArrayView::indexOf(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final long indexOf(io.qt.core.QByteArray a){
-        return indexOf(new io.qt.core.QByteArrayView(a));
+    @QtUninvokable
+    public final long indexOf(QByteArray a){
+        return indexOf(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#indexOf">QByteArrayView::indexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(byte[] a){
-        return indexOf(new io.qt.core.QByteArrayView(a));
+        return indexOf(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#indexOf">QByteArrayView::indexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(String a){
-        return indexOf(new io.qt.core.QByteArrayView(a));
+        return indexOf(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#indexOf">QByteArrayView::indexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(java.nio.ByteBuffer a){
-        return indexOf(new io.qt.core.QByteArrayView(a));
+        return indexOf(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#indexOf">QByteArrayView::indexOf(QByteArray,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final long indexOf(io.qt.core.QByteArray a, long from){
-        return indexOf(new io.qt.core.QByteArrayView(a), from);
+    @QtUninvokable
+    public final long indexOf(QByteArray a, long from){
+        return indexOf(new QByteArrayView(a), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#indexOf">QByteArrayView::indexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(byte[] a, long from){
-        return indexOf(new io.qt.core.QByteArrayView(a), from);
+        return indexOf(new QByteArrayView(a), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#indexOf">QByteArrayView::indexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(String a, long from){
-        return indexOf(new io.qt.core.QByteArrayView(a), from);
+        return indexOf(new QByteArrayView(a), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#indexOf">QByteArrayView::indexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long indexOf(java.nio.ByteBuffer a, long from){
-        return indexOf(new io.qt.core.QByteArrayView(a), from);
+        return indexOf(new QByteArrayView(a), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#lastIndexOf">QByteArrayView::lastIndexOf(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final long lastIndexOf(io.qt.core.QByteArray a){
-        return lastIndexOf(new io.qt.core.QByteArrayView(a));
+    @QtUninvokable
+    public final long lastIndexOf(QByteArray a){
+        return lastIndexOf(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#lastIndexOf">QByteArrayView::lastIndexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(byte[] a){
-        return lastIndexOf(new io.qt.core.QByteArrayView(a));
+        return lastIndexOf(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#lastIndexOf">QByteArrayView::lastIndexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(String a){
-        return lastIndexOf(new io.qt.core.QByteArrayView(a));
+        return lastIndexOf(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#lastIndexOf">QByteArrayView::lastIndexOf(const char*)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(java.nio.ByteBuffer a){
-        return lastIndexOf(new io.qt.core.QByteArrayView(a));
+        return lastIndexOf(new QByteArrayView(a));
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#lastIndexOf">QByteArrayView::lastIndexOf(QByteArray,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final long lastIndexOf(io.qt.core.QByteArray a, long from){
-        return lastIndexOf(new io.qt.core.QByteArrayView(a), from);
+    @QtUninvokable
+    public final long lastIndexOf(QByteArray a, long from){
+        return lastIndexOf(new QByteArrayView(a), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#lastIndexOf">QByteArrayView::lastIndexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(byte[] a, long from){
-        return lastIndexOf(new io.qt.core.QByteArrayView(a), from);
+        return lastIndexOf(new QByteArrayView(a), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#lastIndexOf">QByteArrayView::lastIndexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(String a, long from){
-        return lastIndexOf(new io.qt.core.QByteArrayView(a), from);
+        return lastIndexOf(new QByteArrayView(a), from);
     }
     
     /**
      * <p>See <a href="@docRoot/qbytearrayview.html#lastIndexOf">QByteArrayView::lastIndexOf(const char*,qsizetype)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final long lastIndexOf(java.nio.ByteBuffer a, long from){
-        return lastIndexOf(new io.qt.core.QByteArrayView(a), from);
+        return lastIndexOf(new QByteArrayView(a), from);
     }
 }// class
 
@@ -12332,85 +12386,85 @@ class QStringConverter___{
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForData">QStringConverter::encodingForData(QByteArrayView,char16_t)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForHtml(io.qt.core.QByteArray data){
-        return encodingForHtml(new io.qt.core.QByteArrayView(data));
+    public static java.util.Optional<QStringConverter.Encoding> encodingForHtml(QByteArray data){
+        return encodingForHtml(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForData">QStringConverter::encodingForData(QByteArrayView,char16_t)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForData(io.qt.core.QByteArray data){
-        return encodingForData(new io.qt.core.QByteArrayView(data));
+    public static java.util.Optional<QStringConverter.Encoding> encodingForData(QByteArray data){
+        return encodingForData(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForData">QStringConverter::encodingForData(QByteArrayView,char16_t)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForData(io.qt.core.QByteArray data, char expectedFirstCharacter){
-        return encodingForData(new io.qt.core.QByteArrayView(data), expectedFirstCharacter);
+    public static java.util.Optional<QStringConverter.Encoding> encodingForData(QByteArray data, char expectedFirstCharacter){
+        return encodingForData(new QByteArrayView(data), expectedFirstCharacter);
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForHtml">QStringConverter::encodingForHtml(QByteArrayView)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForHtml(byte[] data){
-        return encodingForHtml(new io.qt.core.QByteArrayView(data));
+    public static java.util.Optional<QStringConverter.Encoding> encodingForHtml(byte[] data){
+        return encodingForHtml(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForData">QStringConverter::encodingForData(QByteArrayView,char16_t)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForData(byte[] data){
-        return encodingForData(new io.qt.core.QByteArrayView(data));
+    public static java.util.Optional<QStringConverter.Encoding> encodingForData(byte[] data){
+        return encodingForData(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForData">QStringConverter::encodingForData(QByteArrayView,char16_t)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForData(byte[] data, char expectedFirstCharacter){
-        return encodingForData(new io.qt.core.QByteArrayView(data), expectedFirstCharacter);
+    public static java.util.Optional<QStringConverter.Encoding> encodingForData(byte[] data, char expectedFirstCharacter){
+        return encodingForData(new QByteArrayView(data), expectedFirstCharacter);
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForHtml">QStringConverter::encodingForHtml(QByteArrayView)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForHtml(String data){
-        return encodingForHtml(new io.qt.core.QByteArrayView(data));
+    public static java.util.Optional<QStringConverter.Encoding> encodingForHtml(String data){
+        return encodingForHtml(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForData">QStringConverter::encodingForData(QByteArrayView,char16_t)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForData(String data){
-        return encodingForData(new io.qt.core.QByteArrayView(data));
+    public static java.util.Optional<QStringConverter.Encoding> encodingForData(String data){
+        return encodingForData(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForData">QStringConverter::encodingForData(QByteArrayView,char16_t)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForData(String data, char expectedFirstCharacter){
-        return encodingForData(new io.qt.core.QByteArrayView(data), expectedFirstCharacter);
+    public static java.util.Optional<QStringConverter.Encoding> encodingForData(String data, char expectedFirstCharacter){
+        return encodingForData(new QByteArrayView(data), expectedFirstCharacter);
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForHtml">QStringConverter::encodingForHtml(QByteArrayView)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForHtml(java.nio.ByteBuffer data){
-        return encodingForHtml(new io.qt.core.QByteArrayView(data));
+    public static java.util.Optional<QStringConverter.Encoding> encodingForHtml(java.nio.ByteBuffer data){
+        return encodingForHtml(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForData">QStringConverter::encodingForData(QByteArrayView,char16_t)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForData(java.nio.ByteBuffer data){
-        return encodingForData(new io.qt.core.QByteArrayView(data));
+    public static java.util.Optional<QStringConverter.Encoding> encodingForData(java.nio.ByteBuffer data){
+        return encodingForData(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qstringconverter.html#encodingForData">QStringConverter::encodingForData(QByteArrayView,char16_t)</a></p>
      */
-    public static java.util.Optional<io.qt.core.QStringConverter.Encoding> encodingForData(java.nio.ByteBuffer data, char expectedFirstCharacter){
-        return encodingForData(new io.qt.core.QByteArrayView(data), expectedFirstCharacter);
+    public static java.util.Optional<QStringConverter.Encoding> encodingForData(java.nio.ByteBuffer data, char expectedFirstCharacter){
+        return encodingForData(new QByteArrayView(data), expectedFirstCharacter);
     }
     
 }// class
@@ -12420,29 +12474,29 @@ class QUuid_63__{
     /**
      * <p>See <a href="@docRoot/quuid.html#fromRfc4122">QUuid::fromRfc4122(QByteArrayView)</a></p>
      */
-    public static io.qt.core.QUuid fromRfc4122(io.qt.core.QByteArray data){
-        return fromRfc4122(new io.qt.core.QByteArrayView(data));
+    public static QUuid fromRfc4122(QByteArray data){
+        return fromRfc4122(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/quuid.html#fromRfc4122">QUuid::fromRfc4122(QByteArrayView)</a></p>
      */
-    public static io.qt.core.QUuid fromRfc4122(byte[] data){
-        return fromRfc4122(new io.qt.core.QByteArrayView(data));
+    public static QUuid fromRfc4122(byte[] data){
+        return fromRfc4122(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/quuid.html#fromRfc4122">QUuid::fromRfc4122(QByteArrayView)</a></p>
      */
-    public static io.qt.core.QUuid fromRfc4122(String data){
-        return fromRfc4122(new io.qt.core.QByteArrayView(data));
+    public static QUuid fromRfc4122(String data){
+        return fromRfc4122(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/quuid.html#fromRfc4122">QUuid::fromRfc4122(QByteArrayView)</a></p>
      */
-    public static io.qt.core.QUuid fromRfc4122(java.nio.ByteBuffer data){
-        return fromRfc4122(new io.qt.core.QByteArrayView(data));
+    public static QUuid fromRfc4122(java.nio.ByteBuffer data){
+        return fromRfc4122(new QByteArrayView(data));
     }
     
 }// class
@@ -12690,34 +12744,34 @@ class QSignalMapper___ extends QSignalMapper {
 
 class QAbstractFileEngine_MapExtensionReturn___ extends QAbstractFileEngine_MapExtensionReturn {
     
-    private io.qt.QNativePointer currentAddressNativePointer; // don't garbage collect while in use
+    private QNativePointer currentAddressNativePointer; // don't garbage collect while in use
     public final void setAddress(String address) {
-        currentAddressNativePointer = address != null ? io.qt.QNativePointer.createCharPointer(address) : null;
+        currentAddressNativePointer = address != null ? QNativePointer.createCharPointer(address) : null;
         address_private(currentAddressNativePointer);
     }
 
     public final String address() {
-        io.qt.QNativePointer np = address_private();
+        QNativePointer np = address_private();
         return np != null ? charPointerToString(np) : null;
     }
 }// class
 
 class QAbstractFileEngine_UnMapExtensionOption___ extends QAbstractFileEngine_UnMapExtensionOption {
     
-    private io.qt.QNativePointer currentAddressNativePointer; // don't garbage collect while in use
+    private QNativePointer currentAddressNativePointer; // don't garbage collect while in use
     public final void setAddress(String address) {
-        currentAddressNativePointer = address != null ? io.qt.QNativePointer.createCharPointer(address) : null;
+        currentAddressNativePointer = address != null ? QNativePointer.createCharPointer(address) : null;
         address_private(currentAddressNativePointer);
     }
 
     public final String address() {
-        io.qt.QNativePointer np = address_private();
+        QNativePointer np = address_private();
         return np != null ? charPointerToString(np) : null;
     }
 }// class
 
 class QFutureInterfaceBase___ {
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public native final void reportException(Throwable e);
 }// class
 
@@ -12726,8 +12780,8 @@ class QtFuture___ {
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static QFuture<Void> connect(QMetaObject.AbstractPrivateSignal0 signal) {
+    @QtUninvokable
+    public static @NonNull QFuture<Void> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal0 signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<Void> promise = QFutureInterface.createVoidFutureInterface();
@@ -12752,8 +12806,8 @@ public static QFuture<Void> connect(QMetaObject.AbstractPrivateSignal0 signal) {
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <A> QFuture<A> connect(QMetaObject.AbstractPrivateSignal1<A> signal) {
+    @QtUninvokable
+    public static <A> @NonNull QFuture<A> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal1<A> signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<A> promise = new QFutureInterface<>();
@@ -12779,8 +12833,8 @@ public static <A> QFuture<A> connect(QMetaObject.AbstractPrivateSignal1<A> signa
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <A,B> QFuture<QPair<A,B>> connect(QMetaObject.AbstractPrivateSignal2<A,B> signal) {
+    @QtUninvokable
+    public static <A,B> @NonNull QFuture<QPair<A,B>> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal2<A,B> signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<QPair<A,B>> promise = new QFutureInterface<>();
@@ -12806,8 +12860,8 @@ public static <A,B> QFuture<QPair<A,B>> connect(QMetaObject.AbstractPrivateSigna
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <A,B,C> QFuture<Object[]> connect(QMetaObject.AbstractPrivateSignal3<A,B,C> signal) {
+    @QtUninvokable
+    public static <A,B,C> @NonNull QFuture<Object[]> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal3<A,B,C> signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<Object[]> promise = new QFutureInterface<>();
@@ -12833,8 +12887,8 @@ public static <A,B,C> QFuture<Object[]> connect(QMetaObject.AbstractPrivateSigna
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <A,B,C,D> QFuture<Object[]> connect(QMetaObject.AbstractPrivateSignal4<A,B,C,D> signal) {
+    @QtUninvokable
+    public static <A,B,C,D> @NonNull QFuture<Object[]> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal4<A,B,C,D> signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<Object[]> promise = new QFutureInterface<>();
@@ -12860,8 +12914,8 @@ public static <A,B,C,D> QFuture<Object[]> connect(QMetaObject.AbstractPrivateSig
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <A,B,C,D,E> QFuture<Object[]> connect(QMetaObject.AbstractPrivateSignal5<A,B,C,D,E> signal) {
+    @QtUninvokable
+    public static <A,B,C,D,E> @NonNull QFuture<Object[]> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal5<A,B,C,D,E> signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<Object[]> promise = new QFutureInterface<>();
@@ -12887,8 +12941,8 @@ public static <A,B,C,D,E> QFuture<Object[]> connect(QMetaObject.AbstractPrivateS
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <A,B,C,D,E,F> QFuture<Object[]> connect(QMetaObject.AbstractPrivateSignal6<A,B,C,D,E,F> signal) {
+    @QtUninvokable
+    public static <A,B,C,D,E,F> @NonNull QFuture<Object[]> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal6<A,B,C,D,E,F> signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<Object[]> promise = new QFutureInterface<>();
@@ -12914,8 +12968,8 @@ public static <A,B,C,D,E,F> QFuture<Object[]> connect(QMetaObject.AbstractPrivat
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <A,B,C,D,E,F,G> QFuture<Object[]> connect(QMetaObject.AbstractPrivateSignal7<A,B,C,D,E,F,G> signal) {
+    @QtUninvokable
+    public static <A,B,C,D,E,F,G> @NonNull QFuture<Object[]> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal7<A,B,C,D,E,F,G> signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<Object[]> promise = new QFutureInterface<>();
@@ -12941,8 +12995,8 @@ public static <A,B,C,D,E,F,G> QFuture<Object[]> connect(QMetaObject.AbstractPriv
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <A,B,C,D,E,F,G,H> QFuture<Object[]> connect(QMetaObject.AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal) {
+    @QtUninvokable
+    public static <A,B,C,D,E,F,G,H> @NonNull QFuture<Object[]> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal8<A,B,C,D,E,F,G,H> signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<Object[]> promise = new QFutureInterface<>();
@@ -12968,8 +13022,8 @@ public static <A,B,C,D,E,F,G,H> QFuture<Object[]> connect(QMetaObject.AbstractPr
     /**
      * <p>See <a href="@docRoot/qtfuture.html#connect">QtFuture::connect(Sender *, Signal)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <A,B,C,D,E,F,G,H,I> QFuture<Object[]> connect(QMetaObject.AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal) {
+    @QtUninvokable
+    public static <A,B,C,D,E,F,G,H,I> @NonNull QFuture<Object[]> connect(QMetaObject.@StrictNonNull AbstractPrivateSignal9<A,B,C,D,E,F,G,H,I> signal) {
         if(signal.containingObject() instanceof QObject) {
             QObject sender = (QObject)signal.containingObject();
             QFutureInterface<Object[]> promise = new QFutureInterface<>();
@@ -12998,8 +13052,8 @@ class QtFuture_6_1__ {
     /**
      * <p>See <a href="@docRoot/qtfuture.html#makeReadyFuture">QtFuture::makeReadyFuture(T)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<T> makeReadyFuture(T value)
+    @QtUninvokable
+    public static <T> @NonNull QFuture<T> makeReadyFuture(T value)
     {
         QFutureInterface<T> promise = new QFutureInterface<>();
         promise.reportStarted();
@@ -13011,8 +13065,8 @@ public static <T> QFuture<T> makeReadyFuture(T value)
     /**
      * <p>See <a href="@docRoot/qtfuture.html#makeReadyFuture-2">QtFuture::makeReadyFuture(QList&lt;T>)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static <T> QFuture<T> makeReadyFuture(java.util.Collection<T> values)
+    @QtUninvokable
+    public static <T> @NonNull QFuture<T> makeReadyFuture(java.util.Collection<T> values)
     {
         QFutureInterface<T> promise = new QFutureInterface<>();
         promise.reportStarted();
@@ -13024,8 +13078,8 @@ public static <T> QFuture<T> makeReadyFuture(java.util.Collection<T> values)
     /**
      * <p>See <a href="@docRoot/qtfuture.html#makeReadyFuture-1">QtFuture::makeReadyFuture()</a></p>
      */
-    @io.qt.QtUninvokable
-    public static QFuture<Void> makeReadyFuture()
+    @QtUninvokable
+    public static @NonNull QFuture<Void> makeReadyFuture()
     {
         QFutureInterface<Void> promise = QFutureInterface.createVoidFutureInterface();
         promise.reportStarted();
@@ -13036,8 +13090,8 @@ public static QFuture<Void> makeReadyFuture()
     /**
      * <p>See <a href="@docRoot/qtfuture.html#makeExceptionalFuture">QtFuture::makeExceptionalFuture(QException)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static QFuture<Void> makeExceptionalFuture(Throwable exception)
+    @QtUninvokable
+    public static @NonNull QFuture<Void> makeExceptionalFuture(@StrictNonNull Throwable exception)
     {
         QFutureInterface<Void> promise = QFutureInterface.createVoidFutureInterface();
         promise.reportStarted();
@@ -13051,8 +13105,8 @@ class QtFuture_6_3__ {
     /**
      * <p>See <a href="@docRoot/qtfuture.html#whenAny-1">QtFuture::whenAny(Futures)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static QFuture<QFuture<?>> whenAny(QFuture<?>... futures) {
+    @QtUninvokable
+    public static @NonNull QFuture<QFuture<?>> whenAny(QFuture<?>... futures) {
         if(futures==null || futures.length==0)
             return makeReadyFuture(java.util.Collections.emptyList());
         QPromise<QFuture<?>> promise = new QPromise<>();
@@ -13072,8 +13126,8 @@ public static QFuture<QFuture<?>> whenAny(QFuture<?>... futures) {
     /**
      * <p>See <a href="@docRoot/qtfuture.html#whenAny-1">QtFuture::whenAny(Futures)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static QFuture<QFuture<?>> whenAny(java.util.Collection<QFuture<?>> futures) {
+    @QtUninvokable
+    public static @NonNull QFuture<QFuture<?>> whenAny(java.util.Collection<QFuture<?>> futures) {
         if(futures==null || futures.size()==0)
             return makeReadyFuture(java.util.Collections.emptyList());
         QPromise<QFuture<?>> promise = new QPromise<>();
@@ -13093,8 +13147,8 @@ public static QFuture<QFuture<?>> whenAny(java.util.Collection<QFuture<?>> futur
     /**
      * <p>See <a href="@docRoot/qtfuture.html#whenAll-1">QtFuture::whenAll(Futures)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static QFuture<QList<QFuture<?>>> whenAll(QFuture<?>... futures) {
+    @QtUninvokable
+    public static @NonNull QFuture<QList<QFuture<?>>> whenAll(QFuture<?>... futures) {
         if(futures==null || futures.length==0)
             return makeReadyFuture(java.util.Collections.emptyList());
         QPromise<QList<QFuture<?>>> promise = new QPromise<>();
@@ -13119,8 +13173,8 @@ public static QFuture<QList<QFuture<?>>> whenAll(QFuture<?>... futures) {
     /**
      * <p>See <a href="@docRoot/qtfuture.html#whenAll-1">QtFuture::whenAll(Futures)</a></p>
      */
-    @io.qt.QtUninvokable
-    public static QFuture<QList<QFuture<?>>> whenAll(java.util.Collection<QFuture<?>> futures) {
+    @QtUninvokable
+    public static @NonNull QFuture<QList<QFuture<?>>> whenAll(java.util.Collection<QFuture<?>> futures) {
         if(futures==null || futures.size()==0)
             return makeReadyFuture(java.util.Collections.emptyList());
         QPromise<QList<QFuture<?>>> promise = new QPromise<>();
@@ -13146,7 +13200,7 @@ public static QFuture<QList<QFuture<?>>> whenAll(java.util.Collection<QFuture<?>
 class QJsonDocument___{
     
     /**
-     * Result class for {@link #fromJson(io.qt.core.QByteArray)}
+     * Result class for {@link #fromJson(QByteArray)}
      */
     public static final class FromJsonResult{
         private FromJsonResult(QJsonDocument document, QJsonParseError error) {
@@ -13154,8 +13208,8 @@ private FromJsonResult(QJsonDocument document, QJsonParseError error) {
             this.document = document;
             this.error = error;
         }
-        public final io.qt.core.QJsonDocument document;
-        public final io.qt.core.QJsonParseError error;
+        public final @NonNull QJsonDocument document;
+        public final @NonNull QJsonParseError error;
     }
 }// class
 
@@ -13163,30 +13217,30 @@ private FromJsonResult(QJsonDocument document, QJsonParseError error) {
 class QJsonDocument_5__{
     
     /**
-     * <p>Overloaded function for {@link #fromRawData(java.nio.ByteBuffer, io.qt.core.QJsonDocument.DataValidation)}.</p>
+     * <p>Overloaded function for {@link #fromRawData(java.nio.ByteBuffer, QJsonDocument.DataValidation)}.</p>
      */
-    public static io.qt.core.QJsonDocument fromRawData(String data) {
-        return fromRawData(data, io.qt.core.QJsonDocument.DataValidation.Validate);
+    public static QJsonDocument fromRawData(String data) {
+        return fromRawData(data, QJsonDocument.DataValidation.Validate);
     }
     
     /**
-     * <p>Overloaded function for {@link #fromRawData(java.nio.ByteBuffer, io.qt.core.QJsonDocument.DataValidation)}.</p>
+     * <p>Overloaded function for {@link #fromRawData(java.nio.ByteBuffer, QJsonDocument.DataValidation)}.</p>
      */
-    public static io.qt.core.QJsonDocument fromRawData(String data, io.qt.core.QJsonDocument.DataValidation validation) {
+    public static QJsonDocument fromRawData(String data, QJsonDocument.DataValidation validation) {
         return fromRawData(data.getBytes(), validation);
     }
     
     /**
-     * <p>Overloaded function for {@link #fromRawData(java.nio.ByteBuffer, io.qt.core.QJsonDocument.DataValidation)}.</p>
+     * <p>Overloaded function for {@link #fromRawData(java.nio.ByteBuffer, QJsonDocument.DataValidation)}.</p>
      */
-    public static io.qt.core.QJsonDocument fromRawData(byte[] data) {
-        return fromRawData(data, io.qt.core.QJsonDocument.DataValidation.Validate);
+    public static QJsonDocument fromRawData(byte[] data) {
+        return fromRawData(data, QJsonDocument.DataValidation.Validate);
     }
     
     /**
-     * <p>Overloaded function for {@link #fromRawData(java.nio.ByteBuffer, io.qt.core.QJsonDocument.DataValidation)}.</p>
+     * <p>Overloaded function for {@link #fromRawData(java.nio.ByteBuffer, QJsonDocument.DataValidation)}.</p>
      */
-    public static io.qt.core.QJsonDocument fromRawData(byte[] data, io.qt.core.QJsonDocument.DataValidation validation) {
+    public static QJsonDocument fromRawData(byte[] data, QJsonDocument.DataValidation validation) {
         java.nio.ByteBuffer buffer = java.nio.ByteBuffer.wrap(data);
         return fromRawData(buffer, buffer.capacity(), validation);
     }
@@ -13215,25 +13269,25 @@ private LockInfo(long pid, String hostname, String appname) {
 class QPropertyAnimation___ extends QPropertyAnimation {
     
     /**
-     * <p>Overloaded constructor for {@link #QPropertyAnimation(io.qt.core.QObject,io.qt.core.QByteArray,io.qt.core.QObject)}
+     * <p>Overloaded constructor for {@link #QPropertyAnimation(QObject,QByteArray,QObject)}
      * with <code>parent = null</code>.</p>
      */
-    public QPropertyAnimation(io.qt.core.QObject target, String propertyName){
-        this(target, new io.qt.core.QByteArray(propertyName), null);
+    public QPropertyAnimation(QObject target, String propertyName){
+        this(target, new QByteArray(propertyName), null);
     }
     
     /**
-     * <p>Overloaded constructor for {@link #QPropertyAnimation(io.qt.core.QObject,io.qt.core.QByteArray,io.qt.core.QObject)}.</p>
+     * <p>Overloaded constructor for {@link #QPropertyAnimation(QObject,QByteArray,QObject)}.</p>
      */
-    public QPropertyAnimation(io.qt.core.QObject target, String propertyName, io.qt.core.QObject parent){
-        this(target, new io.qt.core.QByteArray(propertyName), parent);
+    public QPropertyAnimation(QObject target, String propertyName, QObject parent){
+        this(target, new QByteArray(propertyName), parent);
     }
     
     /**
-     * <p>Overloaded function for {@link #setPropertyName(io.qt.core.QByteArray)}.</p>
+     * <p>Overloaded function for {@link #setPropertyName(QByteArray)}.</p>
      */
     public final void setPropertyName(String propertyName)    {
-        setPropertyName(new io.qt.core.QByteArray(propertyName));
+        setPropertyName(new QByteArray(propertyName));
     }
     
 }// class
@@ -13300,22 +13354,22 @@ public static QMetaType fromObject(Object obj) {
     /**
      * <p>See <a href="@docRoot/qmetatype.html#fromName">QMetaType::fromName(const char*)</a></p>
      */
-    public static io.qt.core.QMetaType fromName(String name){
-        return fromName(new io.qt.core.QByteArrayView(name));
+    public static QMetaType fromName(String name){
+        return fromName(new QByteArrayView(name));
     }
     
     /**
      * <p>See <a href="@docRoot/qmetatype.html#fromName">QMetaType::fromName(QByteArray)</a></p>
      */
-    public static io.qt.core.QMetaType fromName(QByteArray name){
-        return fromName(new io.qt.core.QByteArrayView(name));
+    public static QMetaType fromName(QByteArray name){
+        return fromName(new QByteArrayView(name));
     }
     
     /**
      * <p>See <a href="@docRoot/qmetatype.html#fromName">QMetaType::fromName(const char*)</a></p>
      */
-    public static io.qt.core.QMetaType fromName(byte[] name){
-        return fromName(new io.qt.core.QByteArrayView(name));
+    public static QMetaType fromName(byte[] name){
+        return fromName(new QByteArrayView(name));
     }
     
 }// class
@@ -13335,7 +13389,7 @@ public QMetaType(QMetaType.Type type){
      * @return type name
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final String toString() {
         return ""+name();
     }
@@ -13446,14 +13500,14 @@ public static <T1,T2> boolean registerConverter(ConverterFn<T1,T2> converterFn)
         return io.qt.internal.MetaTypeUtility.registerConverter(converterTypes[0], converterClassTypes[0], converterTypes[1], converterClassTypes[1], converterFn);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static native Class<?> javaType(long __this__nativeId);
     
     /**
      * Returns the Java class for this meta type.
      * @return java class
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final Class<?> javaType(){
         return javaType(QtJambi_LibraryUtilities.internal.nativeId(this));
     }
@@ -13462,21 +13516,21 @@ public final Class<?> javaType(){
      * Returns the Java class for the given meta type ID.
      * @return java class
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static native Class<?> javaType(int metaTypeId);
 
     /**
      * Interface super type for all generic classes representing a QMetaType-registered but Java-unknown value type.
      */
     public interface GenericTypeInterface{
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public QMetaType metaType();
     }
     
     /**
      * This class represents a QMetaType-registered but Java-unknown enumerator type which can be used in QFlags.
      */
-    public static final class GenericFlag implements io.qt.QtFlagEnumerator{
+    public static final class GenericFlag implements QtFlagEnumerator{
         private GenericFlag(int value) {
             super();
             this.value = value;
@@ -13496,16 +13550,16 @@ public int value() {
         public String name() { return "unknown"; }
         
         @Override 
-        public Class<? extends io.qt.QtFlagEnumerator> getDeclaringClass() { return GenericFlag.class; }
+        public Class<? extends QtFlagEnumerator> getDeclaringClass() { return GenericFlag.class; }
     }
     
     /**
      * This class represents a QMetaType-registered but Java-unknown QFlags type.
      */
-    public static final class GenericFlags extends io.qt.QFlags<GenericFlag> implements GenericTypeInterface, Comparable<io.qt.QFlags<?>>{
+    public static final class GenericFlags extends QFlags<GenericFlag> implements GenericTypeInterface, Comparable<QFlags<?>>{
         private static final long serialVersionUID = -7659504264600507749L;
     
-        @io.qt.NativeAccess
+        @NativeAccess
         private GenericFlags(int type, int value) {
             super(value);
             this.type = type;
@@ -13533,7 +13587,7 @@ public GenericFlags combined(GenericFlag flag) {
         }
 
         @Override
-        public int compareTo(io.qt.QFlags<?> o) {
+        public int compareTo(QFlags<?> o) {
                 return Integer.compare(value(), o.value());
         }
     }
@@ -13541,8 +13595,8 @@ public int compareTo(io.qt.QFlags<?> o) {
     /**
      * This class represents a QMetaType-registered but Java-unknown enumerator.
      */
-    private abstract static class AbstractGenericEnumerator implements io.qt.QtAbstractEnumerator, GenericTypeInterface{
-        @io.qt.NativeAccess
+    private abstract static class AbstractGenericEnumerator implements QtAbstractEnumerator, GenericTypeInterface{
+        @NativeAccess
         private AbstractGenericEnumerator(int type, int index, String name) {
             super();
             this.type = type;
@@ -13613,8 +13667,8 @@ public boolean equals(Object obj) {
     /**
      * This class represents a QMetaType-registered but Java-unknown 32 Bit enumerator.
      */
-    public final static class GenericEnumerator extends AbstractGenericEnumerator implements io.qt.QtEnumerator{
-        @io.qt.NativeAccess
+    public final static class GenericEnumerator extends AbstractGenericEnumerator implements QtEnumerator{
+        @NativeAccess
         private GenericEnumerator(int type, int index, int value, String name) {
             super(type, index, name);
             this.value = value;
@@ -13628,7 +13682,7 @@ public int value() {
         }
     
         @Override
-        public Class<? extends io.qt.QtEnumerator> getDeclaringClass() {
+        public Class<? extends QtEnumerator> getDeclaringClass() {
             return GenericEnumerator.class;
         }
     
@@ -13662,8 +13716,8 @@ public boolean equals(Object obj) {
     /**
      * This class represents a QMetaType-registered but Java-unknown 8 Bit enumerator.
      */
-    public final static class GenericByteEnumerator extends AbstractGenericEnumerator implements io.qt.QtByteEnumerator{
-        @io.qt.NativeAccess
+    public final static class GenericByteEnumerator extends AbstractGenericEnumerator implements QtByteEnumerator{
+        @NativeAccess
         private GenericByteEnumerator(int type, int index, byte value, String name) {
             super(type, index, name);
             this.value = value;
@@ -13677,7 +13731,7 @@ public byte value() {
         }
     
         @Override
-        public Class<? extends io.qt.QtByteEnumerator> getDeclaringClass() {
+        public Class<? extends QtByteEnumerator> getDeclaringClass() {
             return GenericByteEnumerator.class;
         }
     
@@ -13711,8 +13765,8 @@ public boolean equals(Object obj) {
     /**
      * This class represents a QMetaType-registered but Java-unknown 16 Bit enumerator.
      */
-    public final static class GenericShortEnumerator extends AbstractGenericEnumerator implements io.qt.QtShortEnumerator{
-        @io.qt.NativeAccess
+    public final static class GenericShortEnumerator extends AbstractGenericEnumerator implements QtShortEnumerator{
+        @NativeAccess
         private GenericShortEnumerator(int type, int index, short value, String name) {
             super(type, index, name);
             this.value = value;
@@ -13726,7 +13780,7 @@ public short value() {
         }
     
         @Override
-        public Class<? extends io.qt.QtShortEnumerator> getDeclaringClass() {
+        public Class<? extends QtShortEnumerator> getDeclaringClass() {
             return GenericShortEnumerator.class;
         }
     
@@ -13760,8 +13814,8 @@ public boolean equals(Object obj) {
     /**
      * This class represents a QMetaType-registered but Java-unknown 64 Bit enumerator.
      */
-    public final static class GenericLongEnumerator extends AbstractGenericEnumerator implements io.qt.QtLongEnumerator{
-        @io.qt.NativeAccess
+    public final static class GenericLongEnumerator extends AbstractGenericEnumerator implements QtLongEnumerator{
+        @NativeAccess
         private GenericLongEnumerator(int type, int index, long value, String name) {
             super(type, index, name);
             this.value = value;
@@ -13775,7 +13829,7 @@ public long value() {
         }
     
         @Override
-        public Class<? extends io.qt.QtLongEnumerator> getDeclaringClass() {
+        public Class<? extends QtLongEnumerator> getDeclaringClass() {
             return GenericLongEnumerator.class;
         }
     
@@ -13809,8 +13863,8 @@ public boolean equals(Object obj) {
     /**
      * This class represents a QMetaType-registered but Java-unknown value type.
      */
-    public final static class GenericValue extends io.qt.QtObject implements Cloneable, GenericTypeInterface{
-        @io.qt.NativeAccess
+    public final static class GenericValue extends QtObject implements Cloneable, GenericTypeInterface{
+        @NativeAccess
         private GenericValue(QPrivateConstructor p) { super(p); }
         
         private native GenericValue clone(int type);
@@ -13821,10 +13875,10 @@ public GenericValue clone() {
             return clone(type);
         }
 
-        @io.qt.NativeAccess
+        @NativeAccess
         private final int type = QMetaType.Type.UnknownType.value();
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public QMetaType metaType() {
             return new QMetaType(type);
         }
@@ -13837,13 +13891,13 @@ public java.nio.ByteBuffer buffer(){
     /**
      * This class represents a QMetaType-registered but Java-unknown object type.
      */
-    public final static class GenericObject extends io.qt.QtObject implements GenericTypeInterface{
+    public final static class GenericObject extends QtObject implements GenericTypeInterface{
         private GenericObject(QPrivateConstructor p) { super(p); }
         
-        @io.qt.NativeAccess
+        @NativeAccess
         private final int type = QMetaType.Type.UnknownType.value();
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public QMetaType metaType() {
             return new QMetaType(type);
         }
@@ -13852,13 +13906,13 @@ public QMetaType metaType() {
     /**
      * This class represents a QMetaType-registered but Java-unknown gadget type.
      */
-    public final static class GenericGadget extends io.qt.QtGadget implements GenericTypeInterface{
+    public final static class GenericGadget extends QtGadget implements GenericTypeInterface{
         private GenericGadget(QPrivateConstructor p) {super(p);}
         
-        @io.qt.NativeAccess
+        @NativeAccess
         private final int type = QMetaType.Type.UnknownType.value();
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public QMetaType metaType() {
             return new QMetaType(type);
         }
@@ -13907,7 +13961,7 @@ class QVariant_5__ {
      * @deprecated Use {@link QDataStream#writeObject(Object)} instead.
      */
     @Deprecated
-    public static void saveObject(QDataStream stream, Object object){
+    public static void saveObject(@StrictNonNull QDataStream stream, Object object){
         saveObject(stream, object, null);
     }
     
@@ -13915,7 +13969,7 @@ public static void saveObject(QDataStream stream, Object object){
      * @deprecated Use {@link QDataStream#writeObject(Object)} instead.
      */
     @Deprecated
-    public static void saveObject(QDataStream stream, Object object, Boolean[] ok){
+    public static void saveObject(@StrictNonNull QDataStream stream, Object object, Boolean[] ok){
         QVariant variant = new QVariant(object);
         int metaType = variant.userType();
         stream.append(metaType);
@@ -13928,7 +13982,7 @@ public static void saveObject(QDataStream stream, Object object, Boolean[] ok){
      * @deprecated Use {@link QDataStream#readObject(Class, QMetaType...)} instead.
      */
     @Deprecated
-    public static Object loadObject(QDataStream stream){
+    public static Object loadObject(@StrictNonNull QDataStream stream){
         return loadObject(stream, null);
     }
     
@@ -13936,7 +13990,7 @@ public static Object loadObject(QDataStream stream){
      * @deprecated Use {@link QDataStream#readObject(Class, QMetaType...)} instead.
      */
     @Deprecated
-    public static Object loadObject(QDataStream stream, Boolean ok[]){
+    public static Object loadObject(@StrictNonNull QDataStream stream, Boolean ok[]){
         java.util.Optional<Object> optional = QMetaType.load(stream, stream.readInt());
         if(ok!=null && ok.length>0)
             ok[0] = optional.isPresent();
@@ -13981,7 +14035,7 @@ public static Object convert(Object obj, int metaType, boolean ok[]) {
      * Convenient static function for type conversion.
      * @see {@link #convert(int)}
      */
-    public static Object convert(Object obj, QMetaType metaType) {
+    public static Object convert(Object obj, @StrictNonNull QMetaType metaType) {
         return convert(obj, metaType.id(), null);
     }
     
@@ -13989,7 +14043,7 @@ public static Object convert(Object obj, QMetaType metaType) {
      * Convenient static function for type conversion.
      * @see {@link #convert(int)}
      */
-    public static Object convert(Object obj, QMetaType metaType, boolean ok[]) {
+    public static Object convert(Object obj, @StrictNonNull QMetaType metaType, boolean ok[]) {
         return convert(obj, metaType.id(), ok);
     }
     
@@ -13997,7 +14051,7 @@ public static Object convert(Object obj, QMetaType metaType, boolean ok[]) {
      * Convenient static function for type conversion.
      * @see {@link #convert(int)}
      */
-    public static Object convert(Object obj, QMetaType.Type metaType) {
+    public static Object convert(Object obj, QMetaType.@StrictNonNull Type metaType) {
         return convert(obj, metaType.value(), null);
     }
     
@@ -14005,7 +14059,7 @@ public static Object convert(Object obj, QMetaType.Type metaType) {
      * Convenient static function for type conversion.
      * @see {@link #convert(int)}
      */
-    public static Object convert(Object obj, QMetaType.Type metaType, boolean ok[]) {
+    public static Object convert(Object obj, QMetaType.@StrictNonNull Type metaType, boolean ok[]) {
         return convert(obj, metaType.value(), ok);
     }
     
@@ -14013,7 +14067,7 @@ public static Object convert(Object obj, QMetaType.Type metaType, boolean ok[])
      * Convenient static function for type conversion.
      * @see {@link #convert(int)}
      */
-    public static Object convert(Object obj, Type metaType) {
+    public static Object convert(Object obj, @StrictNonNull Type metaType) {
         return convert(obj, metaType.value(), null);
     }
     
@@ -14021,37 +14075,37 @@ public static Object convert(Object obj, Type metaType) {
      * Convenient static function for type conversion.
      * @see {@link #convert(int)}
      */
-    public static Object convert(Object obj, Type metaType, boolean ok[]) {
+    public static Object convert(Object obj, @StrictNonNull Type metaType, boolean ok[]) {
         return convert(obj, metaType.value(), ok);
     }
     
     /**
      * <p>See <a href="@docRoot/qvariant.html#canConvert">QVariant::canConvert(int)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final boolean canConvert(io.qt.core.QMetaType.Type targetType){
+    @QtUninvokable
+    public final boolean canConvert(QMetaType.@StrictNonNull Type targetType){
         return canConvert(targetType.value());
     }
     
     /**
      * <p>See <a href="@docRoot/qvariant.html#canConvert">QVariant::canConvert(int)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final boolean canConvert(Type targetType){
+    @QtUninvokable
+    public final boolean canConvert(@StrictNonNull Type targetType){
         return canConvert(targetType.value());
     }
 
     /**
      * <p>See <a href="@docRoot/qvariant.html#convert">QVariant::convert(int)</a></p>
      */
-    public final boolean convert(Class<?> cl, QMetaType...instantiations) {
+    public final boolean convert(@StrictNonNull Class<?> cl, @StrictNonNull QMetaType @StrictNonNull... instantiations) {
         return convert(QMetaType.fromType(cl, instantiations).id());
     }
     
     /**
      * <p>See <a href="@docRoot/qvariant.html#QVariant-1">QVariant::QVariant(int,const void*)</a></p>
      */
-    public QVariant(QMetaType.Type metaType){
+    public QVariant(QMetaType.@StrictNonNull Type metaType){
         this(metaType.value(), null); 
     }
     
@@ -14072,7 +14126,7 @@ public static boolean canConvert(Object obj, int targetType) {
      * Convenient static function for type conversion.
      * @see {@link #canConvert(int)}
      */
-    public static boolean canConvert(Object obj, QMetaType.Type type) {
+    public static boolean canConvert(Object obj, QMetaType.@StrictNonNull Type type) {
         return canConvert(obj, type.value());
     }
 }// class
@@ -14082,7 +14136,7 @@ class QVariant_6__ {
     /**
      * <p>See <a href="https://doc.qt.io/qt/qvariant.html#QVariant-1">QVariant::QVariant(QMetaType,const void*)</a></p>
      */
-    public QVariant(io.qt.core.QMetaType.Type type, java.lang.Object copy){
+    public QVariant(QMetaType.@NonNull Type type, java.lang.Object copy){
         this(new QMetaType(type), copy);
     }
     
@@ -14090,7 +14144,7 @@ public QVariant(io.qt.core.QMetaType.Type type, java.lang.Object copy){
      * @deprecated Use {@link QDataStream#writeObject(Object)} instead.
      */
     @Deprecated
-    public static void saveObject(QDataStream stream, Object object){
+    public static void saveObject(@StrictNonNull QDataStream stream, Object object){
         saveObject(stream, object, null);
     }
     
@@ -14098,7 +14152,7 @@ public static void saveObject(QDataStream stream, Object object){
      * @deprecated Use {@link QDataStream#writeObject(Object)} instead.
      */
     @Deprecated
-    public static void saveObject(QDataStream stream, Object object, Boolean[] ok){
+    public static void saveObject(@StrictNonNull QDataStream stream, Object object, Boolean[] ok){
         QVariant variant = new QVariant(object);
         QMetaType metaType = variant.metaType();
         stream.append(metaType.id());
@@ -14111,7 +14165,7 @@ public static void saveObject(QDataStream stream, Object object, Boolean[] ok){
      * @deprecated Use {@link QDataStream#readObject(Class, QMetaType...)} instead.
      */
     @Deprecated
-    public static Object loadObject(QDataStream stream){
+    public static Object loadObject(@StrictNonNull QDataStream stream){
         return loadObject(stream, null);
     }
     
@@ -14119,7 +14173,7 @@ public static Object loadObject(QDataStream stream){
      * @deprecated Use {@link QDataStream#readObject(Class, QMetaType...)} instead.
      */
     @Deprecated
-    public static Object loadObject(QDataStream stream, Boolean ok[]){
+    public static Object loadObject(@StrictNonNull QDataStream stream, Boolean ok[]){
         QMetaType metaType = new QMetaType(stream.readInt());
         java.util.Optional<Object> optional = metaType.load(stream);
         if(ok!=null && ok.length>0)
@@ -14131,7 +14185,7 @@ public static Object loadObject(QDataStream stream, Boolean ok[]){
      * Convenient static function for type conversion.
      * @see {@link #convert(QMetaType)}
      */
-    public static Object convert(Object obj, QMetaType metaType) {
+    public static Object convert(Object obj, @StrictNonNull QMetaType metaType) {
         return convert(obj, metaType, null);
     }
     
@@ -14139,7 +14193,7 @@ public static Object convert(Object obj, QMetaType metaType) {
      * Convenient static function for type conversion.
      * @see {@link #convert(QMetaType)}
      */
-    public static Object convert(Object obj, QMetaType metaType, boolean ok[]) {
+    public static Object convert(Object obj, @StrictNonNull QMetaType metaType, boolean ok[]) {
         java.util.Objects.requireNonNull(metaType);
         if(obj==null){
             if(ok!=null && ok.length>0)
@@ -14181,8 +14235,8 @@ public static Object convert(Object obj, int metaType, boolean ok[]) {
     /**
      * <p>See <a href="@docRoot/qvariant.html#canConvert">QVariant::canConvert(QMetaType)const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final boolean canConvert(io.qt.core.QMetaType.Type targetType){
+    @QtUninvokable
+    public final boolean canConvert(QMetaType.@NonNull Type targetType){
         return canConvert(new QMetaType(targetType));
     }
     
@@ -14190,7 +14244,7 @@ public final boolean canConvert(io.qt.core.QMetaType.Type targetType){
      * Convenient static function for type conversion.
      * @see {@link #convert(QMetaType)}
      */
-    public static Object convert(Object obj, QMetaType.Type type) {
+    public static Object convert(Object obj, QMetaType.@NonNull Type type) {
         return convert(obj, new QMetaType(type));
     }
     
@@ -14198,7 +14252,7 @@ public static Object convert(Object obj, QMetaType.Type type) {
      * Convenient static function for type conversion.
      * @see {@link #convert(QMetaType)}
      */
-    public static Object convert(Object obj, QMetaType.Type type, boolean ok[]) {
+    public static Object convert(Object obj, QMetaType.@NonNull Type type, boolean ok[]) {
         return convert(obj, new QMetaType(type), ok);
     }
     
@@ -14206,8 +14260,8 @@ public static Object convert(Object obj, QMetaType.Type type, boolean ok[]) {
      * <p>See <a href="@docRoot/qvariant.html#canConvert">QVariant::canConvert(QMetaType)const</a></p>
      */
     @Deprecated
-    @io.qt.QtUninvokable
-    public final boolean canConvert(Type targetType){
+    @QtUninvokable
+    public final boolean canConvert(@StrictNonNull Type targetType){
         return canConvert(new QMetaType(targetType.value()));
     }
     
@@ -14215,7 +14269,7 @@ public final boolean canConvert(Type targetType){
      * Convenient static function for type conversion.
      * @see {@link #canConvert(QMetaType)}
      */
-    public static boolean canConvert(Object obj, QMetaType type) {
+    public static boolean canConvert(Object obj, @StrictNonNull QMetaType type) {
         QMetaType objectType = QMetaType.fromObject(obj);
         if(objectType.equals(type))
             return true;
@@ -14226,14 +14280,14 @@ public static boolean canConvert(Object obj, QMetaType type) {
     /**
      * <p>See <a href="@docRoot/qvariant.html#convert">QVariant::convert(QMetaType)</a></p>
      */
-    public final boolean convert(Class<?> cl, QMetaType...instantiations) {
+    public final boolean convert(@StrictNonNull Class<?> cl, @StrictNonNull QMetaType @StrictNonNull...instantiations) {
         return convert(QMetaType.fromType(cl, instantiations));
     }
     
     /**
      * <p>See <a href="@docRoot/qvariant.html#QVariant-1">QVariant::QVariant(QMetaType,const void*)</a></p>
      */
-    public QVariant(QMetaType.Type metaType){
+    public QVariant(QMetaType.@NonNull Type metaType){
         this(new QMetaType(metaType), null); 
     }
     
@@ -14241,7 +14295,7 @@ public QVariant(QMetaType.Type metaType){
      * Convenient static function for type conversion.
      * @see {@link #canConvert(QMetaType)}
      */
-    public static boolean canConvert(Object obj, QMetaType.Type type) {
+    public static boolean canConvert(Object obj, QMetaType.@NonNull Type type) {
         return canConvert(obj, new QMetaType(type));
     }
     
@@ -14291,7 +14345,7 @@ public static int type(Object obj) {
      * @see {@link #convert(QMetaType)}
      */
     @SuppressWarnings("unchecked")
-    public static <T> T convert(Object obj, Class<T> cl, QMetaType...instantiations) {
+    public static <T> T convert(Object obj, @StrictNonNull Class<T> cl, @StrictNonNull QMetaType @StrictNonNull... instantiations) {
         boolean[] ok = {false};
         Object result = convert(obj, QMetaType.fromType(cl, instantiations), ok);
         Class<?> _cl = cl.isPrimitive() ? getComplexType(cl) : cl;
@@ -14326,17 +14380,17 @@ private static boolean isDBusVariant(Object value, Class <?> cl) {
      * Convenient static function for type conversion.
      * @see {@link #canConvert(QMetaType)}
      */
-    public static <E extends Enum<?>> boolean canConvertToEnum(Class<E> enumClass, Object obj)
+    public static <E extends Enum<?>> boolean canConvertToEnum(@StrictNonNull Class<E> enumClass, Object obj)
     {
         if(enumClass.isInstance(obj)) {
             return true;
         }else {
             QVariant variant = new QVariant(obj);
-            if(io.qt.QtEnumerator.class.isAssignableFrom(enumClass) 
-                    || io.qt.QtByteEnumerator.class.isAssignableFrom(enumClass) 
-                    || io.qt.QtShortEnumerator.class.isAssignableFrom(enumClass)) {
+            if(QtEnumerator.class.isAssignableFrom(enumClass) 
+                    || QtByteEnumerator.class.isAssignableFrom(enumClass) 
+                    || QtShortEnumerator.class.isAssignableFrom(enumClass)) {
                 return variant.canConvert(QMetaType.Type.Int);
-            }else if(io.qt.QtLongEnumerator.class.isAssignableFrom(enumClass)) {
+            }else if(QtLongEnumerator.class.isAssignableFrom(enumClass)) {
                 return variant.canConvert(QMetaType.Type.Long);
             }else if (variant.canConvert(QMetaType.Type.Int)) {
                 boolean[] ok = {false};
@@ -14353,14 +14407,14 @@ public static <E extends Enum<?>> boolean canConvertToEnum(Class<E> enumClass, O
      */
     public static boolean canConvertToFlags(Object obj)
     {
-        return obj instanceof io.qt.QFlags || new QVariant(obj).canConvert(QMetaType.Type.Int);
+        return obj instanceof QFlags || new QVariant(obj).canConvert(QMetaType.Type.Int);
     }
     
     /**
      * Convenient static function for type conversion.
      * @see {@link #canConvert(QMetaType)}
      */
-    public static <E extends Enum<?>> E toEnum(Class<E> enumClass, Object obj) {
+    public static <E extends Enum<?>> E toEnum(@StrictNonNull Class<E> enumClass, Object obj) {
         return toEnum(enumClass, obj, (boolean[])null);
     }
     
@@ -14368,7 +14422,7 @@ public static <E extends Enum<?>> E toEnum(Class<E> enumClass, Object obj) {
      * Convenient static function for type conversion.
      * @see {@link #canConvert(QMetaType)}
      */
-    public static <E extends Enum<?>> E toEnum(Class<E> enumClass, Object obj, boolean ok[]) {
+    public static <E extends Enum<?>> E toEnum(@StrictNonNull Class<E> enumClass, Object obj, boolean ok[]) {
         if(enumClass.isInstance(obj)) {
             try {
                 if(ok!=null && ok.length>0)
@@ -14378,7 +14432,7 @@ public static <E extends Enum<?>> E toEnum(Class<E> enumClass, Object obj, boole
             }
         }else {
             QVariant variant = new QVariant(obj);
-            if(io.qt.QtEnumerator.class.isAssignableFrom(enumClass)) {
+            if(QtEnumerator.class.isAssignableFrom(enumClass)) {
                 try {
                     java.lang.reflect.Method resolveMethod = enumClass.getMethod("resolve", int.class);
                     int value = variant.toInt(ok);
@@ -14386,7 +14440,7 @@ public static <E extends Enum<?>> E toEnum(Class<E> enumClass, Object obj, boole
                         return enumClass.cast(resolveMethod.invoke(null, value));
                 } catch (Exception e) {
                 }
-            }else if(io.qt.QtByteEnumerator.class.isAssignableFrom(enumClass)) {
+            }else if(QtByteEnumerator.class.isAssignableFrom(enumClass)) {
                 try {
                     java.lang.reflect.Method resolveMethod = enumClass.getMethod("resolve", byte.class);
                     int value = variant.toInt(ok);
@@ -14394,7 +14448,7 @@ public static <E extends Enum<?>> E toEnum(Class<E> enumClass, Object obj, boole
                         return enumClass.cast(resolveMethod.invoke(null, (byte)value));
                 } catch (Exception e) {
                 }
-            }else if(io.qt.QtShortEnumerator.class.isAssignableFrom(enumClass)) {
+            }else if(QtShortEnumerator.class.isAssignableFrom(enumClass)) {
                 try {
                     java.lang.reflect.Method resolveMethod = enumClass.getMethod("resolve", short.class);
                     int value = variant.toInt(ok);
@@ -14402,7 +14456,7 @@ public static <E extends Enum<?>> E toEnum(Class<E> enumClass, Object obj, boole
                         return enumClass.cast(resolveMethod.invoke(null, value));
                 } catch (Exception e) {
                 }
-            }else if(io.qt.QtLongEnumerator.class.isAssignableFrom(enumClass)) {
+            }else if(QtLongEnumerator.class.isAssignableFrom(enumClass)) {
                 try {
                     java.lang.reflect.Method resolveMethod = enumClass.getMethod("resolve", long.class);
                     long value = variant.toLong(ok);
@@ -14427,7 +14481,7 @@ public static <E extends Enum<?>> E toEnum(Class<E> enumClass, Object obj, boole
      * Convenient static function for type conversion.
      * @see {@link #convert(QMetaType)}
      */
-    public static <F extends io.qt.QFlags<?>> F toFlags(Class<F> flagsClass, Object obj) {
+    public static <F extends QFlags<?>> F toFlags(@StrictNonNull Class<F> flagsClass, Object obj) {
         return toFlags(flagsClass, obj, null);
     }
     
@@ -14435,7 +14489,7 @@ public static <F extends io.qt.QFlags<?>> F toFlags(Class<F> flagsClass, Object
      * Convenient static function for type conversion.
      * @see {@link #convert(QMetaType)}
      */
-    public static <F extends io.qt.QFlags<?>> F toFlags(Class<F> flagsClass, Object obj, boolean ok[]) {
+    public static <F extends QFlags<?>> F toFlags(@StrictNonNull Class<F> flagsClass, Object obj, boolean ok[]) {
         if(flagsClass.isInstance(obj)) {
             try{
                 if(ok!=null && ok.length>0)
@@ -14540,8 +14594,8 @@ public static boolean canConvertToString(Object obj){
      * Convenient static function for type conversion.
      * @see {@link #toString()}
      */
-    public static String toString(Object obj){
-        return obj==null ? new String() : obj.toString();
+    public static @NonNull String toString(Object obj){
+        return obj==null ? new String() : ""+obj;
     }
     
     /**
@@ -14580,10 +14634,10 @@ public static boolean canConvertToByteArray(Object obj){
      * Convenient static function for type conversion.
      * @see {@link #toByteArray()}
      */
-    public static QByteArray toByteArray(Object obj)
+    public static @NonNull QByteArray toByteArray(Object obj)
     {
         if(obj instanceof QByteArray) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QByteArray)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QByteArray);
@@ -14607,10 +14661,10 @@ public static boolean canConvertToBitArray(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toBitArray()}
      */
-    public static QBitArray toBitArray(Object obj)
+    public static @NonNull QBitArray toBitArray(Object obj)
     {
         if(obj instanceof QBitArray) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QBitArray)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QBitArray);
@@ -14657,10 +14711,10 @@ public static boolean canConvertToDate(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toDate()}
      */
-    public static QDate toDate(Object obj)
+    public static @NonNull QDate toDate(Object obj)
     {
         if(obj instanceof QDate) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QDate)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QDate);
@@ -14684,10 +14738,10 @@ public static boolean canConvertToDateTime(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toDateTime()}
      */
-    public static QDateTime toDateTime(Object obj)
+    public static @NonNull QDateTime toDateTime(Object obj)
     {
         if(obj instanceof QDateTime) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QDateTime)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QDateTime);
@@ -14745,10 +14799,10 @@ public static boolean canConvertToLine(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toLine()}
      */
-    public static QLine toLine(Object obj)
+    public static @NonNull QLine toLine(Object obj)
     {
         if(obj instanceof QLine) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QLine)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QLine);
@@ -14772,10 +14826,10 @@ public static boolean canConvertToLineF(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toLineF()}
      */
-    public static QLineF toLineF(Object obj)
+    public static @NonNull QLineF toLineF(Object obj)
     {
         if(obj instanceof QLineF) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QLineF)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QLineF);
@@ -14799,10 +14853,10 @@ public static boolean canConvertToLocale(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toLocale()}
      */
-    public static QLocale toLocale(Object obj)
+    public static @NonNull QLocale toLocale(Object obj)
     {
         if(obj instanceof QLocale) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QLocale)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QLocale);
@@ -14826,10 +14880,10 @@ public static boolean canConvertToPoint(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toPoint()}
      */
-    public static QPoint toPoint(Object obj)
+    public static @NonNull QPoint toPoint(Object obj)
     {
         if(obj instanceof QPoint) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QPoint)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QPoint);
@@ -14853,10 +14907,10 @@ public static boolean canConvertToPointF(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toPointF()}
      */
-    public static QPointF toPointF(Object obj)
+    public static @NonNull QPointF toPointF(Object obj)
     {
         if(obj instanceof QPointF) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QPointF)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QPointF);
@@ -14880,10 +14934,10 @@ public static boolean canConvertToRect(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toRect()}
      */
-    public static QRect toRect(Object obj)
+    public static @NonNull QRect toRect(Object obj)
     {
         if(obj instanceof QRect) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QRect)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QRect);
@@ -14907,10 +14961,10 @@ public static boolean canConvertToRectF(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toRectF()}
      */
-    public static QRectF toRectF(Object obj)
+    public static @NonNull QRectF toRectF(Object obj)
     {
         if(obj instanceof QRectF) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QRectF)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QRectF);
@@ -14934,10 +14988,10 @@ public static boolean canConvertToRegularExpression(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toRegularExpression()}
      */
-    public static QRegularExpression toRegularExpression(Object obj)
+    public static @NonNull QRegularExpression toRegularExpression(Object obj)
     {
         if(obj instanceof QRegularExpression) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QRegularExpression)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QRegularExpression);
@@ -14961,10 +15015,10 @@ public static boolean canConvertToSize(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toSize()}
      */
-    public static QSize toSize(Object obj)
+    public static @NonNull QSize toSize(Object obj)
     {
         if(obj instanceof QSize) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QSize)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QSize);
@@ -14988,10 +15042,10 @@ public static boolean canConvertToSizeF(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toSizeF()}
      */
-    public static QSizeF toSizeF(Object obj)
+    public static @NonNull QSizeF toSizeF(Object obj)
     {
         if(obj instanceof QSizeF) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QSizeF)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QSizeF);
@@ -15015,10 +15069,10 @@ public static boolean canConvertToTime(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toTime()}
      */
-    public static QTime toTime(Object obj)
+    public static @NonNull QTime toTime(Object obj)
     {
         if(obj instanceof QTime) {
-            if(!((io.qt.QtObjectInterface)obj).isDisposed())
+            if(!((QtObjectInterface)obj).isDisposed())
                 return (QTime)obj;
         }else if(obj!=null){
             Object returned = convert(obj, QMetaType.Type.QTime);
@@ -15071,7 +15125,7 @@ public static boolean canConvertToList(Object obj)
      * @see {@link #toList()}
      */
     @SuppressWarnings("unchecked")
-    public static QList<Object> toList(Object obj)
+    public static @NonNull QList<Object> toList(Object obj)
     {
         if (obj instanceof java.util.Collection){
             if (obj instanceof QList && ((QList<?>)obj).elementMetaType().javaType()==Object.class)
@@ -15101,7 +15155,7 @@ public static boolean canConvertToStringList(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toStringList()}
      */
-    public static QStringList toStringList(Object obj)
+    public static @NonNull QStringList toStringList(Object obj)
     {
         if (obj instanceof java.util.Collection){
             if (obj instanceof QStringList) {
@@ -15134,7 +15188,7 @@ public static boolean canConvertToCollection(Object obj)
      * Convenient static function for type conversion.
      * @see {@link #toList()}
      */
-    public static java.util.Collection<?> toCollection(Object obj)
+    public static java.util.@NonNull Collection<?> toCollection(Object obj)
     {
         if (obj instanceof java.util.Collection){
             return (java.util.Collection<?>)obj;
@@ -15161,7 +15215,7 @@ public static boolean canConvertToMap(Object obj)
      * @see {@link #toHash()}
      */
     @SuppressWarnings("unchecked")
-    public static QHash<String,Object> toHash(Object obj)
+    public static @NonNull QHash<String,Object> toHash(Object obj)
     {
         if (obj instanceof java.util.Map) {
             if(obj instanceof QHash 
@@ -15188,7 +15242,7 @@ public static QHash<String,Object> toHash(Object obj)
      * @see {@link #toMap()}
      */
     @SuppressWarnings("unchecked")
-    public static QMap<String,Object> toMap(Object obj)
+    public static @NonNull QMap<String,Object> toMap(Object obj)
     {
         if (obj instanceof java.util.Map) {
             if(obj instanceof QMap 
@@ -15237,7 +15291,7 @@ class QMetaMethod___ {
     /**
      * <p>See <a href="@docRoot/qmetamethod.html#parameterTypes">QMetaMethod::parameterTypes() const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final java.util.List<Class<?>> parameterClassTypes() {
         if(parameterClassTypes==null) {
             parameterClassTypes = java.util.Collections.unmodifiableList(parameterClassTypes_native());
@@ -15245,13 +15299,13 @@ public final java.util.List<Class<?>> parameterClassTypes() {
         return parameterClassTypes;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native final java.util.List<Class<?>> parameterClassTypes_native();
     
     /**
      * <p>See <a href="@docRoot/qmetamethod.html#parameterType">QMetaMethod::parameterType(int index) const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final Class<?> parameterClassType(int index) {
         return parameterClassTypes().get(index);
     }
@@ -15259,21 +15313,21 @@ public final Class<?> parameterClassType(int index) {
     /**
      * <p>See <a href="@docRoot/qmetamethod.html#returnType">QMetaMethod::returnType() const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final Class<?> returnClassType(){
         if(returnClassType==null)
             returnClassType = returnClassType_native();
         return returnClassType;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native final Class<?> returnClassType_native();
         
     /**
      * <p>See <a href="@docRoot/qmetamethod.html#methodSignature">QMetaMethod::methodSignature() const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final String methodSignature() {
+    @QtUninvokable
+    public final @NonNull String methodSignature() {
         if(!isValid())
             return "";
         StringBuilder args = new StringBuilder();
@@ -15309,26 +15363,26 @@ public final String methodSignature() {
     }
     
     @Override
-    @io.qt.QtUninvokable
-    public final String toString() {
+    @QtUninvokable
+    public final @NonNull String toString() {
         return methodSignature();
     }
     
     /**
      * <p>See <a href="@docRoot/qmetamethod.html#invoke-1">QMetaMethod::invoke(QObject *object, QGenericReturnArgument returnValue, QGenericArgument val0 = QGenericArgument(nullptr), QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(), QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(), QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(), QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument(), QGenericArgument val9 = QGenericArgument()) const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final Object invoke(QObject object, Object... args) throws IllegalArgumentException, io.qt.QUnsuccessfulInvocationException {
+    @QtUninvokable
+    public final Object invoke(QObject object, Object... args) throws IllegalArgumentException, QUnsuccessfulInvocationException {
         return invoke(object, Qt.ConnectionType.AutoConnection, args);
     }
     
     /**
      * <p>See <a href="@docRoot/qmetamethod.html#invoke">QMetaMethod::invoke(QObject *object, Qt::ConnectionType connectionType, QGenericReturnArgument returnValue, QGenericArgument val0 = QGenericArgument(nullptr), QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(), QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(), QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(), QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument(), QGenericArgument val9 = QGenericArgument()) const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final Object invoke(QObject object, Qt.ConnectionType connection, Object... args) throws IllegalArgumentException, io.qt.QUnsuccessfulInvocationException {
+    @QtUninvokable
+    public final Object invoke(QObject object, Qt.ConnectionType connection, Object... args) throws IllegalArgumentException, QUnsuccessfulInvocationException {
         if(!isValid())
-            throw new io.qt.QUnsuccessfulInvocationException("Cannot invoke an invalid QMetaMethod.");
+            throw new QUnsuccessfulInvocationException("Cannot invoke an invalid QMetaMethod.");
         if(parameterCount() != args.length) {
             throw new IllegalArgumentException(String.format("Wrong number of arguments. expected: %2$s, given: %1$s", args.length, parameterCount()));
         }
@@ -15340,17 +15394,17 @@ public final Object invoke(QObject object, Qt.ConnectionType connection, Object.
             }
         }
         if(connection==Qt.ConnectionType.BlockingQueuedConnection && object.thread()==QThread.currentThread()) {
-            throw new io.qt.QUnsuccessfulInvocationException("Blocking-queued invocation on object whose thread is the current thread is not allowed.");
+            throw new QUnsuccessfulInvocationException("Blocking-queued invocation on object whose thread is the current thread is not allowed.");
         }
         Class<?>[] argClassTypes = new Class<?>[1+parameterCount()];
         Class<?> returnType = returnClassType();
         argClassTypes[0] = returnType==null ? void.class : returnType;
         if(argClassTypes[0]!=void.class && argClassTypes[0]!=Void.class) {
             if(connection==Qt.ConnectionType.QueuedConnection) {
-                throw new io.qt.QUnsuccessfulInvocationException("Unable to invoke methods with return values in queued connections.");
+                throw new QUnsuccessfulInvocationException("Unable to invoke methods with return values in queued connections.");
             }else if(connection==Qt.ConnectionType.AutoConnection) {
                 if(QThread.currentThread() != object.thread()) {
-                    throw new io.qt.QUnsuccessfulInvocationException("Unable to invoke methods with return values in queued connections (auto connection with different threads).");
+                    throw new QUnsuccessfulInvocationException("Unable to invoke methods with return values in queued connections (auto connection with different threads).");
                 }
             }
         }
@@ -15361,16 +15415,16 @@ public final Object invoke(QObject object, Qt.ConnectionType connection, Object.
         return invoke_native(object, argClassTypes, connection.ordinal(), args);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native Object invoke_native(QObject object__id, Class<?>[] argClassTypes, int connection, Object[] args);
     
     /**
      * <p>See <a href="@docRoot/qmetamethod.html#invokeOnGadget">QMetaMethod::invokeOnGadget(void *gadget, QGenericReturnArgument returnValue, QGenericArgument val0 = QGenericArgument(nullptr), QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(), QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(), QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(), QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument(), QGenericArgument val9 = QGenericArgument()) const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final Object invokeOnGadget(Object object, Object... args) throws IllegalArgumentException, io.qt.QUnsuccessfulInvocationException {
+    @QtUninvokable
+    public final @Nullable Object invokeOnGadget(Object object, Object... args) throws IllegalArgumentException, QUnsuccessfulInvocationException {
         if(!isValid())
-            throw new io.qt.QUnsuccessfulInvocationException("Cannot invoke an invalid QMetaMethod.");
+            throw new QUnsuccessfulInvocationException("Cannot invoke an invalid QMetaMethod.");
         if(parameterCount() != args.length) {
             throw new IllegalArgumentException(String.format("Wrong number of arguments. expected: %2$s, given: %1$s", args.length, parameterCount()));
         }
@@ -15391,14 +15445,14 @@ public final Object invokeOnGadget(Object object, Object... args) throws Illegal
         return invoke_native(object, argClassTypes, args);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native Object invoke_native(Object object, Class<?>[] argClassTypes, Object[] args);
     
     /**
      * Returns this meta method as Java reflection method.
      */
-    @io.qt.QtUninvokable
-    public final java.lang.reflect.Method toReflectedMethod() {
+    @QtUninvokable
+    public final java.lang.reflect.@Nullable Method toReflectedMethod() {
         if(isValid()) {
             switch(methodType()) {
             case Method:
@@ -15420,14 +15474,14 @@ public final java.lang.reflect.Method toReflectedMethod() {
         return null;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native java.lang.reflect.AccessibleObject toReflected();
     
     /**
      * Returns this meta method as Java reflection constructor.
      */
-    @io.qt.QtUninvokable
-    public final java.lang.reflect.Constructor<?> toReflectedConstructor() {
+    @QtUninvokable
+    public final java.lang.reflect.@Nullable Constructor<?> toReflectedConstructor() {
         if(isValid()) {
             if(methodType()==MethodType.Constructor) {
                 java.lang.reflect.AccessibleObject reflected = toReflected();
@@ -15449,8 +15503,8 @@ public final java.lang.reflect.Constructor<?> toReflectedConstructor() {
     /**
      * Returns this meta method as signal object.
      */
-    @io.qt.QtUninvokable
-    public final QMetaObject.AbstractSignal toSignal(QObject sender) {
+    @QtUninvokable
+    public final QMetaObject.@Nullable AbstractSignal toSignal(@StrictNonNull QObject sender) {
         if(isValid()) {
             if(methodType()==MethodType.Signal) {
                 QtJambi_LibraryUtilities.internal.checkedNativeId(java.util.Objects.requireNonNull(sender));
@@ -15462,7 +15516,7 @@ public final QMetaObject.AbstractSignal toSignal(QObject sender) {
         return null;
     }
 
-    private QMetaObject.AbstractSignal findSignal(QObject sender) {
+    private QMetaObject.AbstractSignal findSignal(@StrictNonNull QObject sender) {
         int methodIndex = methodIndex();
         Class<?> cls = enclosingMetaObject().type();
         if(cls==null)
@@ -15508,10 +15562,10 @@ private QMetaObject.AbstractSignal findSignal(QObject sender) {
     /**
      * Returns corresponding meta method for given signal object.
      */
-    @io.qt.QtUninvokable
-    public static QMetaMethod fromSignal(QMetaObject.Signal signal) {
+    @QtUninvokable
+    public static @NonNull QMetaMethod fromSignal(QMetaObject.@StrictNonNull Signal signal) {
         QMetaMethod method = null;
-        io.qt.QtSignalEmitterInterface containingObject = signal.containingObject();
+        QtSignalEmitterInterface containingObject = signal.containingObject();
         if(containingObject instanceof QObject) {
             if(signal.methodIndex()>=0) {
                 method = ((QObject)containingObject).metaObject().method(signal.methodIndex());
@@ -15520,24 +15574,26 @@ public static QMetaMethod fromSignal(QMetaObject.Signal signal) {
                 method = ((QObject)containingObject).metaObject().method(signal.name(), signalTypeClasses.toArray(new Class[signalTypeClasses.size()]));
             }
         }
+        if(method==null)
+            method = new QMetaMethod();
         return method;
     }
     
     /**
      * Returns corresponding meta method for given reflection constructor.
      */
-    public static QMetaMethod fromReflectedConstructor(java.lang.reflect.Constructor<?> constructor) {
+    public static @NonNull QMetaMethod fromReflectedConstructor(java.lang.reflect.@StrictNonNull Constructor<?> constructor) {
         QMetaObject mo = QMetaObject.forType(constructor.getDeclaringClass());
         if(mo!=null) {
             return mo.constructor(constructor.getParameterTypes());
         }
-        return null;
+        return new QMetaMethod();
     }
     
     /**
      * Returns corresponding meta method for given reflection method.
      */
-    public static QMetaMethod fromReflectedMethod(java.lang.reflect.Method method) {
+    public static @NonNull QMetaMethod fromReflectedMethod(java.lang.reflect.@StrictNonNull Method method) {
         Class<?> declaringClass = method.getDeclaringClass();
         QMetaMethod qmethod = null;
         QMetaObject mo = QMetaObject.forType(declaringClass);
@@ -15551,6 +15607,8 @@ public static QMetaMethod fromReflectedMethod(java.lang.reflect.Method method) {
                 }
             }
         }
+        if(qmethod==null)
+            qmethod = new QMetaMethod();
         return qmethod;
     }
     
@@ -15566,146 +15624,146 @@ private static QMetaMethod fromMethodImpl(QMetaObject.AbstractSlot method) {
             if(info.reflectiveConstructor!=null)
                 return fromReflectedConstructor(info.reflectiveConstructor);
         }
-        return null;
+        return new QMetaMethod();
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <R> QMetaMethod fromMethod(QMetaObject.Method0<R> method) {
+    public static <R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method0<R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,R> QMetaMethod fromMethod(QMetaObject.Method1<A,R> method) {
+    public static <A,R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method1<A,R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,R> QMetaMethod fromMethod(QMetaObject.Method2<A,B,R> method) {
+    public static <A,B,R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method2<A,B,R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,R> QMetaMethod fromMethod(QMetaObject.Method3<A,B,C,R> method) {
+    public static <A,B,C,R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method3<A,B,C,R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,R> QMetaMethod fromMethod(QMetaObject.Method4<A,B,C,D,R> method) {
+    public static <A,B,C,D,R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method4<A,B,C,D,R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E,R> QMetaMethod fromMethod(QMetaObject.Method5<A,B,C,D,E,R> method) {
+    public static <A,B,C,D,E,R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method5<A,B,C,D,E,R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E,F,R> QMetaMethod fromMethod(QMetaObject.Method6<A,B,C,D,E,F,R> method) {
+    public static <A,B,C,D,E,F,R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method6<A,B,C,D,E,F,R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E,F,G,R> QMetaMethod fromMethod(QMetaObject.Method7<A,B,C,D,E,F,G,R> method) {
+    public static <A,B,C,D,E,F,G,R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method7<A,B,C,D,E,F,G,R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E,F,G,H,R> QMetaMethod fromMethod(QMetaObject.Method8<A,B,C,D,E,F,G,H,R> method) {
+    public static <A,B,C,D,E,F,G,H,R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method8<A,B,C,D,E,F,G,H,R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E,F,G,H,I,R> QMetaMethod fromMethod(QMetaObject.Method9<A,B,C,D,E,F,G,H,I,R> method) {
+    public static <A,B,C,D,E,F,G,H,I,R> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Method9<A,B,C,D,E,F,G,H,I,R> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static QMetaMethod fromMethod(QMetaObject.Slot0 method) {
+    public static @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot0 method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A> QMetaMethod fromMethod(QMetaObject.Slot1<A> method) {
+    public static <A> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot1<A> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B> QMetaMethod fromMethod(QMetaObject.Slot2<A,B> method) {
+    public static <A,B> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot2<A,B> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C> QMetaMethod fromMethod(QMetaObject.Slot3<A,B,C> method) {
+    public static <A,B,C> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot3<A,B,C> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D> QMetaMethod fromMethod(QMetaObject.Slot4<A,B,C,D> method) {
+    public static <A,B,C,D> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot4<A,B,C,D> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E> QMetaMethod fromMethod(QMetaObject.Slot5<A,B,C,D,E> method) {
+    public static <A,B,C,D,E> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot5<A,B,C,D,E> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E,F> QMetaMethod fromMethod(QMetaObject.Slot6<A,B,C,D,E,F> method) {
+    public static <A,B,C,D,E,F> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot6<A,B,C,D,E,F> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E,F,G> QMetaMethod fromMethod(QMetaObject.Slot7<A,B,C,D,E,F,G> method) {
+    public static <A,B,C,D,E,F,G> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot7<A,B,C,D,E,F,G> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E,F,G,H> QMetaMethod fromMethod(QMetaObject.Slot8<A,B,C,D,E,F,G,H> method) {
+    public static <A,B,C,D,E,F,G,H> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot8<A,B,C,D,E,F,G,H> method) {
         return fromMethodImpl(method);
     }
     
     /**
      * Returns corresponding meta method for given method handle.
      */
-    public static <A,B,C,D,E,F,G,H,I> QMetaMethod fromMethod(QMetaObject.Slot9<A,B,C,D,E,F,G,H,I> method) {
+    public static <A,B,C,D,E,F,G,H,I> @NonNull QMetaMethod fromMethod(QMetaObject.@StrictNonNull Slot9<A,B,C,D,E,F,G,H,I> method) {
         return fromMethodImpl(method);
     }
 }// class
@@ -15715,8 +15773,8 @@ class QMetaProperty___{
     /**
      * Returns the property notifier as signal object.
      */
-    @io.qt.QtUninvokable
-    public final QMetaObject.AbstractSignal notifySignal(QObject object) {
+    @QtUninvokable
+    public final QMetaObject.@Nullable AbstractSignal notifySignal(@StrictNonNull QObject object) {
         QMetaMethod notifySignal = notifySignal();
         return notifySignal==null ? null : notifySignal.toSignal(object);
     }
@@ -15724,24 +15782,24 @@ public final QMetaObject.AbstractSignal notifySignal(QObject object) {
     /**
      * <p>See <a href="@docRoot/qmetaproperty.html#resetOnGadget">QMetaProperty::resetOnGadget(const void *) const</a></p>
      */
-    @io.qt.QtUninvokable
-    public native final boolean resetOnGadget(Object object);
+    @QtUninvokable
+    public native final boolean resetOnGadget(@StrictNonNull Object object);
     
     /**
      * <p>See <a href="@docRoot/qmetaproperty.html#readOnGadget">QMetaProperty::readOnGadget(const void *) const</a></p>
      */
-    @io.qt.QtUninvokable
-    public native final Object readOnGadget(Object object);
+    @QtUninvokable
+    public native final Object readOnGadget(@StrictNonNull Object object);
     
     /**
      * <p>See <a href="@docRoot/qmetaproperty.html#writeOnGadget">QMetaProperty::writeOnGadget(void *, const QVariant &) const</a></p>
      */
-    @io.qt.QtUninvokable
-    public native final boolean writeOnGadget(Object object, Object value);
+    @QtUninvokable
+    public native final boolean writeOnGadget(@StrictNonNull Object object, Object value);
     
     @Override
-    @io.qt.QtUninvokable
-    public final String toString() {
+    @QtUninvokable
+    public final @NonNull String toString() {
         return name();
     }
     
@@ -15750,7 +15808,7 @@ public final String toString() {
     /**
      * <p>See <a href="@docRoot/qmetaproperty.html#metaType">QMetaProperty::metaType() const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final Class<?> classType(){
         if(classType==null)
             classType = classType_native();
@@ -15759,77 +15817,77 @@ public final Class<?> classType(){
         return classType;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native final Class<?> classType_native();
 }// class
 
 class QMetaEnum___{
     
     @Override
-    @io.qt.QtUninvokable
-    public final String toString() {
+    @QtUninvokable
+    public final @NonNull String toString() {
         return name();
     }
 
     /**
      * <p>See <a href="@docRoot/qmetaenum.html#keysToValue">QMetaEnum::keysToValue(const char *) const</a></p>
      */
-    @io.qt.QtUninvokable
-    public Integer keysToValue(String... keys) {
+    @QtUninvokable
+    public @Nullable Integer keysToValue(String... keys) {
         return keysToValue(new QStringList(keys).join('|'));
     }
     
     /**
      * <p>See <a href="@docRoot/qmetaenum.html#keysToValue">QMetaEnum::keysToValue(const char *) const</a></p>
      */
-    @io.qt.QtUninvokable
-    public Integer keysToValue(java.util.Collection<String> keys) {
+    @QtUninvokable
+    public @Nullable Integer keysToValue(java.util.@StrictNonNull Collection<@NonNull String> keys) {
         return keysToValue((keys instanceof QStringList ? (QStringList)keys : new QStringList(keys)).join('|'));
     }
 
     /**
      * Returns all enum entries of this enum type.
      */
-    @io.qt.QtUninvokable
-    public io.qt.QtAbstractEnumerator[] entries() {
+    @QtUninvokable
+    public io.qt.@NonNull QtAbstractEnumerator @Nullable[] entries() {
         return enclosingMetaObject().enumEntries(this);
     }
     
     /**
      * Returns the enum entry of the given value.
      */
-    @io.qt.QtUninvokable
-    public io.qt.QtAbstractEnumerator entry(int index) {
+    @QtUninvokable
+    public io.qt.@Nullable QtAbstractEnumerator entry(int index) {
         return enclosingMetaObject().enumEntry(this, index);
     }
     
     /**
      * Returns the enum entry of the given name.
      */
-    @io.qt.QtUninvokable
-    public io.qt.QtAbstractEnumerator entry(String name) {
+    @QtUninvokable
+    public io.qt.@Nullable QtAbstractEnumerator entry(String name) {
         return enclosingMetaObject().enumEntry(this, name);
     }
     
     /**
      * Returns the java class of this enum type.
      */
-    @io.qt.QtUninvokable
-    public Class<?> type() {
+    @QtUninvokable
+    public @Nullable Class<?> type() {
         return enclosingMetaObject().enumType(this);
     }
     
-    @io.qt.QtUninvokable
-    @io.qt.NativeAccess
+    @QtUninvokable
+    @NativeAccess
     private static Class<?> flagsType(Class<?> enumType){
         try {
             Class<?> result = enumType.getMethod("asFlags").getReturnType();
-            if(result==io.qt.QFlags.class && enumType.getDeclaringClass()!=null) {
+            if(result==QFlags.class && enumType.getDeclaringClass()!=null) {
                 for(Class<?> cls : enumType.getDeclaringClass().getDeclaredClasses()) {
-                    if(io.qt.QFlags.class.isAssignableFrom(cls)) {
+                    if(QFlags.class.isAssignableFrom(cls)) {
                         if(cls.getGenericSuperclass() instanceof java.lang.reflect.ParameterizedType) {
                             java.lang.reflect.ParameterizedType pt = (java.lang.reflect.ParameterizedType)cls.getGenericSuperclass();
-                            if(pt.getRawType()==io.qt.QFlags.class) {
+                            if(pt.getRawType()==QFlags.class) {
                                 java.lang.reflect.Type[] types = pt.getActualTypeArguments();
                                 if(types.length==1 && types[0]==enumType)
                                     return cls;
@@ -15847,14 +15905,14 @@ private static Class<?> flagsType(Class<?> enumType){
     /**
      * Returns flags for the given value.
      */
-    @io.qt.QtUninvokable
-    public io.qt.QFlags<?> flags(int value) {
+    @QtUninvokable
+    public io.qt.@Nullable QFlags<?> flags(int value) {
         Class<?> enumType = type();
-        if(io.qt.QtFlagEnumerator.class.isAssignableFrom(enumType)) {
+        if(QtFlagEnumerator.class.isAssignableFrom(enumType)) {
             Class<?> flagsType = flagsType(enumType);
             if(flagsType!=null)
                 return flags(flagsType, value);
-        }else if(io.qt.QFlags.class.isAssignableFrom(enumType)) {
+        }else if(QFlags.class.isAssignableFrom(enumType)) {
             return flags(enumType, value);
         }
         return null;
@@ -15863,37 +15921,39 @@ public io.qt.QFlags<?> flags(int value) {
     /**
      * Returns flags for the given enum names.
      */
-    @io.qt.QtUninvokable
-    public io.qt.QFlags<?> flags(String... names) {
+    @QtUninvokable
+    public io.qt.@Nullable QFlags<?> flags(String... names) {
         @SuppressWarnings("unchecked")
-        io.qt.QFlags<io.qt.QtFlagEnumerator> flags = (io.qt.QFlags<io.qt.QtFlagEnumerator>)flags(0);
-        for (String name : names) {
-            io.qt.QtAbstractEnumerator entry = entry(name);
-            if(entry instanceof io.qt.QtFlagEnumerator) {
-                flags.set((io.qt.QtFlagEnumerator)entry);
-            }else {
-                throw new io.qt.QNoSuchEnumValueException(name);
+        QFlags<QtFlagEnumerator> flags = (QFlags<QtFlagEnumerator>)flags(0);
+        if(flags!=null){
+            for (String name : names) {
+                QtAbstractEnumerator entry = entry(name);
+                if(entry instanceof QtFlagEnumerator) {
+                    flags.set((QtFlagEnumerator)entry);
+                }else {
+                    throw new QNoSuchEnumValueException(name);
+                }
             }
         }
         return flags;
     }
     
-    @io.qt.QtUninvokable
-    private static native io.qt.QFlags<? extends io.qt.QtFlagEnumerator> flags(Class<?> cls, int value);
+    @QtUninvokable
+    private static native QFlags<? extends QtFlagEnumerator> flags(Class<?> cls, int value);
     
     /**
      * Returns the enum entry of the given value.
      */
-    @io.qt.QtUninvokable
-    public io.qt.QtAbstractEnumerator resolve(int value) {
+    @QtUninvokable
+    public io.qt.@Nullable QtAbstractEnumerator resolve(int value) {
         Class<?> type = type();
         if(type.isEnum()) {
             byte bitSize = 4;
-            if(io.qt.QtByteEnumerator.class.isAssignableFrom(type)) {
+            if(QtByteEnumerator.class.isAssignableFrom(type)) {
                 bitSize = 1;
-            }else if(io.qt.QtShortEnumerator.class.isAssignableFrom(type)) {
+            }else if(QtShortEnumerator.class.isAssignableFrom(type)) {
                 bitSize = 2;
-            }else if(io.qt.QtLongEnumerator.class.isAssignableFrom(type)) {
+            }else if(QtLongEnumerator.class.isAssignableFrom(type)) {
                 bitSize = 8;
             }
             return resolveEntry(type, value, bitSize);
@@ -15902,14 +15962,14 @@ public io.qt.QtAbstractEnumerator resolve(int value) {
         }
     }
     
-    @io.qt.QtUninvokable
-    private static native io.qt.QtAbstractEnumerator resolveEntry(Class<?> cls, int value, byte bitSize);
+    @QtUninvokable
+    private static native QtAbstractEnumerator resolveEntry(Class<?> cls, int value, byte bitSize);
 
 }// class
 
 class Qt___ extends Qt {
     
-    public final static QMetaObject staticMetaObject = QMetaObject.forType(Qt.class);
+    public final static @NonNull QMetaObject staticMetaObject = QMetaObject.forType(Qt.class);
     
 }// class
 
@@ -15922,9 +15982,9 @@ class QTimeZone___{
 
 class QCollatorSortKey___{
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     @Override
-    public final int compareTo(io.qt.core.QCollatorSortKey key){
+    public final int compareTo(QCollatorSortKey key){
         return compare(key);
     }
     
@@ -15933,16 +15993,16 @@ public final int compareTo(io.qt.core.QCollatorSortKey key){
 class QCborValue_java__{
     
     /**
-     * Result class for {@link #fromCbor(io.qt.core.QByteArray)}
+     * Result class for {@link #fromCbor(QByteArray)}
      */
     public static final class FromCborResult{
-        private FromCborResult(io.qt.core.QCborValue value, io.qt.core.QCborParserError error) {
+        private FromCborResult(QCborValue value, QCborParserError error) {
             super();
             this.value = value;
             this.error = error;
         }
-        public final io.qt.core.QCborValue value;
-        public final io.qt.core.QCborParserError error;
+        public final QCborValue value;
+        public final QCborParserError error;
     }
 }// class
 
@@ -15952,26 +16012,26 @@ class QCborStreamReader_java__{
      * <p>See <a href="@docRoot/qcborstreamreader.html#QCborStreamReader-1">QCborStreamReader::QCborStreamReader(const char*,qsizetype)</a></p>
      */
     public QCborStreamReader(byte[] data){
-        this(new io.qt.core.QByteArray(data));
+        this(new QByteArray(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qcborstreamreader.html#addData">QCborStreamReader::addData(QByteArray)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void addData(byte[] data){
-        addData(new io.qt.core.QByteArray(data));
+        addData(new QByteArray(data));
     }
 }// class
 
 class QFactoryLoader_62_{
-    private QJsonValue getIID(int index){
+    private @NonNull QJsonValue getIID(int index){
         return metaData().get(index).value("IID");
     }
 }// class
 
 class QFactoryLoader_63_{
-    private QJsonValue getIID(int index){
+    private @NonNull QJsonValue getIID(int index){
         return metaData().get(index).toCbor().value(QtPluginMetaDataKeys.IID.value()).toJsonValue();
     }
 }// class
@@ -16993,8 +17053,8 @@ class QStaticPlugin_java__{
     /**
      * <p>See <a href="@docRoot/qstaticplugin.html#instance-var">QStaticPlugin::instance</a></p>
      */
-    @io.qt.QtUninvokable
-    public final native io.qt.core.QObject instance();
+    @QtUninvokable
+    public final native QObject instance();
 }// class
 
 class QThread___{    
@@ -17002,7 +17062,7 @@ class QThread___{
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(ThreadGroup group, String name, long stackSize, io.qt.core.QObject parent) {
+    public QThread(ThreadGroup group, String name, long stackSize, QObject parent) {
         super((QPrivateConstructor)null);        
         initialize_native(this, parent);
         initialize(group);
@@ -17016,7 +17076,7 @@ public QThread(ThreadGroup group, String name, long stackSize, io.qt.core.QObjec
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(Runnable)
      */
-    public static QThread create(Runnable runnable) {
+    public static @NonNull QThread create(@StrictNonNull Runnable runnable) {
         return create(null, runnable, null, -1, null);
     }
     
@@ -17024,7 +17084,7 @@ public static QThread create(Runnable runnable) {
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(Runnable)
      */
-    public static QThread create(Runnable runnable, io.qt.core.QObject parent) {
+    public static @NonNull QThread create(@StrictNonNull Runnable runnable, @Nullable QObject parent) {
         return create(null, runnable, null, -1, parent);
     }
     
@@ -17032,7 +17092,7 @@ public static QThread create(Runnable runnable, io.qt.core.QObject parent) {
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public static QThread create(Runnable runnable, long stackSize) {
+    public static @NonNull QThread create(@StrictNonNull Runnable runnable, long stackSize) {
         return create(null, runnable, null, stackSize, null);
     }
     
@@ -17040,7 +17100,7 @@ public static QThread create(Runnable runnable, long stackSize) {
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public static QThread create(Runnable runnable, long stackSize, io.qt.core.QObject parent) {
+    public static @NonNull QThread create(@StrictNonNull Runnable runnable, long stackSize, @Nullable QObject parent) {
         return create(null, runnable, null, stackSize, parent);
     }
     
@@ -17048,7 +17108,7 @@ public static QThread create(Runnable runnable, long stackSize, io.qt.core.QObje
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public static QThread create(ThreadGroup group, Runnable runnable, long stackSize) {
+    public static @NonNull QThread create(ThreadGroup group, @StrictNonNull Runnable runnable, long stackSize) {
         return create(group, runnable, null, stackSize, null);
     }
     
@@ -17056,7 +17116,7 @@ public static QThread create(ThreadGroup group, Runnable runnable, long stackSiz
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public static QThread create(ThreadGroup group, Runnable runnable, long stackSize, io.qt.core.QObject parent) {
+    public static @NonNull QThread create(ThreadGroup group, @StrictNonNull Runnable runnable, long stackSize, @Nullable QObject parent) {
         return create(group, runnable, null, stackSize, parent);
     }
     
@@ -17064,7 +17124,7 @@ public static QThread create(ThreadGroup group, Runnable runnable, long stackSiz
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(ThreadGroup, Runnable, String)
      */
-    public static QThread create(ThreadGroup group, Runnable runnable, String name) {
+    public static @NonNull QThread create(ThreadGroup group, @StrictNonNull Runnable runnable, @Nullable String name) {
         return create(group, runnable, name, -1, null);
     }
     
@@ -17072,7 +17132,7 @@ public static QThread create(ThreadGroup group, Runnable runnable, String name)
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(ThreadGroup, Runnable, String)
      */
-    public static QThread create(ThreadGroup group, Runnable runnable, String name, io.qt.core.QObject parent) {
+    public static @NonNull QThread create(ThreadGroup group, @StrictNonNull Runnable runnable, @Nullable String name, @Nullable QObject parent) {
         return create(group, runnable, name, -1, parent);
     }
     
@@ -17080,7 +17140,7 @@ public static QThread create(ThreadGroup group, Runnable runnable, String name,
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public static QThread create(ThreadGroup group, Runnable runnable, String name, long stackSize) {
+    public static @NonNull QThread create(ThreadGroup group, @StrictNonNull Runnable runnable, @Nullable String name, long stackSize) {
         return create(group, runnable, name, stackSize, null);
     }
     
@@ -17088,7 +17148,7 @@ public static QThread create(ThreadGroup group, Runnable runnable, String name,
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(Runnable, String, long)
      */
-    public static QThread create(Runnable runnable, String name, long stackSize, io.qt.core.QObject parent) {
+    public static @NonNull QThread create(@StrictNonNull Runnable runnable, @Nullable String name, long stackSize, @Nullable QObject parent) {
         return create(null, runnable, name, stackSize, parent);
     }
     
@@ -17096,7 +17156,7 @@ public static QThread create(Runnable runnable, String name, long stackSize, io.
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(Runnable, String, long)
      */
-    public static QThread create(Runnable runnable, String name, long stackSize) {
+    public static @NonNull QThread create(@StrictNonNull Runnable runnable, @Nullable String name, long stackSize) {
         return create(null, runnable, name, stackSize, null);
     }
     
@@ -17104,7 +17164,7 @@ public static QThread create(Runnable runnable, String name, long stackSize) {
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(Runnable, String)
      */
-    public static QThread create(Runnable runnable, String name, io.qt.core.QObject parent) {
+    public static @NonNull QThread create(@StrictNonNull Runnable runnable, @Nullable String name, @Nullable QObject parent) {
         return create(null, runnable, name, -1, parent);
     }
     
@@ -17112,7 +17172,7 @@ public static QThread create(Runnable runnable, String name, io.qt.core.QObject
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(Runnable, String)
      */
-    public static QThread create(Runnable runnable, String name) {
+    public static @NonNull QThread create(@StrictNonNull Runnable runnable, @Nullable String name) {
         return create(null, runnable, name, -1, null);
     }
     
@@ -17120,7 +17180,7 @@ public static QThread create(Runnable runnable, String name) {
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(ThreadGroup, Runnable)
      */
-    public static QThread create(ThreadGroup group, Runnable runnable) {
+    public static @NonNull QThread create(ThreadGroup group, @StrictNonNull Runnable runnable) {
         return create(group, runnable, null, -1, null);
     }
     
@@ -17128,7 +17188,7 @@ public static QThread create(ThreadGroup group, Runnable runnable) {
      * <p>See <a href="@docRoot/qthread.html#create">QThread::create(Function, Args...)</a></p>
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public static QThread create(ThreadGroup group, Runnable runnable, String name, long stackSize, io.qt.core.QObject parent) {
+    public static @NonNull QThread create(ThreadGroup group, @StrictNonNull Runnable runnable, @Nullable String name, long stackSize, @Nullable QObject parent) {
         return new Runner(group, runnable, name, stackSize, parent);
     }
     
@@ -17150,77 +17210,77 @@ protected void run() {
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(String name) {
+    public QThread(@Nullable String name) {
         this(null, name, -1, null);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(ThreadGroup group) {
+    public QThread(@Nullable ThreadGroup group) {
         this(group, null, -1, null);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(String name, io.qt.core.QObject parent) {
+    public QThread(@Nullable String name, @Nullable QObject parent) {
         this(null, name, -1, parent);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(ThreadGroup group, io.qt.core.QObject parent) {
+    public QThread(ThreadGroup group, QObject parent) {
         this(group, null, -1, parent);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(String name, long stackSize) {
+    public QThread(@Nullable String name, long stackSize) {
         this(null, name, stackSize, null);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(ThreadGroup group, long stackSize) {
+    public QThread(@Nullable ThreadGroup group, long stackSize) {
         this(group, null, stackSize, null);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(String name, long stackSize, io.qt.core.QObject parent) {
+    public QThread(@Nullable String name, long stackSize, @Nullable QObject parent) {
         this(null, name, stackSize, parent);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(ThreadGroup group, long stackSize, io.qt.core.QObject parent) {
+    public QThread(@Nullable ThreadGroup group, long stackSize, @Nullable QObject parent) {
         this(group, null, stackSize, parent);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(ThreadGroup group, String name, long stackSize) {
+    public QThread(@Nullable ThreadGroup group, @Nullable String name, long stackSize) {
         this(group, name, stackSize, null);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(ThreadGroup group, String name, io.qt.core.QObject parent) {
+    public QThread(@Nullable ThreadGroup group, @Nullable String name, QObject parent) {
         this(group, name, -1, parent);
     }
     
     /**
      * @see Thread#Thread(ThreadGroup, Runnable, String, long)
      */
-    public QThread(ThreadGroup group, String name) {
+    public QThread(@Nullable ThreadGroup group, @Nullable String name) {
         this(group, name, -1, null);
     }
     
@@ -17233,7 +17293,7 @@ private void initialize(ThreadGroup group) {
     /**
      * @see Thread#getThreadGroup()
      */
-    public final ThreadGroup getThreadGroup() {
+    public final @Nullable ThreadGroup getThreadGroup() {
         if(javaThread!=null) {
             return javaThread.getThreadGroup();
         }
@@ -17245,7 +17305,7 @@ public final ThreadGroup getThreadGroup() {
     /**
      * @see Thread#setName(String)
      */
-    public void setName(String name) {
+    public void setName(@Nullable String name) {
         if(!isRunning() && javaThread==null)
             __qt_setName(name);
     }
@@ -17255,7 +17315,7 @@ public void setName(String name) {
     /**
      * @see Thread#getName()
      */
-    public final String getName() {
+    public final @Nullable String getName() {
         if(javaThread!=null) {
             return javaThread.getName();
         }
@@ -17289,7 +17349,7 @@ public final boolean isDaemon() {
     /**
      * @see Thread#setUncaughtExceptionHandler(java.lang.Thread.UncaughtExceptionHandler)
      */
-    public void setUncaughtExceptionHandler(Thread.UncaughtExceptionHandler handler) {
+    public void setUncaughtExceptionHandler(Thread.@Nullable UncaughtExceptionHandler handler) {
         if(javaThread!=null) {
             javaThread.setUncaughtExceptionHandler(handler);
         }else {
@@ -17302,7 +17362,7 @@ public void setUncaughtExceptionHandler(Thread.UncaughtExceptionHandler handler)
     /**
      * @see Thread#getUncaughtExceptionHandler()
      */
-    public final Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() {
+    public final Thread.@Nullable UncaughtExceptionHandler getUncaughtExceptionHandler() {
         if(javaThread!=null) {
             return javaThread.getUncaughtExceptionHandler();
         }
@@ -17314,7 +17374,7 @@ public final Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() {
     /**
      * @see Thread#setContextClassLoader(ClassLoader)
      */
-    public void setContextClassLoader(ClassLoader cl) {
+    public void setContextClassLoader(@Nullable ClassLoader cl) {
         if(javaThread!=null) {
             javaThread.setContextClassLoader(cl);
         }else {
@@ -17327,7 +17387,7 @@ public void setContextClassLoader(ClassLoader cl) {
     /**
      * @see Thread#getContextClassLoader()
      */
-    public final ClassLoader getContextClassLoader() {
+    public final @Nullable ClassLoader getContextClassLoader() {
         if(javaThread!=null) {
             return javaThread.getContextClassLoader();
         }
@@ -17339,10 +17399,10 @@ public final ClassLoader getContextClassLoader() {
     private native void __qt_initialize(ThreadGroup group);
     private final Thread javaThread = null;
     
-    public final Thread javaThread() { return javaThread==null ? __qt_javaThread() : javaThread; }
+    public final @Nullable Thread javaThread() { return javaThread==null ? __qt_javaThread() : javaThread; }
     
     private native Thread __qt_javaThread();
-    public static native QThread thread(Thread thread);
+    public static native @Nullable QThread thread(@NonNull Thread thread);
     
     /**
      * @see Thread#isAlive()
@@ -17414,8 +17474,8 @@ public void close(){
             cleanable.clean();
         }
         
-        @io.qt.QtUninvokable
-        public java.nio.ByteBuffer data() {
+        @QtUninvokable
+        public java.nio.@NonNull ByteBuffer data() {
             if(!sharedMemory.__qt_isInUse) {
                 throw new IllegalStateException();
             }
@@ -17431,7 +17491,7 @@ public java.nio.ByteBuffer data() {
     private AccessMode __qt_accessMode = AccessMode.ReadOnly;
     private boolean __qt_isInUse;
     
-    public DataAccess access() throws IllegalStateException{
+    public @NonNull DataAccess access() throws IllegalStateException{
         if(this.isAttached() && !__qt_isInUse && lock()) {
             __qt_isInUse = true;
             return new DataAccess(this);
@@ -17447,46 +17507,46 @@ class QSettings__{
 
 class QModelRoleData___{
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public native final void setData(Object data);
     
 }// class
 
 class QDir__{
     /**
-     * <p>Overloaded function for {@link #entryInfoList(io.qt.core.QDir.Filters, io.qt.core.QDir.SortFlags)}
-     *  with <code>sort = new io.qt.core.QDir.SortFlags(-1)</code>.</p>
+     * <p>Overloaded function for {@link #entryInfoList(QDir.Filters, QDir.SortFlags)}
+     *  with <code>sort = new QDir.SortFlags(-1)</code>.</p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QList<io.qt.core.QFileInfo> entryInfoList(io.qt.core.QDir.Filter... filters) {
-        return entryInfoList(new io.qt.core.QDir.Filters(filters), new io.qt.core.QDir.SortFlags(-1));
+    @QtUninvokable
+    public final @NonNull QList<@NonNull QFileInfo> entryInfoList(QDir.@NonNull Filter @NonNull... filters) {
+        return entryInfoList(new QDir.Filters(filters), new QDir.SortFlags(-1));
     }
     
     /**
-     * <p>Overloaded function for {@link #entryList(io.qt.core.QDir.Filters, io.qt.core.QDir.SortFlags)}
-     *  with <code>sort = new io.qt.core.QDir.SortFlags(-1)</code>.</p>
+     * <p>Overloaded function for {@link #entryList(QDir.Filters, QDir.SortFlags)}
+     *  with <code>sort = new QDir.SortFlags(-1)</code>.</p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QList<java.lang.String> entryList(io.qt.core.QDir.Filter... filters) {
-        return entryList(new io.qt.core.QDir.Filters(filters), new io.qt.core.QDir.SortFlags(-1));
+    @QtUninvokable
+    public final @NonNull QStringList entryList(QDir.@NonNull Filter @NonNull... filters) {
+        return entryList(new QDir.Filters(filters), new QDir.SortFlags(-1));
     }
     
     /**
-     * <p>Overloaded function for {@link #entryList(java.util.Collection, io.qt.core.QDir.Filters, io.qt.core.QDir.SortFlags)}
-     *  with <code>sort = new io.qt.core.QDir.SortFlags(-1)</code>.</p>
+     * <p>Overloaded function for {@link #entryList(java.util.Collection, QDir.Filters, QDir.SortFlags)}
+     *  with <code>sort = new QDir.SortFlags(-1)</code>.</p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QList<java.lang.String> entryList(java.util.Collection<java.lang.String> nameFilters, io.qt.core.QDir.Filter... filters) {
-        return entryList(nameFilters, new io.qt.core.QDir.Filters(filters), new io.qt.core.QDir.SortFlags(-1));
+    @QtUninvokable
+    public final @NonNull QStringList entryList(java.util.Collection<java.lang.String> nameFilters, QDir.@NonNull Filter @NonNull... filters) {
+        return entryList(nameFilters, new QDir.Filters(filters), new QDir.SortFlags(-1));
     }
     
     /**
-     * <p>Overloaded function for {@link #entryInfoList(java.util.Collection, io.qt.core.QDir.Filters, io.qt.core.QDir.SortFlags)}
-     *  with <code>sort = new io.qt.core.QDir.SortFlags(-1)</code>.</p>
+     * <p>Overloaded function for {@link #entryInfoList(java.util.Collection, QDir.Filters, QDir.SortFlags)}
+     *  with <code>sort = new QDir.SortFlags(-1)</code>.</p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QList<io.qt.core.QFileInfo> entryInfoList(java.util.Collection<java.lang.String> nameFilters, io.qt.core.QDir.Filter... filters) {
-        return entryInfoList(nameFilters, new io.qt.core.QDir.Filters(filters), new io.qt.core.QDir.SortFlags(-1));
+    @QtUninvokable
+    public final @NonNull QList<@NonNull QFileInfo> entryInfoList(java.util.Collection<java.lang.String> nameFilters, QDir.@NonNull Filter @NonNull... filters) {
+        return entryInfoList(nameFilters, new QDir.Filters(filters), new QDir.SortFlags(-1));
     }
 }// class
 
@@ -17496,7 +17556,7 @@ class QFile__{
      */
     public static class TrashResult{
         public final boolean success;
-        public final String pathInTrash;
+        public final @NonNull String pathInTrash;
         private TrashResult(boolean success, String pathInTrash) {
             super();
             this.success = success;
@@ -17516,7 +17576,7 @@ class QUntypedPropertyBinding_java__{
     }
     private native static void initialize_native(QUntypedPropertyBinding instance, QPropertyBindingData bindingData);
     
-    QUntypedPropertyBinding(QUntypedPropertyBinding other){
+    QUntypedPropertyBinding(@NonNull QUntypedPropertyBinding other){
         super((QPrivateConstructor)null);
         initialize_native(this, other);
     }
@@ -17550,12 +17610,12 @@ size_t sizeof_QPropertyObserver_shell(){
 }// class
 
 class QUntypedBindable_java__{
-    QUntypedBindable(io.qt.core.QUntypedPropertyData d, io.qt.core.QBindableInterface i){
+    QUntypedBindable(QUntypedPropertyData d, QBindableInterface i){
         super((QPrivateConstructor)null);
         initialize_native(this, d, i);
     }
     
-    private native static void initialize_native(QUntypedBindable instance, io.qt.core.QUntypedPropertyData d, io.qt.core.QBindableInterface i);
+    private native static void initialize_native(QUntypedBindable instance, QUntypedPropertyData d, QBindableInterface i);
     
     /**
      * <p>Registers the given functor f as a callback that shall be called whenever the value of the bindable changes.</p>
@@ -17566,8 +17626,8 @@ class QUntypedBindable_java__{
      * @return property change handler
      * @see QPropertyChangeHandler
      */
-    @io.qt.QtUninvokable
-    public final QPropertyChangeHandler onValueChanged(Runnable f)
+    @QtUninvokable
+    public final @NonNull QPropertyChangeHandler onValueChanged(@StrictNonNull Runnable f)
     {
         QPropertyChangeHandler handler = new QPropertyChangeHandler(f);
         observe(handler);
@@ -17581,8 +17641,8 @@ public final QPropertyChangeHandler onValueChanged(Runnable f)
      * @see QPropertyChangeHandler
      * @see #onValueChanged(Runnable)
      */
-    @io.qt.QtUninvokable
-    public final QPropertyChangeHandler subscribe(Runnable f)
+    @QtUninvokable
+    public final @NonNull QPropertyChangeHandler subscribe(@StrictNonNull Runnable f)
     {
         f.run();
         return onValueChanged(f);
@@ -17597,43 +17657,43 @@ public final QPropertyChangeHandler subscribe(Runnable f)
      * @return property notifier
      * @see QPropertyNotifier
      */
-    @io.qt.QtUninvokable
-    public final QPropertyNotifier addNotifier(Runnable f)
+    @QtUninvokable
+    public final @NonNull QPropertyNotifier addNotifier(@StrictNonNull Runnable f)
     {
         QPropertyNotifier handler = new QPropertyNotifier(f);
         observe(handler);
         return handler;
     }
     
-    @io.qt.QtUninvokable
-    final io.qt.core.QUntypedPropertyBinding overrideBinding(io.qt.core.QUntypedPropertyBinding binding){
+    @QtUninvokable
+    final QUntypedPropertyBinding overrideBinding(QUntypedPropertyBinding binding){
         return overrideBinding(this.iface(), this.data(), binding);
     }
     
-    @io.qt.QtUninvokable
-    private native io.qt.core.QUntypedPropertyBinding overrideBinding(io.qt.core.QBindableInterface iface, io.qt.core.QUntypedPropertyData data, io.qt.core.QUntypedPropertyBinding binding);
+    @QtUninvokable
+    private native QUntypedPropertyBinding overrideBinding(QBindableInterface iface, QUntypedPropertyData data, QUntypedPropertyBinding binding);
     
 }// class
 
 class QBindableInterface__{
-    @io.qt.QtUninvokable
-    final native QMetaType metaType();
+    @QtUninvokable
+    final native @NonNull QMetaType metaType();
 }// class
 
 class QLoggingCategory__{
     private QByteArray __rcCategory;
     /**
-     * <p>Overloaded constructor for {@link #QLoggingCategory(java.lang.String, io.qt.core.QtMsgType)}
-     *  with <code>severityLevel = io.qt.core.QtMsgType.QtDebugMsg</code>.</p>
+     * <p>Overloaded constructor for {@link #QLoggingCategory(java.lang.String, QtMsgType)}
+     *  with <code>severityLevel = QtMsgType.QtDebugMsg</code>.</p>
      */
-    public QLoggingCategory(java.lang.String category){
+    public QLoggingCategory(java.lang.@NonNull String category){
         this(category==null ? null : new QByteArray(category));
     }
     
     /**
      * <p>See <a href="@docRoot/qloggingcategory.html#QLoggingCategory-1">QLoggingCategory::QLoggingCategory(const char*,QtMsgType)</a></p>
      */
-    public QLoggingCategory(java.lang.String category, io.qt.core.QtMsgType severityLevel){
+    public QLoggingCategory(java.lang.@NonNull String category, @NonNull QtMsgType severityLevel){
         this(category==null ? null : new QByteArray(category), severityLevel);
     }
     
@@ -17644,9 +17704,9 @@ class QFunctionPointer__{
      * Overloaded function for <code>invoke(void.class, arguments)</code>.
      * @param arguments
      */
-    @io.qt.QtDeclaredFinal
-    @io.qt.QtUninvokable
-    public void invoke(Object... arguments) throws io.qt.QUnsuccessfulInvocationException {
+    @QtDeclaredFinal
+    @QtUninvokable
+    public void invoke(Object... arguments) throws QUnsuccessfulInvocationException {
         invoke_native(this, void.class, arguments);
     }
     
@@ -17655,9 +17715,9 @@ public void invoke(Object... arguments) throws io.qt.QUnsuccessfulInvocationExce
      * @param returnType
      * @param arguments
      */
-    @io.qt.QtDeclaredFinal
-    @io.qt.QtUninvokable
-    public <R> R invoke(Class<R> returnType, Object... arguments) throws io.qt.QUnsuccessfulInvocationException {
+    @QtDeclaredFinal
+    @QtUninvokable
+    public <R> R invoke(@NonNull Class<R> returnType, Object... arguments) throws QUnsuccessfulInvocationException {
         return invoke_native(this, returnType, arguments);
     }
     
@@ -17672,8 +17732,8 @@ public <R> R invoke(Class<R> returnType, Object... arguments) throws io.qt.QUnsu
      * @param returnType
      * @param arguments argument values or wrapped as QGenericArgument
      */
-    @io.qt.QtUninvokable
-    public <R> R invoke(QGenericReturnType<R> returnType, Object... arguments) throws io.qt.QUnsuccessfulInvocationException {
+    @QtUninvokable
+    public <R> R invoke(@NonNull QGenericReturnType<R> returnType, Object... arguments) throws QUnsuccessfulInvocationException {
         if(arguments==null) {
             return invoke_native(this, returnType, null);
         }else {
@@ -17686,8 +17746,8 @@ public <R> R invoke(QGenericReturnType<R> returnType, Object... arguments) throw
      * @param functionalInterface
      * @return converted function pointer
      */
-    @io.qt.QtUninvokable
-    public <T extends io.qt.QtObjectInterface> T cast(Class<T> functionalInterface) {
+    @QtUninvokable
+    public <T extends QtObjectInterface> T cast(@NonNull Class<T> functionalInterface) {
         return cast(this, functionalInterface);
     }
     
@@ -17696,11 +17756,11 @@ public <T extends io.qt.QtObjectInterface> T cast(Class<T> functionalInterface)
      * @param functionalInterface
      * @return converted function pointer
      */
-    @io.qt.QtUninvokable
-    public native static <T extends io.qt.QtObjectInterface> T cast(io.qt.QtObjectInterface function, Class<T> functionalInterface);
+    @QtUninvokable
+    public native static <T extends QtObjectInterface> T cast(io.qt.@NonNull QtObjectInterface function, @NonNull Class<T> functionalInterface);
     
-    @io.qt.QtUninvokable
-    static native <R> R invoke_native(io.qt.QtObjectInterface function, Object returnType, Object[] arguments);
+    @QtUninvokable
+    static native <R> R invoke_native(QtObjectInterface function, Object returnType, Object[] arguments);
 }// class
 
 class QResource__{
@@ -17743,31 +17803,31 @@ class QCryptographicHash___{
     /**
      * <p>See <a href="@docRoot/qcryptographichash.html#addData-1">QCryptographicHash::addData(const char*)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void addData(java.nio.ByteBuffer data){
-        addData(new io.qt.core.QByteArrayView(data));
+        addData(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qcryptographichash.html#hash">QCryptographicHash::hash(const char*,QCryptographicHash::Algorithm)</a></p>
      */
-    public static io.qt.core.QByteArray hash(java.nio.ByteBuffer data, io.qt.core.QCryptographicHash.Algorithm method){
-        return hash(new io.qt.core.QByteArrayView(data), method);
+    public static QByteArray hash(java.nio.ByteBuffer data, QCryptographicHash.Algorithm method){
+        return hash(new QByteArrayView(data), method);
     }
     
     /**
      * <p>See <a href="@docRoot/qcryptographichash.html#addData-1">QCryptographicHash::addData(QByteArray)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void addData(io.qt.core.QByteArray data){
-        addData(new io.qt.core.QByteArrayView(data));
+    @QtUninvokable
+    public final void addData(@NonNull QByteArray data){
+        addData(new QByteArrayView(data));
     }
     
     /**
      * <p>See <a href="@docRoot/qcryptographichash.html#hash">QCryptographicHash::hash(QByteArray,QCryptographicHash::Algorithm)</a></p>
      */
-    public static io.qt.core.QByteArray hash(io.qt.core.QByteArray data, io.qt.core.QCryptographicHash.Algorithm method){
-        return hash(new io.qt.core.QByteArrayView(data), method);
+    public static @NonNull QByteArray hash(@NonNull QByteArray data, QCryptographicHash.@NonNull Algorithm method){
+        return hash(new QByteArrayView(data), method);
     }
 }// class
 
@@ -17775,7 +17835,7 @@ class QDataStream_5__{
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    public final <T> QDataStream writeObject(T object){
+    public final <T> @NonNull QDataStream append(T object){
         int metaType = QMetaType.fromObject(object).id();
         if(!QMetaType.save(this, metaType, object)){
             this.setStatus(Status.WriteFailed);
@@ -17788,7 +17848,7 @@ public final <T> QDataStream writeObject(T object){
      * <p>See <a href="@docRoot/qdatastream.html#operator-gt-gt-1">QDataStream::operator&gt;&gt;</a></p>
      */
     @SuppressWarnings("unchecked")
-    public final <T> T readObject(Class<T> cl, QMetaType...instantiations){
+    public final <T> T readObject(Class<T> cl, @NonNull QMetaType @NonNull...instantiations){
         int metaType = QMetaType.fromType(cl, instantiations).id();
         java.util.Optional<Object> optional = QMetaType.load(this, metaType);
         if(!optional.isPresent()){
@@ -17803,7 +17863,7 @@ class QDataStream_6__{
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    public final <T> QDataStream writeObject(T object){
+    public final <T> @NonNull QDataStream append(T object){
         QMetaType metaType = QMetaType.fromObject(object);
         if(!metaType.save(this, object)){
             this.setStatus(Status.WriteFailed);
@@ -17816,7 +17876,7 @@ public final <T> QDataStream writeObject(T object){
      * <p>See <a href="@docRoot/qdatastream.html#operator-gt-gt-1">QDataStream::operator&gt;&gt;</a></p>
      */
     @SuppressWarnings("unchecked")
-    public final <T> T readObject(Class<T> cl, QMetaType...instantiations){
+    public final <T> T readObject(Class<T> cl, @NonNull QMetaType @NonNull...instantiations){
         QMetaType metaType = QMetaType.fromType(cl, instantiations);
         java.util.Optional<Object> optional = metaType.load(this);
         if(!optional.isPresent()){
@@ -17832,40 +17892,40 @@ class QDataStream___{
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final <T> QDataStream append(T t){
-        return writeObject(t);
+    @QtUninvokable
+    public final <T> @NonNull QDataStream writeObject(T t){
+        return append(t);
     }
     
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QDataStream append(java.lang.String s){
-        return writeString(s);
+    @QtUninvokable
+    public final @NonNull QDataStream writeString(java.lang.String s){
+        return append(s);
     }
     
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QDataStream append(double v){
-        return writeDouble(v);
+    @QtUninvokable
+    public final @NonNull QDataStream writeDouble(double v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QDataStream append(byte v){
-        return writeByte(v);
+    @QtUninvokable
+    public final @NonNull QDataStream writeByte(byte v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QDataStream append(byte[] v){
+    @QtUninvokable
+    public final @NonNull QDataStream append(byte[] v){
         writeBytes(v);
         return this;
     }
@@ -17873,41 +17933,49 @@ public final QDataStream append(byte[] v){
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QDataStream append(char v){
-        return writeChar(v);
+    @QtUninvokable
+    public final @NonNull QDataStream writeChar(char v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QDataStream append(float v){
-        return writeFloat(v);
+    @QtUninvokable
+    public final @NonNull QDataStream writeFloat(float v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QDataStream append(int v){
-        return writeInt(v);
+    @QtUninvokable
+    public final @NonNull QDataStream writeInt(int v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QDataStream append(long v){
-        return writeLong(v);
+    @QtUninvokable
+    public final @NonNull QDataStream writeLong(long v){
+        return append(v);
     }
     
     /**
      * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QDataStream append(short v){
-        return writeShort(v);
+    @QtUninvokable
+    public final @NonNull QDataStream writeShort(short v){
+        return append(v);
+    }
+    
+    /**
+     * <p>See <a href="@docRoot/qdatastream.html#operator-lt-lt-1">QDataStream::operator&lt;&lt;</a></p>
+     */
+    @QtUninvokable
+    public final @NonNull QDataStream writeBoolean(boolean v){
+        return append(v);
     }
 }// class
 
@@ -17916,7 +17984,7 @@ class QString__{
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final char charAt(int index) {
         return at(index);
     }
@@ -17925,8 +17993,8 @@ public final char charAt(int index) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
-    public final QString subSequence(int start, int end) {
+    @QtUninvokable
+    public final @NonNull QString subSequence(int start, int end) {
         return mid(start, end-start);
     }
 
@@ -17934,16 +18002,16 @@ public final QString subSequence(int start, int end) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
-    public final QString append(CharSequence csq, int start, int end) throws java.io.IOException {
+    @QtUninvokable
+    public final @NonNull QString append(CharSequence csq, int start, int end) throws java.io.IOException {
         return append(csq==null ? "null" : csq.subSequence(start, end));
     }
     
     /**
      * <p>See <a href="@docRoot/qstring.html#arg">QString::arg(Args &amp;&amp;... args) const</a></p>
      */
-    @io.qt.QtUninvokable
-    public final io.qt.core.QString arg(Object... args){
+    @QtUninvokable
+    public final @NonNull QString arg(Object... args){
         QString _this = this.clone();
         for(Object arg : args) {
             if(arg instanceof Integer)
@@ -17976,13 +18044,13 @@ else if(arg!=null)
      * @param args arguments
      * @return formatted string
      */
-    @io.qt.QtUninvokable
-    public static io.qt.core.QString format(CharSequence format, Object... args){
-        io.qt.core.QString strg;
-        if(format instanceof io.qt.core.QString){
-            strg = (io.qt.core.QString)format;
+    @QtUninvokable
+    public static @NonNull QString format(CharSequence format, Object... args){
+        QString strg;
+        if(format instanceof QString){
+            strg = (QString)format;
         }else{
-            strg = new io.qt.core.QString(format);
+            strg = new QString(format);
         }
         return strg.arg(args);
     }
@@ -17992,24 +18060,24 @@ public static io.qt.core.QString format(CharSequence format, Object... args){
      * @param string
      * @return utf8
      */
-    @io.qt.QtUninvokable
-    public static native io.qt.core.QByteArray toUtf8(CharSequence string);
+    @QtUninvokable
+    public static native @NonNull QByteArray toUtf8(CharSequence string);
 
     /**
      * Static version of {@link QString#toLatin1()}
      * @param string
      * @return latin1
      */
-    @io.qt.QtUninvokable
-    public static native io.qt.core.QByteArray toLatin1(CharSequence string);
+    @QtUninvokable
+    public static native @NonNull QByteArray toLatin1(CharSequence string);
 
     /**
      * Static version of {@link QString#toLocal8Bit()}
      * @param string
      * @return local8Bit
      */
-    @io.qt.QtUninvokable
-    public static native io.qt.core.QByteArray toLocal8Bit(CharSequence string);
+    @QtUninvokable
+    public static native @NonNull QByteArray toLocal8Bit(CharSequence string);
 }// class
 
 class QtGlobal_5_ {
@@ -18049,3 +18117,4 @@ public static <T> long qHash(T object) throws UnsupportedOperationException {
      */
     public static native long qHashMultiCommutative(long seed, Object... objects) throws UnsupportedOperationException;
 }// class
+
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiGui.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiGui.java
index 16a7e7ec..0266bd3b 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiGui.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiGui.java
@@ -222,7 +222,7 @@ public QShortcut(io.qt.gui.QKeySequence.StandardKey key, io.qt.core.QObject pare
     /**
      * <p>Type-casting overload of <a href="@docRoot/qobject.html#parent">QObject::parent()const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T> T parent(Class<T> type) {
         return type.cast(parent());
     }
@@ -283,7 +283,7 @@ private InternalUrlHandler(UrlHandler urlHandler) {
                     this.urlHandler = urlHandler;
                 }
 
-                @io.qt.NativeAccess
+                @NativeAccess
                 public void handleUrl(io.qt.core.QUrl url) {
                     urlHandler.handleUrl(url);
                 }
@@ -309,11 +309,11 @@ public static void setUrlHandler(String scheme, UrlHandler urlHandler) {
 
 class QGuiApplication___ extends QGuiApplication {
 
-        public static QGuiApplication initialize(String args[]) {
+        public static @NonNull QGuiApplication initialize(String args @StrictNonNull[]) {
             return io.qt.core.QCoreApplication.initialize(null, args, QGuiApplication::new);
         }
 
-        public static QGuiApplication initialize(String applicationName, String args[]) {
+        public static @NonNull QGuiApplication initialize(String applicationName, String args @StrictNonNull[]) {
             return io.qt.core.QCoreApplication.initialize(applicationName, args, QGuiApplication::new);
         }
 
@@ -321,7 +321,7 @@ public static void shutdown() {
             io.qt.core.QCoreApplication.shutdown();
         }
         
-        public static QGuiApplication instance() {
+        public static @Nullable QGuiApplication instance() {
             io.qt.core.QCoreApplication app = io.qt.core.QCoreApplication.instance();
             if (app instanceof QGuiApplication)
                 return (QGuiApplication) app;
@@ -402,7 +402,7 @@ void __qt_create_new_QImage_8(void* __qtjambi_ptr, JNIEnv* env, jobject, jvalue*
 }// class
 
 class QPointerEvent___{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final native void setPoint(long i, QEventPoint point);
 }// class
 
@@ -412,18 +412,18 @@ class QPointerEvent_native__{
 
 class QKeySequence_5__ extends QKeySequence {
 
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final int at(int i) {
-            return operator_subscript(i);
+            return get(i);
         }
 
 }// class
 
 class QKeySequence_6__ extends QKeySequence {
 
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QKeyCombination at(int i) {
-            return operator_subscript(i);
+            return get(i);
         }
 
 }// class
@@ -434,32 +434,32 @@ class QPainter_redir__ extends QPainter {
 
 class QPainter___ extends QPainter {
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setBrush(QColor color) {
         setBrush(new QBrush(color));
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setBrush(io.qt.core.Qt.GlobalColor color) {
         setBrush(new QBrush(new QColor(color)));
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setBrush(QGradient gradient) {
         setBrush(new QBrush(gradient));
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setBrush(QPixmap pm) {
         setBrush(new QBrush(pm));
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static void beginPaint(QPaintDevice paintedWidget){
         __paintedDevices.put(paintedWidget, java.util.Collections.emptyList());
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static void endPaint(QPaintDevice paintedWidget){
         java.util.List<QPainter> painters = __paintedDevices.remove(paintedWidget);
         if(painters!=null){
@@ -472,7 +472,7 @@ private static void endPaint(QPaintDevice paintedWidget){
         }
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private void initialize(QPaintDevice device, boolean inConstructor){
         if(device instanceof io.qt.core.QObject){
             io.qt.core.QObject object = (io.qt.core.QObject)device;
@@ -480,9 +480,9 @@ private void initialize(QPaintDevice device, boolean inConstructor){
                 java.util.List<QPainter> painters = __paintedDevices.get(device);
                 if(painters==null){
                     if(inConstructor) {
-                        if(QPaintDevice.Impl.getSharedPainter(device)!=null)
+                        if(QPaintDevice.Impl.sharedPainter(device)!=null)
                             return;
-                        QPaintDevice rpd = QPaintDevice.Impl.getRedirected(device, null);
+                        QPaintDevice rpd = QPaintDevice.Impl.redirected(device, null);
                         if(rpd!=null && rpd.paintEngine()!=null)
                             return;
                         throw new QPaintingOutsidePaintEventException();
@@ -507,21 +507,21 @@ private void initialize(QPaintDevice device, boolean inConstructor){
         }
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static native void threadCheck(io.qt.core.QObject object);
     
     private static java.util.Map<QPaintDevice,java.util.List<QPainter>> __paintedDevices = new java.util.HashMap<>();
 }// class
 
 class QPaintDevice___{
-    @io.qt.QtUninvokable
-    static io.qt.gui.QPainter getSharedPainter(QPaintDevice instance){
+    @QtUninvokable
+    static io.qt.gui.QPainter sharedPainter(QPaintDevice instance){
         return sharedPainter_native_constfct(QtJambi_LibraryUtilities.internal.nativeId(instance));
     }
     
-    @io.qt.QtUninvokable
-    static io.qt.gui.QPaintDevice getRedirected(QPaintDevice instance, io.qt.core.QPoint offset){
-        return redirected_native_QPoint_ptr_constfct(QtJambi_LibraryUtilities.internal.nativeId(instance), offset);
+    @QtUninvokable
+    static io.qt.gui.QPaintDevice redirected(QPaintDevice instance, io.qt.core.QPoint offset){
+        return redirected_native_QPoint_ptr_constfct(QtJambi_LibraryUtilities.internal.nativeId(instance), QtJambi_LibraryUtilities.internal.checkedNativeId(offset));
     }
 }// class
 
@@ -553,7 +553,7 @@ class QPixmapFilter___ extends QPixmapFilter {
         public final void setConvolutionKernel(double[] kernel, int rows, int columns) {
             int length = rows * columns;
 
-            io.qt.QNativePointer kernelPtr = new io.qt.QNativePointer(io.qt.QNativePointer.Type.double, length);
+            QNativePointer kernelPtr = new QNativePointer(QNativePointer.Type.double, length);
             for (int i = 0; i < length; ++i)
                 kernelPtr.setdoubleAt(i, kernel[i]);
 
@@ -601,14 +601,14 @@ public boolean hasNext() {
 }// class
 
 class QPolygon___ extends QPolygon {
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final void append(int x, int y) {
             append(new QPoint(x, y));
         }
 }// class
 
 class QPolygonF___ extends QPolygonF {
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final void append(double x, double y) {
             append(new QPointF(x, y));
         }
@@ -616,16 +616,26 @@ public final void append(double x, double y) {
 
 class QValidator___ extends QValidator {
 
-        public static class QValidationData {
-                @io.qt.NativeAccess
-                public QValidationData(String input, int pos) {
-                    string = input;
-                    position = pos;
-                }
+    public static class QValidationData {
+            @NativeAccess
+            public QValidationData(String input, int pos) {
+                string = input;
+                position = pos;
+            }
 
-                public @io.qt.NativeAccess String string;
-                public @io.qt.NativeAccess int position;
-        }
+            public @NativeAccess String string;
+            public @NativeAccess int position;
+    }
+
+    /**
+     * @see #fixup(io.qt.core.QString)
+     */
+    @QtUninvokable
+    public final java.lang.@NonNull String fixup(java.lang.@Nullable String string){
+        io.qt.core.QString _string = new io.qt.core.QString(string);
+        fixup(_string);
+        return _string.toString();
+    }
 
 }// class
 
@@ -655,20 +665,20 @@ class QMatrix___ extends QMatrix {
          *             If this matrix is not invertible.
          */
         public final QMatrix inverted() {
-            io.qt.QNativePointer ok = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+            QNativePointer ok = new QNativePointer(QNativePointer.Type.Boolean);
             QMatrix returned = inverted(ok);
             if (!ok.booleanValue())
                 throw new IllegalArgumentException("Matrix is not invertible");
             return returned;
         }
 
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QMatrix multiply(QMatrix other) {
             operator_multiply_assign(other);
             return this;
         }
 
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public final QMatrix multiplied(QMatrix other) {
             return operator_multiply(other);
         }
@@ -721,12 +731,12 @@ class QOpenGLFunctions_ES2___{
 }// class
 
 class QGradient_java__{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static QGradient create(io.qt.gui.QGradient.Preset preset){
         return create(preset.value());
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native static QGradient create(int preset);
 }// class
 
@@ -735,7 +745,7 @@ class QWindow___ extends QWindow {
      * <p>Overloaded function for {@link #parent(io.qt.gui.QWindow.AncestorMode)}
      *  with <code>mode = io.qt.gui.QWindow.AncestorMode.ExcludeTransients</code>.</p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final io.qt.gui.QWindow nonTransientParent(){
         return parent(io.qt.gui.QWindow.AncestorMode.ExcludeTransients);
     }
@@ -780,7 +790,7 @@ public final void setIcon(QPixmap pm) {
     /**
      * <p>Type-casting overload of <a href="@docRoot/qobject.html#parent">QObject::parent()const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T> T parent(Class<T> type) {
         io.qt.core.QObject result = parent();
         while (result!=null && !type.isInstance(result))
@@ -791,7 +801,7 @@ public final <T> T parent(Class<T> type) {
     /**
      * <p>Type-casting overload of <a href="@docRoot/qaction.html#associatedObjects">QAction::associatedObjects()const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T> io.qt.core.QList<T> associatedObjects(Class<T> type) {
         io.qt.core.QList<T> result = new io.qt.core.QList<>(type);
         for (io.qt.core.QObject object : associatedObjects())
@@ -801,3 +811,71 @@ public final <T> io.qt.core.QList<T> associatedObjects(Class<T> type) {
     }
 }// class
 
+class QTransform___{
+
+    /**
+     * @see #squareToQuad(QPolygonF, QTransform)
+     */
+    public static io.qt.gui.@Nullable QTransform squareToQuad(io.qt.gui.@NonNull QPolygonF square){
+        QTransform transform = new QTransform();
+        if(squareToQuad(square, transform))
+            return transform;
+        else return null;
+    }
+
+    /**
+     * @see #quadToSquare(QPolygonF, QTransform)
+     */
+    public static io.qt.gui.@Nullable QTransform quadToSquare(io.qt.gui.@NonNull QPolygonF quad){
+        QTransform transform = new QTransform();
+        if(quadToSquare(quad, transform))
+            return transform;
+        else return null;
+    }
+
+    /**
+     * @see #quadToQuad(QPolygonF, QPolygonF, QTransform)
+     */
+    public static io.qt.gui.@Nullable QTransform quadToQuad(io.qt.gui.@NonNull QPolygonF one, io.qt.gui.@NonNull QPolygonF two){
+        QTransform transform = new QTransform();
+        if(quadToQuad(one, two, transform))
+            return transform;
+        else return null;
+    }
+}// class
+
+class QPixmapCache___{
+    /**
+     * @see #find(io.qt.gui.QPixmapCache.Key,QPixmap)
+     */
+    public static io.qt.gui.@Nullable QPixmap find(io.qt.gui.QPixmapCache.@NonNull Key key){
+        QPixmap pm = new QPixmap();
+        if(find(key, pm))
+            return pm;
+        else return null;
+    }
+
+    /**
+     * @see #find(io.qt.gui.QPixmapCache.Key,String)
+     */
+    public static io.qt.gui.@Nullable QPixmap find(java.lang.@NonNull String key){
+        QPixmap pm = new QPixmap();
+        if(find(key, pm))
+            return pm;
+        else return null;
+    }
+}// class
+
+class QImageIOHandler_6__{
+
+    /**
+     * @see #allocateImage(io.qt.core.QSize, io.qt.gui.QImage.Format, io.qt.gui.QImage)
+     */
+    public static io.qt.gui.@io.qt.Nullable QImage allocateImage(io.qt.core.@io.qt.NonNull QSize size, io.qt.gui.QImage.@io.qt.NonNull Format format){
+        io.qt.gui.QImage im = new io.qt.gui.QImage();
+        if(allocateImage(size, format, im))
+            return im;
+        else return null;
+    }
+}// class
+
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiHttpServer.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiHttpServer.java
index 62698151..6ab82aa1 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiHttpServer.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiHttpServer.java
@@ -30,35 +30,35 @@
 class QHttpServer___ {
     private QHttpServerRouter __rcRouter;
 
-    @io.qt.QtUninvokable
-    public void afterRequest(java.util.function.Function<QHttpServerResponse, QHttpServerResponse> action) {
+    @QtUninvokable
+    public void afterRequest(java.util.function.@Nullable Function<@NonNull QHttpServerResponse, @NonNull QHttpServerResponse> action) {
         afterRequest(QtJambi_LibraryUtilities.internal.nativeId(this), false, action);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public void afterRequest(
-            java.util.function.BiFunction<QHttpServerResponse, QHttpServerRequest, QHttpServerResponse> action) {
+            java.util.function.@Nullable BiFunction<@NonNull QHttpServerResponse, @NonNull QHttpServerRequest, @NonNull QHttpServerResponse> action) {
         afterRequest(QtJambi_LibraryUtilities.internal.nativeId(this), true, action);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void afterRequest(long __this__nativeId, boolean isBi, Object action);
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void missingHandler(long __this__nativeId, long request, long argX);
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native boolean handleRequest(long __this__nativeId, long request, long argX);
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void sendResponse(long __this__nativeId, long response, long request, long argX);
 
     public interface GenericViewHandler {
-        void invoke(Object[] args, QHttpServerResponder responder, QHttpServerRequest request);
+        void invoke(@Nullable Object @NonNull[] args, @NonNull QHttpServerResponder responder, @NonNull QHttpServerRequest request);
     }
 
-    private Object[] values(io.qt.core.QRegularExpressionMatch rem, io.qt.core.QMetaType[] metaTypes,
-            Object... requestResponder) {
+    private @Nullable Object @NonNull[] values(io.qt.core.@NonNull QRegularExpressionMatch rem, io.qt.core.@NonNull QMetaType @StrictNonNull[] metaTypes,
+            @Nullable Object @StrictNonNull... requestResponder) {
         Object[] values = new Object[metaTypes.length + requestResponder.length];
         for (int i = 0; i < metaTypes.length; i++) {
             String cpt = rem.captured(i + 1);
@@ -70,10 +70,10 @@ private Object[] values(io.qt.core.QRegularExpressionMatch rem, io.qt.core.QMeta
         return values;
     }
 
-    @io.qt.QtUninvokable
-    private <R> QHttpServerRouterRule.RouterHandler createRouterHandler(
-            java.util.function.BiFunction<Object[], QHttpServerRequest, R> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    private <R> QHttpServerRouterRule.@NonNull RouterHandler createRouterHandler(
+            java.util.function.@Nullable BiFunction<@Nullable Object @NonNull[], @NonNull QHttpServerRequest, R> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, responder) -> {
             Object[] values = values(rem, metaTypes);
             R result = viewHandler.apply(values, request);
@@ -81,9 +81,9 @@ private <R> QHttpServerRouterRule.RouterHandler createRouterHandler(
         };
     }
 
-    @io.qt.QtUninvokable
-    private <R> QHttpServerRouterRule.RouterHandler createRouterHandler(
-            java.util.function.Function<Object[], R> viewHandler, io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    private <R> QHttpServerRouterRule.@NonNull RouterHandler createRouterHandler(
+            java.util.function.Function<@Nullable Object @NonNull[], R> viewHandler, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, responder) -> {
             Object[] values = values(rem, metaTypes);
             R result = viewHandler.apply(values);
@@ -91,9 +91,9 @@ private <R> QHttpServerRouterRule.RouterHandler createRouterHandler(
         };
     }
 
-    @io.qt.QtUninvokable
-    private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.RouterHandler createRouterHandlerRequest(
-            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.@NonNull RouterHandler createRouterHandlerRequest(
+            @NonNull ViewHandler viewHandler, @StrictNonNull SlotInvoker<ViewHandler> slotInvoker, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, responder) -> {
             Object[] values = values(rem, metaTypes, request);
             Object result;
@@ -108,9 +108,9 @@ private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRou
         };
     }
 
-    @io.qt.QtUninvokable
-    private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.RouterHandler createRouterHandler(
-            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.@NonNull RouterHandler createRouterHandler(
+            @NonNull ViewHandler viewHandler, @StrictNonNull SlotInvoker<ViewHandler> slotInvoker, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, responder) -> {
             Object[] values = values(rem, metaTypes);
             Object result;
@@ -125,26 +125,26 @@ private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRou
         };
     }
 
-    @io.qt.QtUninvokable
-    public boolean route(String pathPattern, GenericViewHandler viewHandler, io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    public boolean route(@NonNull String pathPattern, @NonNull GenericViewHandler viewHandler, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (pathPattern == null || viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(new QHttpServerRouterRule(pathPattern, createRouterHandler(viewHandler, metaTypes)),
                 metaTypes);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean route(
-            java.util.function.Function<io.qt.httpserver.QHttpServerRouterRule.RouterHandler, QHttpServerRouterRule> ruleFactory,
-            GenericViewHandler viewHandler, io.qt.core.QMetaType... metaTypes) {
+            java.util.function.@StrictNonNull Function<io.qt.httpserver.QHttpServerRouterRule.@NonNull RouterHandler, @NonNull QHttpServerRouterRule> ruleFactory,
+            @NonNull GenericViewHandler viewHandler, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(ruleFactory.apply(createRouterHandler(viewHandler, metaTypes)), metaTypes);
     }
 
-    @io.qt.QtUninvokable
-    public boolean route(String pathPattern, io.qt.httpserver.QHttpServerRequest.Methods methods,
-            GenericViewHandler viewHandler, io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    public boolean route(@NonNull String pathPattern, io.qt.httpserver.QHttpServerRequest.@NonNull Methods methods,
+            @NonNull GenericViewHandler viewHandler, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (pathPattern == null || viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(
@@ -152,30 +152,30 @@ public boolean route(String pathPattern, io.qt.httpserver.QHttpServerRequest.Met
                 metaTypes);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public <R> boolean route(
-            java.util.function.Function<io.qt.httpserver.QHttpServerRouterRule.RouterHandler, QHttpServerRouterRule> ruleFactory,
-            java.util.function.BiFunction<Object[], QHttpServerRequest, R> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+            java.util.function.@StrictNonNull Function<io.qt.httpserver.QHttpServerRouterRule.@NonNull RouterHandler, @NonNull QHttpServerRouterRule> ruleFactory,
+            java.util.function.@Nullable BiFunction<@Nullable Object @NonNull[], @NonNull QHttpServerRequest, R> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(ruleFactory.apply(createRouterHandler(viewHandler, metaTypes)), metaTypes);
     }
 
-    @io.qt.QtUninvokable
-    public <R> boolean route(String pathPattern,
-            java.util.function.BiFunction<Object[], QHttpServerRequest, R> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    public <R> boolean route(@NonNull String pathPattern,
+            java.util.function.@Nullable BiFunction<@Nullable Object @NonNull[], @NonNull QHttpServerRequest, R> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (pathPattern == null || viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(new QHttpServerRouterRule(pathPattern, createRouterHandler(viewHandler, metaTypes)),
                 metaTypes);
     }
 
-    @io.qt.QtUninvokable
-    public <R> boolean route(String pathPattern, io.qt.httpserver.QHttpServerRequest.Methods methods,
-            java.util.function.BiFunction<Object[], QHttpServerRequest, R> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    public <R> boolean route(@NonNull String pathPattern, io.qt.httpserver.QHttpServerRequest.@NonNull Methods methods,
+            java.util.function.@Nullable BiFunction<@Nullable Object @NonNull[], @NonNull QHttpServerRequest, R> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (pathPattern == null || viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(
@@ -183,29 +183,29 @@ public <R> boolean route(String pathPattern, io.qt.httpserver.QHttpServerRequest
                 metaTypes);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean route(
-            java.util.function.Function<io.qt.httpserver.QHttpServerRouterRule.RouterHandler, QHttpServerRouterRule> ruleFactory,
-            java.util.function.BiConsumer<Object[], QHttpServerResponder> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+            java.util.function.@StrictNonNull Function<io.qt.httpserver.QHttpServerRouterRule.@NonNull RouterHandler, @NonNull QHttpServerRouterRule> ruleFactory,
+            java.util.function.@Nullable BiConsumer<@Nullable Object @NonNull[], @NonNull QHttpServerResponder> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(ruleFactory.apply(createRouterHandler(viewHandler, metaTypes)), metaTypes);
     }
 
-    @io.qt.QtUninvokable
-    public boolean route(String pathPattern, java.util.function.BiConsumer<Object[], QHttpServerResponder> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    public boolean route(@NonNull String pathPattern, java.util.function.@Nullable BiConsumer<@Nullable Object @NonNull[], @NonNull QHttpServerResponder> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (pathPattern == null || viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(new QHttpServerRouterRule(pathPattern, createRouterHandler(viewHandler, metaTypes)),
                 metaTypes);
     }
 
-    @io.qt.QtUninvokable
-    public boolean route(String pathPattern, io.qt.httpserver.QHttpServerRequest.Methods methods,
-            java.util.function.BiConsumer<Object[], QHttpServerResponder> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    public boolean route(@NonNull String pathPattern, io.qt.httpserver.QHttpServerRequest.Methods methods,
+            java.util.function.@Nullable BiConsumer<@Nullable Object @NonNull[], @NonNull QHttpServerResponder> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (pathPattern == null || viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(
@@ -213,27 +213,27 @@ public boolean route(String pathPattern, io.qt.httpserver.QHttpServerRequest.Met
                 metaTypes);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public <R> boolean route(
-            java.util.function.Function<io.qt.httpserver.QHttpServerRouterRule.RouterHandler, QHttpServerRouterRule> ruleFactory,
-            java.util.function.Function<Object[], R> viewHandler, io.qt.core.QMetaType... metaTypes) {
+            java.util.function.@StrictNonNull Function<io.qt.httpserver.QHttpServerRouterRule.@NonNull RouterHandler, @NonNull QHttpServerRouterRule> ruleFactory,
+            java.util.function.@Nullable Function<@Nullable Object @NonNull[], R> viewHandler, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(ruleFactory.apply(createRouterHandler(viewHandler, metaTypes)), metaTypes);
     }
 
-    @io.qt.QtUninvokable
-    public <R> boolean route(String pathPattern, java.util.function.Function<Object[], R> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    public <R> boolean route(@NonNull String pathPattern, java.util.function.@Nullable Function<@Nullable Object @NonNull[], R> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (pathPattern == null || viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(new QHttpServerRouterRule(pathPattern, createRouterHandler(viewHandler, metaTypes)),
                 metaTypes);
     }
 
-    @io.qt.QtUninvokable
-    public <R> boolean route(String pathPattern, io.qt.httpserver.QHttpServerRequest.Methods methods,
-            java.util.function.Function<Object[], R> viewHandler, io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    public <R> boolean route(@NonNull String pathPattern, io.qt.httpserver.QHttpServerRequest.@NonNull Methods methods,
+            java.util.function.@Nullable Function<@Nullable Object @NonNull[], R> viewHandler, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         if (pathPattern == null || viewHandler == null || metaTypes == null)
             return false;
         return router().addRule(
@@ -371,8 +371,8 @@ private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> InvokableTypeI
         return info;
     }
 
-    @io.qt.QtUninvokable
-    public <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> boolean route(String pathPattern,
+    @QtUninvokable
+    public <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> boolean route(@NonNull String pathPattern,
             ViewHandler viewHandler) {
         InvokableTypeInfo<ViewHandler> info = type(viewHandler);
         if (info.slotInvoker == null)
@@ -447,10 +447,10 @@ public <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> boolean route(S
         }
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> boolean route(
-            java.util.function.Function<io.qt.httpserver.QHttpServerRouterRule.RouterHandler, QHttpServerRouterRule> ruleFactory,
-            ViewHandler viewHandler) {
+            java.util.function.@StrictNonNull Function<io.qt.httpserver.QHttpServerRouterRule.@NonNull RouterHandler, @NonNull QHttpServerRouterRule> ruleFactory,
+            @NonNull ViewHandler viewHandler) {
         InvokableTypeInfo<ViewHandler> info = type(viewHandler);
         if (info.slotInvoker == null)
             return false;
@@ -526,9 +526,9 @@ public <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> boolean route(
         }
     }
 
-    @io.qt.QtUninvokable
-    public <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> boolean route(String pathPattern,
-            io.qt.httpserver.QHttpServerRequest.Methods methods, ViewHandler viewHandler) {
+    @QtUninvokable
+    public <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> boolean route(@NonNull String pathPattern,
+            io.qt.httpserver.QHttpServerRequest.@NonNull Methods methods, @NonNull ViewHandler viewHandler) {
         InvokableTypeInfo<ViewHandler> info = type(viewHandler);
         if (info.slotInvoker == null)
             return false;
@@ -605,28 +605,28 @@ public <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> boolean route(S
 
 class QHttpServer_64__ {
     @Override
-    protected void missingHandler(QHttpServerRequest request, io.qt.network.QTcpSocket socket) {
+    protected void missingHandler(@NonNull QHttpServerRequest request, io.qt.network.@Nullable QTcpSocket socket) {
         missingHandler(QtJambi_LibraryUtilities.internal.nativeId(this),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(request),
-                QtJambi_LibraryUtilities.internal.nativeId(socket));
+                QtJambi_LibraryUtilities.internal.checkedNativeId(socket));
     }
 
     @Override
-    protected boolean handleRequest(QHttpServerRequest request, io.qt.network.QTcpSocket socket) {
+    protected boolean handleRequest(@NonNull QHttpServerRequest request, io.qt.network.@Nullable QTcpSocket socket) {
         return handleRequest(QtJambi_LibraryUtilities.internal.nativeId(this),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(request),
-                QtJambi_LibraryUtilities.internal.nativeId(socket));
+                QtJambi_LibraryUtilities.internal.checkedNativeId(socket));
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private void sendResponse(QHttpServerResponse response, QHttpServerRequest request, io.qt.network.QTcpSocket socket) {
         sendResponse(QtJambi_LibraryUtilities.internal.nativeId(this),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(response),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(request),
-                QtJambi_LibraryUtilities.internal.nativeId(socket));
+                QtJambi_LibraryUtilities.internal.checkedNativeId(socket));
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private void sendResponse(Object result, QHttpServerRequest request, io.qt.network.QTcpSocket socket) {
         if (result instanceof QHttpServerResponse)
             sendResponse((QHttpServerResponse) result, request, socket);
@@ -644,28 +644,28 @@ else if (result == null)
             sendResponse(new QHttpServerResponse(result.toString()), request, socket);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private QHttpServerRouterRule.RouterHandler createRouterHandler(GenericViewHandler viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, socket) -> {
             Object[] values = values(rem, metaTypes);
             viewHandler.invoke(values, makeResponder(request, socket), request);
         };
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private QHttpServerRouterRule.RouterHandler createRouterHandler(
-            java.util.function.BiConsumer<Object[], QHttpServerResponder> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+            java.util.function.@Nullable BiConsumer<@Nullable Object @NonNull[], @NonNull QHttpServerResponder> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, socket) -> {
             Object[] values = values(rem, metaTypes);
             viewHandler.accept(values, makeResponder(request, socket));
         };
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.RouterHandler createRouterHandlerResponder(
-            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.QMetaType... metaTypes) {
+            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, socket) -> {
             Object[] values = values(rem, metaTypes, makeResponder(request, socket));
             try {
@@ -678,9 +678,9 @@ private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRou
         };
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.RouterHandler createRouterHandlerRequestResponder(
-            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.QMetaType... metaTypes) {
+            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, socket) -> {
             Object[] values = values(rem, metaTypes, request, makeResponder(request, socket));
             try {
@@ -693,9 +693,9 @@ private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRou
         };
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.RouterHandler createRouterHandlerResponderRequest(
-            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.QMetaType... metaTypes) {
+            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, socket) -> {
             Object[] values = values(rem, metaTypes, makeResponder(request, socket), request);
             try {
@@ -711,41 +711,41 @@ private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRou
 
 class QHttpServer_65__ {
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native void sendResponseFuture(long __this__nativeId, io.qt.core.QFuture<QHttpServerResponse> response, long request, long responder);
 
     @Override
-    protected void missingHandler(QHttpServerRequest request, QHttpServerResponder responder) {
+    protected void missingHandler(@NonNull QHttpServerRequest request, @NonNull QHttpServerResponder responder) {
         missingHandler(QtJambi_LibraryUtilities.internal.nativeId(this),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(request),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(responder));
     }
 
     @Override
-    protected boolean handleRequest(QHttpServerRequest request, QHttpServerResponder responder) {
+    protected boolean handleRequest(@NonNull QHttpServerRequest request, @NonNull QHttpServerResponder responder) {
         return handleRequest(QtJambi_LibraryUtilities.internal.nativeId(this),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(request),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(responder));
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private void sendResponse(QHttpServerResponse response, QHttpServerRequest request, QHttpServerResponder responder) {
         sendResponse(QtJambi_LibraryUtilities.internal.nativeId(this),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(response),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(request),
-                QtJambi_LibraryUtilities.internal.nativeId(responder));
+                QtJambi_LibraryUtilities.internal.checkedNativeId(responder));
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private void sendResponse(io.qt.core.QFuture<QHttpServerResponse> response, QHttpServerRequest request, QHttpServerResponder responder) {
         sendResponseFuture(QtJambi_LibraryUtilities.internal.nativeId(this),
                 response,
                 QtJambi_LibraryUtilities.internal.checkedNativeId(request),
-                QtJambi_LibraryUtilities.internal.nativeId(responder));
+                QtJambi_LibraryUtilities.internal.checkedNativeId(responder));
     }
 
     @SuppressWarnings("unchecked")
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private void sendResponse(Object result, QHttpServerRequest request, QHttpServerResponder responder) {
         if (result instanceof QHttpServerResponse)
             sendResponse((QHttpServerResponse) result, request, responder);
@@ -765,28 +765,28 @@ else if (result == null)
             sendResponse(new QHttpServerResponse(result.toString()), request, responder);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private QHttpServerRouterRule.RouterHandler createRouterHandler(GenericViewHandler viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, responder) -> {
             Object[] values = values(rem, metaTypes);
             viewHandler.invoke(values, responder, request);
         };
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private QHttpServerRouterRule.RouterHandler createRouterHandler(
-            java.util.function.BiConsumer<Object[], QHttpServerResponder> viewHandler,
-            io.qt.core.QMetaType... metaTypes) {
+            java.util.function.@Nullable BiConsumer<@Nullable Object @NonNull[], @NonNull QHttpServerResponder> viewHandler,
+            io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, responder) -> {
             Object[] values = values(rem, metaTypes);
             viewHandler.accept(values, responder);
         };
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.RouterHandler createRouterHandlerResponder(
-            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.QMetaType... metaTypes) {
+            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, responder) -> {
             Object[] values = values(rem, metaTypes, responder);
             try {
@@ -799,9 +799,9 @@ private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRou
         };
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.RouterHandler createRouterHandlerRequestResponder(
-            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.QMetaType... metaTypes) {
+            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, responder) -> {
             Object[] values = values(rem, metaTypes, request, responder);
             try {
@@ -814,9 +814,9 @@ private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRou
         };
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRouterRule.RouterHandler createRouterHandlerResponderRequest(
-            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.QMetaType... metaTypes) {
+            ViewHandler viewHandler, SlotInvoker<ViewHandler> slotInvoker, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         return (rem, request, responder) -> {
             Object[] values = values(rem, metaTypes, responder, request);
             try {
@@ -832,206 +832,206 @@ private <ViewHandler extends io.qt.core.QMetaObject.AbstractSlot> QHttpServerRou
 
 class QHttpServerRouter___ {
 
-    @io.qt.QtUninvokable
-    public final void addConverter(Class<?> type, java.lang.String regexp) {
+    @QtUninvokable
+    public final void addConverter(@NonNull Class<?> type, java.lang.@NonNull String regexp) {
         io.qt.core.QMetaType metaType = io.qt.core.QMetaType.fromType(type);
         addConverter(metaType, regexp);
     }
 
-    @io.qt.QtUninvokable
-    public final void removeConverter(Class<?> type) {
+    @QtUninvokable
+    public final void removeConverter(@NonNull Class<?> type) {
         io.qt.core.QMetaType metaType = io.qt.core.QMetaType.fromType(type);
         removeConverter(metaType);
     }
 
-    @io.qt.QtUninvokable
-    boolean addRule(QHttpServerRouterRule rule, io.qt.core.QMetaType... metaTypes) {
+    @QtUninvokable
+    boolean addRule(@NonNull QHttpServerRouterRule rule, io.qt.core.@NonNull QMetaType @NonNull... metaTypes) {
         io.qt.core.QList<io.qt.core.QMetaType> _metaTypes = new io.qt.core.QList<>(io.qt.core.QMetaType.class);
         _metaTypes.append(java.util.Arrays.asList(metaTypes));
         return addRule(rule, _metaTypes);
     }
 
-    @io.qt.QtUninvokable
-    boolean addRule(QHttpServerRouterRule rule, io.qt.core.QList<io.qt.core.QMetaType> metaTypes) {
+    @QtUninvokable
+    boolean addRule(@NonNull QHttpServerRouterRule rule, io.qt.core.QList<io.qt.core.QMetaType> metaTypes) {
         return addRuleImpl(QtJambi_LibraryUtilities.internal.nativeId(this),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(rule),
                 QtJambi_LibraryUtilities.internal.checkedNativeId(metaTypes));
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private native boolean addRuleImpl(long __this__nativeId, long rule, long metaTypes);
 }// class
 
 class QAbstractHttpServer___ {
     @SuppressWarnings({ "exports" })
-    @io.qt.QtUninvokable
-    public final int listen(io.qt.network.QHostAddress.SpecialAddress address, int port) {
+    @QtUninvokable
+    public final int listen(io.qt.network.QHostAddress.@NonNull SpecialAddress address, int port) {
         return listen(new io.qt.network.QHostAddress(address), port);
     }
 
-    @io.qt.QtUninvokable
-    public final int listen(String address, int port) {
+    @QtUninvokable
+    public final int listen(@NonNull String address, int port) {
         return listen(new io.qt.network.QHostAddress(address), port);
     }
 }// class
 
 class QHttpServerResponder___ {
-    @io.qt.QtUninvokable
-    public final void write(String data, String mimeType) {
+    @QtUninvokable
+    public final void write(@NonNull String data, @NonNull String mimeType) {
         write(io.qt.core.QString.toUtf8(data), io.qt.core.QString.toUtf8(mimeType));
     }
 
-    @io.qt.QtUninvokable
-    public final void write(String data, String mimeType, io.qt.httpserver.QHttpServerResponder.StatusCode status) {
+    @QtUninvokable
+    public final void write(@NonNull String data, @NonNull String mimeType, io.qt.httpserver.QHttpServerResponder.@NonNull StatusCode status) {
         write(io.qt.core.QString.toUtf8(data), io.qt.core.QString.toUtf8(mimeType), status);
     }
 
-    @io.qt.QtUninvokable
-    public final void write(io.qt.core.QIODevice data, String mimeType) {
+    @QtUninvokable
+    public final void write(io.qt.core.@NonNull QIODevice data, @NonNull String mimeType) {
         write(data, io.qt.core.QString.toUtf8(mimeType));
     }
 
-    @io.qt.QtUninvokable
-    public final void write(io.qt.core.QIODevice data, String mimeType,
+    @QtUninvokable
+    public final void write(io.qt.core.@NonNull QIODevice data, @NonNull String mimeType,
             io.qt.httpserver.QHttpServerResponder.StatusCode status) {
         write(data, io.qt.core.QString.toUtf8(mimeType), status);
     }
 
-    @io.qt.QtUninvokable
-    public final void write(io.qt.core.QByteArray data, String mimeType) {
+    @QtUninvokable
+    public final void write(io.qt.core.@NonNull QByteArray data, @NonNull String mimeType) {
         write(data, io.qt.core.QString.toUtf8(mimeType));
     }
 
-    @io.qt.QtUninvokable
-    public final void write(io.qt.core.QByteArray data, String mimeType,
-            io.qt.httpserver.QHttpServerResponder.StatusCode status) {
+    @QtUninvokable
+    public final void write(io.qt.core.@NonNull QByteArray data, @NonNull String mimeType,
+            io.qt.httpserver.QHttpServerResponder.@NonNull StatusCode status) {
         write(data, io.qt.core.QString.toUtf8(mimeType), status);
     }
 
-    @io.qt.QtUninvokable
-    public final void writeBody(byte[] body) {
+    @QtUninvokable
+    public final void writeBody(byte @NonNull[] body) {
         writeBody(new io.qt.core.QByteArray(body));
     }
 
-    @io.qt.QtUninvokable
-    public final void writeHeader(io.qt.core.QByteArray key, String value) {
+    @QtUninvokable
+    public final void writeHeader(io.qt.core.@NonNull QByteArray key, @NonNull String value) {
         writeHeader(key, io.qt.core.QString.toUtf8(value));
     }
 
-    @io.qt.QtUninvokable
-    public final void writeHeader(String key, io.qt.core.QByteArray value) {
+    @QtUninvokable
+    public final void writeHeader(@NonNull String key, io.qt.core.@NonNull QByteArray value) {
         writeHeader(io.qt.core.QString.toUtf8(key), value);
     }
 
     @SafeVarargs
-    @io.qt.QtUninvokable
-    public final io.qt.core.QPair<io.qt.core.QByteArray, io.qt.core.QByteArray>[] headerList(
-            io.qt.core.QPair<io.qt.core.QByteArray, io.qt.core.QByteArray>... pairs) {
+    @QtUninvokable
+    public final io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray, io.qt.core.@NonNull QByteArray>[] headerList(
+            io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray, io.qt.core.@NonNull QByteArray> @NonNull... pairs) {
         return pairs;
     }
 
     @SafeVarargs
-    @io.qt.QtUninvokable
-    public final void write(io.qt.core.QByteArray data,
-            io.qt.core.QPair<io.qt.core.QByteArray, io.qt.core.QByteArray>... headers) {
+    @QtUninvokable
+    public final void write(io.qt.core.@NonNull QByteArray data,
+            io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray, io.qt.core.@NonNull QByteArray> @NonNull... headers) {
         write(data, headers, io.qt.httpserver.QHttpServerResponder.StatusCode.Ok);
     }
 
     @SafeVarargs
-    @io.qt.QtUninvokable
-    public final void write(io.qt.core.QIODevice data,
-            io.qt.core.QPair<io.qt.core.QByteArray, io.qt.core.QByteArray>... headers) {
+    @QtUninvokable
+    public final void write(io.qt.core.@NonNull QIODevice data,
+            io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray, io.qt.core.@NonNull QByteArray> @NonNull... headers) {
         write(data, headers, io.qt.httpserver.QHttpServerResponder.StatusCode.Ok);
     }
 
     @SafeVarargs
-    @io.qt.QtUninvokable
-    public final void write(io.qt.core.QJsonDocument document,
-            io.qt.core.QPair<io.qt.core.QByteArray, io.qt.core.QByteArray>... headers) {
+    @QtUninvokable
+    public final void write(io.qt.core.@NonNull QJsonDocument document,
+            io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray, io.qt.core.@NonNull QByteArray> @NonNull... headers) {
         write(document, headers, io.qt.httpserver.QHttpServerResponder.StatusCode.Ok);
     }
 
     @SafeVarargs
-    @io.qt.QtUninvokable
-    public final void write(io.qt.core.QPair<io.qt.core.QByteArray, io.qt.core.QByteArray>... headers) {
+    @QtUninvokable
+    public final void write(io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray, io.qt.core.@NonNull QByteArray> @NonNull... headers) {
         write(headers, io.qt.httpserver.QHttpServerResponder.StatusCode.Ok);
     }
 }// class
 
 class QHttpServerResponse___ {
-    @io.qt.QtUninvokable
-    public final void addHeader(io.qt.core.QByteArray key, String value) {
+    @QtUninvokable
+    public final void addHeader(io.qt.core.@NonNull QByteArray key, @NonNull String value) {
         addHeader(key, io.qt.core.QString.toUtf8(value));
     }
 
-    @io.qt.QtUninvokable
-    public final void addHeader(String key, io.qt.core.QByteArray value) {
+    @QtUninvokable
+    public final void addHeader(@NonNull String key, io.qt.core.@NonNull QByteArray value) {
         addHeader(io.qt.core.QString.toUtf8(key), value);
     }
 
-    @io.qt.QtUninvokable
-    public final void setHeader(io.qt.core.QByteArray key, String value) {
+    @QtUninvokable
+    public final void setHeader(io.qt.core.@NonNull QByteArray key, @NonNull String value) {
         setHeader(key, io.qt.core.QString.toUtf8(value));
     }
 
-    @io.qt.QtUninvokable
-    public final void setHeader(String key, io.qt.core.QByteArray value) {
+    @QtUninvokable
+    public final void setHeader(@NonNull String key, io.qt.core.@NonNull QByteArray value) {
         setHeader(io.qt.core.QString.toUtf8(key), value);
     }
 
-    @io.qt.QtUninvokable
-    public final void clearHeader(String key) {
+    @QtUninvokable
+    public final void clearHeader(@NonNull String key) {
         clearHeader(io.qt.core.QString.toUtf8(key));
     }
 
-    @io.qt.QtUninvokable
-    public final boolean hasHeader(String name) {
+    @QtUninvokable
+    public final boolean hasHeader(@NonNull String name) {
         return hasHeader(io.qt.core.QString.toUtf8(name));
     }
 
-    @io.qt.QtUninvokable
-    public final boolean hasHeader(String name, io.qt.core.QByteArray value) {
+    @QtUninvokable
+    public final boolean hasHeader(@NonNull String name, io.qt.core.@NonNull QByteArray value) {
         return hasHeader(io.qt.core.QString.toUtf8(name), value);
     }
 
-    @io.qt.QtUninvokable
-    public final boolean hasHeader(String name, String value) {
+    @QtUninvokable
+    public final boolean hasHeader(@NonNull String name, @NonNull String value) {
         return hasHeader(io.qt.core.QString.toUtf8(name), io.qt.core.QString.toUtf8(value));
     }
 
-    @io.qt.QtUninvokable
-    public final io.qt.core.QList<io.qt.core.QByteArray> headers(String name) {
+    @QtUninvokable
+    public final io.qt.core.@NonNull QList<io.qt.core.@NonNull QByteArray> headers(String name) {
         return headers(io.qt.core.QString.toUtf8(name));
     }
 
-public QHttpServerResponse(String mimeType, io.qt.core.QByteArray data) {
+    public QHttpServerResponse(@NonNull String mimeType, io.qt.core.@NonNull QByteArray data) {
         this(io.qt.core.QString.toUtf8(mimeType), data);
     }
 
-public QHttpServerResponse(String mimeType, String data) {
+    public QHttpServerResponse(@NonNull String mimeType, @NonNull String data) {
         this(io.qt.core.QString.toUtf8(mimeType), io.qt.core.QString.toUtf8(data));
     }
 
-public QHttpServerResponse(io.qt.core.QByteArray mimeType, String data) {
+    public QHttpServerResponse(io.qt.core.@NonNull QByteArray mimeType, @NonNull String data) {
         this(mimeType, io.qt.core.QString.toUtf8(data));
     }
 
-public QHttpServerResponse(String mimeType, io.qt.core.QByteArray data, io.qt.httpserver.QHttpServerResponder.StatusCode status) {
+    public QHttpServerResponse(@NonNull String mimeType, io.qt.core.@NonNull QByteArray data, io.qt.httpserver.QHttpServerResponder.@NonNull StatusCode status) {
         this(io.qt.core.QString.toUtf8(mimeType), data, status);
     }
 
-public QHttpServerResponse(String mimeType, String data, io.qt.httpserver.QHttpServerResponder.StatusCode status) {
+    public QHttpServerResponse(@NonNull String mimeType, @NonNull String data, io.qt.httpserver.QHttpServerResponder.@NonNull StatusCode status) {
         this(io.qt.core.QString.toUtf8(mimeType), io.qt.core.QString.toUtf8(data), status);
     }
 
-public QHttpServerResponse(io.qt.core.QByteArray mimeType, String data, io.qt.httpserver.QHttpServerResponder.StatusCode status) {
+    public QHttpServerResponse(io.qt.core.@NonNull QByteArray mimeType, @NonNull String data, io.qt.httpserver.QHttpServerResponder.@NonNull StatusCode status) {
         this(mimeType, io.qt.core.QString.toUtf8(data), status);
     }
 }// class
 
 class QHttpServerRequest___ {
-    @io.qt.QtUninvokable
-    public final io.qt.core.QByteArray value(String key) {
+    @QtUninvokable
+    public final io.qt.core.@NonNull QByteArray value(@NonNull String key) {
         return value(io.qt.core.QString.toUtf8(key));
     }
 }// class
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiLocation.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiLocation.java
index 3f0e8eaf..13a913f9 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiLocation.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiLocation.java
@@ -35,21 +35,21 @@ public static final class Result<T extends io.qt.core.QObject>{
         private final QGeoServiceProvider.Error error;
         private final String errorString;
         
-        public Result(T engine) {
+        public Result(@StrictNonNull T engine) {
             super();
             this.engine = java.util.Objects.requireNonNull(engine);
             this.error = QGeoServiceProvider.Error.NoError;
             this.errorString = null;
         }
         
-        public Result(QGeoServiceProvider.Error error, String errorString) {
+        public Result(QGeoServiceProvider.@StrictNonNull Error error, @NonNull String errorString) {
             super();
             this.engine = null;
             this.error = java.util.Objects.requireNonNull(error);
             this.errorString = java.util.Objects.requireNonNull(errorString);
         }
 
-        @io.qt.NativeAccess
+        @NativeAccess
         private Result(T engine, QGeoServiceProvider.Error error, String errorString) {
             super();
             this.engine = engine;
@@ -59,13 +59,13 @@ private Result(T engine, QGeoServiceProvider.Error error, String errorString) {
             this.errorString = errorString;
         }
         
-        public T engine() {
+        public @Nullable T engine() {
             return engine;
         }
-        public QGeoServiceProvider.Error error() {
+        public QGeoServiceProvider.@Nullable Error error() {
             return error;
         }
-        public String errorString() {
+        public @Nullable String errorString() {
             return errorString;
         }
     }
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiMultimedia.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiMultimedia.java
index 68267470..b40d6794 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiMultimedia.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiMultimedia.java
@@ -30,123 +30,123 @@
 ****************************************************************************/
 
 class QVideoEncoderSettingsControl__{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Double> supportedFrameRates(io.qt.multimedia.QVideoEncoderSettings settings) {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<Double> supportedFrameRates = supportedFrameRates(settings, continuous);
         return new ContinuousList<Double>(supportedFrameRates, continuous.booleanValue());
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<io.qt.core.QSize> supportedResolutions(io.qt.multimedia.QVideoEncoderSettings settings) {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<io.qt.core.QSize> supportedResolutions = supportedResolutions(settings, continuous);
         return new ContinuousList<io.qt.core.QSize>(supportedResolutions, continuous.booleanValue());
     }
 }// class
 
 class QImageEncoderControl__{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<io.qt.core.QSize> supportedResolutions(io.qt.multimedia.QImageEncoderSettings settings) {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<io.qt.core.QSize> supportedResolutions = supportedResolutions(settings, continuous);
         return new ContinuousList<io.qt.core.QSize>(supportedResolutions, continuous.booleanValue());
     }
 }// class
 
 class QMediaRecorder__{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Double> supportedFrameRates() {
         return supportedFrameRates(new io.qt.multimedia.QVideoEncoderSettings());
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Double> supportedFrameRates(io.qt.multimedia.QVideoEncoderSettings settings) {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<Double> supportedFrameRates = supportedFrameRates(settings, continuous);
         return new ContinuousList<Double>(supportedFrameRates, continuous.booleanValue());
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<io.qt.core.QSize> supportedResolutions() {
         return supportedResolutions(new io.qt.multimedia.QVideoEncoderSettings());
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<io.qt.core.QSize> supportedResolutions(io.qt.multimedia.QVideoEncoderSettings settings) {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<io.qt.core.QSize> supportedResolutions = supportedResolutions(settings, continuous);
         return new ContinuousList<io.qt.core.QSize>(supportedResolutions, continuous.booleanValue());
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Integer> supportedAudioSampleRates() {
         return supportedAudioSampleRates(new io.qt.multimedia.QAudioEncoderSettings());
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Integer> supportedAudioSampleRates(io.qt.multimedia.QAudioEncoderSettings settings)    {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<Integer> supportedAudioSampleRates = supportedAudioSampleRates(settings, continuous);
         return new ContinuousList<Integer>(supportedAudioSampleRates, continuous.booleanValue());
     }
 }// class
 
 class QCameraImageCapture__{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<io.qt.core.QSize> supportedResolutions() {
         return supportedResolutions(new io.qt.multimedia.QImageEncoderSettings());
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<io.qt.core.QSize> supportedResolutions(io.qt.multimedia.QImageEncoderSettings settings) {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<io.qt.core.QSize> supportedResolutions = supportedResolutions(settings, continuous);
         return new ContinuousList<io.qt.core.QSize>(supportedResolutions, continuous.booleanValue());
     }
 }// class
 
 class QCameraExposureControl__{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Object> supportedParameterRange(ExposureParameter settings) {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<Object> supportedParameterRange = supportedParameterRange(settings, continuous);
         return new ContinuousList<Object>(supportedParameterRange, continuous.booleanValue());
     }
 }// class
 
 class QCameraExposure__{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Integer> supportedIsoSensitivities()    {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<Integer> supportedIsoSensitivities = supportedIsoSensitivities(continuous);
         return new ContinuousList<Integer>(supportedIsoSensitivities, continuous.booleanValue());
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Double> supportedApertures()    {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<Double> supportedApertures = supportedApertures(continuous);
         return new ContinuousList<Double>(supportedApertures, continuous.booleanValue());
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Double> supportedShutterSpeeds()    {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<Double> supportedShutterSpeeds = supportedShutterSpeeds(continuous);
         return new ContinuousList<Double>(supportedShutterSpeeds, continuous.booleanValue());
     }
 }// class
 
 class QAudioEncoderSettingsControl__{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Integer> supportedSampleRates() {
         return supportedSampleRates(new io.qt.multimedia.QAudioEncoderSettings());
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final ContinuousList<Integer> supportedSampleRates(io.qt.multimedia.QAudioEncoderSettings settings) {
-        io.qt.QNativePointer continuous = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Boolean);
+        QNativePointer continuous = new QNativePointer(QNativePointer.Type.Boolean);
         java.util.List<Integer> supportedSampleRates = supportedSampleRates(settings, continuous);
         return new ContinuousList<Integer>(supportedSampleRates, continuous.booleanValue());
     }
@@ -162,7 +162,7 @@ public MapResult(java.nio.ByteBuffer data, int bytesPerLine){
             this.bytesPerLine = bytesPerLine;
         }
         
-        @io.qt.NativeAccess
+        @NativeAccess
         private MapResult(java.nio.ByteBuffer data, int bytesPerLine, boolean unused){
             this.data = data;
             this.bytesPerLine = bytesPerLine;
@@ -231,7 +231,7 @@ class QMediaServiceProviderFactoryInterface_java__{
 
 class QMediaService___{
     public static class Result<T>{
-        public Result(T result, boolean continuous) {
+        Result(T result, boolean continuous) {
             super();
             this.result = result;
             this.continuous = continuous;
@@ -240,20 +240,20 @@ public Result(T result, boolean continuous) {
         public final boolean continuous;
     }
 
-    public static class ListResult<T> extends Result<java.util.List<T>> implements java.lang.Iterable<T>{
-        public ListResult(java.util.List<T> result, boolean continuous) {
+    public static class ListResult<T> extends Result<io.qt.core.@NonNull QList<T>> implements java.lang.Iterable<T>{
+        ListResult(io.qt.core.QList<T> result, boolean continuous) {
             super(result, continuous);
         }
 
         @Override
-        public java.util.Iterator<T> iterator() {
+        public java.util.@NonNull Iterator<T> iterator() {
             return result.iterator();
         }
     }
 }// class
 
 class QAudioFormat__{
-    public static ChannelConfig channelConfig(AudioChannelPosition... channels) {
+    public static @NonNull ChannelConfig channelConfig(@NonNull AudioChannelPosition @NonNull... channels) {
         int value = 0;
         for (AudioChannelPosition channel : channels) {
             value |= (0x01 << channel.value());
@@ -268,8 +268,8 @@ class QCamera__{
     /**
      * <p>See <a href="http://doc.qt.io/qt-5/qcamera.html#setViewfinder">QCamera::setViewfinder(QVideoWidget*)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final <T extends io.qt.core.QObject & io.qt.multimedia.QMediaBindableInterface> void setViewfinder(T viewfinder){
+    @QtUninvokable
+    public final <T extends io.qt.core.QObject & io.qt.multimedia.QMediaBindableInterface> void setViewfinder(@Nullable T viewfinder){
         setViewfinderImpl((io.qt.core.QObject)viewfinder);
     }
     
@@ -280,8 +280,8 @@ class QMediaPlayer__{
     /**
      * <p>See <a href="http://doc.qt.io/qt-5/qmediaplayer.html#setVideoOutput">QMediaPlayer::setVideoOutput(QVideoWidget*)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final <T extends io.qt.core.QObject & io.qt.multimedia.QMediaBindableInterface> void setVideoOutput(T arg__1){
+    @QtUninvokable
+    public final <T extends io.qt.core.QObject & io.qt.multimedia.QMediaBindableInterface> void setVideoOutput(@Nullable T arg__1){
         setVideoOutputImpl(arg__1);
     }
     
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiNetwork.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiNetwork.java
index 5cff584e..9e2b984a 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiNetwork.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiNetwork.java
@@ -39,7 +39,7 @@ class QSsl___{
     /**
      * Determines the availability of ssl on this platform.
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public native static boolean isAvailable();
 }// class
 
@@ -47,7 +47,7 @@ class QHostInfo___ extends QHostInfo {
     /**
      * <p>See <a href="@docRoot/qhostinfo.html#lookupHost">QHostInfo::lookupHost(QString, Functor)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int lookupHost(String name, io.qt.core.QMetaObject.Slot1<QHostInfo> slot) {
         io.qt.core.QObject context = QtJambi_LibraryUtilities.internal.lambdaContext(slot);
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromMethod(java.util.Objects.requireNonNull(slot));
@@ -73,7 +73,7 @@ public static int lookupHost(String name, io.qt.core.QMetaObject.Slot1<QHostInfo
     /**
      * <p>See <a href="@docRoot/qhostinfo.html#lookupHost">QHostInfo::lookupHost(QString, QObject, Functor)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int lookupHost(String name, io.qt.core.QObject context, io.qt.core.QMetaObject.Slot1<QHostInfo> slot){
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromMethod(java.util.Objects.requireNonNull(slot));
         if(metaMethod!=null && metaMethod.isValid()) {
@@ -100,7 +100,7 @@ public static int lookupHost(String name, io.qt.core.QObject context, io.qt.core
      * <p>See <a href="@docRoot/qhostinfo.html#lookupHost">QHostInfo::lookupHost(QString, Functor)</a></p>
      */
     @SuppressWarnings("unchecked")
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int lookupHost(String name, io.qt.core.QMetaObject.Connectable1<QHostInfo> signal) {
         io.qt.core.QObject context = null;
         if(signal.containingObject() instanceof io.qt.core.QObject){
@@ -129,7 +129,7 @@ public static int lookupHost(String name, io.qt.core.QMetaObject.Connectable1<QH
             throw new IllegalArgumentException("Signal is not emitable.");
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static native int lookupHost(String name, long context, io.qt.core.QMetaObject.Slot1<QHostInfo> slot);
 }// class
 
@@ -137,7 +137,7 @@ class QAbstractSocket___ extends QAbstractSocket {
 }// class
 
 class Server___ {
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean waitForNewConnection() throws QTimeoutException {
         return waitForNewConnection(0);
     }
@@ -191,7 +191,7 @@ class QNetworkReply___ extends QNetworkReply {
     /**
      * <p>See <a href="@docRoot/qnetworkreply.html#rawHeader">QNetworkReply::rawHeader(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final io.qt.core.QByteArray rawHeader(String headerName){
         return rawHeader(new io.qt.core.QByteArray(headerName));
     }
@@ -199,7 +199,7 @@ public final io.qt.core.QByteArray rawHeader(String headerName){
     /**
      * <p>See <a href="@docRoot/qnetworkreply.html#hasRawHeader">QNetworkReply::hasRawHeader(QByteArray)const</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean hasRawHeader(String headerName){
         return hasRawHeader(new io.qt.core.QByteArray(headerName));
     }
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQml.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQml.java
index b93bb90b..b3fd4cdc 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQml.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQml.java
@@ -31,81 +31,81 @@
 
 class __QQmlComponent extends QQmlComponent{
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setData(String data, io.qt.core.QUrl baseUrl){
         setData(new io.qt.core.QByteArray(data), baseUrl);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setData(byte[] data, io.qt.core.QUrl baseUrl){
         setData(new io.qt.core.QByteArray(data), baseUrl);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public <T extends io.qt.core.QObject> T create(Class<T> type){
         return create(type, (io.qt.qml.QQmlContext)null);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public <T extends io.qt.core.QObject> T create(Class<T> type, io.qt.qml.QQmlContext context){
         String packageName = type.getName();
         int idx = packageName.lastIndexOf('.');
         if(idx>0){
             packageName = packageName.substring(0, idx);
         }
-        io.qt.QtUtilities.initializePackage(packageName);
+        QtUtilities.initializePackage(packageName);
         return type.cast(create(context));
     }
 }// class
 
 class __QJSValue extends QJSValue{
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(java.lang.String name, String value){
         setProperty(name, new QJSValue(value));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(java.lang.String name, boolean value){
         setProperty(name, new QJSValue(value));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(java.lang.String name, double value){
         setProperty(name, new QJSValue(value));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(java.lang.String name, int value){
         setProperty(name, new QJSValue(value));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(java.lang.String name, QJSValue.SpecialValue value){
         setProperty(name, new QJSValue(value));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(int arrayIndex, String value){
         setProperty(arrayIndex, new QJSValue(value));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(int arrayIndex, boolean value){
         setProperty(arrayIndex, new QJSValue(value));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(int arrayIndex, double value){
         setProperty(arrayIndex, new QJSValue(value));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(int arrayIndex, int value){
         setProperty(arrayIndex, new QJSValue(value));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void setProperty(int arrayIndex, QJSValue.SpecialValue value){
         setProperty(arrayIndex, new QJSValue(value));
     }
@@ -151,17 +151,17 @@ public static int qmlRegisterUncreatableClass(java.lang.Class<? extends io.qt.co
 
 class QQmlProperty__{
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean connectNotifySignal(io.qt.core.QMetaObject.Slot0 slot){
         return connectNotifySignal(slot, io.qt.core.QMetaMethod.fromMethod(java.util.Objects.requireNonNull(slot)));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean connectNotifySignal(io.qt.core.QMetaObject.Slot1<?> slot){
         return connectNotifySignal(slot, io.qt.core.QMetaMethod.fromMethod(java.util.Objects.requireNonNull(slot)));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private final boolean connectNotifySignal(io.qt.core.QMetaObject.AbstractSlot slot, io.qt.core.QMetaMethod metaMethod){
         if(metaMethod!=null && metaMethod.isValid()) {
             io.qt.core.QObject qobject = QtJambi_LibraryUtilities.internal.lambdaContext(slot);
@@ -175,94 +175,61 @@ private final boolean connectNotifySignal(io.qt.core.QMetaObject.AbstractSlot sl
 
 class QJSEngine__{
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QJSValue newQMetaObject(Class<?> type) {
         return newQMetaObject(io.qt.core.QMetaObject.forType(type));
     }
 }// class
 
 class QJSEngine_6_{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T> T fromScriptValue(QJSValue value, Class<T> type, io.qt.core.QMetaType...instantiations) {
         return fromScriptValue(value, io.qt.core.QMetaType.fromType(type, instantiations));
     }
-    
-    @io.qt.QtUninvokable
-    public final <T> T fromScriptValue(QJSValue value, io.qt.core.QMetaType type) {
-        return fromScriptValue(QtJambi_LibraryUtilities.internal.nativeId(this), QtJambi_LibraryUtilities.internal.checkedNativeId(value), QtJambi_LibraryUtilities.internal.checkedNativeId(type));
-    }
-    
-    private static native <T> T fromScriptValue(long thisId, long valueId, long typeId);
-    
-    @io.qt.QtUninvokable
-    public final <T> QJSValue toScriptValue(T value) {
-        return toScriptValue(QtJambi_LibraryUtilities.internal.nativeId(this), value);
-    }
-    
-    private static native QJSValue toScriptValue(long thisId, Object value);
 }// class
 
 class QJSEngine_61_{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T> T fromManagedValue(QJSManagedValue value, Class<T> type, io.qt.core.QMetaType...instantiations) {
         return fromManagedValue(value, io.qt.core.QMetaType.fromType(type, instantiations));
     }
-    
-    @io.qt.QtUninvokable
-    public final <T> T fromManagedValue(QJSManagedValue value, io.qt.core.QMetaType type) {
-        return fromManagedValue(QtJambi_LibraryUtilities.internal.nativeId(this), QtJambi_LibraryUtilities.internal.checkedNativeId(value), QtJambi_LibraryUtilities.internal.checkedNativeId(type));
-    }
-    
-    private static native <T> T fromManagedValue(long thisId, long valueId, long typeId);
-    
-    @io.qt.QtUninvokable
-    public final <T> QJSManagedValue toManagedValue(T value) {
-        return toManagedValue(QtJambi_LibraryUtilities.internal.nativeId(this), value);
-    }
-    
-    private static native QJSManagedValue toManagedValue(long thisId, Object value);
-    
 }// class
 
 class QJSEngine_63_{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T> T fromVariant(Object variant, Class<T> type, io.qt.core.QMetaType...instantiations) {
         return fromVariant(variant, io.qt.core.QMetaType.fromType(type, instantiations));
     }
-    
-    @io.qt.QtUninvokable
-    public final <T> T fromVariant(Object variant, io.qt.core.QMetaType type) {
-        return fromVariant(QtJambi_LibraryUtilities.internal.nativeId(this), variant, QtJambi_LibraryUtilities.internal.checkedNativeId(type));
-    }
-    
-    private static native <T> T fromVariant(long thisId, Object variant, long typeId);
-    
 }// class
 
 class QQmlEngine__{
     
     /**
-     * <p>See <a href="https://doc.qt.io/qt/qqmlengine.html#singletonInstance">QQmlEngine::singletonInstance(int qmlTypeId)</a></p>
+     * <p>See <a href="https://doc.qt.io/qt/qqmlengine.html#singletonInstance">QQmlEngine::singletonInstance(int)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final <T extends io.qt.QtObjectInterface> T singletonInstance(Class<T> type, int qmlTypeId) {
-        io.qt.core.QObject object = singletonInstance(QtJambi_LibraryUtilities.internal.nativeId(this), qmlTypeId).toQObject();
+    @QtUninvokable
+    public final <T extends QtObjectInterface> T singletonInstance(Class<T> type, int qmlTypeId) {
+        io.qt.core.QObject object = singletonInstance(qmlTypeId).toQObject();
         if(object!=null)
             return object.qt_metacast(type);
         return null;
     }
-    
+
+}// class
+
+class QQmlEngine_65_{
+
     /**
-     * <p>See <a href="https://doc.qt.io/qt/qqmlengine.html#singletonInstance">QQmlEngine::singletonInstance(int qmlTypeId)</a></p>
+     * <p>See <a href="https://doc.qt.io/qt/qqmlengine.html#singletonInstance-1">QQmlEngine::singletonInstance(QAnyStringView,QAnyStringView)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final QJSValue singletonInstance(int qmlTypeId) {
-        return singletonInstance(QtJambi_LibraryUtilities.internal.nativeId(this), qmlTypeId);
+    @QtUninvokable
+    public final <T extends QtObjectInterface> T singletonInstance(Class<T> type, java.lang.@NonNull String moduleName, java.lang.@NonNull String typeName) {
+        io.qt.core.QObject object = singletonInstance(moduleName, typeName).toQObject();
+        if(object!=null)
+            return object.qt_metacast(type);
+        return null;
     }
     
-    @io.qt.QtUninvokable
-    private static native QJSValue singletonInstance(long __this__nativeId, int qmlTypeId);
-    
 }// class
 
 class QQmlExpression__{
@@ -302,35 +269,3 @@ public void set(boolean flag) {
 
 class QQmlIncubationController_native__{
 }// class
-
-class QJSPrimitiveValue__{
-    @io.qt.QtUninvokable
-    @Deprecated
-    public final io.qt.qml.QJSPrimitiveValue modulo(io.qt.qml.QJSPrimitiveValue rhs){
-        return mod(rhs);
-    }
-    
-    @io.qt.QtUninvokable
-    @Deprecated
-    public final io.qt.qml.QJSPrimitiveValue multiplied(io.qt.qml.QJSPrimitiveValue rhs){
-        return times(rhs);
-    }
-    
-    @io.qt.QtUninvokable
-    @Deprecated
-    public final io.qt.qml.QJSPrimitiveValue added(io.qt.qml.QJSPrimitiveValue rhs){
-        return plus(rhs);
-    }
-    
-    @io.qt.QtUninvokable
-    @Deprecated
-    public final io.qt.qml.QJSPrimitiveValue divided(io.qt.qml.QJSPrimitiveValue rhs){
-        return div(rhs);
-    }
-    
-    @io.qt.QtUninvokable
-    @Deprecated
-    public final io.qt.qml.QJSPrimitiveValue substracted(io.qt.qml.QJSPrimitiveValue rhs){
-        return minus(rhs);
-    }
-}// class
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQuick.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQuick.java
index e2338f8a..6f8119f7 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQuick.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQuick.java
@@ -50,7 +50,7 @@ class QSGGeometry__{
 
     private static native void setPoint2D(long pointer, int index, Point2D value);
 
-    public static class VertexData<T extends io.qt.QtObjectInterface>{
+    public static class VertexData<T extends QtObjectInterface>{
         public VertexData(long pointer, int size) {
             super();
             this.pointer = pointer;
@@ -60,12 +60,12 @@ public VertexData(long pointer, int size) {
         final long pointer;
         final int size;
 
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public T get(int index) {
             throw new UnsupportedOperationException();
         }
         
-        @io.qt.QtUninvokable
+        @QtUninvokable
         public void set(int index, T value) {
             throw new UnsupportedOperationException();
         }
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQuickTest.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQuickTest.java
index b1790594..1e964afe 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQuickTest.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiQuickTest.java
@@ -30,13 +30,13 @@
 ****************************************************************************/
 
 class QQuickTest___{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int quickTestMainWithSetup(String[] args, String name, java.util.function.Supplier<io.qt.core.QObject> setupSupplier){
         io.qt.core.QObject setup = setupSupplier.get();
         return quickTestMainWithSetup(args, name, null, QtJambi_LibraryUtilities.internal.checkedNativeId(setup));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int quickTestMainWithSetup(String[] args, String name, Class<? extends io.qt.core.QObject> setupType)
     {
         io.qt.core.QObject setup;
@@ -54,18 +54,18 @@ public static int quickTestMainWithSetup(String[] args, String name, Class<? ext
         return quickTestMainWithSetup(args, name, null, QtJambi_LibraryUtilities.internal.checkedNativeId(setup));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int quickTestMainWithSetup(String[] args, String name, io.qt.core.QObject setup){
         return quickTestMainWithSetup(args, name, null, QtJambi_LibraryUtilities.internal.checkedNativeId(setup));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int quickTestMainWithSetup(String[] args, String name, String sourceDir, java.util.function.Supplier<io.qt.core.QObject> setupSupplier){
         io.qt.core.QObject setup = setupSupplier.get();
         return quickTestMainWithSetup(args, name, sourceDir, QtJambi_LibraryUtilities.internal.checkedNativeId(setup));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int quickTestMainWithSetup(String[] args, String name, String sourceDir, Class<? extends io.qt.core.QObject> setupType)
     {
         io.qt.core.QObject setup;
@@ -83,21 +83,21 @@ public static int quickTestMainWithSetup(String[] args, String name, String sour
         return quickTestMainWithSetup(args, name, sourceDir, QtJambi_LibraryUtilities.internal.checkedNativeId(setup));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int quickTestMainWithSetup(String[] args, String name, String sourceDir, io.qt.core.QObject setup){
         return quickTestMainWithSetup(args, name, sourceDir, QtJambi_LibraryUtilities.internal.checkedNativeId(setup));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int quickTestMain(String[] args, String name, String sourceDir){
         return quickTestMainWithSetup(args, name, sourceDir, 0);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int quickTestMain(String[] args, String name){
         return quickTestMainWithSetup(args, name, null, 0);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static native int quickTestMainWithSetup(String[] args, String name, String sourceDir, long setupId);
 }// class
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiRemoteObjects.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiRemoteObjects.java
index 262855f3..5c8d2531 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiRemoteObjects.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiRemoteObjects.java
@@ -37,7 +37,7 @@ class QRemoteObjectNode___ {
      * <li><code>action = io.qt.remoteobjects.QtRemoteObjects.InitialAction.FetchRootSize</code></li>
      * </ul>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final io.qt.remoteobjects.QAbstractItemModelReplica acquireModel(java.lang.String name, int...rolesHint) {
         return acquireModel(name, io.qt.remoteobjects.QtRemoteObjects.InitialAction.FetchRootSize, rolesHint);
     }
@@ -45,7 +45,7 @@ public final io.qt.remoteobjects.QAbstractItemModelReplica acquireModel(java.lan
     /**
      * <p>Overloaded function for {@link #acquireModel(java.lang.String, io.qt.remoteobjects.QtRemoteObjects.InitialAction, java.util.Collection)}.
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final io.qt.remoteobjects.QAbstractItemModelReplica acquireModel(java.lang.String name, io.qt.remoteobjects.QtRemoteObjects.InitialAction action, int...rolesHint) {
         java.util.List<Integer> _rolesHint = new java.util.ArrayList<>();
         for (int hint : rolesHint) {
@@ -54,7 +54,7 @@ public final io.qt.remoteobjects.QAbstractItemModelReplica acquireModel(java.lan
         return acquireModel(name, action, _rolesHint);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final io.qt.core.QStringList instances(Class<? extends io.qt.core.QObject> type){
         for(io.qt.core.QPair<String, String> info : io.qt.core.QMetaObject.forType(type).classInfos()) {
             if("RemoteObject Type".equals(info.first)) {
@@ -64,22 +64,22 @@ public final io.qt.core.QStringList instances(Class<? extends io.qt.core.QObject
         return new io.qt.core.QStringList();
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T extends QRemoteObjectReplica> T acquire(java.util.function.BiFunction<QRemoteObjectNode, String, T> replicaConstructor) {
         return acquire(replicaConstructor, null);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T extends QRemoteObjectReplica> T acquire(java.util.function.BiFunction<QRemoteObjectNode, String, T> replicaConstructor, String name) {
         return replicaConstructor.apply(this, name);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T extends QRemoteObjectReplica> T acquire(Class<T> type) throws NoSuchMethodException{
         return acquire(type, null);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final <T extends QRemoteObjectReplica> T acquire(Class<T> type, java.lang.String name) throws NoSuchMethodException{
         if(type==QRemoteObjectDynamicReplica.class) {
             return type.cast(acquireDynamic(name));
@@ -114,7 +114,7 @@ public static class TypeNameAndMetaobject{
         public final io.qt.core.QMetaObject metaObject;
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static TypeNameAndMetaobject getTypeNameAndMetaobjectFromClassInfo(io.qt.core.QMetaObject metaObject){
         String typeName = metaObject.classInfo("RemoteObject Type");
         if (typeName!=null) { //We have an object created from repc or at least with QCLASSINFO defined
@@ -131,19 +131,19 @@ public static TypeNameAndMetaobject getTypeNameAndMetaobjectFromClassInfo(io.qt.
         return new TypeNameAndMetaobject(typeName, metaObject);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> void copyStoredProperties(T src, T dst)
     {
         if(src!=null)QtRemoteObjects.<T>copyStoredProperties(QtJambi_LibraryUtilities.internal.getClass(src), src, dst);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> void copyStoredProperties(T src, io.qt.core.QDataStream dst)
     {
         if(src!=null)QtRemoteObjects.<T>copyStoredProperties(QtJambi_LibraryUtilities.internal.getClass(src), src, dst);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> void copyStoredProperties(io.qt.core.QDataStream src, T dst)
     {
         if(dst!=null)QtRemoteObjects.<T>copyStoredProperties(QtJambi_LibraryUtilities.internal.getClass(dst), src, dst);
@@ -171,8 +171,8 @@ class QRemoteObjectPendingCall___{
      * <p>Overloaded function for {@link #waitForFinished(int)}
      *  with <code>timeout = 30000</code>.</p>
      */
-    @io.qt.QtDeclaredFinal
-    @io.qt.QtUninvokable
+    @QtDeclaredFinal
+    @QtUninvokable
     public default void waitForFinished() {
         waitForFinished((int)30000);
     }
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiScxml.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiScxml.java
index 1988abd5..983050cf 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiScxml.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiScxml.java
@@ -47,7 +47,7 @@ class QScxmlStateMachine___ {
     public static io.qt.core.QMetaObject.Slot1<Boolean> onEntry(io.qt.core.QObject object, String slot){
         io.qt.core.QMetaMethod method = object.metaObject().method(slot);
         if(method==null || !method.isValid())
-            throw new io.qt.QNoSuchSlotException(object, slot);
+            throw new QNoSuchSlotException(object, slot);
         return (isEnteringState) -> {
             if (isEnteringState && !object.isDisposed())
                 method.invoke(object);
@@ -60,7 +60,7 @@ public static io.qt.core.QMetaObject.Slot1<Boolean> onEntry(io.qt.core.QObject o
     public static io.qt.core.QMetaObject.Slot1<Boolean> onExit(io.qt.core.QObject object, String slot){
         io.qt.core.QMetaMethod method = object.metaObject().method(slot);
         if(method==null || !method.isValid())
-            throw new io.qt.QNoSuchSlotException(object, slot);
+            throw new QNoSuchSlotException(object, slot);
         return (isEnteringState) -> {
             if (!isEnteringState && !object.isDisposed())
                 method.invoke(object);
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiTest.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiTest.java
index a3fac120..f50cf417 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiTest.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiTest.java
@@ -34,7 +34,7 @@ class QTest__{
     /**
      * <p>See <a href="@docRoot/qtest.html#QBENCHMARK">QBENCHMARK</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QBENCHMARK(Runnable runnable) {
         for (QBenchmarkIterationController __iteration_controller = new QBenchmarkIterationController();
                         __iteration_controller.isDone() == false; __iteration_controller.next())
@@ -44,14 +44,14 @@ public static void QBENCHMARK(Runnable runnable) {
     /**
      * <p>See <a href="@docRoot/qtest.html#QBENCHMARK_ONCE">QBENCHMARK_ONCE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QBENCHMARK_ONCE(Runnable runnable) {
         for (QBenchmarkIterationController __iteration_controller = new QBenchmarkIterationController(QBenchmarkIterationController.RunMode.RunOnce);
                         __iteration_controller.isDone() == false; __iteration_controller.next())
             runnable.run();
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> boolean qCompare(T t1, T t2, java.lang.String actual, java.lang.String expected, java.lang.String file, int line){
         return QTest.compare_helper(t1==null ? t1!=null : t1.compareTo(t2)==0, "Compared values are not the same", 
                 "value1", 
@@ -61,7 +61,7 @@ public static <T extends Comparable<T>> boolean qCompare(T t1, T t2, java.lang.S
                 file, line);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> boolean qCompare(T t1, T t2, java.lang.String actual, java.lang.String expected, java.lang.String file, int line){
         return QTest.compare_helper(java.util.Objects.equals(t1, t2), "Compared values are not the same", 
                 "value1", 
@@ -74,7 +74,7 @@ public static <T> boolean qCompare(T t1, T t2, java.lang.String actual, java.lan
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> void QCOMPARE(T t1, T t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qCompare(t1, t2,
@@ -87,7 +87,7 @@ public static <T extends Comparable<T>> void QCOMPARE(T t1, T t2) throws Asserti
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> void QCOMPARE(T t1, T t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qCompare(t1, t2,
@@ -100,7 +100,7 @@ public static <T> void QCOMPARE(T t1, T t2) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE(int t1, int t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qCompare(t1, t2, 
@@ -113,7 +113,7 @@ public static void QCOMPARE(int t1, int t2) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE(double t1, double t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qCompare(t1, t2, 
@@ -126,7 +126,7 @@ public static void QCOMPARE(double t1, double t2) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE(float t1, double t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qCompare(t1, t2, 
@@ -139,7 +139,7 @@ public static void QCOMPARE(float t1, double t2) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE(double t1, float t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qCompare(t1, t2, 
@@ -152,7 +152,7 @@ public static void QCOMPARE(double t1, float t2) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE(float t1, float t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qCompare(t1, t2, 
@@ -165,7 +165,7 @@ public static void QCOMPARE(float t1, float t2) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE(String t1, String t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qCompare(t1, t2, 
@@ -178,7 +178,7 @@ public static void QCOMPARE(String t1, String t2) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE(io.qt.gui.QIcon t1, io.qt.gui.QIcon t2) throws AssertionError {
         if(t1==null)
             t1 = new io.qt.gui.QIcon();
@@ -195,7 +195,7 @@ public static void QCOMPARE(io.qt.gui.QIcon t1, io.qt.gui.QIcon t2) throws Asser
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE(io.qt.gui.QPixmap t1, io.qt.gui.QPixmap t2) throws AssertionError {
         if(t1==null)
             t1 = new io.qt.gui.QPixmap();
@@ -212,7 +212,7 @@ public static void QCOMPARE(io.qt.gui.QPixmap t1, io.qt.gui.QPixmap t2) throws A
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE">QCOMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE(io.qt.gui.QImage t1, io.qt.gui.QImage t2) throws AssertionError {
         if(t1==null)
             t1 = new io.qt.gui.QImage();
@@ -229,7 +229,7 @@ public static void QCOMPARE(io.qt.gui.QImage t1, io.qt.gui.QImage t2) throws Ass
     /**
      * <p>See <a href="@docRoot/qtest.html#QEXPECT_FAIL">QEXPECT_FAIL(dataIndex, comment, mode)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QEXPECT_FAIL(String dataIndex, String comment, QTest.TestFailMode mode) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qExpectFail(dataIndex, comment, mode, info.declaringClass.getName()+"."+info.methodName, info.lineNumber))
@@ -239,7 +239,7 @@ public static void QEXPECT_FAIL(String dataIndex, String comment, QTest.TestFail
     /**
      * <p>See <a href="@docRoot/qtest.html#QFAIL">QFAIL(message)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QFAIL(String message) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QTest.qFail(message, info.declaringClass.getName()+"."+info.methodName, info.lineNumber);
@@ -249,7 +249,7 @@ public static void QFAIL(String message) throws AssertionError {
     /**
      * @deprecated Use {@link #QFETCH(String, Class, io.qt.core.QMetaType...)} instead.
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     @Deprecated
     public static <T> T QFETCH(Class<T> type, String name) {
         return io.qt.core.QVariant.convert(qData(name, io.qt.core.QMetaType.fromType(type).id()), type);
@@ -258,7 +258,7 @@ public static <T> T QFETCH(Class<T> type, String name) {
     /**
      * @deprecated Use {@link #QFETCH_GLOBAL(String, Class, io.qt.core.QMetaType...)} instead.
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     @Deprecated
     public static <T> T QFETCH_GLOBAL(Class<T> type, String name) {
         return io.qt.core.QVariant.convert(qGlobalData(name, io.qt.core.QMetaType.fromType(type).id()), type);
@@ -267,7 +267,7 @@ public static <T> T QFETCH_GLOBAL(Class<T> type, String name) {
     /**
      * <p>See <a href="@docRoot/qtest.html#QFETCH">QFETCH(type, name)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> T QFETCH(String name, Class<T> type, io.qt.core.QMetaType...instantiations) {
         return io.qt.core.QVariant.convert(qData(name, io.qt.core.QMetaType.fromType(type, instantiations).id()), type);
     }
@@ -275,7 +275,7 @@ public static <T> T QFETCH(String name, Class<T> type, io.qt.core.QMetaType...in
     /**
      * <p>See <a href="@docRoot/qtest.html#QFETCH_GLOBAL">QFETCH_GLOBAL(type, name)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> T QFETCH_GLOBAL(String name, Class<T> type, io.qt.core.QMetaType...instantiations) {
         return io.qt.core.QVariant.convert(qGlobalData(name, io.qt.core.QMetaType.fromType(type, instantiations).id()), type);
     }
@@ -283,7 +283,7 @@ public static <T> T QFETCH_GLOBAL(String name, Class<T> type, io.qt.core.QMetaTy
     /**
      * <p>See <a href="@docRoot/qtest.html#QFINDTESTDATA">QFINDTESTDATA(filename)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static String QFINDTESTDATA(String basepath){
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         return QTest.qFindTestData(basepath, info.declaringClass.getName()+"."+info.methodName, info.lineNumber);
@@ -292,7 +292,7 @@ public static String QFINDTESTDATA(String basepath){
     /**
      * <p>See <a href="@docRoot/qtest.html#QFINDTESTDATA">QFINDTESTDATA(filename,builddir)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static String QFINDTESTDATA(String basepath, java.lang.String builddir){
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         return QTest.qFindTestData(basepath, info.declaringClass.getName()+"."+info.methodName, info.lineNumber, builddir);
@@ -301,13 +301,13 @@ public static String QFINDTESTDATA(String basepath, java.lang.String builddir){
     /**
      * <p>See <a href="@docRoot/qtest.html#QSKIP">QSKIP(description)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QSKIP(String statement){
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QTest.qSkip(statement, info.declaringClass.getName()+"."+info.methodName, info.lineNumber);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> boolean qTest(T actual, String elementName, String actualStr, String expected, String file, int line) {
         @SuppressWarnings("unchecked")
         Class<T> cls = (Class<T>)actual.getClass();
@@ -317,7 +317,7 @@ public static <T> boolean qTest(T actual, String elementName, String actualStr,
     /**
      * <p>See <a href="@docRoot/qtest.html#QTEST">QTEST(actual, testElement)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> void QTEST(T actual, String testElement) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if(!QTest.qTest(actual, testElement, java.util.Objects.toString(actual), java.util.Objects.toString(actual), info.declaringClass.getName()+"."+info.methodName, info.lineNumber))
@@ -327,12 +327,12 @@ public static <T> void QTEST(T actual, String testElement) throws AssertionError
     /**
      * <p>See <a href="@docRoot/qtest.html#qExec">QTest::qExec(QObject *, int, char **)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static int qExec(io.qt.core.QObject testObject, String...args){
         return qExec(testObject, java.util.Arrays.asList(args));
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static int QTRY_LOOP_IMPL(java.util.function.BooleanSupplier expr, int timeoutValue, int step) {
         if (!(expr.getAsBoolean())) {
             qWait(0);
@@ -344,7 +344,7 @@ private static int QTRY_LOOP_IMPL(java.util.function.BooleanSupplier expr, int t
         return qt_test_i;
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static void QTRY_TIMEOUT_DEBUG_IMPL(io.qt.InternalAccess.CallerContext info, java.util.function.BooleanSupplier expr, int timeoutValue, int step) throws AssertionError {
         if (!(expr.getAsBoolean())) {
             int qt_test_i = QTRY_LOOP_IMPL(expr, (2 * timeoutValue), step);
@@ -356,7 +356,7 @@ private static void QTRY_TIMEOUT_DEBUG_IMPL(io.qt.InternalAccess.CallerContext i
         }
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static void QTRY_IMPL(io.qt.InternalAccess.CallerContext info, java.util.function.BooleanSupplier expr, int timeout) throws AssertionError {
         int qt_test_step = timeout < 350 ? timeout / 7 + 1 : 50;
         int qt_test_timeoutValue = timeout;
@@ -364,7 +364,7 @@ private static void QTRY_IMPL(io.qt.InternalAccess.CallerContext info, java.util
         QTRY_TIMEOUT_DEBUG_IMPL(info, ()->currentTestFailed() || (expr.getAsBoolean()), qt_test_timeoutValue, qt_test_step);
     }
 
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static void QTRY_COMPARE_WITH_TIMEOUT_IMPL(io.qt.InternalAccess.CallerContext info, java.util.function.BooleanSupplier expr, java.util.function.BooleanSupplier equals, int timeout) throws AssertionError {
         int qt_test_step = timeout < 350 ? timeout / 7 + 1 : 50;
         int qt_test_timeoutValue = timeout;
@@ -386,7 +386,7 @@ private static void QTRY_COMPARE_WITH_TIMEOUT_IMPL(io.qt.InternalAccess.CallerCo
     /**
      * <p>See <a href="@docRoot/qtest.html#QTRY_COMPARE_WITH_TIMEOUT">QTRY_COMPARE_WITH_TIMEOUT(actual, expected, timeout)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> void QTRY_COMPARE_WITH_TIMEOUT(T t1, T t2, int timeout) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QTRY_COMPARE_WITH_TIMEOUT_IMPL(info, ()->t1!=null, ()->t1.compareTo(t2)==0, timeout);
@@ -395,7 +395,7 @@ public static <T extends Comparable<T>> void QTRY_COMPARE_WITH_TIMEOUT(T t1, T t
     /**
      * <p>See <a href="@docRoot/qtest.html#QTRY_COMPARE">QTRY_COMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> void QTRY_COMPARE(T t1, T t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QTRY_COMPARE_WITH_TIMEOUT_IMPL(info, ()->t1!=null, ()->t1.compareTo(t2)==0, 5000);
@@ -404,7 +404,7 @@ public static <T extends Comparable<T>> void QTRY_COMPARE(T t1, T t2) throws Ass
     /**
      * <p>See <a href="@docRoot/qtest.html#QTRY_COMPARE_WITH_TIMEOUT">QTRY_COMPARE_WITH_TIMEOUT(actual, expected, timeout)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> void QTRY_COMPARE_WITH_TIMEOUT(T t1, T t2, int timeout) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QTRY_COMPARE_WITH_TIMEOUT_IMPL(info, ()->t1!=null, ()->java.util.Objects.equals(t1, t2), timeout);
@@ -413,13 +413,13 @@ public static <T> void QTRY_COMPARE_WITH_TIMEOUT(T t1, T t2, int timeout) throws
     /**
      * <p>See <a href="@docRoot/qtest.html#QTRY_COMPARE">QTRY_COMPARE(actual, expected)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> void QTRY_COMPARE(T t1, T t2) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QTRY_COMPARE_WITH_TIMEOUT_IMPL(info, ()->t1!=null, ()->java.util.Objects.equals(t1, t2), 5000);
     }
     
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QTRY_VERIFY_WITH_TIMEOUT(java.util.function.BooleanSupplier expr, int timeout) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QTRY_IMPL(info, expr, timeout);
@@ -429,7 +429,7 @@ public static void QTRY_VERIFY_WITH_TIMEOUT(java.util.function.BooleanSupplier e
     /**
      * <p>See <a href="@docRoot/qtest.html#QTRY_VERIFY_WITH_TIMEOUT">QTRY_VERIFY_WITH_TIMEOUT(condition, timeout)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QTRY_VERIFY_WITH_TIMEOUT(java.util.function.BooleanSupplier expr, String messageExpression, int timeout) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QTRY_IMPL(info, expr, timeout);
@@ -439,7 +439,7 @@ public static void QTRY_VERIFY_WITH_TIMEOUT(java.util.function.BooleanSupplier e
     /**
      * <p>See <a href="@docRoot/qtest.html#QVERIFY">QVERIFY(condition)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QVERIFY(java.util.function.BooleanSupplier statement) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QVERIFY(info, statement);
@@ -448,7 +448,7 @@ public static void QVERIFY(java.util.function.BooleanSupplier statement) throws
     /**
      * <p>See <a href="@docRoot/qtest.html#QVERIFY">QVERIFY(condition)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static void QVERIFY(io.qt.InternalAccess.CallerContext info, java.util.function.BooleanSupplier statement) throws AssertionError {
         if (!qVerify(statement.getAsBoolean(), "", "", info.declaringClass.getName()+"."+info.methodName, info.lineNumber))
             throw new AssertionError();
@@ -457,7 +457,7 @@ private static void QVERIFY(io.qt.InternalAccess.CallerContext info, java.util.f
     /**
      * <p>See <a href="@docRoot/qtest.html#QVERIFY2">QVERIFY2(condition,message)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QVERIFY(java.util.function.BooleanSupplier statement, String description) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QVERIFY(info, statement, description);
@@ -466,7 +466,7 @@ public static void QVERIFY(java.util.function.BooleanSupplier statement, String
     /**
      * <p>See <a href="@docRoot/qtest.html#QVERIFY2">QVERIFY2(condition,message)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static void QVERIFY(io.qt.InternalAccess.CallerContext info, java.util.function.BooleanSupplier statement, String description) throws AssertionError {
         if(statement.getAsBoolean()) {
             if (!qVerify(true, "", description, info.declaringClass.getName()+"."+info.methodName, info.lineNumber))
@@ -480,7 +480,7 @@ private static void QVERIFY(io.qt.InternalAccess.CallerContext info, java.util.f
     /**
      * <p>See <a href="@docRoot/qtest.html">QTest</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QWARN(String message){
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         QTest.qWarn(message, info.declaringClass.getName()+"."+info.methodName, info.lineNumber);
@@ -489,7 +489,7 @@ public static void QWARN(String message){
     /**
      * <p>See <a href="@docRoot/qtest.html">QTest</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static io.qt.core.QTemporaryDir QEXTRACTTESTDATA(String resourcePath){
         return QTest.qExtractTestData(resourcePath);
     }
@@ -498,7 +498,7 @@ public static io.qt.core.QTemporaryDir QEXTRACTTESTDATA(String resourcePath){
      * Use {@link #addColumn(String, Class, QMetaType...)} instead.
      */
     @Deprecated
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void addColumn(Class<?> type, String name){
         addColumn(name, type);
     }
@@ -507,7 +507,7 @@ public static void addColumn(Class<?> type, String name){
      * Place this macro-like method in the main method of the test class.
      * <p>See <a href="@docRoot/qtest.html#QTEST_MAIN">QTEST_MAIN(TestClass)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     @SuppressWarnings("unchecked")
     public static int QTEST_MAIN(String... args) {
         io.qt.InternalAccess.CallerContext context = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
@@ -520,7 +520,7 @@ public static int QTEST_MAIN(String... args) {
      * Place this macro-like method in the main method of the test class.
      * <p>See <a href="@docRoot/qtest.html#QTEST_MAIN">QTEST_MAIN(TestClass)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     @SuppressWarnings("unchecked")
     public static int QTEST_WIDGETLESS_MAIN(String... args) {
         io.qt.InternalAccess.CallerContext context = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
@@ -533,7 +533,7 @@ public static int QTEST_WIDGETLESS_MAIN(String... args) {
      * Place this macro-like method in the main method of the test class.
      * <p>See <a href="@docRoot/qtest.html#QTEST_GUILESS_MAIN">QTEST_GUILESS_MAIN(TestClass)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     @SuppressWarnings("unchecked")
     public static int QTEST_GUILESS_MAIN(String... args) {
         io.qt.InternalAccess.CallerContext context = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
@@ -546,7 +546,7 @@ public static int QTEST_GUILESS_MAIN(String... args) {
      * Place this macro-like method in the main method of the test class.
      * <p>See <a href="@docRoot/qtest.html#QTEST_APPLESS_MAIN">QTEST_APPLESS_MAIN(TestClass)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     @SuppressWarnings("unchecked")
     public static int QTEST_APPLESS_MAIN(String... args) {
         io.qt.InternalAccess.CallerContext context = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
@@ -573,7 +573,7 @@ private static int QTEST_MAIN_WRAPPER(Class<? extends io.qt.core.QObject> testCl
             if(io.qt.widgets.QApplication.instance()!=null) {
                 try {
                     io.qt.widgets.QApplication.setNavigationMode(io.qt.core.Qt.NavigationMode.NavigationModeNone);
-                } catch (io.qt.QNoImplementationException e) {}
+                } catch (QNoImplementationException e) {}
             }
         }else {
             String[] newArgs = new String[args.length+1];
@@ -603,7 +603,7 @@ class QTest_5__{
     /**
      * <p>See <a href="@docRoot/qtest.html#touchEvent-1">QTest::touchEvent(QWindow *window, QTouchDevice *device, bool autoCommit = true)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.gui.QWindow window, io.qt.gui.QTouchDevice device) {
         return touchEvent(window, device, true);
     }
@@ -611,13 +611,13 @@ public static io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.gui.QWindow
     /**
      * <p>See <a href="@docRoot/qtest.html#touchEvent-1">QTest::touchEvent(QWindow *window, QTouchDevice *device, bool autoCommit = true)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static native io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.gui.QWindow window, io.qt.gui.QTouchDevice device, boolean autoCommit);
     
     /**
      * <p>See <a href="@docRoot/qtest.html#touchEvent">QTest::touchEvent(QWidget *widget, QTouchDevice *device, bool autoCommit = true)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.widgets.QWidget window, io.qt.gui.QTouchDevice device) {
         return touchEvent(window, device, true);
     }
@@ -625,7 +625,7 @@ public static io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.widgets.QWid
     /**
      * <p>See <a href="@docRoot/qtest.html#touchEvent">QTest::touchEvent(QWidget *widget, QTouchDevice *device, bool autoCommit = true)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static native io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.widgets.QWidget window, io.qt.gui.QTouchDevice device, boolean autoCommit);
     
 }// class
@@ -635,7 +635,7 @@ class QTest_6__{
     /**
      * <p>See <a href="@docRoot/qtest.html#touchEvent">QTest::touchEvent(QWidget *widget, QPointingDevice *device, bool autoCommit = true)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.gui.QWindow window, io.qt.gui.QPointingDevice device) {
         return touchEvent(window, device, true);
     }
@@ -643,7 +643,7 @@ public static io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.gui.QWindow
     /**
      * <p>See <a href="@docRoot/qtest.html#touchEvent">QTest::touchEvent(QWidget *widget, QPointingDevice *device, bool autoCommit = true)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.gui.QWindow window, io.qt.gui.QPointingDevice device, boolean autoCommit){
         return new io.qt.test.QTest.QTouchEventSequence(window, device, autoCommit);
     }
@@ -651,7 +651,7 @@ public static io.qt.test.QTest.QTouchEventSequence touchEvent(io.qt.gui.QWindow
     /**
      * <p>See <a href="@docRoot/qtest.html#touchEvent-1">QTest::touchEvent(QWindow *window, QPointingDevice *device, bool autoCommit = true)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static io.qt.test.QTest.QTouchEventWidgetSequence touchEvent(io.qt.widgets.QWidget window, io.qt.gui.QPointingDevice device) {
         return touchEvent(window, device, true);
     }
@@ -659,13 +659,13 @@ public static io.qt.test.QTest.QTouchEventWidgetSequence touchEvent(io.qt.widget
     /**
      * <p>See <a href="@docRoot/qtest.html#touchEvent-1">QTest::touchEvent(QWindow *window, QPointingDevice *device, bool autoCommit = true)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static native io.qt.test.QTest.QTouchEventWidgetSequence touchEvent(io.qt.widgets.QWidget window, io.qt.gui.QPointingDevice device, boolean autoCommit);
         
     /**
      * <p>See <a href="@docRoot/qtest.html#QFINDTESTDATA">QFINDTESTDATA(filename,builddir)</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static String QFINDTESTDATA(String basepath, java.lang.String builddir, java.lang.String sourcedir){
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         return QTest.qFindTestData(basepath, info.declaringClass.getName()+"."+info.methodName, info.lineNumber, builddir, sourcedir);
@@ -674,7 +674,7 @@ public static String QFINDTESTDATA(String basepath, java.lang.String builddir, j
 }// class
 
 class QTest_64__{
-    @io.qt.QtUninvokable
+    @QtUninvokable
     private static <T> void QCOMPARE_OP_IMPL(java.util.function.BiPredicate<T, T> predicate, T lhs, T rhs, ComparisonOperation op) throws AssertionError {
         io.qt.InternalAccess.CallerContext info = QtJambi_LibraryUtilities.internal.callerContextProvider().get();
         if (reportResult(predicate.test(lhs, rhs),
@@ -688,7 +688,7 @@ private static <T> void QCOMPARE_OP_IMPL(java.util.function.BiPredicate<T, T> pr
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_EQ">QCOMPARE_EQ</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> void QCOMPARE_EQ(T lhs, T rhs) throws AssertionError {
         QCOMPARE_OP_IMPL(java.util.Objects::equals, lhs, rhs, ComparisonOperation.Equal);
     }
@@ -696,7 +696,7 @@ public static <T> void QCOMPARE_EQ(T lhs, T rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_NE">QCOMPARE_NE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T> void QCOMPARE_NE(T lhs, T rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->!java.util.Objects.equals(l,r), lhs, rhs, ComparisonOperation.Equal);
     }
@@ -704,7 +704,7 @@ public static <T> void QCOMPARE_NE(T lhs, T rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_EQ">QCOMPARE_EQ</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> void QCOMPARE_EQ(T lhs, T rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l.compareTo(r)==0, lhs, rhs, ComparisonOperation.Equal);
     }
@@ -712,7 +712,7 @@ public static <T extends Comparable<T>> void QCOMPARE_EQ(T lhs, T rhs) throws As
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_EQ">QCOMPARE_EQ</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_EQ(int lhs, int rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l==r, lhs, rhs, ComparisonOperation.Equal);
     }
@@ -720,7 +720,7 @@ public static void QCOMPARE_EQ(int lhs, int rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_EQ">QCOMPARE_EQ</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_EQ(double lhs, double rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l==r, lhs, rhs, ComparisonOperation.Equal);
     }
@@ -728,7 +728,7 @@ public static void QCOMPARE_EQ(double lhs, double rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_EQ">QCOMPARE_EQ</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_EQ(long lhs, long rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l==r, lhs, rhs, ComparisonOperation.Equal);
     }
@@ -736,7 +736,7 @@ public static void QCOMPARE_EQ(long lhs, long rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_NE">QCOMPARE_NE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> void QCOMPARE_NE(T lhs, T rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l.compareTo(r)!=0, lhs, rhs, ComparisonOperation.NotEqual);
     }
@@ -744,7 +744,7 @@ public static <T extends Comparable<T>> void QCOMPARE_NE(T lhs, T rhs) throws As
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_NE">QCOMPARE_NE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_NE(int lhs, int rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l!=r, lhs, rhs, ComparisonOperation.NotEqual);
     }
@@ -752,7 +752,7 @@ public static void QCOMPARE_NE(int lhs, int rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_NE">QCOMPARE_NE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_NE(double lhs, double rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l!=r, lhs, rhs, ComparisonOperation.NotEqual);
     }
@@ -760,7 +760,7 @@ public static void QCOMPARE_NE(double lhs, double rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_NE">QCOMPARE_NE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_NE(long lhs, long rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l!=r, lhs, rhs, ComparisonOperation.NotEqual);
     }
@@ -768,7 +768,7 @@ public static void QCOMPARE_NE(long lhs, long rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_LT">QCOMPARE_LT</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> void QCOMPARE_LT(T lhs, T rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l.compareTo(r)<0, lhs, rhs, ComparisonOperation.LessThan);
     }
@@ -776,7 +776,7 @@ public static <T extends Comparable<T>> void QCOMPARE_LT(T lhs, T rhs) throws As
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_LT">QCOMPARE_LT</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_LT(int lhs, int rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l<r, lhs, rhs, ComparisonOperation.LessThan);
     }
@@ -784,7 +784,7 @@ public static void QCOMPARE_LT(int lhs, int rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_LT">QCOMPARE_LT</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_LT(double lhs, double rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l<r, lhs, rhs, ComparisonOperation.LessThan);
     }
@@ -792,7 +792,7 @@ public static void QCOMPARE_LT(double lhs, double rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_LT">QCOMPARE_LT</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_LT(long lhs, long rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l<r, lhs, rhs, ComparisonOperation.LessThan);
     }
@@ -800,7 +800,7 @@ public static void QCOMPARE_LT(long lhs, long rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_LE">QCOMPARE_LE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> void QCOMPARE_LE(T lhs, T rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l.compareTo(r)<=0, lhs, rhs, ComparisonOperation.LessThanOrEqual);
     }
@@ -808,7 +808,7 @@ public static <T extends Comparable<T>> void QCOMPARE_LE(T lhs, T rhs) throws As
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_LE">QCOMPARE_LE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_LE(int lhs, int rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l<=r, lhs, rhs, ComparisonOperation.LessThanOrEqual);
     }
@@ -816,7 +816,7 @@ public static void QCOMPARE_LE(int lhs, int rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_LE">QCOMPARE_LE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_LE(double lhs, double rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l<=r, lhs, rhs, ComparisonOperation.LessThanOrEqual);
     }
@@ -824,7 +824,7 @@ public static void QCOMPARE_LE(double lhs, double rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_LE">QCOMPARE_LE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_LE(long lhs, long rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l<=r, lhs, rhs, ComparisonOperation.LessThanOrEqual);
     }
@@ -832,7 +832,7 @@ public static void QCOMPARE_LE(long lhs, long rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_GT">QCOMPARE_GT</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> void QCOMPARE_GT(T lhs, T rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l.compareTo(r)>0, lhs, rhs, ComparisonOperation.GreaterThan);
     }
@@ -840,7 +840,7 @@ public static <T extends Comparable<T>> void QCOMPARE_GT(T lhs, T rhs) throws As
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_GT">QCOMPARE_GT</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_GT(int lhs, int rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l>r, lhs, rhs, ComparisonOperation.GreaterThan);
     }
@@ -848,7 +848,7 @@ public static void QCOMPARE_GT(int lhs, int rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_GT">QCOMPARE_GT</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_GT(double lhs, double rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l>r, lhs, rhs, ComparisonOperation.GreaterThan);
     }
@@ -856,7 +856,7 @@ public static void QCOMPARE_GT(double lhs, double rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_GT">QCOMPARE_GT</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_GT(long lhs, long rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l>r, lhs, rhs, ComparisonOperation.GreaterThan);
     }
@@ -864,7 +864,7 @@ public static void QCOMPARE_GT(long lhs, long rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_GE">QCOMPARE_GE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static <T extends Comparable<T>> void QCOMPARE_GE(T lhs, T rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l.compareTo(r)>=0, lhs, rhs, ComparisonOperation.GreaterThanOrEqual);
     }
@@ -872,7 +872,7 @@ public static <T extends Comparable<T>> void QCOMPARE_GE(T lhs, T rhs) throws As
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_GE">QCOMPARE_GE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_GE(int lhs, int rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l>=r, lhs, rhs, ComparisonOperation.GreaterThanOrEqual);
     }
@@ -880,7 +880,7 @@ public static void QCOMPARE_GE(int lhs, int rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_GE">QCOMPARE_GE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_GE(double lhs, double rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l>=r, lhs, rhs, ComparisonOperation.GreaterThanOrEqual);
     }
@@ -888,7 +888,7 @@ public static void QCOMPARE_GE(double lhs, double rhs) throws AssertionError {
     /**
      * <p>See <a href="@docRoot/qtest.html#QCOMPARE_GE">QCOMPARE_GE</a></p>
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public static void QCOMPARE_GE(long lhs, long rhs) throws AssertionError {
         QCOMPARE_OP_IMPL((l,r)->l>=r, lhs, rhs, ComparisonOperation.GreaterThanOrEqual);
     }
@@ -914,7 +914,7 @@ public QSignalSpy(QMetaObject.AbstractSignal signal) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void forEach(Consumer<? super java.util.List<java.lang.Object>> action) {
         list().forEach(action);
     }
@@ -923,7 +923,7 @@ public final void forEach(Consumer<? super java.util.List<java.lang.Object>> act
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean addAll(Collection<? extends java.util.List<java.lang.Object>> c) {
         return list().addAll(c);
     }
@@ -932,7 +932,7 @@ public boolean addAll(Collection<? extends java.util.List<java.lang.Object>> c)
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean addAll(int index, Collection<? extends java.util.List<java.lang.Object>> c) {
         return list().addAll(index, c);
     }
@@ -941,7 +941,7 @@ public boolean addAll(int index, Collection<? extends java.util.List<java.lang.O
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public java.util.List<java.lang.Object> remove(int index) {
         return list().remove(index);
     }
@@ -950,7 +950,7 @@ public java.util.List<java.lang.Object> remove(int index) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public ListIterator<java.util.List<java.lang.Object>> listIterator() {
         return list().listIterator();
     }
@@ -959,7 +959,7 @@ public ListIterator<java.util.List<java.lang.Object>> listIterator() {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public ListIterator<java.util.List<java.lang.Object>> listIterator(int index) {
         return list().listIterator(index);
     }
@@ -968,7 +968,7 @@ public ListIterator<java.util.List<java.lang.Object>> listIterator(int index) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public List<java.util.List<java.lang.Object>> subList(int fromIndex, int toIndex) {
         return list().subList(fromIndex, toIndex);
     }
@@ -977,7 +977,7 @@ public List<java.util.List<java.lang.Object>> subList(int fromIndex, int toIndex
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public Object[] toArray() {
         return list().toArray();
     }
@@ -986,7 +986,7 @@ public Object[] toArray() {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public <T> T[] toArray(T[] a) {
         return list().toArray(a);
     }
@@ -995,7 +995,7 @@ public <T> T[] toArray(T[] a) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean containsAll(Collection<?> c) {
         return list().containsAll(c);
     }
@@ -1004,7 +1004,7 @@ public boolean containsAll(Collection<?> c) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public QList<java.util.List<java.lang.Object>> clone() {
         return list().clone();
     }
@@ -1012,7 +1012,7 @@ public QList<java.util.List<java.lang.Object>> clone() {
     /**
      * @see io.qt.core.QList#append(java.util.Collection)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void append(java.util.Collection<java.util.List<java.lang.Object>> t) {
         list().append(t);
     }
@@ -1021,7 +1021,7 @@ public final void append(java.util.Collection<java.util.List<java.lang.Object>>
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean removeAll(Collection<?> c) {
         return list().removeAll(c);
     }
@@ -1030,7 +1030,7 @@ public boolean removeAll(Collection<?> c) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean retainAll(Collection<?> c) {
         return list().retainAll(c);
     }
@@ -1038,7 +1038,7 @@ public boolean retainAll(Collection<?> c) {
     /**
      * @see io.qt.core.QList#append(java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void append(java.util.List<java.lang.Object> t) {
         list().append(t);
     }
@@ -1047,7 +1047,7 @@ public final void append(java.util.List<java.lang.Object> t) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public Iterator<java.util.List<java.lang.Object>> iterator() {
         return list().iterator();
     }
@@ -1056,7 +1056,7 @@ public Iterator<java.util.List<java.lang.Object>> iterator() {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public String toString() {
         return list().toString();
     }
@@ -1064,7 +1064,7 @@ public String toString() {
     /**
      * @see io.qt.core.QList#at(int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final java.util.List<java.lang.Object> at(int i) {
         return list().at(i);
     }
@@ -1073,7 +1073,7 @@ public final java.util.List<java.lang.Object> at(int i) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void clear() {
         list().clear();
     }
@@ -1082,7 +1082,7 @@ public final void clear() {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean contains(Object t) {
         return list().contains(t);
     }
@@ -1090,7 +1090,7 @@ public final boolean contains(Object t) {
     /**
      * @see io.qt.core.QList#count()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int count() {
         return list().count();
     }
@@ -1098,7 +1098,7 @@ public final int count() {
     /**
      * @see io.qt.core.QList#count(java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int count(java.util.List<java.lang.Object> t) {
         return list().count(t);
     }
@@ -1106,7 +1106,7 @@ public final int count(java.util.List<java.lang.Object> t) {
     /**
      * @see io.qt.core.QList#endsWith(java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean endsWith(java.util.List<java.lang.Object> t) {
         return list().endsWith(t);
     }
@@ -1114,7 +1114,7 @@ public final boolean endsWith(java.util.List<java.lang.Object> t) {
     /**
      * @see io.qt.core.QList#first()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final java.util.List<java.lang.Object> first() {
         return list().first();
     }
@@ -1122,7 +1122,7 @@ public final java.util.List<java.lang.Object> first() {
     /**
      * @see io.qt.core.QList#indexOf(java.util.List,int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int indexOf(java.util.List<java.lang.Object> t, int from) {
         return list().indexOf(t, from);
     }
@@ -1130,7 +1130,7 @@ public final int indexOf(java.util.List<java.lang.Object> t, int from) {
     /**
      * @see io.qt.core.QList#insert(int,java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void insert(int i, java.util.List<java.lang.Object> t) {
         list().insert(i, t);
     }
@@ -1139,7 +1139,7 @@ public final void insert(int i, java.util.List<java.lang.Object> t) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean isEmpty() {
         return list().isEmpty();
     }
@@ -1147,7 +1147,7 @@ public final boolean isEmpty() {
     /**
      * @see io.qt.core.QList#last()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final java.util.List<java.lang.Object> last() {
         return list().last();
     }
@@ -1156,7 +1156,7 @@ public final java.util.List<java.lang.Object> last() {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int lastIndexOf(Object t) {
         return list().lastIndexOf(t);
     }
@@ -1164,7 +1164,7 @@ public final int lastIndexOf(Object t) {
     /**
      * @see io.qt.core.QList#lastIndexOf(java.util.List,int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int lastIndexOf(java.util.List<java.lang.Object> t, int from) {
         return list().lastIndexOf(t, from);
     }
@@ -1172,7 +1172,7 @@ public final int lastIndexOf(java.util.List<java.lang.Object> t, int from) {
     /**
      * @see io.qt.core.QList#length()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int length() {
         return list().length();
     }
@@ -1180,7 +1180,7 @@ public final int length() {
     /**
      * @see io.qt.core.QList#mid(int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QList<java.util.List<java.lang.Object>> mid(int pos) {
         return list().mid(pos);
     }
@@ -1188,7 +1188,7 @@ public final QList<java.util.List<java.lang.Object>> mid(int pos) {
     /**
      * @see io.qt.core.QList#mid(int,int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QList<java.util.List<java.lang.Object>> mid(int pos, int length) {
         return list().mid(pos, length);
     }
@@ -1196,7 +1196,7 @@ public final QList<java.util.List<java.lang.Object>> mid(int pos, int length) {
     /**
      * @see io.qt.core.QList#move(int,int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void move(int from, int to) {
         list().move(from, to);
     }
@@ -1204,7 +1204,7 @@ public final void move(int from, int to) {
     /**
      * @see io.qt.core.QList#prepend(java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void prepend(java.util.List<java.lang.Object> t) {
         list().prepend(t);
     }
@@ -1212,7 +1212,7 @@ public final void prepend(java.util.List<java.lang.Object> t) {
     /**
      * @see io.qt.core.QList#removeAll(java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int removeAll(java.util.List<java.lang.Object> t) {
         return list().removeAll(t);
     }
@@ -1220,7 +1220,7 @@ public final int removeAll(java.util.List<java.lang.Object> t) {
     /**
      * @see io.qt.core.QList#removeAt(int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void removeAt(int i) {
         list().removeAt(i);
     }
@@ -1228,7 +1228,7 @@ public final void removeAt(int i) {
     /**
      * @see io.qt.core.QList#removeOnt(java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean removeOne(java.util.List<java.lang.Object> t) {
         return list().removeOne(t);
     }
@@ -1236,7 +1236,7 @@ public final boolean removeOne(java.util.List<java.lang.Object> t) {
     /**
      * @see io.qt.core.QList#replace(int,java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void replace(int i, java.util.List<java.lang.Object> t) {
         list().replace(i, t);
     }
@@ -1244,7 +1244,7 @@ public final void replace(int i, java.util.List<java.lang.Object> t) {
     /**
      * @see io.qt.core.QList#reserve(int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void reserve(int size) {
         list().reserve(size);
     }
@@ -1253,7 +1253,7 @@ public final void reserve(int size) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int size() {
         return list().size();
     }
@@ -1261,7 +1261,7 @@ public final int size() {
     /**
      * @see io.qt.core.QList#startsWith(java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean startsWith(java.util.List<java.lang.Object> t) {
         return list().startsWith(t);
     }
@@ -1269,7 +1269,7 @@ public final boolean startsWith(java.util.List<java.lang.Object> t) {
     /**
      * @see io.qt.core.QList#takeAt(int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final java.util.List<java.lang.Object> takeAt(int i) {
         return list().takeAt(i);
     }
@@ -1277,7 +1277,7 @@ public final java.util.List<java.lang.Object> takeAt(int i) {
     /**
      * @see io.qt.core.QList#takeFirst()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final java.util.List<java.lang.Object> takeFirst() {
         return list().takeFirst();
     }
@@ -1285,7 +1285,7 @@ public final java.util.List<java.lang.Object> takeFirst() {
     /**
      * @see io.qt.core.QList#takeLast()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final java.util.List<java.lang.Object> takeLast() {
         return list().takeLast();
     }
@@ -1293,7 +1293,7 @@ public final java.util.List<java.lang.Object> takeLast() {
     /**
      * @see io.qt.core.QList#value(int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final java.util.List<java.lang.Object> value(int i) {
         return list().value(i);
     }
@@ -1301,7 +1301,7 @@ public final java.util.List<java.lang.Object> value(int i) {
     /**
      * @see io.qt.core.QList#value(int,java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final java.util.List<java.lang.Object> value(int i, java.util.List<java.lang.Object> defaultValue) {
         return list().value(i, defaultValue);
     }
@@ -1310,7 +1310,7 @@ public final java.util.List<java.lang.Object> value(int i, java.util.List<java.l
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean equals(Object other) {
         return list().equals(other);
     }
@@ -1319,7 +1319,7 @@ public boolean equals(Object other) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public int hashCode() {
         return list().hashCode();
     }
@@ -1328,7 +1328,7 @@ public int hashCode() {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean add(java.util.List<java.lang.Object> e) {
         return list().add(e);
     }
@@ -1337,7 +1337,7 @@ public boolean add(java.util.List<java.lang.Object> e) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public void add(int index, java.util.List<java.lang.Object> e) {
         list().add(index, e);
     }
@@ -1346,7 +1346,7 @@ public void add(int index, java.util.List<java.lang.Object> e) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public java.util.List<java.lang.Object> set(int index, java.util.List<java.lang.Object> e) {
         return list().set(index, e);
     }
@@ -1355,7 +1355,7 @@ public java.util.List<java.lang.Object> set(int index, java.util.List<java.lang.
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public boolean remove(Object e) {
         return list().remove(e);
     }
@@ -1364,7 +1364,7 @@ public boolean remove(Object e) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public int indexOf(Object e) {
         return list().indexOf(e);
     }
@@ -1373,7 +1373,7 @@ public int indexOf(Object e) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public java.util.List<java.lang.Object> get(int index) {
         return list().get(index);
     }
@@ -1381,7 +1381,7 @@ public java.util.List<java.lang.Object> get(int index) {
     /**
      * @see io.qt.core.QList#swapItemsAt(int,int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void swapItemsAt(int i, int j) {
         list().swapItemsAt(i, j);
     }
@@ -1390,7 +1390,7 @@ public final void swapItemsAt(int i, int j) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void replaceAll(UnaryOperator<java.util.List<java.lang.Object>> operator) {
         list().replaceAll(operator);
     }
@@ -1398,7 +1398,7 @@ public final void replaceAll(UnaryOperator<java.util.List<java.lang.Object>> ope
     /**
      * @see io.qt.core.QList#writeTo(QDataStream)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public void writeTo(QDataStream stream) {
         list().writeTo(stream);
     }
@@ -1406,7 +1406,7 @@ public void writeTo(QDataStream stream) {
     /**
      * @see io.qt.core.QList#readFrom(QDataStream)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public void readFrom(QDataStream stream) {
         list().readFrom(stream);
     }
@@ -1415,7 +1415,7 @@ public void readFrom(QDataStream stream) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void sort(Comparator<? super java.util.List<java.lang.Object>> c) {
         list().sort(c);
     }
@@ -1424,7 +1424,7 @@ public final void sort(Comparator<? super java.util.List<java.lang.Object>> c) {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final boolean removeIf(Predicate<? super java.util.List<java.lang.Object>> filter) {
         return list().removeIf(filter);
     }
@@ -1433,7 +1433,7 @@ public final boolean removeIf(Predicate<? super java.util.List<java.lang.Object>
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final Spliterator<java.util.List<java.lang.Object>> spliterator() {
         return list().spliterator();
     }
@@ -1442,7 +1442,7 @@ public final Spliterator<java.util.List<java.lang.Object>> spliterator() {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final Stream<java.util.List<java.lang.Object>> stream() {
         return list().stream();
     }
@@ -1451,7 +1451,7 @@ public final Stream<java.util.List<java.lang.Object>> stream() {
      * {@inheritDoc}
      */
     @Override
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final Stream<java.util.List<java.lang.Object>> parallelStream() {
         return list().parallelStream();
     }
@@ -1459,7 +1459,7 @@ public final Stream<java.util.List<java.lang.Object>> parallelStream() {
     /**
      * @see io.qt.core.QList#removeFirst()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void removeFirst() {
         list().removeFirst();
     }
@@ -1467,7 +1467,7 @@ public final void removeFirst() {
     /**
      * @see io.qt.core.QList#removeLast()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void removeLast() {
         list().removeLast();
     }
@@ -1477,7 +1477,7 @@ class QSignalSpy_5_{
     /**
      * @see io.qt.core.QList#toSet()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final QSet<java.util.List<java.lang.Object>> toSet()    {
         return list().toSet();
     }
@@ -1487,7 +1487,7 @@ class QSignalSpy_6_{
     /**
      * @see io.qt.core.QList#fill(java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void fill(java.util.List<java.lang.Object> t) {
         list().fill(t);
     }
@@ -1495,7 +1495,7 @@ public final void fill(java.util.List<java.lang.Object> t) {
     /**
      * @see io.qt.core.QList#fill(java.util.List,int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void fill(java.util.List<java.lang.Object> t, int size) {
         list().fill(t, size);
     }
@@ -1503,7 +1503,7 @@ public final void fill(java.util.List<java.lang.Object> t, int size) {
     /**
      * @see io.qt.core.QList#insert(int,int,java.util.List)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void insert(int i, int n, java.util.List<java.lang.Object> t) {
         list().insert(i, n, t);
     }
@@ -1511,7 +1511,7 @@ public final void insert(int i, int n, java.util.List<java.lang.Object> t) {
     /**
      * @see io.qt.core.QList#remove(int,int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void remove(int i, int n) {
         list().remove(i, n);
     }
@@ -1519,7 +1519,7 @@ public final void remove(int i, int n) {
     /**
      * @see io.qt.core.QList#capacity()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final int capacity() {
         return list().capacity();
     }
@@ -1527,7 +1527,7 @@ public final int capacity() {
     /**
      * @see io.qt.core.QList#resize(int)
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void resize(int size) {
         list().resize(size);
     }
@@ -1535,7 +1535,7 @@ public final void resize(int size) {
     /**
      * @see io.qt.core.QList#squeeze()
      */
-    @io.qt.QtUninvokable
+    @QtUninvokable
     public final void squeeze() {
         list().squeeze();
     }
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiWidgets.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiWidgets.java
index 7b7af70e..a97c987f 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiWidgets.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiWidgets.java
@@ -33,7 +33,7 @@
 package generator;
 
 import io.qt.*;
-import io.qt.QtUtilities;
+import QtUtilities;
 import io.qt.internal.QtJambiObject.QPrivateConstructor;
 import io.qt.core.QCoreApplication;
 import io.qt.core.QPoint;
@@ -295,14 +295,14 @@ public final void setShortcut(QKeySequence.StandardKey key) {
 }// class
 
 class QLayout___ extends QLayout {
-    @io.qt.QtUninvokable
-    public final void addWidget(io.qt.widgets.QWidget w){
+    @QtUninvokable
+    public final void addWidget(io.qt.widgets.@Nullable QWidget w){
         add_widget(w);
     }
 }// class
 
 class QBoxLayout___ extends QBoxLayout {
-    @io.qt.QtUninvokable
+    @QtUninvokable
     void add_widget(QWidget widget){
         addWidget(widget, 0);
     }
@@ -330,8 +330,8 @@ class QColorDialog__java_{
     /**
      * <p>See <a href="https://doc.qt.io/qt/qcolordialog.html#open">QColorDialog::open(QObject *, const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void open(io.qt.core.QMetaObject.Slot1<io.qt.gui.QColor> selectedSlot) {
+    @QtUninvokable
+    public final void open(io.qt.core.QMetaObject.@StrictNonNull Slot1<io.qt.gui.@NonNull QColor> selectedSlot) {
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromMethod(java.util.Objects.requireNonNull(selectedSlot));
         if(metaMethod==null || !metaMethod.isValid()) {
             throw new IllegalArgumentException("Unable to detect slot for given handle.");
@@ -352,8 +352,8 @@ public final void open(io.qt.core.QMetaObject.Slot1<io.qt.gui.QColor> selectedSl
     /**
      * <p>See <a href="https://doc.qt.io/qt/qcolordialog.html#open">QColorDialog::open(QObject *, const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void open(io.qt.core.QMetaObject.Connectable1<io.qt.gui.QColor> selectedSignal) {
+    @QtUninvokable
+    public final void open(io.qt.core.QMetaObject.@StrictNonNull Connectable1<io.qt.gui.@NonNull QColor> selectedSignal) {
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromSignal(selectedSignal);
         if(metaMethod==null || !metaMethod.isValid()) {
             throw new IllegalArgumentException("Unable to detect signal for given handle.");
@@ -377,8 +377,8 @@ class QFontDialog__java_ extends QFontDialog {
     /**
      * <p>See <a href="https://doc.qt.io/qt/qfontdialog.html#open">QFontDialog::open(QObject *, const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void open(io.qt.core.QMetaObject.Slot1<io.qt.gui.QFont> selectedSlot) {
+    @QtUninvokable
+    public final void open(io.qt.core.QMetaObject.@StrictNonNull Slot1<io.qt.gui.@NonNull QFont> selectedSlot) {
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromMethod(java.util.Objects.requireNonNull(selectedSlot));
         if(metaMethod==null || !metaMethod.isValid()) {
             throw new IllegalArgumentException("Unable to detect slot for given handle.");
@@ -399,8 +399,8 @@ public final void open(io.qt.core.QMetaObject.Slot1<io.qt.gui.QFont> selectedSlo
     /**
      * <p>See <a href="https://doc.qt.io/qt/qfontdialog.html#open">QFontDialog::open(QObject *, const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void open(io.qt.core.QMetaObject.Connectable1<io.qt.gui.QFont> selectedSignal) {
+    @QtUninvokable
+    public final void open(io.qt.core.QMetaObject.@StrictNonNull Connectable1<io.qt.gui.@NonNull QFont> selectedSignal) {
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromSignal(selectedSignal);
         if(metaMethod==null || !metaMethod.isValid()) {
             throw new IllegalArgumentException("Unable to detect signal for given handle.");
@@ -430,7 +430,7 @@ class QFileDialog__java_ extends QFileDialog {
      * <a href="https://doc.qt.io/qt/qfiledialog.html#getSaveFileUrl">QFileDialog::getSaveFileUrl(QWidget*,QString,QUrl,QString,QString*,Options,QStringList)</a>.
      */
     public static final class Result<R> {
-        @io.qt.NativeAccess
+        @NativeAccess
         private Result(R result, String selectedFilter) {
             this.result = result;
             this.selectedFilter = selectedFilter;
@@ -443,36 +443,36 @@ private Result(R result, String selectedFilter) {
     /**
      * <p>See <a href="https://doc.qt.io/qt/qfiledialog.html#getExistingDirectoryUrl">QFileDialog::getExistingDirectoryUrl(QWidget*,QString,QUrl,Options,QStringList)</a></p>
      */
-    public static io.qt.core.QUrl getExistingDirectoryUrl(io.qt.widgets.QWidget parent, java.lang.String caption, io.qt.core.QUrl dir, java.util.Collection<java.lang.String> supportedSchemes, io.qt.widgets.QFileDialog.Option... options){
+    public static io.qt.core.@NonNull QUrl getExistingDirectoryUrl(io.qt.widgets.@Nullable QWidget parent, java.lang.@NonNull String caption, io.qt.core.@NonNull QUrl dir, java.util.@NonNull Collection<java.lang.@NonNull String> supportedSchemes, io.qt.widgets.QFileDialog.@NonNull Option @NonNull... options){
         return getExistingDirectoryUrl(parent, caption, dir, new io.qt.widgets.QFileDialog.Options(options), supportedSchemes);
     }
     
     /**
      * <p>See <a href="https://doc.qt.io/qt/qfiledialog.html#getOpenFileUrl">QFileDialog::getOpenFileUrl(QWidget*,QString,QUrl,QString,QString*,Options,QStringList)</a></p>
      */
-    public static io.qt.widgets.QFileDialog.Result<io.qt.core.QUrl> getOpenFileUrl(io.qt.widgets.QWidget parent, java.lang.String caption, io.qt.core.QUrl dir, java.lang.String filter, java.util.Collection<java.lang.String> supportedSchemes, io.qt.widgets.QFileDialog.Option... options){
+    public static io.qt.widgets.QFileDialog.@NonNull Result<io.qt.core.@NonNull QUrl> getOpenFileUrl(io.qt.widgets.@Nullable QWidget parent, java.lang.@NonNull String caption, io.qt.core.@NonNull QUrl dir, java.lang.@NonNull String filter, java.util.@NonNull Collection<java.lang.@NonNull String> supportedSchemes, io.qt.widgets.QFileDialog.@NonNull Option @NonNull... options){
         return getOpenFileUrl(parent, caption, dir, filter, io.qt.widgets.QFileDialog.Option.flags(options), supportedSchemes);
     }
     
     /**
      * <p>See <a href="https://doc.qt.io/qt/qfiledialog.html#getOpenFileUrls">QFileDialog::getOpenFileUrls(QWidget*,QString,QUrl,QString,QString*,Options,QStringList)</a></p>
      */
-    public static io.qt.widgets.QFileDialog.Result<java.util.List<io.qt.core.QUrl>> getOpenFileUrls(io.qt.widgets.QWidget parent, java.lang.String caption, io.qt.core.QUrl dir, java.lang.String filter, java.util.Collection<java.lang.String> supportedSchemes, io.qt.widgets.QFileDialog.Option... options){
+    public static io.qt.widgets.QFileDialog.@NonNull Result<io.qt.core.@NonNull QList<io.qt.core.@NonNull QUrl>> getOpenFileUrls(io.qt.widgets.@Nullable QWidget parent, java.lang.@NonNull String caption, io.qt.core.@NonNull QUrl dir, java.lang.@NonNull String filter, java.util.Collection<java.lang.String> supportedSchemes, io.qt.widgets.QFileDialog.@NonNull Option @NonNull... options){
         return getOpenFileUrls(parent, caption, dir, filter, io.qt.widgets.QFileDialog.Option.flags(options), supportedSchemes);
     }
     
     /**
      * <p>See <a href="https://doc.qt.io/qt/qfiledialog.html#getSaveFileUrl">QFileDialog::getSaveFileUrl(QWidget*,QString,QUrl,QString,QString*,Options,QStringList)</a></p>
      */
-    public static io.qt.widgets.QFileDialog.Result<io.qt.core.QUrl> getSaveFileUrl(io.qt.widgets.QWidget parent, java.lang.String caption, io.qt.core.QUrl dir, java.lang.String filter, java.util.Collection<java.lang.String> supportedSchemes, io.qt.widgets.QFileDialog.Option... options){
+    public static io.qt.widgets.QFileDialog.@NonNull Result<io.qt.core.@NonNull QUrl> getSaveFileUrl(io.qt.widgets.@Nullable QWidget parent, java.lang.String caption, io.qt.core.@NonNull QUrl dir, java.lang.@NonNull String filter, java.util.@NonNull Collection<java.lang.@NonNull String> supportedSchemes, io.qt.widgets.QFileDialog.@NonNull Option @NonNull... options){
         return getSaveFileUrl(parent, caption, dir, filter, io.qt.widgets.QFileDialog.Option.flags(options), supportedSchemes);
     }
     
     /**
      * <p>See <a href="https://doc.qt.io/qt/qfiledialog.html#open">QFileDialog::open(QObject *, const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void open(io.qt.core.QMetaObject.Slot1<?> selectedSlot) {
+    @QtUninvokable
+    public final void open(io.qt.core.QMetaObject.@StrictNonNull Slot1<?> selectedSlot) {
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromMethod(java.util.Objects.requireNonNull(selectedSlot));
         if(metaMethod==null || !metaMethod.isValid()) {
             throw new IllegalArgumentException("Unable to detect slot for given handle.");
@@ -499,8 +499,8 @@ public final void open(io.qt.core.QMetaObject.Slot1<?> selectedSlot) {
     /**
      * <p>See <a href="https://doc.qt.io/qt/qfiledialog.html#open">QFileDialog::open(QObject *, const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void open(io.qt.core.QMetaObject.Connectable1<?> selectedSignal) {
+    @QtUninvokable
+    public final void open(io.qt.core.QMetaObject.@StrictNonNull Connectable1<?> selectedSignal) {
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromSignal(selectedSignal);
         if(metaMethod==null || !metaMethod.isValid()) {
             throw new IllegalArgumentException("Unable to detect signal for given handle.");
@@ -530,8 +530,8 @@ class QInputDialog__java_ extends QInputDialog {
     /**
      * <p>See <a href="https://doc.qt.io/qt/qinputdialog.html#open">QInputDialog::open(QObject *, const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void open(io.qt.core.QMetaObject.Slot0 selectedSlot) {
+    @QtUninvokable
+    public final void open(io.qt.core.QMetaObject.@StrictNonNull Slot0 selectedSlot) {
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromMethod(java.util.Objects.requireNonNull(selectedSlot));
         if(metaMethod==null || !metaMethod.isValid()) {
             throw new IllegalArgumentException("Unable to detect slot for given handle.");
@@ -549,8 +549,8 @@ public final void open(io.qt.core.QMetaObject.Slot0 selectedSlot) {
     /**
      * <p>See <a href="https://doc.qt.io/qt/qinputdialog.html#open">QInputDialog::open(QObject *, const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void open(io.qt.core.QMetaObject.Slot1<?> selectedSlot) {
+    @QtUninvokable
+    public final void open(io.qt.core.QMetaObject.@StrictNonNull Slot1<?> selectedSlot) {
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromMethod(java.util.Objects.requireNonNull(selectedSlot));
         if(metaMethod==null || !metaMethod.isValid()) {
             throw new IllegalArgumentException("Unable to detect slot for given handle.");
@@ -574,8 +574,8 @@ public final void open(io.qt.core.QMetaObject.Slot1<?> selectedSlot) {
     /**
      * <p>See <a href="https://doc.qt.io/qt/qinputdialog.html#open">QInputDialog::open(QObject *, const char *)</a></p>
      */
-    @io.qt.QtUninvokable
-    public final void open(io.qt.core.QMetaObject.Connectable1<?> selectedSignal) {
+    @QtUninvokable
+    public final void open(io.qt.core.QMetaObject.@StrictNonNull Connectable1<?> selectedSignal) {
         io.qt.core.QMetaMethod metaMethod = io.qt.core.QMetaMethod.fromSignal(selectedSignal);
         if(metaMethod==null || !metaMethod.isValid()) {
             throw new IllegalArgumentException("Unable to detect signal for given handle.");
@@ -611,7 +611,7 @@ class QSplitter___ extends QSplitter {
          * Result class for <a href="https://doc.qt.io/qt/qsplitter.html#getRange">QSplitter::getRange(int,int*,int*)const</a>.
          */
         public static final class Range {
-            @io.qt.NativeAccess
+            @NativeAccess
             private Range(int min, int max) {
                 minimum = min;
                 maximum = max;
@@ -661,11 +661,11 @@ public final void setIcon(QPixmap pm) {
 
 class QApplication___ extends QApplication {
 
-        public static QApplication initialize(String args[]) {
+        public static @NonNull QApplication initialize(String args @StrictNonNull[]) {
             return io.qt.core.QCoreApplication.initialize(null, args, QApplication::new);
         }
 
-        public static QApplication initialize(String applicationName, String args[]) {
+        public static @NonNull QApplication initialize(String applicationName, String args @StrictNonNull[]) {
             return io.qt.core.QCoreApplication.initialize(applicationName, args, QApplication::new);
         }
 
@@ -673,7 +673,7 @@ public static void shutdown() {
             io.qt.core.QCoreApplication.shutdown();
         }
         
-        public static QApplication instance() {
+        public static @Nullable QApplication instance() {
             io.qt.core.QCoreApplication app = io.qt.core.QCoreApplication.instance();
             if (app instanceof QApplication)
                 return (QApplication) app;
@@ -702,450 +702,14 @@ class QGraphicsWidget___ extends QGraphicsWidget {
         /**
          * @see #getWindowFrameMargins(double[])
          */
-        @io.qt.QtUninvokable
-        public final io.qt.core.QMarginsF windowFrameMargins() {
+        @QtUninvokable
+        public final io.qt.core.@NonNull QMarginsF windowFrameMargins() {
             double[] mrg = {0.0, 0.0, 0.0, 0.0};
             getWindowFrameMargins(mrg);
             return new io.qt.core.QMarginsF(mrg[0], mrg[1], mrg[2], mrg[3]);
         }
 }// class
 
-class QListWidget___ extends QListWidget {
-
-        /**
-         * Inserts an item with the text label at the end of the list widget.
-         *
-         * @param label The text of the new item.
-         */
-        public final void addItem(String label) {
-            addItem(new QListWidgetItem(label, this));
-        }
-
-        /**
-         * Inserts items with the text labels at the end of the list widget.
-         *
-         * @param labels The collection of labels for the new items.
-         */
-        public final void addItems(java.util.List<String> labels) {
-        for (String label : labels)
-                addItem(label);
-        }
-
-        /**
-         * This is an overloaded member function, provided for convenience.
-         * Inserts an item with the text label in the list widget at the position given by row.
-         *
-         * @param row The position in which to insert the new item.
-         * @param label The text of the new item.
-         */
-        public final void insertItem(int row, String label) {
-            insertItem(row, new QListWidgetItem(label, this));
-        }
-
-        /**
-         * Inserts items from the list of labels into the list, starting at the given row.
-         *
-         * @param row The position in which to insert the new items.
-         * @param labels The collection of labels for the new items.
-         */
-        public final void insertItems(int row, java.util.List<String> labels) {
-        for (String label : labels)
-                insertItem(row++, label);
-        }
-}// class
-
-class QGraphicsScene___ extends QGraphicsScene {
-        /**
-         * Equivalent to addEllipse(rect, null, null)
-         */
-        public final QGraphicsEllipseItem addEllipse(io.qt.core.QRectF rect) {
-            return addEllipse(rect, null);
-        }
-
-        /**
-         * Equivalent to addEllipse(rect, pen, null)
-         */
-        public final QGraphicsEllipseItem addEllipse(io.qt.core.QRectF rect, QPen pen) {
-            return addEllipse(rect, pen, null);
-        }
-
-
-        /**
-         * Creates and adds an ellipse item to the scene, and returns the item
-         * reference. The geometry of the ellipse is defined by rect, and its pen
-         * and brush are initialized to pen and brush.
-         *
-         * Note that the item's geometry is provided in item coordinates, and its
-         * position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem::isVisible() returns true),
-         * QGraphicsScene will emit changed() once control goes back to the event
-         * loop.
-         *
-         * @param rect The bounding rectangle of the ellipse.
-         * @param pen The pen for the resulting QGraphicsEllipseItem.
-         * @param brush The brush for the resulting QGraphicsEllipseItem.
-         * @return The resulting item.
-         */
-        public final QGraphicsEllipseItem addEllipse(io.qt.core.QRectF rect, QPen pen, QBrush brush) {
-            return addEllipse(rect.x(), rect.y(), rect.width(), rect.height(), pen, brush);
-        }
-
-        /**
-         * Equivalent to addEllipse(x, y, w, h, null, null)
-         */
-        public final QGraphicsEllipseItem addEllipse(double x, double y, double w, double h) {
-            return addEllipse(x, y, w, h, null);
-        }
-
-        /**
-         * Equivalent to addEllipse(x, y, w, h, pen, null)
-         */
-        public final QGraphicsEllipseItem addEllipse(double x, double y, double w, double h, QPen pen) {
-            return addEllipse(x, y, w, h, pen, null);
-        }
-
-        /**
-         * Creates and adds an ellipse item to the scene, and returns the item
-         * reference. The geometry of the ellipse is defined by x, y, w, h, and its pen
-         * and brush are initialized to pen and brush.
-         *
-         * Note that the item's geometry is provided in item coordinates, and its
-         * position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param x The left horizontal coordinate of the ellipse's bounding rectangle.
-         * @param y The top vertical coordinate of the ellipse's bounding rectangle.
-         * @param w The width of the ellipse's bounding rectangle.
-         * @param h The height of the ellipse's bounding rectangle.
-         * @param pen The pen for the resulting QGraphicsEllipseItem.
-         * @param brush The brush for the resulting QGraphicsEllipseItem.
-         * @return The resulting item.
-         */
-        public final QGraphicsEllipseItem addEllipse(double x, double y, double w, double h, QPen pen, QBrush brush) {
-            QGraphicsEllipseItem item = new QGraphicsEllipseItem(x, y, w, h);
-            item.setPen(pen);
-            item.setBrush(brush);
-
-            addItem(item);
-
-            return item;
-        }
-
-        /**
-         * Equivalent to addLine(line, null)
-         */
-        public final QGraphicsLineItem addLine(QLineF line) {
-            return addLine(line, null);
-        }
-
-        /**
-         * Creates and adds a line item to the scene, and returns the item
-         * reference. The geometry of the line is defined by line, and its pen
-         * is initialized to pen.
-         *
-         * Note that the item's geometry is provided in item coordinates, and its
-         * position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param line The definition of the line.
-         * @param pen The pen with which to draw the line.
-         * @return The resulting item.
-         */
-        public final QGraphicsLineItem addLine(QLineF line, QPen pen) {
-            return addLine(line.x1(), line.y1(), line.x2(), line.y2(), pen);
-        }
-
-        /**
-         * Equivalent to addLine(x1, y1, x2, y2, null)
-         */
-        public final QGraphicsLineItem addLine(double x1, double y1, double x2, double y2) {
-            return addLine(x1, y1, x2, y2, null);
-        }
-
-        /**
-         * Creates and adds a line item to the scene, and returns the item
-         * reference. The geometry of the line is defined by x1, y1, x2, y2, and its pen
-         * is initialized to pen.
-         *
-         * Note that the item's geometry is provided in item coordinates, and its
-         * position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param x1 The first horizontal coordinate of the line.
-         * @param y1 The first vertical coordinate of the line.
-         * @param x2 The second horizontal coordinate of the line.
-         * @param y2 The second vertical coordinate of the line.
-         * @param pen The pen with which to draw the line.
-         * @return The resulting item.
-         */
-        public final QGraphicsLineItem addLine(double x1, double y1, double x2, double y2, QPen pen) {
-            QGraphicsLineItem item = new QGraphicsLineItem(x1, y1, x2, y2);
-            item.setPen(pen);
-
-            addItem(item);
-
-            return item;
-        }
-
-
-        /**
-         * Equivalent to addPath(path, null, null)
-         */
-        public final QGraphicsPathItem addPath(QPainterPath path) {
-            return addPath(path, null);
-        }
-
-        /**
-         * Equivalent to addPath(path, pen, null)
-         */
-        public final QGraphicsPathItem addPath(QPainterPath path, QPen pen) {
-            return addPath(path, pen, null);
-        }
-        /**
-         * Creates and adds a path item to the scene, and returns the item
-         * reference. The geometry of the path is defined by path, and its pen and
-         * brush are initialized to pen and brush.
-         *
-         * Note that the item's geometry is provided in item coordinates, and its
-         * position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param path The definition of the path.
-         * @param pen The pen for drawing the path.
-         * @param brush The brush for drawing the path.
-         * @return The resulting item.
-         */
-        public final QGraphicsPathItem addPath(QPainterPath path, QPen pen, QBrush brush) {
-            QGraphicsPathItem item = new QGraphicsPathItem(path);
-            item.setPen(pen);
-            item.setBrush(brush);
-
-            addItem(item);
-
-            return item;
-        }
-
-        /**
-         * Creates and adds a pixmap item to the scene, and returns the item
-         * reference. The pixmap is defined by pixmap.
-         *
-         * Note that the item's geometry is provided in item coordinates, and its
-         * position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param pixmap The pixmap for which to create a graphics item.
-         * @return The resulting item.
-         */
-        public final QGraphicsPixmapItem addPixmap(QPixmap pixmap) {
-            QGraphicsPixmapItem item = new QGraphicsPixmapItem(pixmap);
-
-            addItem(item);
-
-            return item;
-        }
-
-        /**
-         * Equivalent to addPolygon(polygon, null, null)
-         */
-        public final QGraphicsPolygonItem addPolygon(QPolygonF polygon) {
-            return addPolygon(polygon, null);
-        }
-
-        /**
-         * Equivalent to addPolygon(polygon, pen, null)
-         */
-        public final QGraphicsPolygonItem addPolygon(QPolygonF polygon, QPen pen) {
-            return addPolygon(polygon, pen, null);
-        }
-
-        /**
-         * Creates and adds a polygon item to the scene, and returns the item
-         * reference. The polygon is defined by polygon, and its pen and
-         * brush are initialized to pen and brush.
-         *
-         * Note that the item's geometry is provided in item coordinates, and its
-         * position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param polygon The definition of the polygon.
-         * @param pen The pen with which to draw the polygon.
-         * @param brush The brush with which to draw the polygon.
-         * @return The resulting item.
-         */
-        public final QGraphicsPolygonItem addPolygon(QPolygonF polygon, QPen pen, QBrush brush) {
-            QGraphicsPolygonItem item = new QGraphicsPolygonItem(polygon);
-            item.setPen(pen);
-            item.setBrush(brush);
-
-            addItem(item);
-
-            return item;
-        }
-
-        /**
-         * Equivalent to addRect(rect, null, null)
-         */
-        public final QGraphicsRectItem addRect(io.qt.core.QRectF rect) {
-            return addRect(rect, null);
-        }
-
-        /**
-         * Equivalent to addRect(rect, pen, null)
-         */
-        public final QGraphicsRectItem addRect(io.qt.core.QRectF rect, QPen pen) {
-            return addRect(rect, pen, null);
-        }
-
-        /**
-         * Creates and adds a rectangle item to the scene, and returns the item
-         * reference. The geometry of the rectangle is defined by rect, and its pen
-         * and brush are initialized to pen and brush.
-         *
-         * Note that the item's geometry is provided in item coordinates, and its
-         * position is initialized to (0, 0). For example, if a QRect(50, 50, 100,
-         * 100) is added, its top-left corner will be at (50, 50) relative to the
-         * origin in the item's coordinate system.
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param rect The definition of the rectangle.
-         * @param pen The pen with which to draw the rectangle.
-         * @param brush The brush with which to draw the rectangle.
-         * @return The resulting item.
-         */
-        public final QGraphicsRectItem addRect(io.qt.core.QRectF rect, QPen pen, QBrush brush) {
-            return addRect(rect.x(), rect.y(), rect.width(), rect.height(), pen, brush);
-        }
-
-        /**
-         * Equivalent to addRect(x, y, w, h, null, null)
-         */
-        public final QGraphicsRectItem addRect(double x, double y, double w, double h) {
-            return addRect(x, y, w, h, null);
-        }
-
-        /**
-         * Equivalent to addRect(x, y, w, h, pen, null)
-         */
-        public final QGraphicsRectItem addRect(double x, double y, double w, double h, QPen pen) {
-            return addRect(x, y, w, h, pen, null);
-        }
-
-        /**
-         * Creates and adds a rectangle item to the scene, and returns the item
-         * reference. The geometry of the rectangle is defined by x, y, w, h, and its pen
-         * and brush are initialized to pen and brush.
-         *
-         * Note that the item's geometry is provided in item coordinates, and its
-         * position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param x The left horizontal coordinate of the rectangle.
-         * @param y The top vertical coordinate of the rectangle.
-         * @param w The width of the rectangle.
-         * @param h The height of the rectangle.
-         * @param pen The pen with which to draw the rectangle.
-         * @param brush The brush with which to draw the rectangle.
-         * @return The resulting item.
-         */
-        public final QGraphicsRectItem addRect(double x, double y, double w, double h, QPen pen, QBrush brush) {
-            QGraphicsRectItem item = new QGraphicsRectItem(x, y, w, h);
-            item.setPen(pen);
-            item.setBrush(brush);
-
-            addItem(item);
-
-            return item;
-        }
-
-        /**
-         * Equivalent to addSimpleText(text, null)
-         */
-        public final QGraphicsSimpleTextItem addSimpleText(String text) {
-            return addSimpleText(text, null);
-        }
-
-        /**
-         * Creates and adds a QGraphicsSimpleTextItem to the scene, and returns the
-         * item reference. The text string is initialized to text, and its font is
-         * initialized to font.
-         *
-         * The item's position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param text The text to add to the scene.
-         * @param font The font to use for displaying the text.
-         * @return The resulting item.
-         */
-        public final QGraphicsSimpleTextItem addSimpleText(String text, QFont font) {
-            QGraphicsSimpleTextItem item = new QGraphicsSimpleTextItem(text);
-            item.setFont(font);
-
-            addItem(item);
-
-            return item;
-        }
-
-        /**
-         * Equivalent to addText(text, null)
-         */
-        public final QGraphicsTextItem addText(String text) {
-            return addText(text, null);
-        }
-
-        /**
-         * Creates and adds a text item to the scene, and returns the item
-         * reference. The text string is initialized to text, and its font
-         * is initialized to font.
-         *
-         * The item's position is initialized to (0, 0).
-         *
-         * If the item is visible (i.e., QGraphicsItem.isVisible() returns true),
-         * QGraphicsScene will emit changed once control goes back to the event
-         * loop.
-         *
-         * @param text The text to add to the scene.
-         * @param font The font to use for displaying the text.
-         * @return The resulting item.
-         */
-        public final QGraphicsTextItem addText(String text, QFont font) {
-            QGraphicsTextItem item = new QGraphicsTextItem(text);
-            item.setFont(font);
-
-            addItem(item);
-
-            return item;
-        }
-
-}// class
-
 class QGraphicsItem___{
     /**
      * Result class for <a href="https://doc.qt.io/qt/qgraphicsitem.html#isBlockedByModalPanel">QGraphicsItem::isBlockedByModalPanel(QGraphicsItem**)const</a>.
@@ -1158,13 +722,13 @@ private BlockedByModalPanelInfo(boolean isBlockedByModalPanel,
             this.modalPanel = modalPanel;
         }
         public final boolean isBlockedByModalPanel;
-        public final QGraphicsItem modalPanel;
+        public final @Nullable QGraphicsItem modalPanel;
     }
 }// class
 
 class QStyle___{
-    @io.qt.QtUninvokable
-    private static SubControl findSubControl(int control, int subControl) {
+    @QtUninvokable
+    private static @NonNull SubControl findSubControl(int control, int subControl) {
         SubControl[] subControls = SubControl.values();
         ComplexControl complexControl = ComplexControl.resolve(control);
         String complexControlName;
@@ -1185,5 +749,18 @@ private static SubControl findSubControl(int control, int subControl) {
     }
 }// class
 
+class QAbstractSpinBox___{
+    /**
+     * @see #fixup(io.qt.core.QString)
+     */
+    @QtUninvokable
+    public final java.lang.@NonNull String fixup(java.lang.@Nullable String string){
+        io.qt.core.QString _string = new io.qt.core.QString(string);
+        fixup(_string);
+        return _string.toString();
+    }
+}// class
+
+
 
 
diff --git a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiXml.java b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiXml.java
index a334b5a4..6d091e6d 100644
--- a/src/cpp/QtJambiGenerator/typesystem/java/QtJambiXml.java
+++ b/src/cpp/QtJambiGenerator/typesystem/java/QtJambiXml.java
@@ -77,10 +77,10 @@ interface QXmlEntityResolver___ extends QXmlEntityResolver {
 
     public static final class ResolvedEntity {
 
-            public final @io.qt.NativeAccess boolean error;
-            public final @io.qt.NativeAccess QXmlInputSource inputSource;
+            public final @NativeAccess boolean error;
+            public final @NativeAccess QXmlInputSource inputSource;
 
-            @io.qt.NativeAccess
+            @NativeAccess
             public ResolvedEntity(boolean error, QXmlInputSource inputSource) {
 
                 this.error = error;
@@ -92,22 +92,3 @@ public ResolvedEntity(boolean error, QXmlInputSource inputSource) {
 
 }// class
 
-class QXmlReader_parse___{
-    JniEnvironment __jni_env{300};
-    jmethodID method_id = __shell_javaMethod(10);
-    if(__jni_env && method_id) {
-        bool  __qt_return_value = false;
-        if(jobject __java_this = __shell()->getJavaObjectLocalRef(__jni_env)){
-            jobject __java_input0 = qtjambi_cast<jobject>(__jni_env, &input0);
-            QTJAMBI_INVALIDATE_AFTER_USE(__jni_env, __java_input0);
-            jboolean __java_return_value = __jni_env->CallBooleanMethod(__java_this, method_id, __java_input0);
-            JavaException::check(__jni_env QTJAMBI_STACKTRACEINFO );
-            __qt_return_value = bool(__java_return_value);
-        } else {
-            __shell()->warnForMethod("QXmlReader::parse(const QXmlInputSource& input)");
-        }
-        return __qt_return_value;
-    }
-}// class
-
-
diff --git a/src/cpp/QtJambiGenerator/typesystem/modification.h b/src/cpp/QtJambiGenerator/typesystem/modification.h
index 181bc5f4..13525357 100644
--- a/src/cpp/QtJambiGenerator/typesystem/modification.h
+++ b/src/cpp/QtJambiGenerator/typesystem/modification.h
@@ -165,7 +165,8 @@ struct Modification {
         NoExcept =              0x02000000,
         BlockExcept =           0x10000000,
         RethrowExcept =         0x20000000,
-        IsPaintMethod =         0x20000000
+        IsPaintMethod =         0x40000000,
+        NoKotlinGetter =        0x80000000
     };
 
     Modification() : modifiers(0) { }
@@ -193,6 +194,7 @@ struct Modification {
     bool isNoExcept() const { return modifiers & NoExcept; }
     bool isBlockExceptions() const { return modifiers & BlockExcept; }
     bool isRethrowExceptions() const { return modifiers & RethrowExcept; }
+    bool isNoKotlinGetter() const { return modifiers & NoKotlinGetter; }
 
     void setRenamedTo(const QString &name) { renamedToName = name; }
     QString renamedTo() const { return renamedToName; }
@@ -202,6 +204,22 @@ struct Modification {
     QString renamedToName;
 };
 
+struct Delegate{
+    QString name;
+    bool isDeprecated;
+    bool isSelfReturning;
+    uint modifiers;
+    CodeSnipList snips;
+
+    Modification::Modifiers accessModifier() const { return Modification::Modifiers(modifiers & Modification::AccessModifierMask); }
+    bool isPrivate() const { return accessModifier() == Modification::Private; }
+    bool isProtected() const { return accessModifier() == Modification::Protected; }
+    bool isPublic() const { return accessModifier() == Modification::Public; }
+    bool isFriendly() const { return accessModifier() == Modification::Friendly; }
+    bool isFinal() const { return modifiers & Modification::Final; }
+    bool isNonFinal() const { return modifiers & Modification::NonFinal && !(modifiers & Modification::NativeDeclFinal); }
+};
+
 struct AbstractFunctionModification: public Modification {
     AbstractFunctionModification() = default;
     AbstractFunctionModification(const AbstractFunctionModification&) = default;
@@ -213,6 +231,7 @@ struct AbstractFunctionModification: public Modification {
     QString targetType;
     QString proxyCall;
     QList<ArgumentModification> argument_mods;
+    QList<Delegate> delegates;
 };
 
 struct Parameter{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DAnimation.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DAnimation.qml
index 74be7a9c..c80bb7ab 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DAnimation.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DAnimation.qml
@@ -31,142 +31,43 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.animation"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "Qt3DAnimation"
     module: "qtjambi.qt3danimation"
     description: "The Qt 3D Animation modules provides a set of prebuilt elements to help you get started with Qt 3D."
-
-    Rejection{
-        className: "Qt3DAnimation::QClipBlendNodeCreatedChange"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannelComponent"
-        functionName: "rbegin"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannelComponent"
-        functionName: "rend"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannelComponent"
-        functionName: "cbegin"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannelComponent"
-        functionName: "cend"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannelComponent"
-        functionName: "crbegin"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannelComponent"
-        functionName: "crend"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannel"
-        functionName: "rbegin"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannel"
-        functionName: "rend"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannel"
-        functionName: "cbegin"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannel"
-        functionName: "cend"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannel"
-        functionName: "crbegin"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QChannel"
-        functionName: "crend"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QAnimationClipData"
-        functionName: "rbegin"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QAnimationClipData"
-        functionName: "rend"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QAnimationClipData"
-        functionName: "cbegin"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QAnimationClipData"
-        functionName: "cend"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QAnimationClipData"
-        functionName: "crbegin"
-    }
-    
-    Rejection{
-        className: "Qt3DAnimation::QAnimationClipData"
-        functionName: "crend"
-    }
     
     NamespaceType{
         name: "Qt3DAnimation"
+        NamespacePrefix{
+            namingPolicy: NamespacePrefix.Cut
+        }
         generate: false
+        Rejection{ className: "QClipBlendNodeCreatedChange" }
         since: [5, 10]
     }
     
-    
-    EnumType{
-        name: "Qt3DAnimation::QAbstractAnimation::AnimationType"
-    }
-    
     ObjectType{
         name: "Qt3DAnimation::QAbstractAnimation"
-        javaName: "QAbstractAnimation"
+        EnumType{ name: "AnimationType" }
         since: [5, 11]
     }
     
     ObjectType{
         name: "Qt3DAnimation::QAbstractAnimationClip"
-        javaName: "QAbstractAnimationClip"
         since: [5, 11]
     }
     
     ObjectType{
         name: "Qt3DAnimation::QAbstractChannelMapping"
-        javaName: "QAbstractChannelMapping"
         since: [5, 11]
     }
     
-    EnumType{
-        name: "Qt3DAnimation::QAbstractClipAnimator::Loops"
-        forceInteger: true
-    }
-    
     ObjectType{
         name: "Qt3DAnimation::QAbstractClipAnimator"
-        javaName: "QAbstractClipAnimator"
+        EnumType{
+            name: "Loops"
+            forceInteger: true
+        }
         ModifyFunction{
             signature: "setChannelMapper(Qt3DAnimation::QChannelMapper *)"
             ModifyArgument{
@@ -190,13 +91,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QAbstractClipBlendNode"
-        javaName: "QAbstractClipBlendNode"
         since: [5, 11]
     }
     
     ObjectType{
         name: "Qt3DAnimation::QAdditiveClipBlend"
-        javaName: "QAdditiveClipBlend"
         ModifyFunction{
             signature: "setBaseClip(Qt3DAnimation::QAbstractClipBlendNode *)"
             ModifyArgument{
@@ -229,32 +128,28 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QAnimationAspect"
-        javaName: "QAnimationAspect"
         since: [5, 11]
     }
     
     ObjectType{
         name: "Qt3DAnimation::QAnimationCallback"
-        javaName: "QAnimationCallback"
+        EnumType{ name: "Flag" }
         since: [5, 11]
     }
     
-    EnumType{
-        name: "Qt3DAnimation::QAnimationCallback::Flag"
-        flags: "Qt3DAnimation::QAnimationCallback::Flags"
-    }
-    
     ObjectType{
         name: "Qt3DAnimation::QAnimationClip"
-        javaName: "QAnimationClip"
         since: [5, 11]
     }
     
     ValueType{
         name: "Qt3DAnimation::QAnimationClipData"
-        javaName: "QAnimationClipData"
-        InjectCode{
-        }
+        Rejection{functionName: "rbegin"}
+        Rejection{functionName: "rend"}
+        Rejection{functionName: "cbegin"}
+        Rejection{functionName: "cend"}
+        Rejection{functionName: "crbegin"}
+        Rejection{functionName: "crend"}
         ModifyFunction{
             signature: "begin() const"
             access: Modification.Protected
@@ -263,36 +158,27 @@ TypeSystem{
             signature: "end() const"
             access: Modification.Protected
         }
-        ModifyFunction{
-            signature: "operator=(const Qt3DAnimation::QAnimationClipData &)"
-            remove: RemoveFlag.All
-        }
-        since: [5, 11]
-    }
 
-    IteratorType{
-        name: "Qt3DAnimation::QAnimationClipData::iterator"
-        isConst: true
-    }
+        IteratorType{
+            name: "iterator"
+            isConst: true
+        }
 
-    IteratorType{
-        name: "Qt3DAnimation::QAnimationClipData::const_iterator"
-        isConst: true
+        IteratorType{
+            name: "const_iterator"
+            isConst: true
+        }
+        since: [5, 11]
     }
     
     ObjectType{
         name: "Qt3DAnimation::QAnimationClipLoader"
-        javaName: "QAnimationClipLoader"
+        EnumType{name: "Status"}
         since: [5, 11]
     }
     
-    EnumType{
-        name: "Qt3DAnimation::QAnimationClipLoader::Status"
-    }
-    
     ObjectType{
         name: "Qt3DAnimation::QAnimationController"
-        javaName: "QAnimationController"
         ModifyFunction{
             signature: "setEntity(Qt3DCore::QEntity *)"
             ModifyArgument{
@@ -339,7 +225,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QAnimationGroup"
-        javaName: "QAnimationGroup"
         ModifyFunction{
             signature: "setAnimations(const QVector<Qt3DAnimation::QAbstractAnimation *>&)"
             InjectCode{
@@ -377,7 +262,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QBlendedClipAnimator"
-        javaName: "QBlendedClipAnimator"
         ModifyFunction{
             signature: "setBlendTree(Qt3DAnimation::QAbstractClipBlendNode *)"
             ModifyArgument{
@@ -392,9 +276,8 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QCallbackMapping"
-        javaName: "QCallbackMapping"
         ModifyFunction{
-            signature: "setCallback(int,Qt3DAnimation::QAnimationCallback*,QFlags<Qt3DAnimation::QAnimationCallback::Flag>)"
+            signature: "setCallback(int,Qt3DAnimation::QAnimationCallback*,Qt3DAnimation::QAnimationCallback::Flags)"
             ModifyArgument{
                 index: 2
                 ReferenceCount{
@@ -408,7 +291,12 @@ TypeSystem{
     
     ValueType{
         name: "Qt3DAnimation::QChannel"
-        javaName: "QChannel"
+        Rejection{functionName: "rbegin"}
+        Rejection{functionName: "rend"}
+        Rejection{functionName: "cbegin"}
+        Rejection{functionName: "cend"}
+        Rejection{functionName: "crbegin"}
+        Rejection{functionName: "crend"}
         ModifyFunction{
             signature: "begin() const"
             access: Modification.Protected
@@ -417,20 +305,27 @@ TypeSystem{
             signature: "end() const"
             access: Modification.Protected
         }
-        ModifyFunction{
-            signature: "operator=(const Qt3DAnimation::QChannel &)"
-            remove: RemoveFlag.All
+
+        IteratorType{
+            name: "const_iterator"
         }
         since: [5, 11]
     }
     
-    IteratorType{
-        name: "Qt3DAnimation::QChannel::const_iterator"
-    }
-    
     ValueType{
         name: "Qt3DAnimation::QChannelComponent"
-        javaName: "QChannelComponent"
+
+        Rejection{functionName: "rbegin"}
+        Rejection{functionName: "rend"}
+        Rejection{functionName: "cbegin"}
+        Rejection{functionName: "cend"}
+        Rejection{functionName: "crbegin"}
+        Rejection{functionName: "crend"}
+
+        IteratorType{
+            name: "const_iterator"
+        }
+
         ModifyFunction{
             signature: "begin() const"
             access: Modification.Protected
@@ -439,10 +334,6 @@ TypeSystem{
             signature: "end() const"
             access: Modification.Protected
         }
-        ModifyFunction{
-            signature: "operator=(const Qt3DAnimation::QChannelComponent &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "insertKeyFrame(int,Qt3DAnimation::QKeyFrame)"
             ModifyArgument{
@@ -455,13 +346,8 @@ TypeSystem{
         since: [5, 11]
     }
     
-    IteratorType{
-        name: "Qt3DAnimation::QChannelComponent::const_iterator"
-    }
-    
     ObjectType{
         name: "Qt3DAnimation::QChannelMapper"
-        javaName: "QChannelMapper"
         ModifyFunction{
             signature: "addMapping(Qt3DAnimation::QAbstractChannelMapping*)"
             ModifyArgument{
@@ -485,7 +371,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QChannelMapping"
-        javaName: "QChannelMapping"
         ModifyFunction{
             signature: "setTarget(Qt3DCore::QNode*)"
             ModifyArgument{
@@ -500,7 +385,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QClipAnimator"
-        javaName: "QClipAnimator"
         ModifyFunction{
             signature: "setClip(Qt3DAnimation::QAbstractAnimationClip*)"
             ModifyArgument{
@@ -515,13 +399,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QClipBlendNodeCreatedChangeBase"
-        javaName: "QClipBlendNodeCreatedChange"
         since: [5, 11]
     }
     
     ObjectType{
         name: "Qt3DAnimation::QClipBlendValue"
-        javaName: "QClipBlendValue"
         ModifyFunction{
             signature: "setClip(Qt3DAnimation::QAbstractAnimationClip*)"
             ModifyArgument{
@@ -536,27 +418,22 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QClock"
-        javaName: "QClock"
         since: [5, 11]
     }
     
     ObjectType{
         name: "Qt3DAnimation::QKeyFrame"
-        javaName: "QKeyFrame"
+        EnumType{
+            name: "InterpolationType"
+        }
         since: [5, 11]
     }
     
-    EnumType{
-        name: "Qt3DAnimation::QKeyFrame::InterpolationType"
-    }
-    
-    EnumType{
-        name: "Qt3DAnimation::QKeyframeAnimation::RepeatMode"
-    }
-    
     ObjectType{
         name: "Qt3DAnimation::QKeyframeAnimation"
-        javaName: "QKeyframeAnimation"
+        EnumType{
+            name: "RepeatMode"
+        }
         ModifyFunction{
             signature: "setKeyframes(const QVector<Qt3DCore::QTransform*>&)"
             InjectCode{
@@ -604,7 +481,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QLerpClipBlend"
-        javaName: "QLerpClipBlend"
         ModifyFunction{
             signature: "setStartClip(Qt3DAnimation::QAbstractClipBlendNode*)"
             ModifyArgument{
@@ -632,7 +508,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QMorphingAnimation"
-        javaName: "QMorphingAnimation"
         ModifyFunction{
             signature: "setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget*>&)"
             InjectCode{
@@ -680,7 +555,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QMorphTarget"
-        javaName: "QMorphTarget"
         ModifyFunction{
             signature: "setAttributes(const QVector<Qt3DRender::QAttribute*>&)"
             InjectCode{
@@ -756,7 +630,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QSkeletonMapping"
-        javaName: "QSkeletonMapping"
         ModifyFunction{
             signature: "setSkeleton(Qt3DCore::QAbstractSkeleton *)"
             ModifyArgument{
@@ -771,7 +644,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DAnimation::QVertexBlendAnimation"
-        javaName: "QVertexBlendAnimation"
         ModifyFunction{
             signature: "setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget*>&)"
             InjectCode{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DCore.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DCore.qml
index 0b3589ad..22c4f16a 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DCore.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DCore.qml
@@ -31,16 +31,44 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.core"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "Qt3DCore"
     module: "qtjambi.qt3dcore"
     description: "The Qt 3D module contains functionality to support near-realtime simulation systems."
     RequiredLibrary{
         name: "QtConcurrent"
     }
+
+    NamespacePrefix{
+        prefix: "Qt3DCore"
+        namespace: "Qt3DCore"
+        namingPolicy: NamespacePrefix.Cut
+    }
     
     NamespaceType{
         name: "Qt3DCore"
+
+        Rejection{
+            functionName: "functor_cast"
+            since: 6
+        }
+        Rejection{
+            functionName: "operator|"
+        }
+        Rejection{
+            className: "QNodeCreatedChange"
+        }
+        Rejection{
+            className: "FunctorType"
+        }
+
+        EnumType{
+            name: "ChangeFlag"
+        }
+        ModifyFunction{
+            signature: "qIdsForNodes<T>(T)"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "functorTypeId<T>()"
             remove: RemoveFlag.All
@@ -61,10 +89,6 @@ TypeSystem{
             signature: "intersects(Qt3DCore::Sphere,Qt3DCore::Sphere)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "intersects(Qt3DCore::QAxisAlignedBoundingBox,Qt3DCore::QAxisAlignedBoundingBox)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "operator ==(Qt3DCore::QOpenGLFilter,Qt3DCore::QOpenGLFilter)"
             remove: RemoveFlag.All
@@ -77,35 +101,12 @@ TypeSystem{
             signature: "qHash(Qt3DCore::QNodeId, unsigned int)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator <<(QDataStream&,const Qt3DCore::QRay3D&)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator >>(QDataStream&,Qt3DCore::QRay3D&)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "operator <<(QDebug,Qt3DCore::QNodeId)"
             remove: RemoveFlag.All
         }
     }
     
-    Rejection{
-        className: "Qt3DCore::QNodeCreatedChange"
-    }
-    
-    Rejection{
-        className: "Qt3DCore"
-        functionName: "functor_cast"
-        since: 6
-    }
-    
-    Rejection{
-        className: "Qt3DCore"
-        functionName: "operator|"
-    }
-    
     Rejection{
         className: "Qt3DCore::QGeometryView"
         functionName: "setGeometryFactory"
@@ -142,15 +143,6 @@ TypeSystem{
         className: "QHandleManager"
     }
     
-    Rejection{
-        className: "Qt3DCore::FunctorType"
-    }
-    
-    Rejection{
-        className: "Qt3DCore::QGeometry"
-        functionName: "boundingVolumeSpecifier"
-    }
-    
     Rejection{
         className: "Qt3DCore::QAbstractFunctor"
         functionName: "functor_cast"
@@ -159,7 +151,10 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QGeometry"
-        javaName: "QGeometry"
+
+        Rejection{
+            functionName: "boundingVolumeSpecifier"
+        }
         ModifyFunction{
             signature: "addAttribute(Qt3DCore::QAttribute*)"
             threadAffinity: true
@@ -197,7 +192,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QAttribute"
-        javaName: "QAttribute"
         ModifyFunction{
             signature: "setBuffer(Qt3DCore::QBuffer*)"
             ModifyArgument{
@@ -207,43 +201,34 @@ TypeSystem{
                 }
             }
         }
-        since: 6
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QAttribute::AttributeType"
-        since: 6
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QAttribute::VertexBaseType"
+
+        EnumType{
+            name: "AttributeType"
+        }
+
+        EnumType{
+            name: "VertexBaseType"
+        }
         since: 6
     }
     
     ObjectType{
         name: "Qt3DCore::QBuffer"
-        javaName: "QBuffer"
-        since: 6
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QBuffer::BufferType"
-        since: 6
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QBuffer::UsageType"
-        since: 6
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QBuffer::AccessType"
+        EnumType{
+            name: "BufferType"
+        }
+        EnumType{
+            name: "UsageType"
+        }
+        EnumType{
+            name: "AccessType"
+        }
+
         since: 6
     }
     
     InterfaceType{
         name: "Qt3DCore::QAbstractFunctor"
-        javaName: "QAbstractFunctor"
         ModifyFunction{
             signature: "id()const"
             remove: RemoveFlag.JavaAndNative
@@ -263,7 +248,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QBoundingVolume"
-        javaName: "QBoundingVolume"
         ModifyFunction{
             signature: "setView(Qt3DCore::QGeometryView*)"
             ModifyArgument{
@@ -279,24 +263,20 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QCoreAspect"
-        javaName: "QCoreAspect"
         since: 6
     }
     
     ObjectType{
         name: "Qt3DCore::QCoreSettings"
-        javaName: "QCoreSettings"
-        since: 6
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QGeometryView::PrimitiveType"
         since: 6
     }
     
     ObjectType{
         name: "Qt3DCore::QGeometryView"
-        javaName: "QGeometryView"
+
+        EnumType{
+            name: "PrimitiveType"
+        }
         ModifyFunction{
             signature: "setGeometry(Qt3DCore::QGeometry*)"
             threadAffinity: true
@@ -311,19 +291,8 @@ TypeSystem{
         since: 6
     }
     
-    EnumType{
-        name: "Qt3DCore::ChangeFlag"
-        flags: "Qt3DCore::ChangeFlags"
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QNode::PropertyTrackingMode"
-        since: [5, 9]
-    }
-    
     InterfaceType{
         name: "Qt3DCore::QSceneInterface"
-        javaName: "Qt3DCoreScene"
         ModifyFunction{
             signature: "addObservable(Qt3DCore::QObservableInterface*,Qt3DCore::QNodeId)"
             ModifyArgument{
@@ -375,7 +344,6 @@ TypeSystem{
     
     InterfaceType{
         name: "Qt3DCore::QBackendNodeFactory"
-        javaName: "QBackendNodeFactory"
         ModifyFunction{
             signature: "createBackendNode(const QSharedPointer<Qt3DCore::QNodeCreatedChangeBase>&) const"
             ModifyArgument{
@@ -394,12 +362,10 @@ TypeSystem{
     
     InterfaceType{
         name: "Qt3DCore::QAspectJobProviderInterface"
-        javaName: "QAspectJobProvider"
     }
     
     ValueType{
         name: "Qt3DCore::QNodeId"
-        javaName: "QNodeId"
         ModifyFunction{
             signature: "operator bool() const"
             remove: RemoveFlag.All
@@ -408,7 +374,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QNode"
-        javaName: "QNode"
+
+        EnumType{
+            name: "PropertyTrackingMode"
+            since: [5, 9]
+        }
         ModifyFunction{
             signature: "event(QEvent *)"
             remove: RemoveFlag.All
@@ -428,17 +398,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "sendCommand(const QString &, const QVariant &, unsigned int)"
-            ModifyArgument{
-                index: 3
-                ReplaceDefaultExpression{
-                    expression: "0"
-                }
-            }
-            since: [5, 10]
-        }
-        ModifyFunction{
-            signature: "sendCommand(const QString &, const QVariant &, unsigned long long)"
+            signature: "sendCommand(const QString &, const QVariant &, Qt3DCore::QNodeCommand::CommandId)"
             ModifyArgument{
                 index: 3
                 ReplaceDefaultExpression{
@@ -446,18 +406,17 @@ TypeSystem{
                 }
             }
             since: [5, 10]
+            until: 5
         }
     }
     
     ObjectType{
         name: "Qt3DCore::QAbstractSkeleton"
-        javaName: "QAbstractSkeleton"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DCore::QArmature"
-        javaName: "QArmature"
         ModifyFunction{
             signature: "setSkeleton(Qt3DCore::QAbstractSkeleton*)"
             ModifyArgument{
@@ -472,7 +431,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QJoint"
-        javaName: "QJoint"
         ModifyFunction{
             signature: "addChildJoint(Qt3DCore::QJoint *)"
             ModifyArgument{
@@ -496,7 +454,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QComponent"
-        javaName: "QComponent"
         ModifyFunction{
             signature: "addedToEntity(Qt3DCore::QEntity*)"
             ModifyArgument{
@@ -519,7 +476,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QEntity"
-        javaName: "QEntity"
         ModifyFunction{
             signature: "componentsOfType<T>()const"
             remove: RemoveFlag.All
@@ -564,7 +520,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QAbstractCameraController"
-        javaName: "QAbstractCameraController"
         ModifyFunction{
             signature: "setCamera(Qt3DRender::QCamera*)"
             ModifyArgument{
@@ -577,41 +532,42 @@ TypeSystem{
         since: [5, 10]
     }
     
-    EnumType{
-        name: "Qt3DCore::QSceneChange::Priority"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QSceneChange::ObservableType"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QSceneChange::DeliveryFlag"
-        flags: "Qt3DCore::QSceneChange::DeliveryFlags"
-        until: 5
-    }
-    
     ObjectType{
         name: "Qt3DCore::QSceneChange"
-        javaName: "QSceneChange"
+
+        EnumType{
+            name: "Priority"
+            until: [5, 6]
+        }
+
+        EnumType{
+            name: "ObservableType"
+            until: [5, 6]
+        }
+
+        EnumType{
+            name: "DeliveryFlag"
+        }
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QNodeCommand"
-        javaName: "QNodeCommand"
+        PrimitiveType{
+            name: "CommandId"
+            javaName: "long"
+            jniName: "jlong"
+            preferredConversion: false
+        }
         until: 5
     }
     
-    EnumType{
-        name: "Qt3DCore::QBackendNode::Mode"
-    }
-    
     ObjectType{
         name: "Qt3DCore::QBackendNode"
-        javaName: "QBackendNode"
+
+        EnumType{
+            name: "Mode"
+        }
         ModifyFunction{
             signature: "setFactory(const Qt3DCore::QBackendNodeFactory*)"
             ModifyArgument{
@@ -635,17 +591,7 @@ TypeSystem{
             until: [5, 6]
         }
         ModifyFunction{
-            signature: "sendCommand(const QString &, const QVariant &, unsigned int)"
-            ModifyArgument{
-                index: 3
-                ReplaceDefaultExpression{
-                    expression: "0"
-                }
-            }
-            since: [5, 10]
-        }
-        ModifyFunction{
-            signature: "sendCommand(const QString &, const QVariant &, unsigned long long)"
+            signature: "sendCommand(const QString &, const QVariant &, Qt3DCore::QNodeCommand::CommandId)"
             ModifyArgument{
                 index: 3
                 ReplaceDefaultExpression{
@@ -653,31 +599,16 @@ TypeSystem{
                 }
             }
             since: [5, 10]
+            until: 5
         }
     }
     
     ObjectType{
         name: "Qt3DCore::QBackendScenePropertyChange"
-        javaName: "QBackendScenePropertyChange"
-    }
-    
-    ValueType{
-        name: "Qt3DCore::QRay3D"
-        javaName: "QRay3D"
-        ModifyFunction{
-            signature: "transform(const QMatrix4x4 &)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-        }
     }
     
     ObjectType{
         name: "Qt3DCore::QScene"
-        javaName: "QScene"
         ModifyFunction{
             signature: "addObservable(Qt3DCore::QObservableInterface*,Qt3DCore::QNodeId)"
             ModifyArgument{
@@ -735,7 +666,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QAspectEngine"
-        javaName: "QAspectEngine"
+
+        EnumType{
+            name: "RunMode"
+            since: [5, 14]
+        }
         ModifyFunction{
             signature: "setRootEntity(QSharedPointer<Qt3DCore::QEntity>)"
             ModifyArgument{
@@ -765,18 +700,8 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DCore::QAspectEngine::RunMode"
-        since: [5, 14]
-    }
-    
     ValueType{
         name: "Qt3DCore::QAspectFactory"
-        javaName: "QAspectFactory"
-        ModifyFunction{
-            signature: "operator=(const Qt3DCore::QAspectFactory &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "functionHelper(QObject *)"
             remove: RemoveFlag.All
@@ -785,7 +710,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QScenePropertyChange"
-        javaName: "QScenePropertyChange"
         ExtraIncludes{
             Include{
                 fileName: "QtCore/QScopedPointer"
@@ -806,36 +730,8 @@ TypeSystem{
                           "private:\n"+
                           "    QScopedPointer<QByteArray> __qt_propertyName;"}
         }
-        ModifyFunction{
-            signature: "propertyName()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "setPropertyName(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "const char * %out = nullptr;\n"+
-                                  "QByteArray* container = nullptr;\n"+
-                                  "if(%in){\n"+
-                                  "    container = new QByteArray(qtjambi_cast<QByteArray>(%env, %in));\n"+
-                                  "    %out = container->constData();\n"+
-                                  "}"}
-                }
-            }
             InjectCode{
                 target: CodeClass.Native
                 position: Position.End
@@ -844,14 +740,13 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DCore::QAbstractAspect::AspectType"
-        until: [5, 6]
-    }
-    
     ObjectType{
         name: "Qt3DCore::QAbstractAspect"
-        javaName: "QAbstractAspect"
+
+        EnumType{
+            name: "AspectType"
+            until: [5, 6]
+        }
         ExtraIncludes{
             Include{
                 fileName: "Qt3DCore/QBackendNodeMapper"
@@ -889,294 +784,166 @@ TypeSystem{
         }
     }
     
-    ValueType{
-        name: "Qt3DCore::QAxisAlignedBoundingBox"
-        javaName: "QAxisAlignedBoundingBox"
-        ModifyFunction{
-            signature: "transform(const QMatrix4x4 &)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-        }
-    }
-    
-    EnumType{
-        name: "Qt3DCore::QCameraLens::ProjectionType"
-        until: [5, 6]
-    }
-    
     ObjectType{
         name: "Qt3DCore::QCameraLens"
-        javaName: "QCameraLens"
+        EnumType{
+            name: "ProjectionType"
+        }
         until: [5, 6]
     }
     
     ObjectType{
         name: "Qt3DCore::QAbstractBuffer"
-        javaName: "QAbstractBuffer"
     }
-    
+
     ObjectType{
         name: "Qt3DCore::QAspectJob"
-        javaName: "QAspectJob"
     }
     
     ObjectType{
         name: "Qt3DCore::QNodeVisitor"
-        javaName: "QNodeVisitor"
     }
     
     
     ObjectType{
         name: "Qt3DCore::QOpenGLInformationService"
-        javaName: "QOpenGLInformationService"
     }
     
     ObjectType{
         name: "Qt3DCore::QAbstractServiceProvider"
-        javaName: "QAbstractServiceProvider"
     }
     
     ObjectType{
         name: "Qt3DCore::QSystemInformationService"
-        javaName: "QSystemInformationService"
     }
     
     ObjectType{
         name: "Qt3DCore::QAbstractTransform"
-        javaName: "QAbstractTransform"
     }
     
     ObjectType{
         name: "Qt3DCore::QLookAtTransform"
-        javaName: "QLookAtTransform"
     }
     
     ObjectType{
         name: "Qt3DCore::QMatrixTransform"
-        javaName: "QMatrixTransform"
     }
     
     ObjectType{
         name: "Qt3DCore::QRotateTransform"
-        javaName: "QRotateTransform"
     }
     
     ObjectType{
         name: "Qt3DCore::QScaleTransform"
-        javaName: "QScaleTransform"
     }
     
     ObjectType{
         name: "Qt3DCore::QTranslateTransform"
-        javaName: "QTranslateTransform"
     }
     
     ObjectType{
         name: "Qt3DCore::QComponentAddedChange"
-        javaName: "QComponentAddedChange"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QComponentRemovedChange"
-        javaName: "QComponentRemovedChange"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QDynamicPropertyUpdatedChange"
-        javaName: "QDynamicPropertyUpdatedChange"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QNodeCreatedChangeBase"
-        javaName: "QNodeCreatedChange"
         since: [5, 7]
         until: 5
     }
     
     ValueType{
         name: "Qt3DCore::QNodeIdTypePair"
-        javaName: "QNodeIdTypePair"
         since: [5, 8]
     }
     
     ObjectType{
         name: "Qt3DCore::QNodeDestroyedChange"
-        javaName: "QNodeDestroyedChange"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QPropertyNodeAddedChange"
-        javaName: "QPropertyNodeAddedChange"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QPropertyNodeRemovedChange"
-        javaName: "QPropertyNodeRemovedChange"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QPropertyUpdatedChange"
-        javaName: "QPropertyUpdatedChange"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QPropertyUpdatedChangeBase"
-        javaName: "QPropertyUpdatedChangeBase"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QPropertyValueAddedChange"
-        javaName: "QPropertyValueAddedChange"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QPropertyValueAddedChangeBase"
-        javaName: "QPropertyValueAddedChangeBase"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QPropertyValueRemovedChange"
-        javaName: "QPropertyValueRemovedChange"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QPropertyValueRemovedChangeBase"
-        javaName: "QPropertyValueRemovedChangeBase"
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QStaticPropertyUpdatedChangeBase"
-        javaName: "QStaticPropertyUpdatedChangeBase"
-        ModifyFunction{
-            signature: "propertyName() const"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setPropertyName(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray string1(qtjambi_cast<QByteArray>(%env, %in));\n"+
-                                  "const char* %out = string1.constData();"}
-                }
-            }
-        }
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QStaticPropertyValueAddedChangeBase"
-        javaName: "QStaticPropertyValueAddedChangeBase"
-        ModifyFunction{
-            signature: "propertyName() const"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setPropertyName(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray string1(qtjambi_cast<QByteArray>(%env, %in));\n"+
-                                  "const char* %out = string1.constData();"}
-                }
-            }
-        }
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QStaticPropertyValueRemovedChangeBase"
-        javaName: "QStaticPropertyValueRemovedChangeBase"
-        ModifyFunction{
-            signature: "propertyName() const"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setPropertyName(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray string1(qtjambi_cast<QByteArray>(%env, %in));\n"+
-                                  "const char* %out = string1.constData();"}
-                }
-            }
-        }
         since: [5, 7]
         until: 5
     }
     
     ObjectType{
         name: "Qt3DCore::QBackendNodeMapper"
-        javaName: "QBackendNodeMapper"
         ModifyFunction{
             signature: "create(const QSharedPointer<Qt3DCore::QNodeCreatedChangeBase>&) const"
             ModifyArgument{
@@ -1212,7 +979,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::QSkeleton"
-        javaName: "QSkeleton"
         ModifyFunction{
             signature: "setRootJoint(Qt3DCore::QJoint*)"
             ModifyArgument{
@@ -1225,30 +991,22 @@ TypeSystem{
         since: [5, 10]
     }
     
-    EnumType{
-        name: "Qt3DCore::QSkeletonLoader::Status"
-        since: [5, 10]
-    }
-    
     ObjectType{
         name: "Qt3DCore::QSkeletonLoader"
-        javaName: "QSkeletonLoader"
+        EnumType{
+            name: "Status"
+            since: [5, 10]
+        }
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DCore::QTransform"
-        javaName: "QTransform"
     }
     
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'Qt3DCore::operator<<', unmatched return type 'QDebug'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'Qt3DCore::operator|', unmatched return type 'QIncompatibleFlag'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'Qt3DCore::operator|', unmatched return type 'QFlags<ChangeFlags::enum_type>'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'doClone()const' for function modification in '*' not found.*"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature '*' for function modification in 'Qt3DCore' not found.*"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Final class 'QAbstractSkeleton' set to non-final, as it is extended by other classes"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'sendCommand*' for function modification in 'Qt3DCore::QNode' not found. Possible candidates: *"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'sendCommand*' for function modification in 'Qt3DCore::QBackendNode' not found. Possible candidates: *"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'Qt3DCore::QAspectJob::postFrame', unmatched parameter type 'Qt3DCore::QAspectManager*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: private virtual function 'sceneChangeEvent(*)' in 'QCameraLens'"}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type Qt3DCore::QNodeIdTypePair."}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DExtras.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DExtras.qml
index 85b7ae6d..087e46cb 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DExtras.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DExtras.qml
@@ -31,24 +31,29 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.extras"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "Qt3DExtras"
     module: "qtjambi.qt3dextras"
     description: "The Qt 3D Extras module provides a set of prebuilt elements to help you get started with Qt 3D."
+
+    NamespacePrefix{
+        prefix: "Qt3DExtras"
+        namespace: "Qt3DExtras"
+        namingPolicy: NamespacePrefix.Cut
+    }
+
     NamespaceType{
         name: "Qt3DExtras"
         generate: false
         since: [5, 10]
     }
     
-    ValueType{
-        name: "Qt3DExtras::QAbstractCameraController::InputState"
-        javaName: "QAbstractCameraController$InputState"
-    }
-    
     ObjectType{
         name: "Qt3DExtras::QAbstractCameraController"
-        javaName: "QAbstractCameraController"
+
+        ValueType{
+            name: "InputState"
+        }
         ModifyFunction{
             signature: "setCamera(Qt3DRender::QCamera*)"
             ModifyArgument{
@@ -64,7 +69,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QAbstractSpriteSheet"
-        javaName: "QAbstractSpriteSheet"
         ExtraIncludes{
             Include{
                 fileName: "hashes.h"
@@ -91,49 +95,41 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QConeGeometry"
-        javaName: "QConeGeometry"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QConeMesh"
-        javaName: "QConeMesh"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QCuboidMesh"
-        javaName: "QCuboidMesh"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QCuboidGeometry"
-        javaName: "QCuboidGeometry"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QCylinderGeometry"
-        javaName: "QCylinderGeometry"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QCylinderMesh"
-        javaName: "QCylinderMesh"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QDiffuseSpecularMaterial"
-        javaName: "QDiffuseSpecularMaterial"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QDiffuseMapMaterial"
-        javaName: "QDiffuseMapMaterial"
         ModifyFunction{
             signature: "setDiffuse(Qt3DRender::QAbstractTexture*)"
             ModifyArgument{
@@ -149,7 +145,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QDiffuseSpecularMapMaterial"
-        javaName: "QDiffuseSpecularMapMaterial"
         ModifyFunction{
             signature: "setDiffuse(Qt3DRender::QAbstractTexture*)"
             ModifyArgument{
@@ -175,13 +170,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QNormalDiffuseMapAlphaMaterial"
-        javaName: "QNormalDiffuseMapAlphaMaterial"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QNormalDiffuseMapMaterial"
-        javaName: "QNormalDiffuseMapMaterial"
         ModifyFunction{
             signature: "setDiffuse(Qt3DRender::QAbstractTexture*)"
             ModifyArgument{
@@ -207,7 +200,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QNormalDiffuseSpecularMapMaterial"
-        javaName: "QNormalDiffuseSpecularMapMaterial"
         ModifyFunction{
             signature: "setDiffuse(Qt3DRender::QAbstractTexture*)"
             ModifyArgument{
@@ -243,43 +235,36 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QPhongAlphaMaterial"
-        javaName: "QPhongAlphaMaterial"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QPhongMaterial"
-        javaName: "QPhongMaterial"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QTexturedMetalRoughMaterial"
-        javaName: "QTexturedMetalRoughMaterial"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QExtrudedTextGeometry"
-        javaName: "QExtrudedTextGeometry"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QExtrudedTextMesh"
-        javaName: "QExtrudedTextMesh"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QFirstPersonCameraController"
-        javaName: "QFirstPersonCameraController"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QForwardRenderer"
-        javaName: "QForwardRenderer"
         ModifyFunction{
             signature: "setCamera(Qt3DCore::QEntity*)"
             ModifyArgument{
@@ -303,67 +288,56 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QGoochMaterial"
-        javaName: "QGoochMaterial"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QMetalRoughMaterial"
-        javaName: "QMetalRoughMaterial"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QMorphPhongMaterial"
-        javaName: "QMorphPhongMaterial"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QOrbitCameraController"
-        javaName: "QOrbitCameraController"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QPerVertexColorMaterial"
-        javaName: "QPerVertexColorMaterial"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QPlaneGeometry"
-        javaName: "QPlaneGeometry"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QPlaneMesh"
-        javaName: "QPlaneMesh"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QSkyboxEntity"
-        javaName: "QSkyboxEntity"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QSphereGeometry"
-        javaName: "QSphereGeometry"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QSphereMesh"
-        javaName: "QSphereMesh"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QSpriteGrid"
-        javaName: "QSpriteGrid"
         since: [5, 10]
         ExtraIncludes{
             Include{
@@ -380,7 +354,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QSpriteSheet"
-        javaName: "QSpriteSheet"
         ExtraIncludes{
             Include{
                 fileName: "hashes.h"
@@ -415,19 +388,16 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QSpriteSheetItem"
-        javaName: "QSpriteSheetItem"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QText2DEntity"
-        javaName: "QText2DEntity"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QTextureMaterial"
-        javaName: "QTextureMaterial"
         ExtraIncludes{
             Include{
                 fileName: "hashes.h"
@@ -454,19 +424,16 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QTorusGeometry"
-        javaName: "QTorusGeometry"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::QTorusMesh"
-        javaName: "QTorusMesh"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DExtras::Qt3DWindow"
-        javaName: "Qt3DWindow"
         ModifyFunction{
             signature: "registerAspect(Qt3DCore::QAbstractAspect *)"
             ModifyArgument{
@@ -513,37 +480,31 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DExtras::QConeGeometryView"
-        javaName: "QConeGeometryView"
         since: 6
     }
     
     ObjectType{
         name: "Qt3DExtras::QCuboidGeometryView"
-        javaName: "QCuboidGeometryView"
         since: 6
     }
     
     ObjectType{
         name: "Qt3DExtras::QCylinderGeometryView"
-        javaName: "QCylinderGeometryView"
         since: 6
     }
     
     ObjectType{
         name: "Qt3DExtras::QPlaneGeometryView"
-        javaName: "QPlaneGeometryView"
         since: 6
     }
     
     ObjectType{
         name: "Qt3DExtras::QSphereGeometryView"
-        javaName: "QSphereGeometryView"
         since: 6
     }
     
     ObjectType{
         name: "Qt3DExtras::QTorusGeometryView"
-        javaName: "QTorusGeometryView"
         since: 6
     }
     
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DInput.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DInput.qml
index 00640262..9692b480 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DInput.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DInput.qml
@@ -31,34 +31,37 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.input"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "Qt3DInput"
     module: "qtjambi.qt3dinput"
     description: "The Qt 3D Input module provides classes for handling user input in applications using Qt3D."
-    Rejection{
-        className: "Qt3DInput::QPhysicalDeviceCreatedChange"
+
+    NamespacePrefix{
+        prefix: "Qt3DInput"
+        namespace: "Qt3DInput"
+        namingPolicy: NamespacePrefix.Cut
     }
     
     NamespaceType{
         name: "Qt3DInput"
         generate: false
+        Rejection{
+            className: "QPhysicalDeviceCreatedChange"
+        }
     }
     
     ObjectType{
         name: "Qt3DInput::QButtonAxisInput"
-        javaName: "QButtonAxisInput"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DInput::QAbstractActionInput"
-        javaName: "QAbstractActionInput"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DInput::QAbstractAxisInput"
-        javaName: "QAbstractAxisInput"
         ModifyFunction{
             signature: "setSourceDevice(Qt3DInput::QAbstractPhysicalDevice*)"
             ModifyArgument{
@@ -73,19 +76,19 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QKeyboardDevice"
-        javaName: "QKeyboardDevice"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DInput::QMouseDevice"
-        javaName: "QMouseDevice"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DInput::QAxisAccumulator"
-        javaName: "QAxisAccumulator"
+        EnumType{
+            name: "SourceAxisType"
+        }
         ModifyFunction{
             signature: "setSourceAxis(Qt3DInput::QAxis*)"
             ModifyArgument{
@@ -94,18 +97,15 @@ TypeSystem{
                     action: ReferenceCount.Ignore
                 }
             }
-        }
-        since: [5, 8]
-    }
-    
-    EnumType{
-        name: "Qt3DInput::QAxisAccumulator::SourceAxisType"
+        }        
         since: [5, 8]
     }
     
     ObjectType{
         name: "Qt3DInput::QMouseHandler"
-        javaName: "QMouseHandler"
+        EnumType{
+            name: "Axis"
+        }
         ModifyFunction{
             signature: "wheel(Qt3DInput::QWheelEvent *)"
             ppCondition: "QT_CONFIG(wheelevent)"
@@ -118,19 +118,12 @@ TypeSystem{
                     action: ReferenceCount.Ignore
                 }
             }
-            since: [5, 7]
         }
         since: [5, 7]
     }
-    
-    EnumType{
-        name: "Qt3DInput::QMouseDevice::Axis"
-        since: [5, 7]
-    }
-    
+
     ObjectType{
         name: "Qt3DInput::QKeyboardHandler"
-        javaName: "QKeyboardHandler"
         ModifyFunction{
             signature: "setSourceDevice(Qt3DInput::QKeyboardDevice*)"
             ModifyArgument{
@@ -146,13 +139,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QAnalogAxisInput"
-        javaName: "QAnalogAxisInput"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DInput::QInputChord"
-        javaName: "QInputChord"
         ModifyFunction{
             signature: "addChord(Qt3DInput::QAbstractActionInput*)"
             ModifyArgument{
@@ -178,7 +169,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QInputSequence"
-        javaName: "QInputSequence"
         ModifyFunction{
             signature: "addSequence(Qt3DInput::QAbstractActionInput*)"
             ModifyArgument{
@@ -204,7 +194,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QAbstractPhysicalDevice"
-        javaName: "QAbstractPhysicalDevice"
         ModifyFunction{
             signature: "addAxisSetting(Qt3DInput::QAxisSetting*)"
             ModifyArgument{
@@ -227,12 +216,10 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QAbstractPhysicalDeviceBackendNode"
-        javaName: "QAbstractPhysicalDeviceBackendNode"
     }
     
     ObjectType{
         name: "Qt3DInput::QAction"
-        javaName: "QAction"
         ModifyFunction{
             signature: "addInput(Qt3DInput::QAbstractActionInput*)"
             ModifyArgument{
@@ -257,7 +244,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QInputSettings"
-        javaName: "QInputSettings"
         ModifyFunction{
             signature: "setEventSource(QObject*)"
             ModifyArgument{
@@ -273,7 +259,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QActionInput"
-        javaName: "QActionInput"
         ModifyFunction{
             signature: "setSourceDevice(Qt3DInput::QAbstractPhysicalDevice *)"
             ModifyArgument{
@@ -289,7 +274,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QAxis"
-        javaName: "QAxis"
         ModifyFunction{
             signature: "addInput(Qt3DInput::QAbstractAxisInput*)"
             ModifyArgument{
@@ -314,22 +298,18 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QAxisActionHandler"
-        javaName: "QAxisActionHandler"
     }
     
     ObjectType{
         name: "Qt3DInput::QAxisInput"
-        javaName: "QAxisInput"
     }
     
     ObjectType{
         name: "Qt3DInput::QAxisSetting"
-        javaName: "QAxisSetting"
     }
     
     ObjectType{
         name: "Qt3DInput::QInputDeviceIntegration"
-        javaName: "QInputDeviceIntegration"
         ModifyFunction{
             signature: "registerBackendType(const QSharedPointer<Qt3DCore::QBackendNodeFunctor> &)"
             remove: RemoveFlag.All
@@ -342,44 +322,39 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QInputDevicePlugin"
-        javaName: "QInputDevicePlugin"
-    }
-    
-    EnumType{
-        name: "Qt3DInput::QMouseEvent::Buttons"
-    }
-    
-    EnumType{
-        name: "Qt3DInput::QMouseEvent::Modifiers"
     }
     
     ObjectType{
         name: "Qt3DInput::QMouseEvent"
-        javaName: "QMouseEvent"
-    }
-    
-    EnumType{
-        name: "Qt3DInput::QWheelEvent::Buttons"
-    }
-    
-    EnumType{
-        name: "Qt3DInput::QWheelEvent::Modifiers"
+        EnumType{
+            name: "Buttons"
+        }
+
+        EnumType{
+            name: "Modifiers"
+        }
     }
     
     ObjectType{
         name: "Qt3DInput::QWheelEvent"
-        javaName: "QWheelEvent"
+        EnumType{
+            name: "Buttons"
+            ppCondition: "QT_CONFIG(wheelevent)"
+        }
+
+        EnumType{
+            name: "Modifiers"
+            ppCondition: "QT_CONFIG(wheelevent)"
+        }
         ppCondition: "QT_CONFIG(wheelevent)"
     }
     
     ObjectType{
         name: "Qt3DInput::QMouseInput"
-        javaName: "QMouseInput"
     }
     
     ObjectType{
         name: "Qt3DInput::QKeyEvent"
-        javaName: "QKeyEvent"
         ModifyFunction{
             signature: "matches(QKeySequence::StandardKey) const"
             ppCondition: "QT_CONFIG(shortcut)"
@@ -388,7 +363,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QLogicalDevice"
-        javaName: "QLogicalDevice"
         ModifyFunction{
             signature: "addAxis(Qt3DInput::QAxis*)"
             ModifyArgument{
@@ -427,19 +401,15 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DInput::QMouseController::Axis"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DInput::QMouseController::Button"
-        until: [5, 6]
-    }
-    
     ObjectType{
         name: "Qt3DInput::QMouseController"
-        javaName: "QMouseController"
+        EnumType{
+            name: "Axis"
+        }
+
+        EnumType{
+            name: "Button"
+        }
         ModifyFunction{
             signature: "axisCount() const"
             access: Modification.DeclFinal
@@ -469,7 +439,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QInputAspect"
-        javaName: "QInputAspect"
         ModifyFunction{
             signature: "setCamera(Qt3DRender::QCamera*)"
             ModifyArgument{
@@ -495,7 +464,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QKeyboardController"
-        javaName: "QKeyboardController"
         ModifyFunction{
             signature: "axisCount() const"
             access: Modification.DeclFinal
@@ -524,7 +492,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QKeyboardInput"
-        javaName: "QKeyboardInput"
         ModifyFunction{
             signature: "setController(Qt3DInput::QKeyboardController*)"
             ModifyArgument{
@@ -538,7 +505,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DInput::QPhysicalDeviceCreatedChangeBase"
-        javaName: "QPhysicalDeviceCreatedChange"
         since: [5, 7]
     }
     
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DLogic.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DLogic.qml
index 21c06aec..857fcbb4 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DLogic.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DLogic.qml
@@ -31,10 +31,17 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.logic"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "Qt3DLogic"
     module: "qtjambi.qt3dlogic"
     description: "The Qt 3D Logic module enables synchronizing frames with the Qt 3D backend."
+
+    NamespacePrefix{
+        prefix: "Qt3DLogic"
+        namespace: "Qt3DLogic"
+        namingPolicy: NamespacePrefix.Cut
+    }
+
     NamespaceType{
         name: "Qt3DLogic"
         generate: false
@@ -42,16 +49,13 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DLogic::QLogicAspect"
-        javaName: "QLogicAspect"
     }
     
     ObjectType{
         name: "Qt3DLogic::QFrameAction"
-        javaName: "QFrameAction"
     }
     
     ObjectType{
         name: "Qt3DInput::QLogicComponent"
-        javaName: "QLogicComponent"
     }
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuick.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuick.qml
index e8ad1948..7643b310 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuick.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuick.qml
@@ -31,23 +31,29 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.core.quick"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "Qt3DQuick"
     module: "qtjambi.qt3dquick"
     description: "Qt3DQuick Contains classes used for implementing QML functionality into Qt3D applications."
+
+    NamespacePrefix{
+        prefix: "Qt3DCore::Quick"
+        namespace: "Qt3DCore::Quick"
+        namingPolicy: NamespacePrefix.Cut
+    }
+
     NamespaceType{
         name: "Qt3DCore::Quick"
         javaName: "Qt3DQuick"
         generate: false
     }
     
-    EnumType{
-        name: "Qt3DCore::Quick::QQmlAspectEngine::Status"
-    }
-    
     ObjectType{
         name: "Qt3DCore::Quick::QQmlAspectEngine"
-        javaName: "QQmlAspectEngine"
+
+        EnumType{
+            name: "Status"
+        }
         ExtraIncludes{
             Include{
                 fileName: "QtJambi/QmlAPI"
@@ -62,7 +68,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::Quick::Quick3DConfiguration"
-        javaName: "Quick3DConfiguration"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -83,7 +88,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::Quick::Quick3DEntity"
-        javaName: "Quick3DEntity"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -94,7 +98,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::Quick::Quick3DEntityLoader"
-        javaName: "Quick3DEntityLoader"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -105,7 +108,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::Quick::Quick3DNode"
-        javaName: "Quick3DNode"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -116,7 +118,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DCore::Quick::Quick3DTransform"
-        javaName: "Quick3DTransform"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickExtras.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickExtras.qml
index 6311a96b..775eb43d 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickExtras.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickExtras.qml
@@ -31,25 +31,28 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.extras.quick"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "Qt3DQuickExtras"
     module: "qtjambi.qt3dquickextras"
     description: ""
 
+    NamespacePrefix{
+        prefix: "Qt3DExtras::Quick"
+        namespace: "Qt3DExtras::Quick"
+        namingPolicy: NamespacePrefix.Cut
+    }
+
     NamespaceType{
         name: "Qt3DExtras::Quick"
         generate: false
         since: [5, 7]
     }
     
-    EnumType{
-        name: "Qt3DExtras::Quick::Qt3DQuickWindow::CameraAspectRatioMode"
-        since: [5, 7]
-    }
-    
     ObjectType{
         name: "Qt3DExtras::Quick::Qt3DQuickWindow"
-        javaName: "Qt3DQuickWindow"
+        EnumType{
+            name: "CameraAspectRatioMode"
+        }
         ExtraIncludes{
             Include{
                 fileName: "QtJambi/QmlAPI"
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickRender.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickRender.qml
index dd539e2e..1b726ba7 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickRender.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickRender.qml
@@ -31,18 +31,24 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.render.quick"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     module: "qtjambi.qt3dquickrender"
     description: ""
+
+    NamespacePrefix{
+        prefix: "Qt3DRender::Render::Quick"
+        namespace: "Qt3DRender::Render::Quick"
+        namingPolicy: NamespacePrefix.Cut
+    }
+
     NamespaceType{
         name: "Qt3DRender::Render::Quick"
-        javaName: "Qt3DQuickRenderer"
+        javaName: "Qt3DQuickRender"
         generate: false
     }
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DEffect"
-        javaName: "Quick3DEffect"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -53,7 +59,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DMaterial"
-        javaName: "Quick3DMaterial"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -64,7 +69,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DParameter"
-        javaName: "Quick3DParameter"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -75,7 +79,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DRenderPass"
-        javaName: "Quick3DRenderPass"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -86,7 +89,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DRenderPassFilter"
-        javaName: "Quick3DRenderPassFilter"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -97,7 +99,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DRenderTarget"
-        javaName: "Quick3DRenderTarget"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -108,7 +109,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DRenderTargetSelector"
-        javaName: "Quick3DRenderTargetSelector"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -119,7 +119,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DScene"
-        javaName: "Quick3DScene"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -130,7 +129,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DShaderData"
-        javaName: "Quick3DShaderData"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -141,7 +139,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DShaderDataArray"
-        javaName: "Quick3DShaderDataArray"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -152,7 +149,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DSortMethod"
-        javaName: "Quick3DSortMethod"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -163,7 +159,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DStateSet"
-        javaName: "Quick3DStateSet"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -174,7 +169,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DTechnique"
-        javaName: "Quick3DTechnique"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -185,7 +179,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DTechniqueFilter"
-        javaName: "Quick3DTechniqueFilter"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -196,7 +189,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DTextureExtension"
-        javaName: "Quick3DTextureExtension"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
@@ -207,7 +199,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::Render::Quick::Quick3DViewport"
-        javaName: "Quick3DViewport"
         ExtraIncludes{
             Include{
                 fileName: "QtJambiQml/hashes.h"
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickScene2D.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickScene2D.qml
index afe7f76d..b39ecd64 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickScene2D.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DQuickScene2D.qml
@@ -31,23 +31,27 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.render.quick.scene2d"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "Qt3DQuickScene2D"
     module: "qtjambi.qt3dquickscene2d"
     description: "Qt 3D Scene2D Module"
 
+    NamespacePrefix{
+        prefix: "Qt3DRender::Quick"
+        namespace: "Qt3DRender::Quick"
+        namingPolicy: NamespacePrefix.Cut
+    }
+
     NamespaceType{
         name: "Qt3DRender::Quick"
         generate: false
     }
     
-    EnumType{
-        name: "Qt3DRender::Quick::QScene2D::RenderPolicy"
-    }
-    
     ObjectType{
         name: "Qt3DRender::Quick::QScene2D"
-        javaName: "QScene2D"
+        EnumType{
+            name: "RenderPolicy"
+        }
         ExtraIncludes{
             Include{
                 fileName: "QtJambi/QmlAPI"
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DRender.qml b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DRender.qml
index e639eb94..0c2833bc 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DRender.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/Qt3DRender.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qt3d.render"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "Qt3DRender"
     module: "qtjambi.qt3drender"
     description: "Contains classes that enable 2D and 3D rendering"
@@ -43,6 +43,12 @@ TypeSystem{
         mode: RequiredLibrary.ProvideOnly
     }
 
+    NamespacePrefix{
+        prefix: "Qt3DRender"
+        namespace: "Qt3DRender"
+        namingPolicy: NamespacePrefix.Cut
+    }
+
     NamespaceType{
         name: "Qt3DRender"
         generate: false
@@ -57,181 +63,113 @@ TypeSystem{
                 location: Include.Global
             }
         }
+
+        Rejection{
+            functionName: "functorTypeId"
+        }
+
+        Rejection{
+            functionName: "functor_cast"
+        }
+
+        Rejection{
+            functionName: "operator=="
+        }
+
+        Rejection{
+            functionName: "operator!="
+        }
+
+        Rejection{
+            functionName: "swap"
+        }
+
+        EnumType{
+            name: "API"
+        }
         since: [5, 15]
     }
     
-    TypeAliasType{
-        name: "Qt3DRender::QAbstractRayCaster::Hits"
-    }
-    
     Rejection{
         className: "QCameraPrivate"
     }
-    
+
     Rejection{
-        className: "Qt3DRender::QLevelOfDetailPrivate"
+        className: "Qt3DRender::Sphere"
     }
-    
+
     Rejection{
-        className: "Qt3DRender::QAbstractRayCasterPrivate"
+        className: "Qt3DRender::QLevelOfDetailPrivate"
     }
-    
+
     Rejection{
         className: "Qt3DRender::QAbstractRayCasterPrivate"
     }
-    
-    Rejection{
-        className: "Qt3DRender"
-        functionName: "functorTypeId"
-        since: [5, 15]
-    }
-    
-    Rejection{
-        className: "Qt3DRender"
-        functionName: "functor_cast"
-        since: [5, 15]
-    }
-    
-    Rejection{
-        className: "Qt3DRender::QAbstractFunctor"
-        functionName: "functor_cast"
-        since: [5, 15]
-    }
-    
-    Rejection{
-        className: "Qt3DRender"
-        functionName: "operator=="
-        since: [5, 15]
-    }
-    
-    Rejection{
-        className: "Qt3DRender"
-        functionName: "operator!="
-        since: [5, 15]
-    }
-    
+
     Rejection{
-        className: "Qt3DRender"
-        functionName: "swap"
-        since: [5, 15]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::API"
-        since: [5, 15]
+        className: "Qt3DRender::QAbstractRayCasterPrivate"
     }
-    
+
     Rejection{
         className: "Qt3DRender::FunctorType"
     }
-    
+
     Rejection{
         className: "Qt3DRender::QFrameGraphNodeCreatedChange"
     }
-    
-    Rejection{
-        className: "Qt3DRender::QStencilTest"
-        functionName: "front"
-        until: [5, 6]
-    }
-    
-    Rejection{
-        className: "Qt3DRender::QStencilTest"
-        functionName: "back"
-        until: [5, 6]
-    }
-    
+
     Rejection{
         className: "Qt3DRender::QStencilTestSeparate"
     }
     
-    Rejection{
-        className: "Qt3DRender::QTechnique"
-        functionName: "graphicsApiFilter"
-    }
-    
-    Rejection{
-        className: "Qt3DRender::QGeometry"
-        functionName: "boundingVolumeSpecifier"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QRenderAspect::RenderType"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QRenderAspect::SubmissionType"
-        since: 6
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QShaderProgram::Format"
-        since: [5, 15]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QRenderAspect"
-        javaName: "QRenderAspect"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QMemoryBarrier::Operation"
-        flags: "Qt3DRender::QMemoryBarrier::Operations"
+
+        EnumType{
+            name: "RenderType"
+        }
+
+        EnumType{
+            name: "SubmissionType"
+            since: 6
+        }
     }
     
     ObjectType{
         name: "Qt3DRender::QMemoryBarrier"
-        javaName: "QMemoryBarrier"
+
+        EnumType{
+            name: "Operation"
+        }
     }
     
     ObjectType{
         name: "Qt3DRender::QScreenRayCaster"
-        javaName: "QScreenRayCaster"
         ModifyFunction{
             signature: "pick(QPoint)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.core.QList<io.qt.qt3d.render.QRayCasterHit>"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<Qt3DRender::QAbstractRayCaster::Hits*>(%env, %in);"}
-                }
-            }
             since: 6
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QSetFence::HandleType"
-    }
-    
     ObjectType{
         name: "Qt3DRender::QSetFence"
-        javaName: "QSetFence"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QWaitFence::HandleType"
+        EnumType{
+            name: "HandleType"
+        }
     }
     
     ObjectType{
         name: "Qt3DRender::QWaitFence"
-        javaName: "QWaitFence"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QLevelOfDetail::ThresholdType"
+        EnumType{
+            name: "HandleType"
+        }
     }
     
     ObjectType{
         name: "Qt3DRender::QLevelOfDetail"
-        javaName: "QLevelOfDetail"
+        EnumType{
+            name: "ThresholdType"
+        }
         ModifyFunction{
             signature: "setCamera(Qt3DRender::QCamera*)"
             ModifyArgument{
@@ -246,16 +184,14 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QLevelOfDetailSwitch"
-        javaName: "QLevelOfDetailSwitch"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QBlitFramebuffer::InterpolationMethod"
     }
     
     ObjectType{
         name: "Qt3DRender::QBlitFramebuffer"
-        javaName: "QBlitFramebuffer"
+
+        EnumType{
+            name: "InterpolationMethod"
+        }
         ModifyFunction{
             signature: "setDestination(Qt3DRender::QRenderTarget*)"
             ModifyArgument{
@@ -278,12 +214,10 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QBufferCapture"
-        javaName: "QBufferCapture"
     }
     
     ObjectType{
         name: "Qt3DRender::QEnvironmentLight"
-        javaName: "QEnvironmentLight"
         ModifyFunction{
             signature: "setIrradiance(Qt3DRender::QAbstractTexture*)"
             ModifyArgument{
@@ -306,7 +240,6 @@ TypeSystem{
     
     ValueType{
         name: "Qt3DRender::QLevelOfDetailBoundingSphere"
-        javaName: "QLevelOfDetailBoundingSphere"
         ModifyFunction{
             signature: "operator=(const Qt3DRender::QLevelOfDetailBoundingSphere &)"
             remove: RemoveFlag.All
@@ -315,18 +248,15 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QFrameGraphNodeCreatedChangeBase"
-        javaName: "QFrameGraphNodeCreatedChange"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QLineWidth"
-        javaName: "QLineWidth"
     }
     
     ObjectType{
         name: "Qt3DRender::QDiffuseMapMaterial"
-        javaName: "QDiffuseMapMaterial"
         ModifyFunction{
             signature: "setDiffuse(Qt3DRender::QAbstractTextureProvider*)"
             ModifyArgument{
@@ -342,7 +272,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QDiffuseSpecularMapMaterial"
-        javaName: "QDiffuseSpecularMapMaterial"
         ModifyFunction{
             signature: "setDiffuse(Qt3DRender::QAbstractTextureProvider*)"
             ModifyArgument{
@@ -368,7 +297,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QForwardRenderer"
-        javaName: "QForwardRenderer"
         ModifyFunction{
             signature: "setCamera(Qt3DCore::QEntity*)"
             ModifyArgument{
@@ -382,13 +310,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QNormalDiffuseMapAlphaMaterial"
-        javaName: "QNormalDiffuseMapAlphaMaterial"
         until: [5, 6]
     }
     
     ObjectType{
         name: "Qt3DRender::QNormalDiffuseMapMaterial"
-        javaName: "QNormalDiffuseMapMaterial"
         ModifyFunction{
             signature: "setDiffuse(Qt3DRender::QAbstractTextureProvider*)"
             ModifyArgument{
@@ -414,7 +340,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QNormalDiffuseSpecularMapMaterial"
-        javaName: "QNormalDiffuseSpecularMapMaterial"
         ModifyFunction{
             signature: "setDiffuse(Qt3DRender::QAbstractTextureProvider*)"
             ModifyArgument{
@@ -450,13 +375,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QPhongMaterial"
-        javaName: "QPhongMaterial"
         until: [5, 6]
     }
     
     ObjectType{
         name: "Qt3DRender::QMaterial"
-        javaName: "QMaterial"
         ModifyFunction{
             signature: "setEffect(Qt3DRender::QEffect*)"
             ModifyArgument{
@@ -500,13 +423,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QSkyboxEntity"
-        javaName: "QSkyboxEntity"
         until: [5, 6]
     }
     
     InterfaceType{
         name: "Qt3DRender::QAbstractMeshFunctor"
-        javaName: "QAbstractMeshFunctor"
         ModifyFunction{
             signature: "operator==(const Qt3DRender::QAbstractMeshFunctor &) const"
             rename: "equals"
@@ -525,7 +446,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator()()"
-            rename: "get"
+            Delegate{name: "get"}
             ModifyArgument{
                 index: "return"
                 DefineOwnership{
@@ -542,27 +463,19 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QAbstractMesh"
-        javaName: "QAbstractMesh"
     }
     
     NamespaceType{
         name: "Qt3DRender::Render"
-        javaName: "Qt3DRenderer"
         generate: false
     }
     
-    EnumType{
-        name: "Qt3DRender::QAbstractSceneLoader::Status"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QGeometryRenderer::PrimitiveType"
-    }
-    
     ObjectType{
         name: "Qt3DRender::QGeometryRenderer"
-        javaName: "QGeometryRenderer"
+
+        EnumType{
+            name: "PrimitiveType"
+        }
         ModifyFunction{
             signature: "setGeometry(Qt3DRender::QGeometry *)"
             ModifyArgument{
@@ -589,7 +502,10 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QGeometry"
-        javaName: "QGeometry"
+
+        Rejection{
+            functionName: "boundingVolumeSpecifier"
+        }
         ModifyFunction{
             signature: "addAttribute(Qt3DRender::QAttribute *)"
             ModifyArgument{
@@ -659,13 +575,14 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QAbstractSceneLoader"
-        javaName: "QAbstractSceneLoader"
+        EnumType{
+            name: "Status"
+        }
         until: [5, 6]
     }
     
     InterfaceType{
         name: "Qt3DRender::QTextureDataFunctor"
-        javaName: "QTextureDataFunctor"
         ModifyFunction{
             signature: "operator==(const Qt3DRender::QTextureDataFunctor &) const"
             rename: "equals"
@@ -684,7 +601,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator()()"
-            rename: "get"
+            Delegate{name: "get"}
             ModifyArgument{
                 index: "return"
                 DefineOwnership{
@@ -701,7 +618,6 @@ TypeSystem{
     
     InterfaceType{
         name: "Qt3DRender::QGeometryFunctor"
-        javaName: "QGeometryFunctor"
         ModifyFunction{
             signature: "operator==(const Qt3DRender::QGeometryFunctor &) const"
             rename: "equals"
@@ -720,7 +636,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator()()"
-            rename: "get"
+            Delegate{name: "get"}
             ModifyArgument{
                 index: "return"
                 DefineOwnership{
@@ -738,7 +654,11 @@ TypeSystem{
     
     InterfaceType{
         name: "Qt3DRender::QAbstractFunctor"
-        javaName: "QAbstractFunctor"
+
+        Rejection{
+            functionName: "functor_cast"
+            since: [5, 15]
+        }
         ModifyFunction{
             signature: "id()const"
             remove: RemoveFlag.JavaAndNative
@@ -758,7 +678,6 @@ TypeSystem{
     
     InterfaceType{
         name: "Qt3DRender::QBufferFunctor"
-        javaName: "QBufferFunctor"
         ModifyFunction{
             signature: "operator==(const Qt3DRender::QBufferFunctor &) const"
             rename: "equals"
@@ -777,7 +696,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator()()"
-            rename: "get"
+            Delegate{name: "get"}
             ModifyArgument{
                 index: "return"
                 DefineOwnership{
@@ -794,12 +713,10 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QAbstractTextureImage"
-        javaName: "QAbstractTextureImage"
     }
     
     ObjectType{
         name: "Qt3DRender::QPaintedTextureImage"
-        javaName: "QPaintedTextureImage"
         ModifyFunction{
             signature: "paint(QPainter*)"
             ModifyArgument{
@@ -811,52 +728,42 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QRenderCapture"
-        javaName: "QRenderCapture"
     }
     
     ObjectType{
         name: "Qt3DRender::QRenderCaptureReply"
-        javaName: "QRenderCaptureReply"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTextureProvider::Status"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTextureProvider::Target"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTextureProvider::TextureFormat"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTextureProvider::Filter"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTextureProvider::CubeMapFace"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTextureProvider::ComparisonFunction"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTextureProvider::ComparisonMode"
-        until: [5, 6]
     }
     
     ObjectType{
         name: "Qt3DRender::QAbstractTextureProvider"
-        javaName: "QAbstractTextureProvider"
+        EnumType{
+            name: "Status"
+        }
+
+        EnumType{
+            name: "Target"
+        }
+
+        EnumType{
+            name: "TextureFormat"
+        }
+
+        EnumType{
+            name: "Filter"
+        }
+
+        EnumType{
+            name: "CubeMapFace"
+        }
+
+        EnumType{
+            name: "ComparisonFunction"
+        }
+
+        EnumType{
+            name: "ComparisonMode"
+            until: [5, 6]
+        }
         ModifyFunction{
             signature: "addTextureImage(Qt3DRender::QAbstractTextureImage*)"
             ModifyArgument{
@@ -887,49 +794,40 @@ TypeSystem{
         until: [5, 6]
     }
     
-    EnumType{
-        name: "Qt3DRender::QAbstractTexture::Status"
-        since: []
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTexture::Target"
-        since: []
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTexture::TextureFormat"
-        since: []
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTexture::Filter"
-        since: []
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTexture::CubeMapFace"
-        since: []
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTexture::ComparisonFunction"
-        since: []
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTexture::ComparisonMode"
-        since: []
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractTexture::HandleType"
-        since: [5, 12]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QAbstractTexture"
-        javaName: "QAbstractTexture"
+        EnumType{
+            name: "Status"
+        }
+
+        EnumType{
+            name: "Target"
+        }
+
+        EnumType{
+            name: "TextureFormat"
+        }
+
+        EnumType{
+            name: "Filter"
+        }
+
+        EnumType{
+            name: "CubeMapFace"
+        }
+
+        EnumType{
+            name: "ComparisonFunction"
+        }
+
+        EnumType{
+            name: "ComparisonMode"
+        }
+
+        EnumType{
+            name: "HandleType"
+            since: [5, 12]
+        }
         ModifyFunction{
             signature: "addTextureImage(Qt3DRender::QAbstractTextureImage*)"
             ModifyArgument{
@@ -957,18 +855,15 @@ TypeSystem{
                 }
             }
         }
-        since: []
     }
     
     ObjectType{
         name: "Qt3DRender::QSharedGLTexture"
-        javaName: "QSharedGLTexture"
         since: [5, 13]
     }
     
     ObjectType{
         name: "Qt3DRender::QAlphaCoverage"
-        javaName: "QAlphaCoverage"
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -976,19 +871,16 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QAlphaTest::AlphaFunc"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAlphaTest::AlphaFunction"
-        since: [5, 7]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QAlphaTest"
-        javaName: "QAlphaTest"
+        EnumType{
+            name: "AlphaFunc"
+        }
+
+        EnumType{
+            name: "AlphaFunction"
+            since: [5, 7]
+        }
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -998,22 +890,19 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QAnnotation"
-        javaName: "QAnnotation"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QBlendEquation::BlendMode"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QBlendEquation::BlendFunction"
-        since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QBlendEquation"
-        javaName: "QBlendEquation"
+        EnumType{
+            name: "BlendMode"
+            until: [5, 6]
+        }
+
+        EnumType{
+            name: "BlendFunction"
+            since: [5, 7]
+        }
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1021,31 +910,27 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QBlendState::Blending"
-        RejectEnumValue{
-            name: "OneMinusSrcAlpha"
-        }
-        RejectEnumValue{
-            name: "DstAlpha"
-        }
-        until: [5, 6]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QBlendState"
-        javaName: "QBlendState"
+
+        EnumType{
+            name: "Blending"
+            RejectEnumValue{
+                name: "OneMinusSrcAlpha"
+            }
+            RejectEnumValue{
+                name: "DstAlpha"
+            }
+        }
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
-            until: [5, 6]
         }
         until: [5, 6]
     }
     
     ObjectType{
         name: "Qt3DRender::QColorMask"
-        javaName: "QColorMask"
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1060,16 +945,14 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QCuboidMesh"
-        javaName: "QCuboidMesh"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QCullFace::CullingMode"
     }
     
     ObjectType{
         name: "Qt3DRender::QCullFace"
-        javaName: "QCullFace"
+
+        EnumType{
+            name: "CullingMode"
+        }
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1079,12 +962,10 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QCylinderMesh"
-        javaName: "QCylinderMesh"
     }
     
     ObjectType{
         name: "Qt3DRender::QDepthMask"
-        javaName: "QDepthMask"
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1092,19 +973,17 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QDepthTest::DepthFunc"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QDepthTest::DepthFunction"
-        since: [5, 7]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QDepthTest"
-        javaName: "QDepthTest"
+
+        EnumType{
+            name: "DepthFunc"
+        }
+
+        EnumType{
+            name: "DepthFunction"
+            since: [5, 7]
+        }
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1114,12 +993,10 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QDirectionalLight"
-        javaName: "QDirectionalLight"
     }
     
     ObjectType{
         name: "Qt3DRender::QDithering"
-        javaName: "QDithering"
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1129,7 +1006,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QEffect"
-        javaName: "QEffect"
         ModifyFunction{
             signature: "addParameter(Qt3DRender::QParameter*)"
             ModifyArgument{
@@ -1170,7 +1046,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QAttribute"
-        javaName: "QAttribute"
         ModifyFunction{
             signature: "setBuffer(Qt3DRender::QBuffer*)"
             ModifyArgument{
@@ -1180,56 +1055,50 @@ TypeSystem{
                 }
             }
         }
-        until: 5
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAttribute::AttributeType"
-        until: 5
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAttribute::VertexBaseType"
+
+        EnumType{
+            name: "AttributeType"
+        }
+
+        EnumType{
+            name: "VertexBaseType"
+        }
         until: 5
     }
     
     ObjectType{
         name: "Qt3DRender::QAbstractAttribute"
-        javaName: "QAbstractAttribute"
         ModifyFunction{
             signature: "buffer() const"
             access: Modification.NonFinal
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QFrontFace::FaceDir"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QFrontFace::WindingDirection"
-        since: [5, 7]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QFrontFace"
-        javaName: "QFrontFace"
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
             until: [5, 6]
         }
+
+        EnumType{
+            name: "FaceDir"
+            until: [5, 6]
+        }
+
+        EnumType{
+            name: "WindingDirection"
+            since: [5, 7]
+        }
     }
     
     ObjectType{
         name: "Qt3DRender::QAbstractBuffer"
-        javaName: "QAbstractBuffer"
     }
     
     ObjectType{
         name: "Qt3DRender::QBuffer"
-        javaName: "QBuffer"
         ModifyFunction{
             signature: "QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode *)"
             ModifyArgument{
@@ -1239,28 +1108,24 @@ TypeSystem{
                 }
             }
         }
-        until: 5
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QBuffer::BufferType"
-        until: 5
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QBuffer::UsageType"
-        until: 5
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QBuffer::AccessType"
-        since: [5, 9]
+
+        EnumType{
+            name: "BufferType"
+        }
+
+        EnumType{
+            name: "UsageType"
+        }
+
+        EnumType{
+            name: "AccessType"
+            since: [5, 9]
+        }
         until: 5
     }
     
     ObjectType{
         name: "Qt3DRender::QItemModelBuffer"
-        javaName: "QItemModelBuffer"
         ModifyFunction{
             signature: "setModel(QAbstractItemModel*)"
             ModifyArgument{
@@ -1275,49 +1140,39 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QLayer"
-        javaName: "QLayer"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QMesh::Status"
-        since: [5, 11]
     }
     
     ObjectType{
         name: "Qt3DRender::QMesh"
-        javaName: "QMesh"
+        EnumType{
+            name: "Status"
+            since: [5, 11]
+        }
     }
     
-    
     ObjectType{
         name: "Qt3DRender::QParameter"
-        javaName: "QParameter"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QParameterMapping::Binding"
-        until: [5, 9]
     }
     
     ObjectType{
         name: "Qt3DRender::QParameterMapping"
-        javaName: "QParameterMapping"
+
+        EnumType{
+            name: "Binding"
+        }
         until: [5, 9]
     }
     
     ObjectType{
         name: "Qt3DRender::QPlaneMesh"
-        javaName: "QPlaneMesh"
     }
     
     ObjectType{
         name: "Qt3DRender::QPointLight"
-        javaName: "QPointLight"
     }
     
     ObjectType{
         name: "Qt3DRender::QPolygonOffset"
-        javaName: "QPolygonOffset"
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1325,19 +1180,16 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QRenderAttachment::RenderAttachmentType"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QRenderAttachment::CubeMapFace"
-        until: [5, 6]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QRenderAttachment"
-        javaName: "QRenderAttachment"
+
+        EnumType{
+            name: "RenderAttachmentType"
+        }
+
+        EnumType{
+            name: "CubeMapFace"
+        }
         ModifyFunction{
             signature: "setTexture(Qt3DRender::QAbstractTextureProvider*)"
             ModifyArgument{
@@ -1352,7 +1204,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QRenderPass"
-        javaName: "QRenderPass"
         ModifyFunction{
             signature: "glslNameForParameter(QString) const"
             remove: RemoveFlag.All
@@ -1463,19 +1314,17 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QRenderState::Type"
-    }
-    
     ObjectType{
         name: "Qt3DRender::QRenderState"
-        javaName: "QRenderState"
+
+        EnumType{
+            name: "Type"
+        }
         forceAbstract: true
     }
     
     ObjectType{
         name: "Qt3DRender::QRenderTarget"
-        javaName: "QRenderTarget"
         ModifyFunction{
             signature: "addAttachment(Qt3DRender::QRenderAttachment*)"
             ModifyArgument{
@@ -1516,18 +1365,17 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QSceneLoader::Status"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QSceneLoader::ComponentType"
-        since: [5, 9]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QSceneLoader"
-        javaName: "QSceneLoader"
+
+        EnumType{
+            name: "Status"
+        }
+
+        EnumType{
+            name: "ComponentType"
+            since: [5, 9]
+        }
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1537,7 +1385,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QScissorTest"
-        javaName: "QScissorTest"
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1545,13 +1392,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QShaderData::TransformType"
-    }
-    
     ObjectType{
         name: "Qt3DRender::QShaderData"
-        javaName: "QShaderData"
+
+        EnumType{
+            name: "TransformType"
+        }
         ModifyFunction{
             signature: "event(QEvent*)"
             ModifyArgument{
@@ -1561,68 +1407,71 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QAbstractLight::Type"
-    }
-    
     ObjectType{
         name: "Qt3DRender::QAbstractLight"
-        javaName: "QAbstractLight"
+        EnumType{
+            name: "Type"
+        }
     }
     
     ObjectType{
         name: "Qt3DRender::QLight"
-        javaName: "QLight"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QLight::Type"
+        EnumType{
+            name: "Type"
+        }
         until: [5, 6]
     }
     
     InterfaceType{
         name: "Qt3DRender::PropertyReaderInterface"
-        javaName: "PropertyReaderInterface"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QShaderProgram::Status"
-        since: [5, 9]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QShaderProgram::ShaderType"
     }
     
     ObjectType{
         name: "Qt3DRender::QShaderProgram"
-        javaName: "QShaderProgram"
+
+        EnumType{
+            name: "Status"
+            since: [5, 9]
+        }
+        EnumType{
+            name: "ShaderType"
+        }
+        EnumType{
+            name: "Format"
+            since: [5, 15]
+        }
     }
     
     ObjectType{
         name: "Qt3DRender::QSphereMesh"
-        javaName: "QSphereMesh"
     }
     
     ObjectType{
         name: "Qt3DRender::QSpotLight"
-        javaName: "QSpotLight"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QStencilTest::StencilFaceMode"
-        until: [5, 6]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QStencilTest::StencilFunc"
-        until: [5, 6]
     }
     
     ObjectType{
         name: "Qt3DRender::QStencilTest"
-        javaName: "QStencilTest"
+
+        Rejection{
+            functionName: "front"
+            until: [5, 6]
+        }
+
+        Rejection{
+            functionName: "back"
+            until: [5, 6]
+        }
+
+        EnumType{
+            name: "StencilFaceMode"
+            until: [5, 6]
+        }
+
+        EnumType{
+            name: "StencilFunc"
+            until: [5, 6]
+        }
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1632,7 +1481,10 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QTechnique"
-        javaName: "QTechnique"
+
+        Rejection{
+            functionName: "graphicsApiFilter"
+        }
         ModifyFunction{
             signature: "addPass(Qt3DRender::QRenderPass*)"
             ModifyArgument{
@@ -1733,7 +1585,11 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QTextureImage"
-        javaName: "QTextureImage"
+
+        EnumType{
+            name: "Status"
+            since: [5, 7]
+        }
         ModifyFunction{
             signature: "doClone() const"
             remove: RemoveFlag.All
@@ -1743,122 +1599,81 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QTexture1D"
-        javaName: "QTexture1D"
     }
     
     ObjectType{
         name: "Qt3DRender::QTexture1DArray"
-        javaName: "QTexture1DArray"
     }
     
     ObjectType{
         name: "Qt3DRender::QTexture2D"
-        javaName: "QTexture2D"
     }
     
     ObjectType{
         name: "Qt3DRender::QTexture2DArray"
-        javaName: "QTexture2DArray"
     }
-    
+
     ObjectType{
         name: "Qt3DRender::QTexture3D"
-        javaName: "QTexture3D"
     }
     
     ObjectType{
         name: "Qt3DRender::QTextureCubeMap"
-        javaName: "QTextureCubeMap"
     }
     
     ObjectType{
         name: "Qt3DRender::QTextureCubeMapArray"
-        javaName: "QTextureCubeMapArray"
     }
     
     ObjectType{
         name: "Qt3DRender::QTexture2DMultisample"
-        javaName: "QTexture2DMultisample"
     }
     
     ObjectType{
         name: "Qt3DRender::QTexture2DMultisampleArray"
-        javaName: "QTexture2DMultisampleArray"
     }
     
     ObjectType{
         name: "Qt3DRender::QTextureRectangle"
-        javaName: "QTextureRectangle"
     }
     
     ObjectType{
         name: "Qt3DRender::QTextureBuffer"
-        javaName: "QTextureBuffer"
     }
     
     ObjectType{
         name: "Qt3DRender::QTextureLoader"
-        javaName: "QTextureLoader"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QTextureData"
-        javaName: "QTextureData"
-        ModifyFunction{
-            signature: "addImageData(const QSharedPointer<Qt3DRender::QTextureImageData> &)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.qt3d.render.QTextureImageData"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "imageData() const"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "java.util.List<QTextureImageData>"
-                }
-            }
-        }
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QTorusMesh"
-        javaName: "QTorusMesh"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QTextureWrapMode::WrapMode"
     }
     
     ObjectType{
         name: "Qt3DRender::QTextureWrapMode"
-        javaName: "QTextureWrapMode"
-    }
-    
-    
-    Rejection{
-        className: "Qt3DRender::Sphere"
+
+        EnumType{
+            name: "WrapMode"
+        }
     }
     
     ObjectType{
         name: "Qt3DRender::Attribute"
-        javaName: "Attribute"
     }
     
     ObjectType{
         name: "Qt3DRender::Buffer"
-        javaName: "Buffer"
     }
     
     
     ObjectType{
         name: "Qt3DRender::TexImageData"
-        javaName: "TexImageData"
         ModifyFunction{
             signature: "setCompressedData(QByteArray, QOpenGLTexture::PixelFormat)"
             remove: RemoveFlag.All
@@ -1867,7 +1682,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QCameraSelector"
-        javaName: "QCameraSelector"
         ModifyFunction{
             signature: "setCamera(Qt3DCore::QEntity*)"
             ModifyArgument{
@@ -1879,20 +1693,17 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QClearBuffer::BufferType"
-        until: [5, 6]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QClearBuffer"
-        javaName: "QClearBuffer"
+
+        EnumType{
+            name: "BufferType"
+        }
         until: [5, 6]
     }
     
     ObjectType{
         name: "Qt3DRender::QFrameGraph"
-        javaName: "QFrameGraph"
         ModifyFunction{
             signature: "setActiveFrameGraph(Qt3DRender::QFrameGraphNode*)"
             ModifyArgument{
@@ -1907,7 +1718,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QFrameGraphNode"
-        javaName: "QFrameGraphNode"
         ModifyFunction{
             signature: "isEnabled() const"
             rename: "isFrameGraphEnabled"
@@ -1922,26 +1732,23 @@ TypeSystem{
     
     InterfaceType{
         name: "Qt3DRender::QFrameGraphSelectorFunctor"
-        javaName: "QFrameGraphSelectorFunctor"
         ModifyFunction{
             signature: "operator()()"
-            rename: "call"
+            Delegate{name: "call"}
         }
     }
     
     ObjectType{
         name: "Qt3DRender::QFrameGraphSelector"
-        javaName: "QFrameGraphSelector"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QLayerFilter::FilterMode"
-        since: [5, 5]
     }
     
     ObjectType{
         name: "Qt3DRender::QLayerFilter"
-        javaName: "QLayerFilter"
+
+        EnumType{
+            name: "FilterMode"
+            since: [5, 5]
+        }
         ModifyFunction{
             signature: "addLayer(Qt3DRender::QLayer*)"
             ModifyArgument{
@@ -1965,12 +1772,10 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QNoDraw"
-        javaName: "QNoDraw"
     }
     
     ObjectType{
         name: "Qt3DRender::QRenderPassFilter"
-        javaName: "QRenderPassFilter"
         ModifyFunction{
             signature: "addInclude(Qt3DRender::QAnnotation*)"
             ModifyArgument{
@@ -2031,7 +1836,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QRenderTargetSelector"
-        javaName: "QRenderTargetSelector"
         ModifyFunction{
             signature: "setTarget(Qt3DRender::QRenderTarget*)"
             ModifyArgument{
@@ -2043,20 +1847,17 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "Qt3DRender::QSortCriterion::SortType"
-        until: [5, 6]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QSortCriterion"
-        javaName: "QSortCriterion"
+
+        EnumType{
+            name: "SortType"
+        }
         until: [5, 6]
     }
     
     ObjectType{
         name: "Qt3DRender::QSortMethod"
-        javaName: "QSortMethod"
         ModifyFunction{
             signature: "addCriterion(Qt3DRender::QSortCriterion*)"
             ModifyArgument{
@@ -2079,7 +1880,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QStateSet"
-        javaName: "QStateSet"
         ModifyFunction{
             signature: "addRenderState(Qt3DRender::QRenderState*)"
             ModifyArgument{
@@ -2102,7 +1902,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QTechniqueFilter"
-        javaName: "QTechniqueFilter"
         ModifyFunction{
             signature: "addParameter(Qt3DRender::QParameter*)"
             ModifyArgument{
@@ -2163,17 +1962,14 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QViewport"
-        javaName: "QViewport"
     }
     
     ObjectType{
         name: "Qt3DRender::QWindow"
-        javaName: "QWindow"
     }
     
     ObjectType{
         name: "Qt3DRender::QTexImageData"
-        javaName: "QTexImageData"
         ModifyFunction{
             signature: "operator=(const Qt3DRender::QTexImageData &)"
             remove: RemoveFlag.All
@@ -2182,19 +1978,16 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QDispatchCompute"
-        javaName: "QDispatchCompute"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QFrustumCulling"
-        javaName: "QFrustumCulling"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QClearBuffers"
-        javaName: "QClearBuffers"
         ModifyFunction{
             signature: "setColorBuffer(Qt3DRender::QRenderTargetOutput *)"
             ModifyArgument{
@@ -2205,17 +1998,15 @@ TypeSystem{
                 }
             }
         }
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QClearBuffers::BufferType"
+
+        EnumType{
+            name: "BufferType"
+        }
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QRenderStateSet"
-        javaName: "QRenderStateSet"
         ModifyFunction{
             signature: "addRenderState(Qt3DRender::QRenderState*)"
             ModifyArgument{
@@ -2239,7 +2030,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QRenderSurfaceSelector"
-        javaName: "QRenderSurfaceSelector"
         ModifyFunction{
             signature: "setSurface(QObject *)"
             ModifyArgument{
@@ -2255,7 +2045,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QSortPolicy"
-        javaName: "QSortPolicy"
         ModifyFunction{
             signature: "sortTypesChanged(const QVector<int> &)"
             rename: "sortTypesIntChanged"
@@ -2264,71 +2053,65 @@ TypeSystem{
             signature: "setSortTypes(const QVector<int> &)"
             rename: "setSortTypesInt"
         }
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QSortPolicy::SortType"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QCamera::CameraTranslationOption"
+
+        EnumType{
+            name: "SortType"
+        }
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QCamera"
-        javaName: "QCamera"
+
+        EnumType{
+            name: "CameraTranslationOption"
+        }
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QCameraLens"
-        javaName: "QCameraLens"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QCameraLens::ProjectionType"
+
+        EnumType{
+            name: "ProjectionType"
+        }
         since: [5, 7]
     }
     
-    EnumType{
-        name: "Qt3DRender::QComputeCommand::RunType"
-        since: [5, 12]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QComputeCommand"
-        javaName: "QComputeCommand"
+
+        EnumType{
+            name: "RunType"
+            since: [5, 12]
+        }
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QPickingSettings"
-        javaName: "QPickingSettings"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QPickingSettings::PickMethod"
         since: [5, 7]
     }
     
-    EnumType{
-        name: "Qt3DRender::QPickingSettings::PickResultMode"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QPickingSettings::FaceOrientationPickingMode"
-        since: [5, 8]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QRenderSettings"
-        javaName: "QRenderSettings"
+
+        EnumType{
+            name: "PickMethod"
+        }
+
+        EnumType{
+            name: "PickResultMode"
+        }
+
+        EnumType{
+            name: "FaceOrientationPickingMode"
+            since: [5, 8]
+        }
+
+        EnumType{
+            name: "RenderPolicy"
+        }
         ModifyFunction{
             signature: "setActiveFrameGraph(Qt3DRender::QFrameGraphNode*)"
             ModifyArgument{
@@ -2341,14 +2124,12 @@ TypeSystem{
         since: [5, 7]
     }
     
-    EnumType{
-        name: "Qt3DRender::QRenderSettings::RenderPolicy"
-        since: [5, 7]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QRenderTargetOutput"
-        javaName: "QRenderTargetOutput"
+
+        EnumType{
+            name: "AttachmentPoint"
+        }
         ModifyFunction{
             signature: "setTexture(Qt3DRender::QAbstractTexture*)"
             ModifyArgument{
@@ -2361,14 +2142,8 @@ TypeSystem{
         since: [5, 7]
     }
     
-    EnumType{
-        name: "Qt3DRender::QRenderTargetOutput::AttachmentPoint"
-        since: [5, 7]
-    }
-    
     InterfaceType{
         name: "Qt3DRender::QBufferDataGenerator"
-        javaName: "QBufferDataGenerator"
         ExtraIncludes{
             Include{
                 fileName: "Qt3DRender/qabstractfunctor.h"
@@ -2394,14 +2169,13 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator()()"
-            rename: "get"
+            Delegate{name: "get"}
         }
         since: [5, 7]
     }
     
     InterfaceType{
         name: "Qt3DRender::QGeometryFactory"
-        javaName: "QGeometryFactory"
         ExtraIncludes{
             Include{
                 fileName: "Qt3DRender/qabstractfunctor.h"
@@ -2427,7 +2201,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator()()"
-            rename: "get"
+            Delegate{name: "get"}
             ModifyArgument{
                 index: "return"
                 DefineOwnership{
@@ -2445,7 +2219,6 @@ TypeSystem{
     
     InterfaceType{
         name: "Qt3DRender::QTextureGenerator"
-        javaName: "QTextureGenerator"
         ExtraIncludes{
             Include{
                 fileName: "Qt3DRender/qabstractfunctor.h"
@@ -2470,14 +2243,13 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator()()"
-            rename: "get"
+            Delegate{name: "get"}
         }
         since: [5, 7]
     }
     
     InterfaceType{
         name: "Qt3DRender::QTextureImageDataGenerator"
-        javaName: "QTextureImageDataGenerator"
         ExtraIncludes{
             Include{
                 fileName: "Qt3DRender/qabstractfunctor.h"
@@ -2503,12 +2275,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator()()"
-            rename: "get"
+            Delegate{name: "get"}
             ModifyArgument{
                 index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.qt3d.render.QTextureImageData"
-                }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
@@ -2520,60 +2289,61 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QFilterKey"
-        javaName: "QFilterKey"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QGraphicsApiFilter"
-        javaName: "QGraphicsApiFilter"
-        ModifyFunction{
-            signature: "operator==(const Qt3DRender::QGraphicsApiFilter &,const Qt3DRender::QGraphicsApiFilter &)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "OpenGLProfile"
         }
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QGraphicsApiFilter::OpenGLProfile"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QGraphicsApiFilter::Api"
-        RejectEnumValue{
-            name: "Vulkan"
+
+        EnumType{
+            name: "Api"
+            RejectEnumValue{
+                name: "Vulkan"
+            }
         }
         since: [5, 7]
     }
+    GlobalFunction{
+        signature: "operator==(const Qt3DRender::QGraphicsApiFilter &,const Qt3DRender::QGraphicsApiFilter &)"
+        remove: RemoveFlag.All
+    }
     
     ObjectType{
         name: "Qt3DRender::QObjectPicker"
-        javaName: "QObjectPicker"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QPickEvent"
-        javaName: "QPickEvent"
+
+        EnumType{
+            name: "Buttons"
+            since: [5, 8]
+        }
+
+        EnumType{
+            name: "Modifiers"
+            since: [5, 8]
+        }
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QPickLineEvent"
-        javaName: "QPickLineEvent"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DRender::QPickPointEvent"
-        javaName: "QPickPointEvent"
         since: [5, 10]
     }
     
     ObjectType{
         name: "Qt3DRender::QProximityFilter"
-        javaName: "QProximityFilter"
         ModifyFunction{
             signature: "setEntity(Qt3DCore::QEntity*)"
             ModifyArgument{
@@ -2588,7 +2358,6 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QShaderProgramBuilder"
-        javaName: "QShaderProgramBuilder"
         ModifyFunction{
             signature: "setShaderProgram(Qt3DRender::QShaderProgram*)"
             ModifyArgument{
@@ -2601,154 +2370,114 @@ TypeSystem{
         since: [5, 10]
     }
     
-    EnumType{
-        name: "Qt3DRender::QPickEvent::Buttons"
-        since: [5, 8]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QPickEvent::Modifiers"
-        since: [5, 8]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QPickTriangleEvent"
-        javaName: "QPickTriangleEvent"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QBlendEquationArguments"
-        javaName: "QBlendEquationArguments"
+
+        EnumType{
+            name: "Blending"
+            RejectEnumValue{
+                name: "Source1Alpha"
+            }
+            RejectEnumValue{
+                name: "Source1Color"
+            }
+            RejectEnumValue{
+                name: "OneMinusSource1Color0"
+                since: [5, 8]
+            }
+        }
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QClipPlane"
-        javaName: "QClipPlane"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QMultiSampleAntiAliasing"
-        javaName: "QMultiSampleAntiAliasing"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QNoDepthMask"
-        javaName: "QNoDepthMask"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QPointSize"
-        javaName: "QPointSize"
+
+        EnumType{
+            name: "SizeMode"
+        }
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QSeamlessCubemap"
-        javaName: "QSeamlessCubemap"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QStencilMask"
-        javaName: "QStencilMask"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QStencilOperation"
-        javaName: "QStencilOperation"
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QStencilOperationArguments"
-        javaName: "QStencilOperationArguments"
+
+        EnumType{
+            name: "FaceMode"
+        }
+
+        EnumType{
+            name: "Operation"
+        }
         since: [5, 7]
     }
     
     ObjectType{
         name: "Qt3DRender::QStencilTestArguments"
-        javaName: "QStencilTestArguments"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QBlendEquationArguments::Blending"
-        RejectEnumValue{
-            name: "Source1Alpha"
-        }
-        RejectEnumValue{
-            name: "Source1Color"
+        EnumType{
+            name: "StencilFaceMode"
         }
-        RejectEnumValue{
-            name: "OneMinusSource1Color0"
-            since: [5, 8]
+        EnumType{
+            name: "StencilFunction"
         }
         since: [5, 7]
     }
     
-    EnumType{
-        name: "Qt3DRender::QPointSize::SizeMode"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QStencilOperationArguments::FaceMode"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QStencilOperationArguments::Operation"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QStencilTestArguments::StencilFaceMode"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QStencilTestArguments::StencilFunction"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QTextureImage::Status"
-        since: [5, 7]
-    }
-    
     ValueType{
         name: "Qt3DRender::QTextureImageData"
-        javaName: "QTextureImageData"
-        ModifyFunction{
-            signature: "operator=(const Qt3DRender::QTextureImageData &)"
-            remove: RemoveFlag.All
+
+        FunctionalType{
+            name: "DataConverter"
+            using: "std::function<QByteArray(QByteArray,int,int,int)>"
+            since: 6
         }
         since: [5, 7]
     }
     
-    FunctionalType{
-        name: "Qt3DRender::QTextureImageData::DataConverter"
-        using: "std::function<QByteArray(QByteArray,int,int,int)>"
-        since: 6
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractRayCaster::RunMode"
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QAbstractRayCaster::FilterMode"
-    }
-    
     ObjectType{
         name: "Qt3DRender::QAbstractRayCaster"
-        javaName: "QAbstractRayCaster"
+
+        EnumType{
+            name: "RunMode"
+        }
+
+        EnumType{
+            name: "FilterMode"
+        }
         ModifyFunction{
             signature: "addLayer(Qt3DRender::QLayer*)"
             ModifyArgument{
@@ -2767,95 +2496,53 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "hitsChanged(const Qt3DRender::QAbstractRayCaster::Hits &)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QList<io.qt.qt3d.render.QRayCasterHit>"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "const Qt3DRender::QAbstractRayCaster::Hits& %out = qtjambi_cast<const Qt3DRender::QAbstractRayCaster::Hits&>(%env, %scope, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "hits() const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.core.QList<io.qt.qt3d.render.QRayCasterHit>"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
         name: "Qt3DRender::QRayCaster"
-        javaName: "QRayCaster"
-        ModifyFunction{
-            signature: "pick(QVector3D,QVector3D,float)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.core.QList<io.qt.qt3d.render.QRayCasterHit>"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<Qt3DRender::QAbstractRayCaster::Hits*>(%env, %in);"}
-                }
-            }
-            since: 6
-        }
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QRayCasterHit::HitType"
     }
     
     ValueType{
         name: "Qt3DRender::QRayCasterHit"
-        javaName: "QRayCasterHit"
-        ModifyFunction{
-            signature: "operator=(const Qt3DRender::QRayCasterHit &)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "HitType"
         }
     }
     
     ObjectType{
         name: "Qt3DRender::QDepthRange"
-        javaName: "QDepthRange"
         since: [5, 14]
     }
     
     ObjectType{
         name: "Qt3DRender::QNoPicking"
-        javaName: "QNoPicking"
         since: [5, 14]
     }
     
     ObjectType{
         name: "Qt3DRender::QRasterMode"
-        javaName: "QRasterMode"
+
+        EnumType{
+            name: "FaceMode"
+        }
+
+        EnumType{
+            name: "RasterMode"
+        }
         since: [5, 14]
     }
     
     ObjectType{
         name: "Qt3DRender::QShaderImage"
-        javaName: "QShaderImage"
+
+        EnumType{
+            name: "Access"
+        }
+
+        EnumType{
+            name: "ImageFormat"
+        }
         ModifyFunction{
             signature: "setTexture(Qt3DRender::QAbstractTexture*)"
             ModifyArgument{
@@ -2870,46 +2557,37 @@ TypeSystem{
     
     ObjectType{
         name: "Qt3DRender::QSubtreeEnabler"
-        javaName: "QSubtreeEnabler"
+
+        EnumType{
+            name: "Enablement"
+        }
         since: [5, 14]
     }
     
     ObjectType{
         name: "Qt3DRender::QRenderCapabilities"
-        javaName: "QRenderCapabilities"
+
+        EnumType{
+            name: "API"
+        }
+
+        EnumType{
+            name: "Profile"
+        }
         since: [5, 15]
     }
     
     ObjectType{
         name: "Qt3DRender::QDebugOverlay"
-        javaName: "QDebugOverlay"
-        since: [5, 15]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QRenderCapabilities::API"
-        since: [5, 15]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QRenderCapabilities::Profile"
         since: [5, 15]
     }
     
     ValueType{
         name: "Qt3DRender::QTextureDataUpdate"
-        javaName: "QTextureDataUpdate"
-        ModifyFunction{
-            signature: "operator=(const Qt3DRender::QTextureDataUpdate &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "setData(const QSharedPointer<Qt3DRender::QTextureImageData> &)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.qt3d.render.QTextureImageData"
-                }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "QSharedPointer<Qt3DRender::QTextureImageData> %out = qtjambi_cast<QSharedPointer<Qt3DRender::QTextureImageData>>(%env, %in);"}
@@ -2920,9 +2598,6 @@ TypeSystem{
             signature: "data()const"
             ModifyArgument{
                 index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.qt3d.render.QTextureImageData"
-                }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
@@ -2932,34 +2607,8 @@ TypeSystem{
         since: [5, 14]
     }
     
-    EnumType{
-        name: "Qt3DRender::QRasterMode::FaceMode"
-        since: [5, 14]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QRasterMode::RasterMode"
-        since: [5, 14]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QShaderImage::Access"
-        since: [5, 14]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QShaderImage::ImageFormat"
-        since: [5, 14]
-    }
-    
-    EnumType{
-        name: "Qt3DRender::QSubtreeEnabler::Enablement"
-        since: [5, 14]
-    }
-    
     ObjectType{
         name: "Qt3DRender::QPickingProxy"
-        javaName: "QPickingProxy"
         since: 6
     }
     
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtActiveX.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtActiveX.qml
index 5f2c3279..3e8190c8 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtActiveX.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtActiveX.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.activex"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     targetName: "QtJambiActiveX"
     module: "qtjambi.activex"
     description: "Classes for applications which use ActiveX and COM"
@@ -101,50 +101,6 @@ TypeSystem{
         className: "IAxServerBase"
     }
     
-    Rejection{
-        className: "QAxBase::qt_meta_stringdata_QAxBase_t"
-    }
-    
-    Rejection{
-        className: "QAxBase"
-        fieldName: "qt_meta_data_QAxBase"
-    }
-    
-    Rejection{
-        className: "QAxBase"
-        fieldName: "qt_meta_stringdata_QAxBase"
-    }
-    
-    Rejection{
-        className: "QAxBase"
-        functionName: "queryInterface"
-    }
-    
-    Rejection{
-        className: "QAxBaseObject"
-        functionName: "queryInterface"
-    }
-    
-    Rejection{
-        className: "QAxBaseWidget"
-        functionName: "queryInterface"
-    }
-    
-    Rejection{
-        className: "QAxWidget"
-        functionName: "queryInterface"
-    }
-    
-    Rejection{
-        className: "QAxObject"
-        functionName: "queryInterface"
-    }
-    
-    Rejection{
-        className: "QAxScriptEngine"
-        functionName: "queryInterface"
-    }
-    
     Rejection{
         className: ""
         functionName: "qAxFactory"
@@ -217,6 +173,10 @@ TypeSystem{
     
     ObjectType{
         name: "QAxBaseObject"
+
+        Rejection{
+            functionName: "queryInterface"
+        }
         ModifyFunction{
             signature: "signal(QString, int, void *)"
             access: Modification.Private
@@ -226,6 +186,10 @@ TypeSystem{
     
     ObjectType{
         name: "QAxBaseWidget"
+
+        Rejection{
+            functionName: "queryInterface"
+        }
         ModifyFunction{
             signature: "signal(QString, int, void *)"
             access: Modification.Private
@@ -235,6 +199,10 @@ TypeSystem{
     
     ObjectType{
         name: "QAxWidget"
+
+        Rejection{
+            functionName: "queryInterface"
+        }
         ModifyFunction{
             signature: "qt_static_metacall(QObject *, QMetaObject::Call, int, void **)"
             remove: RemoveFlag.All
@@ -252,83 +220,33 @@ TypeSystem{
     
     InterfaceType{
         name: "QAxBase"
-        ModifyFunction{
-            signature: "qt_static_metacall(QAxBase *, QMetaObject::Call, int, void **)"
-            remove: RemoveFlag.All
-            until: [5, 15]
-        }
-        ModifyFunction{
-            signature: "operator=(const QProcessEnvironment&)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator<<(QDataStream&,QAxBase)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator>>(QDataStream&,QAxBase&)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "propertyWritable(const char*)const"
-            ModifyArgument{
-                index: 1
-                replaceType: "java.lang.String"
-            }
-        }
-        ModifyFunction{
-            signature: "setPropertyWritable(const char*,bool)"
-            ModifyArgument{
-                index: 1
-                replaceType: "java.lang.String"
-            }
-        }
-        ModifyFunction{
-            signature: "className()const"
-            ModifyArgument{
-                index: 0
-                replaceType: "java.lang.String"
-            }
+
+        Rejection{
+            className: "qt_meta_stringdata_QAxBase_t"
         }
-        ModifyFunction{
-            signature: "dynamicCall(const char*,QList<QVariant>&)"
-            ModifyArgument{
-                index: 1
-                replaceType: "java.lang.String"
-            }
+        Rejection{
+            fieldName: "qt_meta_data_QAxBase"
         }
-        ModifyFunction{
-            signature: "dynamicCall(const char*,QList<QVariant>&,uint)"
-            ModifyArgument{
-                index: 1
-                replaceType: "java.lang.String"
-            }
+        Rejection{
+            fieldName: "qt_meta_stringdata_QAxBase"
         }
-        ModifyFunction{
-            signature: "dynamicCall(const char*,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant)"
-            ModifyArgument{
-                index: 1
-                replaceType: "java.lang.String"
-            }
+        Rejection{
+            functionName: "queryInterface"
         }
-        ModifyFunction{
-            signature: "querySubObject(const char*,QList<QVariant>&)"
-            ModifyArgument{
-                index: 1
-                replaceType: "java.lang.String"
-            }
+        Rejection{
+            functionName: "qt_metacall"
         }
-        ModifyFunction{
-            signature: "querySubObject(const char*,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant)"
-            ModifyArgument{
-                index: 1
-                replaceType: "java.lang.String"
-            }
+        Rejection{
+            functionName: "qt_static_metacall"
         }
     }
     
     ObjectType{
         name: "QAxObject"
+
+        Rejection{
+            functionName: "queryInterface"
+        }
         ModifyFunction{
             signature: "qt_static_metacall(QObject *, QMetaObject::Call, int, void **)"
             remove: RemoveFlag.All
@@ -342,14 +260,22 @@ TypeSystem{
     
     ObjectType{
         name: "QAxScript"
-    }
-    
-    EnumType{
-        name: "QAxScript::FunctionFlags"
+
+        EnumType{
+            name: "FunctionFlags"
+        }
     }
     
     ObjectType{
         name: "QAxScriptEngine"
+
+        Rejection{
+            functionName: "queryInterface"
+        }
+
+        EnumType{
+            name: "State"
+        }
     }
     
     ObjectType{
@@ -377,16 +303,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QAxScriptEngine::State"
-    }
-    
     ObjectType{
         name: "QAxSelect"
-    }
-    
-    EnumType{
-        name: "QAxSelect::SandboxingLevel"
+
+        EnumType{
+            name: "SandboxingLevel"
+        }
     }
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'IUnknown*'"}
@@ -395,4 +317,5 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: private virtual function 'metaObject() const' in '*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: private virtual function 'qt_metacall(*)' in '*'"}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: Either add or remove specified for reference count variable '__rcObjects' in 'QAxScriptManager' but not both."}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping field 'IID_IAxServerBase' with unmatched type 'GUID'"}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtBluetooth.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtBluetooth.qml
index 7ad59d04..cf70a1d0 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtBluetooth.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtBluetooth.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.bluetooth"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtBluetooth"
     module: "qtjambi.bluetooth"
     description: "Provides access to Bluetooth hardware."
@@ -59,282 +59,120 @@ TypeSystem{
     
     NamespaceType{
         name: "QBluetooth"
-    }
-    
-    EnumType{
-        name: "QBluetooth::AttAccessConstraint"
-        flags: "QBluetooth::AttAccessConstraints"
-    }
-    
-    EnumType{
-        name: "QBluetooth::Security"
-        flags: "QBluetooth::SecurityFlags"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceDiscoveryAgent::DiscoveryMethod"
-        flags: "QBluetoothDeviceDiscoveryAgent::DiscoveryMethods"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceDiscoveryAgent::Error"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceDiscoveryAgent::InquiryType"
-    }
-    
-    EnumType{
-        name: "QBluetoothServiceInfo::AttributeId"
-        RejectEnumValue{
-            name: "PrimaryLanguageBase"
+
+        EnumType{
+            name: "AttAccessConstraint"
         }
-    }
-    
-    EnumType{
-        name: "QBluetoothServiceInfo::Protocol"
-    }
-    
-    EnumType{
-        name: "QBluetoothSocket::SocketError"
-    }
-    
-    EnumType{
-        name: "QBluetoothSocket::SocketState"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::CoreConfiguration"
-        flags: "QBluetoothDeviceInfo::CoreConfigurations"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::DataCompleteness"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::Field"
-        flags: "QBluetoothDeviceInfo::Fields"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MajorDeviceClass"
-        RejectEnumValue{
-            name: "NetworkDevice"
-            until: 5
+
+        EnumType{
+            name: "Security"
         }
     }
     
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorAudioVideoClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorComputerClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorHealthClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorImagingClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorMiscellaneousClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorNetworkClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorPeripheralClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorPhoneClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorToyClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::MinorWearableClass"
-    }
-    
-    EnumType{
-        name: "QBluetoothDeviceInfo::ServiceClass"
-        flags: "QBluetoothDeviceInfo::ServiceClasses"
-    }
-    
-    EnumType{
-        name: "QBluetoothLocalDevice::Error"
-    }
-    
-    EnumType{
-        name: "QBluetoothLocalDevice::HostMode"
-    }
-    
-    EnumType{
-        name: "QBluetoothLocalDevice::Pairing"
-    }
-    
-    EnumType{
-        name: "QBluetoothServer::Error"
-    }
-    
-    EnumType{
-        name: "QBluetoothServiceDiscoveryAgent::DiscoveryMode"
-    }
-    
-    EnumType{
-        name: "QBluetoothServiceDiscoveryAgent::Error"
-    }
-    
-    EnumType{
-        name: "QBluetoothTransferReply::TransferError"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QBluetoothTransferRequest::Attribute"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QBluetoothUuid::CharacteristicType"
-    }
-    
-    EnumType{
-        name: "QBluetoothUuid::DescriptorType"
-    }
-    
-    EnumType{
-        name: "QBluetoothUuid::ProtocolUuid"
-    }
-    
-    EnumType{
-        name: "QBluetoothUuid::ServiceClassUuid"
-    }
-    
-    EnumType{
-        name: "QLowEnergyAdvertisingData::Discoverability"
-    }
-    
-    EnumType{
-        name: "QLowEnergyAdvertisingParameters::FilterPolicy"
-    }
-    
-    EnumType{
-        name: "QLowEnergyAdvertisingParameters::Mode"
-    }
-    
-    EnumType{
-        name: "QLowEnergyController::ControllerState"
-    }
-    
-    EnumType{
-        name: "QLowEnergyController::Error"
-    }
-    
-    EnumType{
-        name: "QLowEnergyController::RemoteAddressType"
-    }
-    
-    EnumType{
-        name: "QLowEnergyController::Role"
-    }
-    
-    EnumType{
-        name: "QLowEnergyService::ServiceError"
+    ValueType{
+        name: "QBluetoothAddress"
     }
     
-    EnumType{
-        name: "QLowEnergyService::ServiceState"
-        RejectEnumValue{
-            name: "DiscoveryRequired"
-            since: [6, 2]
+    ValueType{
+        name: "QBluetoothServiceInfo"
+
+        EnumType{
+            name: "AttributeId"
+            RejectEnumValue{
+                name: "PrimaryLanguageBase"
+            }
         }
-        RejectEnumValue{
-            name: "DiscoveringService"
+
+        EnumType{
+            name: "Protocol"
         }
-        RejectEnumValue{
-            name: "ServiceDiscovered"
-            since: [6, 2]
+
+        ValueType{
+            name: "Sequence"
+            ExtraIncludes{
+                Include{
+                    fileName: "hashes.h"
+                    location: Include.Local
+                }
+            }
         }
-    }
-    
-    EnumType{
-        name: "QLowEnergyService::WriteMode"
-    }
-    
-    EnumType{
-        name: "QLowEnergyService::DiscoveryMode"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QLowEnergyService::ServiceType"
-        flags: "QLowEnergyService::ServiceTypes"
-    }
-    
-    EnumType{
-        name: "QLowEnergyServiceData::ServiceType"
-    }
-    
-    EnumType{
-        name: "QLowEnergyCharacteristic::PropertyType"
-        flags: "QLowEnergyCharacteristic::PropertyTypes"
-    }
-    
-    ValueType{
-        name: "QLowEnergyAdvertisingParameters::AddressInfo"
-    }
-    
-    ValueType{
-        name: "QBluetoothServiceInfo::Sequence"
-        ExtraIncludes{
-            Include{
-                fileName: "hashes.h"
-                location: Include.Local
+
+        ValueType{
+            name: "Alternative"
+            ExtraIncludes{
+                Include{
+                    fileName: "hashes.h"
+                    location: Include.Local
+                }
             }
         }
     }
     
     ValueType{
-        name: "QBluetoothServiceInfo::Alternative"
-        ExtraIncludes{
-            Include{
-                fileName: "hashes.h"
-                location: Include.Local
+        name: "QBluetoothDeviceInfo"
+
+        EnumType{
+            name: "CoreConfiguration"
+        }
+
+        EnumType{
+            name: "DataCompleteness"
+        }
+
+        EnumType{
+            name: "Field"
+        }
+
+        EnumType{
+            name: "MajorDeviceClass"
+            RejectEnumValue{
+                name: "NetworkDevice"
+                until: 5
             }
         }
-    }
-    
-    ValueType{
-        name: "QBluetoothAddress"
-        ModifyFunction{
-            signature: "operator=(QBluetoothAddress)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "MinorAudioVideoClass"
         }
-    }
-    
-    ValueType{
-        name: "QBluetoothServiceInfo"
-        ModifyFunction{
-            signature: "operator=(QBluetoothServiceInfo)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "MinorComputerClass"
         }
-    }
-    
-    ValueType{
-        name: "QBluetoothDeviceInfo"
-        ModifyFunction{
-            signature: "operator=(QBluetoothDeviceInfo)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "MinorHealthClass"
+        }
+
+        EnumType{
+            name: "MinorImagingClass"
+        }
+
+        EnumType{
+            name: "MinorMiscellaneousClass"
+        }
+
+        EnumType{
+            name: "MinorNetworkClass"
+        }
+
+        EnumType{
+            name: "MinorPeripheralClass"
+        }
+
+        EnumType{
+            name: "MinorPhoneClass"
+        }
+
+        EnumType{
+            name: "MinorToyClass"
+        }
+
+        EnumType{
+            name: "MinorWearableClass"
+        }
+
+        EnumType{
+            name: "ServiceClass"
         }
         ExtraIncludes{
             Include{
@@ -388,6 +226,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.bluetooth.QBluetoothDeviceInfo$ServiceUuids"
                 }
@@ -402,32 +241,41 @@ TypeSystem{
     
     ValueType{
         name: "QBluetoothHostInfo"
-        ModifyFunction{
-            signature: "operator=(QBluetoothHostInfo)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QBluetoothTransferRequest"
-        ModifyFunction{
-            signature: "operator=(QBluetoothTransferRequest)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "Attribute"
         }
         until: 5
     }
     
     ValueType{
         name: "QBluetoothUuid"
-        ModifyFunction{
-            signature: "operator=(QBluetoothUuid)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "CharacteristicType"
+        }
+
+        EnumType{
+            name: "DescriptorType"
+        }
+
+        EnumType{
+            name: "ProtocolUuid"
+        }
+
+        EnumType{
+            name: "ServiceClassUuid"
         }
         ModifyFunction{
             signature: "toUInt128() const"
             rename: "toBytes"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "byte[]"
                 }
@@ -447,6 +295,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "byte[]"
                 }
@@ -463,7 +312,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Short"
+                    modifiedType: "java.lang.@Nullable Short"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -487,7 +336,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Integer"
+                    modifiedType: "java.lang.@Nullable Integer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -514,65 +363,57 @@ TypeSystem{
     
     ValueType{
         name: "QLowEnergyAdvertisingData"
-        ModifyFunction{
-            signature: "operator=(QLowEnergyAdvertisingData)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "Discoverability"
         }
     }
     
     ValueType{
         name: "QLowEnergyAdvertisingParameters"
-        ModifyFunction{
-            signature: "operator=(QLowEnergyAdvertisingParameters)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "FilterPolicy"
+        }
+
+        EnumType{
+            name: "Mode"
+        }
+
+        ValueType{
+            name: "AddressInfo"
         }
     }
     
     ValueType{
         name: "QLowEnergyDescriptor"
-        ModifyFunction{
-            signature: "operator=(QLowEnergyDescriptor)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QLowEnergyDescriptorData"
-        ModifyFunction{
-            signature: "operator=(QLowEnergyDescriptorData)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QLowEnergyCharacteristic"
-        ModifyFunction{
-            signature: "operator=(QLowEnergyCharacteristic)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "PropertyType"
         }
     }
     
     ValueType{
         name: "QLowEnergyCharacteristicData"
-        ModifyFunction{
-            signature: "operator=(QLowEnergyCharacteristicData)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QLowEnergyConnectionParameters"
-        ModifyFunction{
-            signature: "operator=(QLowEnergyConnectionParameters)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QLowEnergyServiceData"
-        ModifyFunction{
-            signature: "operator=(QLowEnergyServiceData)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "ServiceType"
         }
         ModifyFunction{
             signature: "setIncludedServices(const QList<QLowEnergyService*>&)"
@@ -600,14 +441,46 @@ TypeSystem{
     
     ObjectType{
         name: "QBluetoothDeviceDiscoveryAgent"
+
+        EnumType{
+            name: "DiscoveryMethod"
+        }
+
+        EnumType{
+            name: "Error"
+        }
+
+        EnumType{
+            name: "InquiryType"
+        }
     }
     
     ObjectType{
         name: "QBluetoothLocalDevice"
+
+        EnumType{
+            name: "Error"
+        }
+
+        EnumType{
+            name: "HostMode"
+        }
+
+        EnumType{
+            name: "Pairing"
+        }
     }
     
     ObjectType{
         name: "QBluetoothSocket"
+
+        EnumType{
+            name: "SocketError"
+        }
+
+        EnumType{
+            name: "SocketState"
+        }
         ModifyFunction{
             signature: "errorString() const"
             rename: "socketErrorString"
@@ -616,10 +489,22 @@ TypeSystem{
     
     ObjectType{
         name: "QBluetoothServer"
+
+        EnumType{
+            name: "Error"
+        }
     }
     
     ObjectType{
         name: "QBluetoothServiceDiscoveryAgent"
+
+        EnumType{
+            name: "DiscoveryMode"
+        }
+
+        EnumType{
+            name: "Error"
+        }
     }
     
     ObjectType{
@@ -628,6 +513,11 @@ TypeSystem{
     
     ObjectType{
         name: "QBluetoothTransferReply"
+
+        EnumType{
+            name: "TransferError"
+            until: 5
+        }
         ModifyFunction{
             signature: "setManager(QBluetoothTransferManager*)"
             ModifyArgument{
@@ -643,6 +533,22 @@ TypeSystem{
     
     ObjectType{
         name: "QLowEnergyController"
+
+        EnumType{
+            name: "ControllerState"
+        }
+
+        EnumType{
+            name: "Error"
+        }
+
+        EnumType{
+            name: "RemoteAddressType"
+        }
+
+        EnumType{
+            name: "Role"
+        }
         ModifyFunction{
             signature: "addService(QLowEnergyServiceData,QObject*)"
             ModifyArgument{
@@ -729,6 +635,38 @@ TypeSystem{
     
     ObjectType{
         name: "QLowEnergyService"
+
+        EnumType{
+            name: "WriteMode"
+        }
+
+        EnumType{
+            name: "DiscoveryMode"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "ServiceType"
+        }
+
+        EnumType{
+            name: "ServiceError"
+        }
+
+        EnumType{
+            name: "ServiceState"
+            RejectEnumValue{
+                name: "DiscoveryRequired"
+                since: [6, 2]
+            }
+            RejectEnumValue{
+                name: "DiscoveringService"
+            }
+            RejectEnumValue{
+                name: "ServiceDiscovered"
+                since: [6, 2]
+            }
+        }
     }
     
     SuppressedWarning{text: "WARNING(CppImplGenerator) :: Object type 'quint128' passed as value. Resulting code will not compile.  io.qt.bluetooth.QBluetoothUuid::QBluetoothUuid(quint128 uuid)"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtBodymovin.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtBodymovin.qml
index 941220e3..c93b440e 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtBodymovin.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtBodymovin.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.lottie"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtBodyMovin"
     module: "qtjambi.lottie"
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtCharts.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtCharts.qml
index fff4b622..ce15c5f3 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtCharts.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtCharts.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.charts"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtCharts"
     module: "qtjambi.charts"
     description: "UI Components for displaying visually pleasing charts, driven by static or dynamic data models."
@@ -54,21 +54,20 @@ TypeSystem{
         until: 5
     }
     
-    EnumType{
-        name: "QtCharts::QAbstractAxis::AxisType"
-        flags: "QtCharts::QAbstractAxis::AxisTypes"
-    }
-    
     ObjectType{
         name: "QtCharts::QAbstractAxis"
-    }
-    
-    EnumType{
-        name: "QtCharts::QAbstractBarSeries::LabelsPosition"
+
+        EnumType{
+            name: "AxisType"
+        }
     }
     
     ObjectType{
         name: "QtCharts::QAbstractBarSeries"
+
+        EnumType{
+            name: "LabelsPosition"
+        }
         ModifyFunction{
             signature: "append(QtCharts::QBarSet *)"
             threadAffinity: true
@@ -129,12 +128,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtCharts::QAbstractSeries::SeriesType"
-    }
-    
     ObjectType{
         name: "QtCharts::QAbstractSeries"
+
+        EnumType{
+            name: "SeriesType"
+        }
         ModifyFunction{
             signature: "attachAxis(QtCharts::QAbstractAxis *)"
             threadAffinity: true
@@ -226,10 +225,6 @@ TypeSystem{
             signature: "operator<<(qreal)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator[](const int)const"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -299,18 +294,14 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtCharts::QBoxSet::ValuePositions"
-    }
-    
     ObjectType{
         name: "QtCharts::QBoxSet"
-        ModifyFunction{
-            signature: "operator<<(qreal)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "ValuePositions"
         }
         ModifyFunction{
-            signature: "operator[](const int)const"
+            signature: "operator<<(qreal)"
             remove: RemoveFlag.All
         }
     }
@@ -437,39 +428,38 @@ TypeSystem{
         name: "QtCharts::QCandlestickSet"
     }
     
-    EnumType{
-        name: "QtCharts::QCategoryAxis::AxisType"
-    }
-    
-    EnumType{
-        name: "QtCharts::QCategoryAxis::AxisLabelsPosition"
-    }
-    
     ObjectType{
         name: "QtCharts::QCategoryAxis"
-    }
-    
-    EnumType{
-        name: "QtCharts::QChart::AnimationOption"
-        flags: "QtCharts::QChart::AnimationOptions"
-    }
-    
-    EnumType{
-        name: "QtCharts::QChart::ChartTheme"
-    }
-    
-    EnumType{
-        name: "QtCharts::QChart::ChartType"
+
+        EnumType{
+            name: "AxisType"
+        }
+
+        EnumType{
+            name: "AxisLabelsPosition"
+        }
     }
     
     ObjectType{
         name: "QtCharts::QChart"
+
+        EnumType{
+            name: "AnimationOption"
+        }
+
+        EnumType{
+            name: "ChartTheme"
+        }
+
+        EnumType{
+            name: "ChartType"
+        }
         ModifyFunction{
             signature: "scroll(qreal,qreal)"
             rename: "scrollBy"
         }
         ModifyFunction{
-            signature: "axes(QFlags<Qt::Orientation>, QtCharts::QAbstractSeries *)const"
+            signature: "axes(Qt::Orientations, QtCharts::QAbstractSeries *)const"
             ModifyArgument{
                 index: 1
                 RemoveDefaultExpression{
@@ -477,7 +467,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addAxis(QtCharts::QAbstractAxis *, QFlags<Qt::AlignmentFlag>)"
+            signature: "addAxis(QtCharts::QAbstractAxis *, Qt::Alignment)"
             threadAffinity: true
             ModifyArgument{
                 index: 1
@@ -565,13 +555,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtCharts::QChartView::RubberBand"
-        flags: "QtCharts::QChartView::RubberBands"
-    }
-    
     ObjectType{
         name: "QtCharts::QChartView"
+
+        EnumType{
+            name: "RubberBand"
+        }
         ModifyFunction{
             signature: "setChart(QtCharts::QChart *)"
             threadAffinity: true
@@ -881,12 +870,12 @@ TypeSystem{
         name: "QtCharts::QHorizontalStackedBarSeries"
     }
     
-    EnumType{
-        name: "QtCharts::QLegend::MarkerShape"
-    }
-    
     ObjectType{
         name: "QtCharts::QLegend"
+
+        EnumType{
+            name: "MarkerShape"
+        }
         ModifyFunction{
             signature: "setFont(QFont)"
             rename: "setLegendFont"
@@ -897,12 +886,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtCharts::QLegendMarker::LegendMarkerType"
-    }
-    
     ObjectType{
         name: "QtCharts::QLegendMarker"
+
+        EnumType{
+            name: "LegendMarkerType"
+        }
     }
     
     ObjectType{
@@ -984,23 +973,22 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtCharts::QPieSlice::LabelPosition"
-    }
-    
     ObjectType{
         name: "QtCharts::QPieSlice"
-    }
-    
-    EnumType{
-        name: "QtCharts::QPolarChart::PolarOrientation"
-        flags: "QtCharts::QPolarChart::PolarOrientations"
+
+        EnumType{
+            name: "LabelPosition"
+        }
     }
     
     ObjectType{
         name: "QtCharts::QPolarChart"
+
+        EnumType{
+            name: "PolarOrientation"
+        }
         ModifyFunction{
-            signature: "axes(QFlags<QtCharts::QPolarChart::PolarOrientation>, QtCharts::QAbstractSeries *)const"
+            signature: "axes(QtCharts::QPolarChart::PolarOrientations, QtCharts::QAbstractSeries *)const"
             ModifyArgument{
                 index: 1
                 RemoveDefaultExpression{
@@ -1031,12 +1019,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtCharts::QScatterSeries::MarkerShape"
-    }
-    
     ObjectType{
         name: "QtCharts::QScatterSeries"
+
+        EnumType{
+            name: "MarkerShape"
+        }
         ModifyFunction{
             signature: "brush()const"
             remove: RemoveFlag.All
@@ -1167,12 +1155,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtCharts::QValueAxis::TickType"
-    }
-    
     ObjectType{
         name: "QtCharts::QValueAxis"
+
+        EnumType{
+            name: "TickType"
+        }
     }
     
     ObjectType{
@@ -1183,13 +1171,13 @@ TypeSystem{
         name: "QtCharts::QXYLegendMarker"
     }
     
-    EnumType{
-        name: "QtCharts::QXYSeries::PointConfiguration"
-        since: [6, 2]
-    }
-    
     ObjectType{
         name: "QtCharts::QXYSeries"
+
+        EnumType{
+            name: "PointConfiguration"
+            since: [6, 2]
+        }
         ModifyFunction{
             signature: "markerSize() const"
             access: Modification.NonFinal
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtConcurrent.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtConcurrent.qml
index ef048175..d92a1812 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtConcurrent.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtConcurrent.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.concurrent"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtConcurrent"
     module: "qtjambi.concurrent"
     description: "Classes for writing multi-threaded programs without using low-level threading primitives."
@@ -46,732 +46,6 @@ TypeSystem{
         Text{content: "initialize_meta_info_util();"}
     }
     
-    Rejection{
-        className: "QtConcurrent"
-        enumName: "enum_1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "operator|"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "run"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "runWithPromise"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "task"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "startFiltered"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "selectIteration"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "blockingFiltered"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "startMap"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "startMappedReduced"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "startMapped"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "startThreadEngine"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "startFilteredReduced"
-    }
-    
-    Rejection{
-        className: "QtConcurrent"
-        functionName: "filterInternal"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::BlockSizeManager"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::BlockSizeManagerV2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::BlockSizeManagerV2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ConstMemberFunctionWrapper"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::Exception"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::FilterKernel"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::FilteredEachKernel"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::FilteredReducedKernel"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::FunctionWrapper0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::FunctionWrapper1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::FunctionWrapper2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::IntermediateResults"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::DefaultValueContainer"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::IterateKernel"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::MapKernel"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::MappedEachKernel"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::MappedReducedKernel"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::Median"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::MemberFunctionWrapper"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::MemberFunctionWrapper1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::qValueType"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ReduceKernel"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ResultItem"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ResultIterator"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ResultIteratorBase"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ResultReporter"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ResultStore"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ResultStoreBase"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::RunFunctionTask"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::RunFunctionTaskBase"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectSpecialization"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionPointerCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionPointerCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionPointerCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionPointerCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionPointerCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredConstMemberFunctionPointerCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorPointerCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorPointerCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorPointerCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorPointerCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorPointerCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredFunctorPointerCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionPointerCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionPointerCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionPointerCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionPointerCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionPointerCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SelectStoredMemberFunctionPointerCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SequenceHolder1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::SequenceHolder2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionPointerCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionPointerCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionPointerCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionPointerCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionPointerCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredConstMemberFunctionPointerCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorPointerCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorPointerCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorPointerCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorPointerCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorPointerCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorPointerCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionPointerCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionPointerCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionPointerCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionPointerCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionPointerCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredMemberFunctionPointerCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ThreadEngine"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ThreadEngineSemaphore"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ThreadEngineStarter"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ThreadEngineStarterBase"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::UnhandledException"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionPointerCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionPointerCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionPointerCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionPointerCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionPointerCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredConstMemberFunctionPointerCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorPointerCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorPointerCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorPointerCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorPointerCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorPointerCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredFunctorPointerCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionPointerCall0"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionPointerCall1"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionPointerCall2"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionPointerCall3"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionPointerCall4"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::VoidStoredMemberFunctionPointerCall5"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::internal"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctorCall"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::FunctionResolver"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::FunctionResolverHelper"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::InvokeResult"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::MemberFunctionResolver"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::NonMemberFunctionResolver"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::NonPromiseTaskResolver"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::PromiseTaskResolver"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::QTaskBuilder"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctionCall"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::StoredFunctionCallWithPromise"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::TaskResolver"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::TaskResolverHelper"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::TaskStartParameters"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ThreadEngineBarrier"
-    }
-    
-    Rejection{
-        className: "QtConcurrent::ThreadEngineBase"
-    }
-    
-    Rejection{
-        className: "QtPrivate::ExceptionStore"
-    }
-    
     NamespaceType{
         name: "QtConcurrent"
         targetType: "class"
@@ -781,20 +55,714 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ExtraIncludes{
-            Include{
-                fileName: "io.qt.core.*"
-                location: Include.Java
-            }
-            Include{
-                fileName: "java.util.*"
-                location: Include.Java
-            }
-            Include{
-                fileName: "java.util.concurrent.*"
-                location: Include.Java
-            }
+        ExtraIncludes{
+            Include{
+                fileName: "io.qt.core.*"
+                location: Include.Java
+            }
+            Include{
+                fileName: "java.util.*"
+                location: Include.Java
+            }
+            Include{
+                fileName: "java.util.concurrent.*"
+                location: Include.Java
+            }
+        }
+
+        Rejection{enumName: "enum_1"}
+        Rejection{functionName: "operator|"}
+        Rejection{functionName: "run"}
+        Rejection{functionName: "runWithPromise"}
+        Rejection{functionName: "task"}
+        Rejection{functionName: "startFiltered"}
+        Rejection{functionName: "selectIteration"}
+        Rejection{functionName: "blockingFiltered"}
+        Rejection{functionName: "startMap"}
+        Rejection{functionName: "startMappedReduced"}
+        Rejection{functionName: "startMapped"}
+        Rejection{functionName: "startThreadEngine"}
+        Rejection{functionName: "startFilteredReduced"}
+        Rejection{functionName: "filterInternal"}
+        Rejection{functionName: "blockingMappedReduced"}
+        Rejection{functionName: "blockingFilter"}
+        Rejection{functionName: "mappedReduced"}
+        Rejection{functionName: "mapped"}
+        Rejection{functionName: "filter"}
+        Rejection{functionName: "blockingMapped"}
+        Rejection{functionName: "filtered"}
+        Rejection{functionName: "filteredReduced"}
+        Rejection{functionName: "blockingMap"}
+        Rejection{functionName: "map"}
+        Rejection{functionName: "blockingFilteredReduced"}
+        Rejection{
+            className: "BlockSizeManager"
+        }
+
+        Rejection{
+            className: "BlockSizeManagerV2"
+        }
+
+        Rejection{
+            className: "BlockSizeManagerV2"
+        }
+
+        Rejection{
+            className: "ConstMemberFunctionWrapper"
+        }
+
+        Rejection{
+            className: "Exception"
+        }
+
+        Rejection{
+            className: "FilterKernel"
+        }
+
+        Rejection{
+            className: "FilteredEachKernel"
+        }
+
+        Rejection{
+            className: "FilteredReducedKernel"
+        }
+
+        Rejection{
+            className: "FunctionWrapper0"
+        }
+
+        Rejection{
+            className: "FunctionWrapper1"
+        }
+
+        Rejection{
+            className: "FunctionWrapper2"
+        }
+
+        Rejection{
+            className: "IntermediateResults"
+        }
+
+        Rejection{
+            className: "DefaultValueContainer"
+        }
+
+        Rejection{
+            className: "IterateKernel"
+        }
+
+        Rejection{
+            className: "MapKernel"
+        }
+
+        Rejection{
+            className: "MappedEachKernel"
+        }
+
+        Rejection{
+            className: "MappedReducedKernel"
+        }
+
+        Rejection{
+            className: "Median"
+        }
+
+        Rejection{
+            className: "MemberFunctionWrapper"
+        }
+
+        Rejection{
+            className: "MemberFunctionWrapper1"
+        }
+
+        Rejection{
+            className: "qValueType"
+        }
+
+        Rejection{
+            className: "ReduceKernel"
+        }
+
+        Rejection{
+            className: "ResultItem"
+        }
+
+        Rejection{
+            className: "ResultIterator"
+        }
+
+        Rejection{
+            className: "ResultIteratorBase"
+        }
+
+        Rejection{
+            className: "ResultReporter"
+        }
+
+        Rejection{
+            className: "ResultStore"
+        }
+
+        Rejection{
+            className: "ResultStoreBase"
+        }
+
+        Rejection{
+            className: "RunFunctionTask"
+        }
+
+        Rejection{
+            className: "RunFunctionTaskBase"
+        }
+
+        Rejection{
+            className: "SelectSpecialization"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionCall0"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionCall1"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionCall2"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionCall3"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionCall4"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionCall5"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionPointerCall0"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionPointerCall1"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionPointerCall2"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionPointerCall3"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionPointerCall4"
+        }
+
+        Rejection{
+            className: "SelectStoredConstMemberFunctionPointerCall5"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorCall0"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorCall1"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorCall2"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorCall3"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorCall4"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorCall5"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorPointerCall0"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorPointerCall1"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorPointerCall2"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorPointerCall3"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorPointerCall4"
+        }
+
+        Rejection{
+            className: "SelectStoredFunctorPointerCall5"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionCall0"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionCall1"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionCall2"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionCall3"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionCall4"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionCall5"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionPointerCall0"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionPointerCall1"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionPointerCall2"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionPointerCall3"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionPointerCall4"
+        }
+
+        Rejection{
+            className: "SelectStoredMemberFunctionPointerCall5"
+        }
+
+        Rejection{
+            className: "SequenceHolder1"
+        }
+
+        Rejection{
+            className: "SequenceHolder2"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionCall0"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionCall1"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionCall2"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionCall3"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionCall4"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionCall5"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionPointerCall0"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionPointerCall1"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionPointerCall2"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionPointerCall3"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionPointerCall4"
+        }
+
+        Rejection{
+            className: "StoredConstMemberFunctionPointerCall5"
+        }
+
+        Rejection{
+            className: "StoredFunctorCall0"
+        }
+
+        Rejection{
+            className: "StoredFunctorCall1"
+        }
+
+        Rejection{
+            className: "StoredFunctorCall2"
+        }
+
+        Rejection{
+            className: "StoredFunctorCall3"
+        }
+
+        Rejection{
+            className: "StoredFunctorCall4"
+        }
+
+        Rejection{
+            className: "StoredFunctorCall5"
+        }
+
+        Rejection{
+            className: "StoredFunctorPointerCall0"
+        }
+
+        Rejection{
+            className: "StoredFunctorPointerCall1"
+        }
+
+        Rejection{
+            className: "StoredFunctorPointerCall2"
+        }
+
+        Rejection{
+            className: "StoredFunctorPointerCall3"
+        }
+
+        Rejection{
+            className: "StoredFunctorPointerCall4"
+        }
+
+        Rejection{
+            className: "StoredFunctorPointerCall5"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionCall0"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionCall1"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionCall2"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionCall3"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionCall4"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionCall5"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionPointerCall0"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionPointerCall1"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionPointerCall2"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionPointerCall3"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionPointerCall4"
+        }
+
+        Rejection{
+            className: "StoredMemberFunctionPointerCall5"
+        }
+
+        Rejection{
+            className: "ThreadEngine"
+        }
+
+        Rejection{
+            className: "ThreadEngineSemaphore"
+        }
+
+        Rejection{
+            className: "ThreadEngineStarter"
+        }
+
+        Rejection{
+            className: "ThreadEngineStarterBase"
+        }
+
+        Rejection{
+            className: "UnhandledException"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionCall0"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionCall1"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionCall2"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionCall3"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionCall4"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionCall5"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionPointerCall0"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionPointerCall1"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionPointerCall2"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionPointerCall3"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionPointerCall4"
+        }
+
+        Rejection{
+            className: "VoidStoredConstMemberFunctionPointerCall5"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorCall0"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorCall1"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorCall2"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorCall3"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorCall4"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorCall5"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorPointerCall0"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorPointerCall1"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorPointerCall2"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorPointerCall3"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorPointerCall4"
+        }
+
+        Rejection{
+            className: "VoidStoredFunctorPointerCall5"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionCall0"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionCall1"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionCall2"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionCall3"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionCall4"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionCall5"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionPointerCall0"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionPointerCall1"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionPointerCall2"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionPointerCall3"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionPointerCall4"
+        }
+
+        Rejection{
+            className: "VoidStoredMemberFunctionPointerCall5"
+        }
+
+        Rejection{
+            className: "internal"
+        }
+
+        Rejection{
+            className: "StoredFunctorCall"
+        }
+
+        Rejection{
+            className: "FunctionResolver"
+        }
+
+        Rejection{
+            className: "FunctionResolverHelper"
+        }
+
+        Rejection{
+            className: "InvokeResult"
+        }
+
+        Rejection{
+            className: "MemberFunctionResolver"
+        }
+
+        Rejection{
+            className: "NonMemberFunctionResolver"
+        }
+
+        Rejection{
+            className: "NonPromiseTaskResolver"
+        }
+
+        Rejection{
+            className: "PromiseTaskResolver"
+        }
+
+        Rejection{
+            className: "QTaskBuilder"
+        }
+
+        Rejection{
+            className: "StoredFunctionCall"
+        }
+
+        Rejection{
+            className: "StoredFunctionCallWithPromise"
+        }
+
+        Rejection{
+            className: "TaskResolver"
+        }
+
+        Rejection{
+            className: "TaskResolverHelper"
+        }
+
+        Rejection{
+            className: "TaskStartParameters"
+        }
+
+        Rejection{
+            className: "ThreadEngineBarrier"
+        }
+
+        Rejection{
+            className: "ThreadEngineBase"
+        }
+
+        EnumType{
+            name: "ReduceOption"
+        }
+
+        EnumType{
+            name: "ThreadFunctionResult"
+        }
+
+        EnumType{
+            name: "FutureResult"
+        }
+
+        ObjectType{
+            name: "MedianDouble"
         }
+
         InjectCode{
             target: CodeClass.Java
             ImportFile{
@@ -823,23 +791,6 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtConcurrent::ReduceOption"
-        flags: "QtConcurrent::ReduceOptions"
-    }
-    
-    EnumType{
-        name: "QtConcurrent::ThreadFunctionResult"
-    }
-    
-    EnumType{
-        name: "QtConcurrent::FutureResult"
-    }
-    
-    ObjectType{
-        name: "QtConcurrent::MedianDouble"
-    }
-    
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::selectIteration', unmatched parameter type 'T'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::advance', unmatched parameter type 'It&'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'Sequence'"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtCore.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtCore.qml
index 04894bc6..af8e7570 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtCore.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtCore.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.core"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtCore"
     module: "qtjambi"
     description: "<p>QtJambi base module containing QtCore, QtGui and QtWidgets.</p>\n"+
@@ -63,9 +63,9 @@ TypeSystem{
         packageName: "io.qt.internal"
         target: CodeClass.Java
         position: Position.Beginning
-        Text{content: "final static java.util.Properties properties = new java.util.Properties();\n"+
+        Text{content: "final static Properties properties = new Properties();\n"+
                       "\n"+
-                      "@io.qt.QtUninvokable private static native void shutdown();"}
+                      "@QtUninvokable private static native void shutdown();"}
     }
     
     InjectCode{
@@ -148,44 +148,10 @@ TypeSystem{
                       "}"}
     }
     
-    Template{
-        name: "core.AtomicReference_to_ptr"
-        Text{content: "%TYPE* %out = nullptr;\n"+
-                      "if(%in){\n"+
-                      "    jobject obj = %env->CallObjectMethod(%in, _AtomicReference->get);\n"+
-                      "    JavaException::check(%env QTJAMBI_STACKTRACEINFO );\n"+
-                      "    %out = new %TYPE( qtjambi_cast<%TYPE>(%env, obj) );\n"+
-                      "    %scope.addFinalAction([%env,_AtomicReference,%in,%out](){\n"+
-                      "            QScopedPointer<%TYPE> ptr(%out);\n"+
-                      "            Java::Runtime::AtomicReference::set(%env, %in, qtjambi_cast<jobject>(%env, *%out));\n"+
-                      "        });\n"+
-                      "}"}
-    }
-    
-    Template{
-        name: "core.ptr_to_AtomicReference"
-        Text{content: "jobject %out = nullptr;\n"+
-                      "if(%in){\n"+
-                      "    %out = Java::Runtime::AtomicReference::newInstance(%env, qtjambi_cast<jobject>(%env, *%in));\n"+
-                      "    %scope.addFinalAction([%env,_AtomicReference,%in,%out](){\n"+
-                      "            *%in = qtjambi_cast<%TYPE>(%env, Java::Runtime::AtomicReference::get(%env, %out));\n"+
-                      "        });\n"+
-                      "}"}
-    }
-    
-    Template{
-        name: "core.std_iterator_to_java_util_Iterator"
-        Text{content: "@Override\n"+
-                      "@io.qt.QtUninvokable\n"+
-                      "public final java.util.Iterator<%ELEMENT_TYPE> iterator() {\n"+
-                      "    return constBegin().toJavaIterator();\n"+
-                      "}"}
-    }
-    
     Template{
         name: "core.self_iterator"
         Text{content: "@Override\n"+
-                      "@io.qt.QtUninvokable\n"+
+                      "@QtUninvokable\n"+
                       "public final java.util.Iterator<%ELEMENT_TYPE> iterator() {\n"+
                       "    return this;\n"+
                       "}"}
@@ -194,148 +160,12 @@ TypeSystem{
     Template{
         name: "core.to_iterator"
         Text{content: "@Override\n"+
-                      "@io.qt.QtUninvokable\n"+
+                      "@QtUninvokable\n"+
                       "public final %ITERATOR_TYPE iterator() {\n"+
                       "    return new %ITERATOR_TYPE(this);\n"+
                       "}"}
     }
     
-    Template{
-        name: "core.return_string_instead_of_char*"
-        Text{content: "public final String %FUNCTION_NAME() {\n"+
-                      "    QNativePointer np = %FUNCTION_NAME_private();\n"+
-                      "    String returned = \"\";\n"+
-                      "    int i=0;\n"+
-                      "    while (np.byteAt(i) != 0) returned += (char) np.byteAt(i++);\n"+
-                      "    return returned;\n"+
-                      "}"}
-    }
-    
-    Template{
-        name: "core.call_with_string_instead_of_char*"
-        Text{content: "public final void %FUNCTION_NAME(String %ARG_NAME) {\n"+
-                      "    %FUNCTION_NAME(QNativePointer.createCharPointer(%ARG_NAME));\n"+
-                      "}"}
-    }
-    
-    Template{
-        name: "core.private_function_return_self"
-        Text{content: "public final %RETURN_TYPE %FUNCTION_NAME(%ARGUMENTS) {\n"+
-                      "    %FUNCTION_NAME_private(%ARGUMENT_NAMES);\n"+
-                      "    return this;\n"+
-                      "}"}
-    }
-    
-    Template{
-        name: "core.unary_other_type"
-        InsertTemplate{
-            name: "core.private_function_return_self"
-            Replace{
-                from: "%RETURN_TYPE"
-                to: "%OUT_TYPE"
-            }
-            Replace{
-                from: "%ARGUMENTS"
-                to: "%IN_TYPE other"
-            }
-            Replace{
-                from: "%ARGUMENT_NAMES"
-                to: "other"
-            }
-        }
-    }
-    
-    Template{
-        name: "core.unary_self_type"
-        InsertTemplate{
-            name: "core.unary_other_type"
-            Replace{
-                from: "%IN_TYPE"
-                to: "%TYPE"
-            }
-            Replace{
-                from: "%OUT_TYPE"
-                to: "%TYPE"
-            }
-        }
-    }
-    
-    Template{
-        name: "core.operator_assign_self_type"
-        InsertTemplate{
-            name: "core.unary_self_type"
-            Replace{
-                from: "%FUNCTION_NAME"
-                to: "operator_assign"
-            }
-        }
-    }
-    
-    Template{
-        name: "core.operator_assign_other_type"
-        InsertTemplate{
-            name: "core.unary_other_type"
-            Replace{
-                from: "%FUNCTION_NAME"
-                to: "operator_assign"
-            }
-        }
-    }
-    
-    Template{
-        name: "core.call_through_with_byte[]_instead_of_char*_and_int"
-        Text{content: "public final int %FUNCTION_NAME(byte data[]) {\n"+
-                      "    QNativePointer np = new QNativePointer(QNativePointer.Type.Byte, data.length);\n"+
-                      "    %COPY_IN\n"+
-                      "    int returned = (int) %FUNCTION_NAME(np, data.length);\n"+
-                      "    %COPY_OUT\n"+
-                      "    return returned;\n"+
-                      "}"}
-    }
-    
-    Template{
-        name: "core.read_with_byte[]_instead_of_char*_and_int"
-        InsertTemplate{
-            name: "core.call_through_with_byte[]_instead_of_char*_and_int"
-            Replace{
-                from: "%COPY_IN"
-                to: ""
-            }
-            Replace{
-                from: "%COPY_OUT"
-                to: "for (int i=0; i<returned; ++i) data[i] = np.byteAt(i);"
-            }
-        }
-    }
-    
-    Template{
-        name: "core.write_with_byte[]_instead_of_char*_and_int"
-        InsertTemplate{
-            name: "core.call_through_with_byte[]_instead_of_char*_and_int"
-            Replace{
-                from: "%COPY_OUT"
-                to: ""
-            }
-            Replace{
-                from: "%COPY_IN"
-                to: "for (int i=0; i<data.length; ++i) np.setByteAt(i, data[i]);"
-            }
-        }
-    }
-    
-    Template{
-        name: "core.stream_operator_shift_right"
-        Text{content: "public final %STREAM_TYPE operator_shift_right(%TYPE array[]) {\n"+
-                      "    QNativePointer np = new QNativePointer(QNativePointer.Type.%NATIVEPOINTER_TYPE);\n"+
-                      "    for (int i=0; i<array.length; ++i) {\n"+
-                      "        operator_shift_right_%TYPE(np);\n"+
-                      "        array[i] = np.%VALUE_FUNCTION();\n"+
-                      "    }\n"+
-                      "    \n"+
-                      "    return this;\n"+
-                      "}"}
-    }
-    
     PrimitiveType{
         name: "bool"
         javaName: "boolean"
@@ -378,6 +208,34 @@ TypeSystem{
         jniName: "jlong"
         preferredConversion: false
     }
+
+    PrimitiveType{
+        name: "qulonglong"
+        javaName: "long"
+        jniName: "jlong"
+        preferredConversion: false
+    }
+
+    PrimitiveType{
+        name: "qlonglong"
+        javaName: "long"
+        jniName: "jlong"
+        preferredConversion: false
+    }
+
+    PrimitiveType{
+        name: "qint64"
+        javaName: "long"
+        jniName: "jlong"
+        preferredConversion: false
+    }
+
+    PrimitiveType{
+        name: "quint64"
+        javaName: "long"
+        jniName: "jlong"
+        preferredConversion: false
+    }
     
     PrimitiveType{
         name: "size_t"
@@ -447,6 +305,27 @@ TypeSystem{
         jniName: "jshort"
         preferredConversion: false
     }
+
+    PrimitiveType{
+        name: "ushort"
+        javaName: "short"
+        jniName: "jshort"
+        preferredConversion: false
+    }
+
+    PrimitiveType{
+        name: "qint16"
+        javaName: "short"
+        jniName: "jshort"
+        preferredConversion: false
+    }
+
+    PrimitiveType{
+        name: "quint16"
+        javaName: "short"
+        jniName: "jshort"
+        preferredConversion: false
+    }
     
     PrimitiveType{
         name: "unsigned short"
@@ -481,6 +360,34 @@ TypeSystem{
         jniName: "jbyte"
         preferredConversion: false
     }
+
+    PrimitiveType{
+        name: "schar"
+        javaName: "byte"
+        jniName: "jbyte"
+        preferredConversion: false
+    }
+
+    PrimitiveType{
+        name: "uchar"
+        javaName: "byte"
+        jniName: "jbyte"
+        preferredConversion: false
+    }
+
+    PrimitiveType{
+        name: "qint8"
+        javaName: "byte"
+        jniName: "jbyte"
+        preferredConversion: false
+    }
+
+    PrimitiveType{
+        name: "quint8"
+        javaName: "byte"
+        jniName: "jbyte"
+        preferredConversion: false
+    }
     
     PrimitiveType{
         name: "std::byte"
@@ -549,39 +456,32 @@ TypeSystem{
         jniName: "jint"
         preferredConversion: false
     }
-    
+
     PrimitiveType{
-        name: "WId"
-        javaName: "long"
-        jniName: "jlong"
+        name: "qint32"
+        javaName: "int"
+        jniName: "jint"
         preferredConversion: false
     }
-    
+
     PrimitiveType{
-        name: "Qt::HANDLE"
-        javaName: "long"
-        jniName: "jlong"
+        name: "quint32"
+        javaName: "int"
+        jniName: "jint"
         preferredConversion: false
     }
     
     PrimitiveType{
-        name: "QSocketDescriptor"
+        name: "WId"
         javaName: "long"
         jniName: "jlong"
         preferredConversion: false
     }
     
     PrimitiveType{
-        name: "QByteRef"
-        javaName: "byte"
-        jniName: "jbyte"
-        preferredConversion: false
-    }
-    
-    PrimitiveType{
-        name: "QBitRef"
-        javaName: "boolean"
-        jniName: "jboolean"
+        name: "QSocketDescriptor"
+        javaName: "long"
+        jniName: "jlong"
         preferredConversion: false
     }
     
@@ -636,76 +536,36 @@ TypeSystem{
     
     PrimitiveType{
         name: "std::nullptr_t"
-        javaName: "null"
-        jniName: "std::nullptr_t"
+        javaName: "java.lang.Void"
+        jniName: "jobject"
         preferredConversion: false
     }
-    
-    Template{
-        name: "core.multiply-devide-add-subtract"
-        Text{content: "public final %TYPE multiply(double d) { operator_multiply_assign(d); return this; }\n"+
-                      "public final %TYPE divide(double d) { operator_divide_assign(d); return this; }\n"+
-                      "public final %TYPE add(%TYPE p) { operator_add_assign(p); return this; }\n"+
-                      "public final %TYPE subtract(%TYPE p) { operator_subtract_assign(p); return this; }"}
+
+    PrimitiveType{
+        name: "hash_type"
+        javaName: "int"
+        jniName: "jint"
+        preferredConversion: false
+        until: 5
+    }
+
+    PrimitiveType{
+        name: "hash_type"
+        javaName: "long"
+        jniName: "jlong"
+        preferredConversion: false
+        since: 6
     }
     
     TemplateType{
         name: "Stream"
-        ModifyFunction{
-            signature: "operator<<(long long)"
-            Rename{
-                to: "writeLong"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-        }
         ModifyFunction{
             signature: "operator<<(float)"
-            Rename{
-                to: "writeFloat"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            rename: "append"
         }
         ModifyFunction{
             signature: "operator<<(double)"
-            Rename{
-                to: "writeDouble"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "operator>>(long long&)"
-            Rename{
-                to: "readLong"
-            }
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "long"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
-                                  "%out = __qt_%1;"}
-                }
-            }
-            ModifyArgument{
-                index: 1
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "long long %out = 0;"}
-                }
-            }
+            rename: "append"
         }
         ModifyFunction{
             signature: "operator>>(float&)"
@@ -760,6 +620,11 @@ TypeSystem{
             }
         }
     }
+
+    GlobalFunction{
+        signature: "operator==<T>(QFuture<T>,QFuture<T>)"
+        remove: RemoveFlag.All
+    }
     
     GlobalFunction{
         signature: "qRegisterMetaType<T>(const char*)"
@@ -807,41 +672,56 @@ TypeSystem{
             }
         }
     }
-    
-    
-    Rejection{
-        className: "QStringConverterBase::State"
-        functionName: "reset"
-    }
 
     Rejection{
         className: "QSequentialConstIterator"
     }
-    
+
     Rejection{
         className: ""
-        enumName: "QtJambiNativeID"
+        fieldName: "qConstOverload"
     }
-    
+
     Rejection{
-        className: "QNativeInterface::QAndroidApplication"
-        functionName: "runOnAndroidMainThread"
+        className: ""
+        fieldName: "qNonConstOverload"
     }
-    
+
     Rejection{
-        className: "std::string"
+        className: ""
+        fieldName: "qOverload"
     }
-    
+
     Rejection{
-        className: "std::seed_seq"
+        className: ""
+        fieldName: "qt_incomplete_metaTypeArray"
     }
-    
+
     Rejection{
-        className: "function_ref"
+        className: ""
+        fieldName: "qt_metaTypeArray"
     }
-    
+
+    Rejection{
+        className: ""
+        fieldName: "static_assert"
+    }
+    
+    Rejection{
+        className: ""
+        enumName: "QtJambiNativeID"
+    }
+    
+    Rejection{
+        className: "std::string"
+    }
+    
+    Rejection{
+        className: "std::seed_seq"
+    }
+    
     Rejection{
-        className: "QtPrivate::Deprecated_t"
+        className: "function_ref"
     }
     
     Rejection{
@@ -1012,10 +892,6 @@ TypeSystem{
         className: "QSemaphoreReleaser"
     }
     
-    Rejection{
-        className: "QRandomGenerator64"
-    }
-    
     Rejection{
         className: "QKeyValueIterator"
     }
@@ -1067,208 +943,24 @@ TypeSystem{
     Rejection{
         className: "QPalette::Data"
     }
-    
-    Rejection{
-        className: "QStringConverter::Interface"
-    }
-    
-    Rejection{
-        className: "QList::MemoryLayout"
-    }
-    
-    Rejection{
-        className: "QString::DataPointer"
-    }
-    
-    Rejection{
-        className: "QtPrivate::BindingEvaluationState"
-    }
-    
-    Rejection{
-        className: "QList"
-        enumName: "MemoryLayout"
-    }
-    
-    Rejection{
-        className: "QPropertyObserverBase"
-        enumName: "ObserverTag"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QReadWriteLock"
-        functionName: "stateForWaitCondition"
-    }
-    
+
     Rejection{
         className: "QFactoryLoader"
         functionName: "library"
     }
-    
+
     Rejection{
         className: "QByteArrayView"
         functionName: "m_data"
     }
-    
-    Rejection{
-        className: "QBindingStorage"
-        functionName: "status"
-    }
-    
-    Rejection{
-        className: "QtPrivate"
-        functionName: "fulfillPromise"
-    }
-    
-    Rejection{
-        className: "QtPrivate"
-        functionName: "warnIfContainerIsNotShared"
-    }
-    
-    Rejection{
-        className: "QNativeInterface::Private"
-        functionName: "hasTypeInfo"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "rightRef"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "leftRef"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "midRef"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "splitRef"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "sprintf"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "asprintf"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "vasprintf"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "fromStdU32String"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "crend"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "normalized"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "fromStdU16String"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "fromWCharArray"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "fromStdWString"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "tokenize"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "crbegin"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "rbegin"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "fromStdString"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "rend"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "toWCharArray"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "toUInt"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "toUShort"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "toULong"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "toULongLong"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "toLong"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "push_back"
-    }
-    
-    Rejection{
-        className: "QString"
-        functionName: "push_front"
-    }
-    
+
     Rejection{
-        className: "QString"
-        enumName: "SplitBehavior"
-        until: [5, 15]
+        className: "QList::MemoryLayout"
     }
-    
+
     Rejection{
-        className: "QString::Null"
-        until: [5, 15]
+        className: "QList"
+        enumName: "MemoryLayout"
     }
     
     Rejection{
@@ -1351,66 +1043,6 @@ TypeSystem{
         functionName: "shrink_to_fit"
     }
     
-    Rejection{
-        className: "QJsonObject"
-        functionName: "empty"
-    }
-    
-    Rejection{
-        className: "QJsonArray"
-        functionName: "empty"
-    }
-    
-    Rejection{
-        className: "QJsonArray"
-        functionName: "pop_back"
-    }
-    
-    Rejection{
-        className: "QJsonArray"
-        functionName: "pop_front"
-    }
-    
-    Rejection{
-        className: "QJsonArray"
-        functionName: "push_back"
-    }
-    
-    Rejection{
-        className: "QJsonArray"
-        functionName: "push_front"
-    }
-    
-    Rejection{
-        className: "QCborArray"
-        functionName: "empty"
-    }
-    
-    Rejection{
-        className: "QCborArray"
-        functionName: "pop_back"
-    }
-    
-    Rejection{
-        className: "QCborArray"
-        functionName: "pop_front"
-    }
-    
-    Rejection{
-        className: "QCborArray"
-        functionName: "push_back"
-    }
-    
-    Rejection{
-        className: "QCborArray"
-        functionName: "push_front"
-    }
-    
-    Rejection{
-        className: "QCborArray"
-        functionName: "erase"
-    }
-    
     Rejection{
         className: "QCborNegativeInteger"
     }
@@ -1432,10 +1064,6 @@ TypeSystem{
         className: "QCborArray::Iterator"
     }
     
-    Rejection{
-        className: "QCborMap::Iterator"
-    }
-    
     Rejection{
         className: "QHash::iterator"
     }
@@ -1465,10 +1093,6 @@ TypeSystem{
         className: "QByteArray::DataPointer"
     }
     
-    Rejection{
-        className: "Qt::Initialization"
-    }
-    
     Rejection{
         className: "FILE"
     }
@@ -1508,21 +1132,6 @@ TypeSystem{
         functionName: "pop_front"
     }
     
-    Rejection{
-        className: "QFutureInterfaceBase"
-        functionName: "resultStoreBase"
-    }
-    
-    Rejection{
-        className: "QFutureInterfaceBase"
-        functionName: "reportException"
-    }
-    
-    Rejection{
-        className: "QFutureInterfaceBase"
-        functionName: "exceptionStore"
-    }
-    
     Rejection{
         className: "QList::iterator"
     }
@@ -1553,26 +1162,6 @@ TypeSystem{
         enumName: "QCborNegativeInteger"
     }
     
-    Rejection{
-        className: "QString"
-        enumName: "NormalizationForm"
-    }
-    
-    Rejection{
-        className: "QSysInfo"
-        enumName: "Sizes"
-    }
-    
-    Rejection{
-        className: "QSysInfo"
-        enumName: "MacVersion"
-    }
-    
-    Rejection{
-        className: "QSysInfo"
-        enumName: "WinVersion"
-    }
-    
     Rejection{
         className: "QListSpecialMethods"
     }
@@ -1679,111 +1268,61 @@ TypeSystem{
     }
     
     Rejection{
-        className: "QRegularExpressionMatchIterator"
-        functionName: "begin"
+        className: "QAbstractAnimationPrivate"
     }
     
     Rejection{
-        className: "QRegularExpressionMatchIterator"
-        functionName: "end"
+        className: "QAbstractButtonPrivate"
     }
     
     Rejection{
-        className: "QUrlTwoFlags"
+        className: "QAbstractEventDispatcherPrivate"
     }
     
     Rejection{
-        className: "QMetaType::Constructor"
+        className: "*"
+        functionName: "d_func"
     }
     
     Rejection{
-        className: "QMetaType::Creator"
+        className: "*"
+        functionName: "data_ptr"
     }
     
     Rejection{
-        className: "QMetaType::Deleter"
+        className: "QBasicMutex"
+        functionName: "try_lock"
     }
     
     Rejection{
-        className: "QMetaType::Destructor"
+        className: "QBasicMutex"
+        functionName: "fastTryUnlock"
     }
     
     Rejection{
-        className: "QMetaType::LoadOperator"
+        className: "QBasicMutex"
+        functionName: "fastTryLock"
     }
     
     Rejection{
-        className: "QMetaType::SaveOperator"
+        className: "QBasicMutex"
+        functionName: "dummyLocked"
     }
     
     Rejection{
-        className: "QMetaType::TypedConstructor"
+        className: "QMutex"
+        functionName: "try_lock_for"
     }
     
     Rejection{
-        className: "QMetaType::TypedDestructor"
+        className: "QMutex"
+        functionName: "try_lock_until"
     }
     
-    Rejection{
-        className: "QMetaType::MutableViewFunction"
-    }
     
     Rejection{
-        className: "QAbstractAnimationPrivate"
-    }
-    
-    Rejection{
-        className: "QAbstractButtonPrivate"
-    }
-    
-    Rejection{
-        className: "QAbstractEventDispatcherPrivate"
-    }
-    
-    Rejection{
-        className: "*"
-        functionName: "d_func"
-    }
-    
-    Rejection{
-        className: "*"
-        functionName: "data_ptr"
-    }
-    
-    Rejection{
-        className: "QBasicMutex"
-        functionName: "try_lock"
-    }
-    
-    Rejection{
-        className: "QBasicMutex"
-        functionName: "fastTryUnlock"
-    }
-    
-    Rejection{
-        className: "QBasicMutex"
-        functionName: "fastTryLock"
-    }
-    
-    Rejection{
-        className: "QBasicMutex"
-        functionName: "dummyLocked"
-    }
-    
-    Rejection{
-        className: "QMutex"
-        functionName: "try_lock_for"
-    }
-    
-    Rejection{
-        className: "QMutex"
-        functionName: "try_lock_until"
-    }
-    
-    
-    Rejection{
-        className: "*"
-        fieldName: "d_ptr"
+        className: "*"
+        fieldName: "d_ptr"
     }
     
     Rejection{
@@ -1931,34 +1470,6 @@ TypeSystem{
         functionName: "remainingTimeAsDuration"
     }
     
-    Rejection{
-        className: "QtPrivate"
-        functionName: "qTryMetaTypeInterfaceForType"
-    }
-    
-    Rejection{
-        className: "QtPrivate"
-        functionName: "qMetaTypeInterfaceForType"
-    }
-    
-    Rejection{
-        className: "QtPrivate"
-        functionName: "qMakeStringPrivate"
-    }
-    
-    Rejection{
-        className: "QtPrivate"
-        functionName: "qMakeForeachContainer"
-    }
-    
-    Rejection{
-        className: "Qt::QtMsgType"
-    }
-    
-    Rejection{
-        className: "Qt::Disambiguated_t"
-    }
-    
     Rejection{
         className: ""
         enumName: "QtValidLicenseForTestModule"
@@ -2212,33 +1723,6 @@ TypeSystem{
         until: [5, 15]
     }
     
-    Rejection{
-        className: "QtFuture"
-        functionName: "makeExceptionalFuture"
-    }
-    
-    Rejection{
-        className: "QtFuture"
-        functionName: "makeReadyFuture"
-    }
-    
-    Rejection{
-        className: "QVariant::Private"
-    }
-    
-    Rejection{
-        className: "QVariant::PrivateShared"
-    }
-    
-    Rejection{
-        className: "QVariantAnimation::Interpolator"
-    }
-    
-    Rejection{
-        className: "QVariantAnimation"
-        functionName: "qRegisterAnimationInterpolator"
-    }
-    
     Rejection{
         className: "*"
         functionName: "qRegisterAnimationInterpolator"
@@ -2254,15 +1738,10 @@ TypeSystem{
     }
     
     Rejection{
-        className: "QVersionNumber"
+        className: "*"
         functionName: "Q_STATIC_ASSERT"
     }
     
-    Rejection{
-        className: "QRunnable"
-        functionName: "create"
-    }
-    
     Rejection{
         className: "QProcess"
         functionName: "setupChildProcess"
@@ -2289,20 +1768,6 @@ TypeSystem{
         since: [6, 3]
     }
     
-    Rejection{
-        className: "QtFuture::WhenAnyResult"
-        since: [6, 3]
-    }
-    
-    Rejection{
-        className: "Qt"
-        enumName: "Modifier"
-    }
-    
-    Rejection{
-        className: "Qt::Modifiers"
-    }
-    
     Rejection{
         className: "QEnableSharedFromThis"
     }
@@ -2451,10 +1916,6 @@ TypeSystem{
         className: "QAbstractConcatenable"
     }
     
-    Rejection{
-        className: "QBitRef"
-    }
-    
     Rejection{
         className: "QCache"
     }
@@ -2471,10 +1932,6 @@ TypeSystem{
         className: "QContiguousCacheTypedData"
     }
     
-    Rejection{
-        className: "QCharRef"
-    }
-    
     Rejection{
         className: "QNoDebug"
     }
@@ -2511,10 +1968,6 @@ TypeSystem{
         className: "QHashDummyNode"
     }
     
-    Rejection{
-        className: "QHashDummyValue"
-    }
-    
     Rejection{
         className: "QHashIterator"
     }
@@ -2607,11 +2060,6 @@ TypeSystem{
         className: "QObjectData"
     }
     
-    Rejection{
-        className: "QObject"
-        fieldName: "staticQtMetaObject"
-    }
-    
     Rejection{
         className: "QObjectUserData"
     }
@@ -2938,19 +2386,6 @@ TypeSystem{
         className: "QFuture::const_iterator"
     }
     
-    Rejection{
-        className: "QNativeInterface::NativeInterface"
-    }
-    
-    Rejection{
-        className: "QNativeInterface::has_type_info"
-    }
-    
-    Rejection{
-        className: "Qt"
-        enumName: "Initialization"
-    }
-    
     Rejection{
         className: "QFuture"
         functionName: "unwrap"
@@ -3027,12 +2462,6 @@ TypeSystem{
         enumName: "enum_1"
     }
     
-    
-    Rejection{
-        className: "QRandomGenerator"
-        functionName: "bounded"
-    }
-    
     Rejection{
         className: "QFile"
         functionName: "setDecodingFunction"
@@ -3043,51 +2472,6 @@ TypeSystem{
         functionName: "setEncodingFunction"
     }
     
-    Rejection{
-        className: "QObject"
-        functionName: "setUserData"
-    }
-    
-    Rejection{
-        className: "QObject"
-        functionName: "userData"
-    }
-    
-    Rejection{
-        className: "QObject"
-        functionName: "connect"
-    }
-    
-    Rejection{
-        className: "QObject"
-        functionName: "disconnect"
-    }
-    
-    Rejection{
-        className: "QObject"
-        functionName: "registerUserData"
-    }
-    
-    Rejection{
-        className: "QObject"
-        functionName: "connectImpl"
-    }
-    
-    Rejection{
-        className: "QObject"
-        functionName: "connect_functor"
-    }
-    
-    Rejection{
-        className: "QObject"
-        functionName: "disconnectImpl"
-    }
-    
-    Rejection{
-        className: "QTimer"
-        functionName: "singleShot"
-    }
-    
     Rejection{
         className: "QProcess"
         functionName: "pid"
@@ -3149,50 +2533,6 @@ TypeSystem{
         since: 6
     }
     
-    Rejection{
-        className: "QNativeInterface::Private::NativeInterface"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QNativeInterface::Private::TypeInfo"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QNativeInterface::Private::has_type_info"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QNativeInterface::QAndroidApplication::TypeInfo"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "registerMutableViewFunction"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "unregisterMutableViewFunction"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "view"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "iface"
-        since: 6
-    }
-    
     Rejection{
         className: "QPluginParsedMetaData"
         functionName: "parse"
@@ -3205,12 +2545,6 @@ TypeSystem{
         since: [6, 3]
     }
     
-    Rejection{
-        className: "QFutureInterfaceBase"
-        functionName: "get"
-        since: [6, 3]
-    }
-    
     Rejection{
         className: "QByteArrayView"
         functionName: "back"
@@ -3257,223 +2591,128 @@ TypeSystem{
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "back"
+        className: "QAbstractEventDispatcher"
+        functionName: "installNativeEventFilter"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "front"
+        className: "QAbstractEventDispatcher"
+        functionName: "removeNativeEventFilter"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "rbegin"
+        className: "QCborContainerPrivate"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "rend"
+        className: "QAbstractFileEnginePrivate"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "cend"
+        className: "QException"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "cbegin"
+        className: "QUnhandledException"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "crend"
+        className: "QMessageLogger"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "crbegin"
+        className: "QAbstractNativeEventFilter"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "empty"
+        className: "QFSFileEnginePrivate"
     }
     
+    
     Rejection{
-        className: "QByteArray"
-        functionName: "erase"
+        className: "QAbstractFileEngine"
+        functionName: "extension"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "fromStdString"
+        className: "QAbstractFileEngine"
+        functionName: "supportsExtension"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "reallocData"
+        className: "QFSFileEngine"
+        functionName: "extension"
     }
     
     Rejection{
-        className: "QByteArray"
-        functionName: "reallocGrowData"
+        className: "QFSFileEngine"
+        functionName: "supportsExtension"
     }
     
+    
     Rejection{
-        className: "QAbstractEventDispatcher"
-        functionName: "installNativeEventFilter"
+        className: "QAbstractFileEngine"
+        enumName: "Extension"
     }
     
     Rejection{
-        className: "QAbstractEventDispatcher"
-        functionName: "removeNativeEventFilter"
+        className: "QAbstractFileEngine::ExtensionOption"
     }
     
     Rejection{
-        className: "QCborContainerPrivate"
+        className: "QAbstractFileEngine::ExtensionReturn"
     }
     
     Rejection{
-        className: "QAbstractFileEnginePrivate"
+        className: "QAbstractFileEngine::MapExtensionOption"
     }
     
     Rejection{
-        className: "QException"
+        className: "QAbstractFileEngine::MapExtensionReturn"
     }
     
     Rejection{
-        className: "QUnhandledException"
+        className: "QAbstractFileEngine::UnMapExtensionOption"
     }
     
     Rejection{
-        className: "QMessageLogger"
+        className: "QSharedPointer"
+        functionName: "*"
     }
     
     Rejection{
-        className: "QAbstractNativeEventFilter"
+        className: "QWeakPointer"
+        functionName: "*"
     }
     
     Rejection{
-        className: "Qt"
-        functionName: "codecForHtml"
+        className: "QModelRoleData"
+        functionName: "setData"
     }
     
     Rejection{
-        className: "Qt"
-        functionName: "mightBeRichText"
+        className: "QAtomicOps"
     }
     
     Rejection{
-        className: "Qt"
-        functionName: "escape"
+        className: "QAtomicTraits"
     }
     
     Rejection{
-        className: "Qt"
-        functionName: "convertFromPlainText"
+        className: "QtJambiNativeID"
     }
     
     Rejection{
-        className: "Qt"
-        functionName: "makePropertyBinding"
+        className: "QFutureIterator"
     }
     
+    
     Rejection{
-        className: "Qt"
-        enumName: "Modifiers"
+        className: "QAudioEngineFactoryInterface"
     }
     
     Rejection{
-        className: "QFSFileEnginePrivate"
-    }
-    
-    
-    Rejection{
-        className: "QAbstractFileEngine"
-        functionName: "extension"
-    }
-    
-    Rejection{
-        className: "QAbstractFileEngine"
-        functionName: "supportsExtension"
-    }
-    
-    Rejection{
-        className: "QFSFileEngine"
-        functionName: "extension"
-    }
-    
-    Rejection{
-        className: "QFSFileEngine"
-        functionName: "supportsExtension"
-    }
-    
-    
-    Rejection{
-        className: "QAbstractFileEngine"
-        enumName: "Extension"
-    }
-    
-    Rejection{
-        className: "QAbstractFileEngine::ExtensionOption"
-    }
-    
-    Rejection{
-        className: "QAbstractFileEngine::ExtensionReturn"
-    }
-    
-    Rejection{
-        className: "QAbstractFileEngine::MapExtensionOption"
-    }
-    
-    Rejection{
-        className: "QAbstractFileEngine::MapExtensionReturn"
-    }
-    
-    Rejection{
-        className: "QAbstractFileEngine::UnMapExtensionOption"
-    }
-    
-    Rejection{
-        className: "QSharedPointer"
-        functionName: "*"
-    }
-    
-    Rejection{
-        className: "QWeakPointer"
-        functionName: "*"
-    }
-    
-    Rejection{
-        className: "QModelRoleData"
-        functionName: "setData"
-    }
-    
-    Rejection{
-        className: "QAtomicOps"
-    }
-    
-    Rejection{
-        className: "QAtomicTraits"
-    }
-    
-    Rejection{
-        className: "QtJambiNativeID"
-    }
-    
-    Rejection{
-        className: "QFutureIterator"
-    }
-    
-    
-    Rejection{
-        className: "QAudioEngineFactoryInterface"
-    }
-    
-    Rejection{
-        className: "QAudioEnginePlugin"
+        className: "QAudioEnginePlugin"
     }
     
     Rejection{
@@ -3630,10 +2869,6 @@ TypeSystem{
         className: "QPropertyData"
     }
     
-    Rejection{
-        className: "QSequentialConstIterator"
-    }
-    
     Rejection{
         className: "QSequentialIterator"
     }
@@ -3674,8 +2909,14 @@ TypeSystem{
         className: "QVariantPointer"
     }
     
-    Rejection{
-        className: "QVariantRef"
+    ValueType{
+        name: "QVariantRef"
+        generate: false
+    }
+
+    ValueType{
+        name: "QHashDummyValue"
+        generate: false
     }
     
     NamespaceType{
@@ -3687,998 +2928,992 @@ TypeSystem{
                 since: 6
             }
         }
-        InjectCode{
-            ImportFile{
-                name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
-                quoteAfterLine: "class Qt___"
-                quoteBeforeLine: "}// class"
+
+        Rejection{enumName: "Initialization"}
+        Rejection{enumName: "Modifier"}
+        Rejection{className: "Modifiers"}
+        Rejection{enumName: "Modifiers"}
+        Rejection{functionName: "codecForHtml"}
+        Rejection{functionName: "mightBeRichText"}
+        Rejection{functionName: "escape"}
+        Rejection{functionName: "convertFromPlainText"}
+        Rejection{functionName: "makePropertyBinding"}
+        Rejection{functionName: "bin"}
+        Rejection{functionName: "bom"}
+        Rejection{functionName: "center"}
+        Rejection{functionName: "dec"}
+        Rejection{functionName: "endl"}
+        Rejection{functionName: "fixed"}
+        Rejection{functionName: "flush"}
+        Rejection{functionName: "forcepoint"}
+        Rejection{functionName: "forcesign"}
+        Rejection{functionName: "hex"}
+        Rejection{functionName: "left"}
+        Rejection{functionName: "lowercasebase"}
+        Rejection{functionName: "lowercasedigits"}
+        Rejection{functionName: "noforcepoint"}
+        Rejection{functionName: "noforcesign"}
+        Rejection{functionName: "noshowbase"}
+        Rejection{functionName: "oct"}
+        Rejection{functionName: "reset"}
+        Rejection{functionName: "right"}
+        Rejection{functionName: "scientific"}
+        Rejection{functionName: "showbase"}
+        Rejection{functionName: "uppercasebase"}
+        Rejection{functionName: "uppercasedigits"}
+        Rejection{functionName: "ws"}
+        Rejection{fieldName: "Disambiguated"}
+
+        EnumType{
+            name: "InputMethodQuery"
+            RejectEnumValue{
+                name: "ImMicroFocus"
             }
         }
-    }
-    
-    NamespaceType{
-        name: "QtPrivate"
-        generate: false
-    }
-    
-    EnumType{
-        name: "PropertyFlags"
-        packageName: "io.qt.internal"
-        flags: "PropertyAttributes"
-    }
-    
-    EnumType{
-        name: "MethodFlags"
-        packageName: "io.qt.internal"
-        flags: "MethodAttributes"
-        RejectEnumValue{
-            name: "MethodMethod"
+
+        ValueType{
+            name: "Disambiguated_t"
+            generate: false
+            since: 6.4
         }
-        RejectEnumValue{
-            name: "MethodTypeMask"
+
+        EnumType{
+            name: "AnchorPoint"
         }
-    }
-    
-    EnumType{
-        name: "EnumFlags"
-        packageName: "io.qt.internal"
-        flags: "EnumAttributes"
-    }
-    
-    EnumType{
-        name: "MetaObjectFlags"
-        packageName: "io.qt.internal"
-        flags: "MetaObjectAttributes"
-        until: 5
-    }
-    
-    EnumType{
-        name: "MetaObjectFlag"
-        packageName: "io.qt.internal"
-        flags: "MetaObjectFlags"
-        since: 6
-    }
-    
-    EnumType{
-        name: "MetaDataFlags"
-        packageName: "io.qt.internal"
-        flags: "MetaDataAttributes"
-    }
-    
-    EnumType{
-        name: "QDate::MonthNameType"
-    }
-    
-    EnumType{
-        name: "QAbstractAnimation::State"
-    }
-    
-    EnumType{
-        name: "QAbstractAnimation::DeletionPolicy"
-    }
-    
-    EnumType{
-        name: "QAbstractAnimation::Direction"
-    }
-    
-    EnumType{
-        name: "QDataStream::FloatingPointPrecision"
-    }
-    
-    EnumType{
-        name: "QDataStream::ByteOrder"
-    }
-    
-    EnumType{
-        name: "QEasingCurve::Type"
-    }
-    
-    EnumType{
-        name: "QHistoryState::HistoryType"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QState::ChildMode"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QState::RestorePolicy"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QStateMachine::Error"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QStateMachine::EventPriority"
-        until: 5
-    }
-    
-    
-    EnumType{
-        name: "Qt::InputMethodQuery"
-        flags: "Qt::InputMethodQueries"
-        RejectEnumValue{
-            name: "ImMicroFocus"
+
+        EnumType{
+            name: "CoordinateSystem"
         }
-    }
-    
-    EnumType{
-        name: "Qt::AnchorPoint"
-    }
-    
-    EnumType{
-        name: "Qt::CoordinateSystem"
-    }
-    
-    EnumType{
-        name: "Qt::CursorMoveStyle"
-    }
-    
-    
-    EnumType{
-        name: "Qt::GestureState"
-    }
-    
-    EnumType{
-        name: "Qt::InputMethodHint"
-        flags: "Qt::InputMethodHints"
-    }
-    
-    EnumType{
-        name: "Qt::NavigationMode"
-    }
-    
-    
-    EnumType{
-        name: "Qt::TileRule"
-    }
-    
-    EnumType{
-        name: "Qt::TimerType"
-    }
-    
-    EnumType{
-        name: "Qt::EnterKeyType"
-    }
-    
-    EnumType{
-        name: "Qt::ChecksumType"
-        since: [5, 9]
-    }
-    
-    EnumType{
-        name: "Qt::HighDpiScaleFactorRoundingPolicy"
-        since: [5, 14]
-    }
-    
-    EnumType{
-        name: "Qt::TouchPointState"
-        flags: "Qt::TouchPointStates"
-    }
-    
-    EnumType{
-        name: "Qt::ApplicationState"
-        flags: "Qt::ApplicationStates"
-    }
-    
-    EnumType{
-        name: "Qt::FindChildOption"
-        flags: "Qt::FindChildOptions"
-    }
-    
-    EnumType{
-        name: "Qt::ScreenOrientation"
-        flags: "Qt::ScreenOrientations"
-    }
 
-    EnumType{
-        name: "Qt::PermissionStatus"
-        since: [6, 5]
-    }
-    
-    EnumType{
-        name: "QtMsgType"
-        RejectEnumValue{
-            name: "QtSystemMsg"
+        EnumType{
+            name: "CursorMoveStyle"
         }
-    }
-    
-    EnumType{
-        name: "QtPluginMetaDataKeys"
-        packageName: "io.qt.core.internal"
-        since: [6, 3]
-    }
-    
-    EnumType{
-        name: "QTextBoundaryFinder::BoundaryReason"
-        flags: "QTextBoundaryFinder::BoundaryReasons"
-    }
-    
-    EnumType{
-        name: "QTextBoundaryFinder::BoundaryType"
-    }
-    
-    EnumType{
-        name: "QDataStream::Status"
-    }
-    
-    EnumType{
-        name: "QDir::Filter"
-        flags: "QDir::Filters"
-    }
-    
-    EnumType{
-        name: "QEvent::Type"
-        extensible: true
-        RejectEnumValue{
-            name: "ApplicationActivated"
+
+        EnumType{
+            name: "GestureState"
         }
-        RejectEnumValue{
-            name: "ApplicationDeactivated"
+
+        EnumType{
+            name: "InputMethodHint"
         }
-        RenameEnumValue{
-            name: "DeferredDelete"
-            rename: "DeferredDispose"
+
+        EnumType{
+            name: "NavigationMode"
         }
-    }
-    
-    EnumType{
-        name: "QEventLoop::ProcessEventsFlag"
-        flags: "QEventLoop::ProcessEventsFlags"
-    }
-    
-    EnumType{
-        name: "QIODevice::OpenModeFlag"
-        flags: "QIODevice::OpenMode"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QIODeviceBase::OpenModeFlag"
-        flags: "QIODeviceBase::OpenMode"
-        since: 6
-    }
-    
-    EnumType{
-        name: "QLibraryInfo::LibraryLocation"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QLibraryInfo::LibraryPath"
-        RejectEnumValue{
-            name: "Qml2ImportsPath"
-            since: [6, 2]
+
+        EnumType{
+            name: "TileRule"
         }
-        since: 6
-    }
-    
-    EnumType{
-        name: "QLocale::CurrencySymbolFormat"
-    }
-    
-    
-    EnumType{
-        name: "QLocale::FormatType"
-    }
-    
-    EnumType{
-        name: "QLocale::NumberOption"
-        flags: "QLocale::NumberOptions"
-    }
-    
-    EnumType{
-        name: "QLocale::MeasurementSystem"
-        RejectEnumValue{
-            name: "ImperialSystem"
+
+        EnumType{
+            name: "TimerType"
         }
-    }
-    
-    EnumType{
-        name: "QLocale::DataSizeFormat"
-        flags: "QLocale::DataSizeFormats"
-        RejectEnumValue{
-            name: "DataSizeTraditionalFormat"
+
+        EnumType{
+            name: "EnterKeyType"
         }
-        since: [5, 10]
-    }
-    
-    EnumType{
-        name: "QLocale::LanguageCodeType"
-        flags: "QLocale::LanguageCodeTypes"
-        RejectEnumValue{
-            name: "ISO639Alpha2"
+
+        EnumType{
+            name: "ChecksumType"
+            since: [5, 9]
         }
-        since: [6, 3]
-    }
-    
-    EnumType{
-        name: "QUrl::AceProcessingOption"
-        flags: "QUrl::AceProcessingOptions"
-        since: [6, 3]
-    }
-    
-    EnumType{
-        name: "QFutureInterfaceBase::CancelMode"
-        since: [6, 3]
-    }
-    
-    EnumType{
-        name: "QProcessEnvironment::Initialization"
-        since: [6, 3]
-    }
-    
-    EnumType{
-        name: "QLocale::QuotationStyle"
-    }
-    
-    
-    EnumType{
-        name: "QLocale::FloatingPointPrecisionOption"
-        since: [5, 7]
-    }
-    
-    EnumType{
-        name: "QCommandLineOption::Flag"
-        flags: "QCommandLineOption::Flags"
-        since: [5, 8]
-    }
-    
-    EnumType{
-        name: "QProcess::ExitStatus"
-        ppCondition: "QT_CONFIG(process)"
-    }
-    
-    EnumType{
-        name: "QProcess::ProcessChannel"
-        ppCondition: "QT_CONFIG(process)"
-    }
-    
-    EnumType{
-        name: "QProcess::ProcessChannelMode"
-        ppCondition: "QT_CONFIG(process)"
-    }
-    
-    EnumType{
-        name: "QProcess::ProcessError"
-        ppCondition: "QT_CONFIG(process)"
-    }
-    
-    EnumType{
-        name: "QProcess::ProcessState"
-        ppCondition: "QT_CONFIG(process)"
-    }
-    
-    EnumType{
-        name: "QProcess::InputChannelMode"
-        ppCondition: "QT_CONFIG(process)"
-    }
-    
-    EnumType{
-        name: "QCommandLineParser::SingleDashWordOptionMode"
-    }
-    
-    EnumType{
-        name: "QCommandLineParser::OptionsAfterPositionalArgumentsMode"
-    }
-    
-    EnumType{
-        name: "QRegExp::CaretMode"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QRegExp::PatternSyntax"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QSettings::Format"
-    }
-    
-    EnumType{
-        name: "QSettings::Scope"
-    }
-    
-    EnumType{
-        name: "QSettings::Status"
-    }
-    
-    EnumType{
-        name: "QSocketNotifier::Type"
-    }
-    
-    EnumType{
-        name: "QTextCodec::ConversionFlag"
-        flags: "QTextCodec::ConversionFlags"
-        until: [5, 16]
-    }
-    
-    EnumType{
-        name: "QStringConverterBase::Flag"
-        flags: "QStringConverterBase::Flags"
-        since: 6
-    }
-    
-    EnumType{
-        name: "QTextStream::FieldAlignment"
-    }
-    
-    EnumType{
-        name: "QTextStream::NumberFlag"
-        flags: "QTextStream::NumberFlags"
-    }
-    
-    EnumType{
-        name: "QTextStream::RealNumberNotation"
-    }
-    
-    EnumType{
-        name: "QTextStream::Status"
-    }
-    
-    EnumType{
-        name: "QTimeLine::CurveShape"
-    }
-    
-    EnumType{
-        name: "QTimeLine::Direction"
-    }
-    
-    EnumType{
-        name: "QTimeLine::State"
-    }
-    
-    EnumType{
-        name: "QUrl::UserInputResolutionOption"
-        flags: "QUrl::UserInputResolutionOptions"
-    }
-    
-    EnumType{
-        name: "QUrl::UrlFormattingOption"
-        implementing: "FormattingOption"
-    }
-    
-    EnumType{
-        name: "QUrl::ComponentFormattingOption"
-        flags: "QUrl::ComponentFormattingOptions"
-        implementing: "FormattingOption"
-    }
-    
-    EnumType{
-        name: "QUrl::ParsingMode"
-    }
-    
-    EnumType{
-        name: "QUuid::Variant"
-    }
-    
-    EnumType{
-        name: "QUuid::Version"
-        RejectEnumValue{
-            name: "Name"
+
+        EnumType{
+            name: "HighDpiScaleFactorRoundingPolicy"
+            since: [5, 14]
         }
-    }
-    
-    EnumType{
-        name: "Qt::SizeHint"
-    }
-    
-    EnumType{
-        name: "Qt::SizeMode"
-    }
-    
-    EnumType{
-        name: "Qt::WindowFrameSection"
-    }
-    
-    EnumType{
-        name: "Qt::Axis"
-    }
-    
-    EnumType{
-        name: "Qt::ApplicationAttribute"
-        RejectEnumValue{
-            name: "AA_MacPluginApplication"
-            since: [5, 7]
+
+        EnumType{
+            name: "TouchPointState"
         }
-    }
-    
-    EnumType{
-        name: "Qt::ArrowType"
-    }
-    
-    EnumType{
-        name: "Qt::AspectRatioMode"
-    }
-    
-    EnumType{
-        name: "Qt::BGMode"
-    }
-    
-    EnumType{
-        name: "Qt::BrushStyle"
-    }
-    
-    EnumType{
-        name: "Qt::CaseSensitivity"
-    }
-    
-    EnumType{
-        name: "Qt::CheckState"
-    }
-    
-    EnumType{
-        name: "Qt::ClipOperation"
-    }
-    
-    EnumType{
-        name: "Qt::ConnectionType"
-    }
-    
-    EnumType{
-        name: "Qt::ContextMenuPolicy"
-    }
-    
-    EnumType{
-        name: "Qt::Corner"
-    }
-    
-    EnumType{
-        name: "Qt::DayOfWeek"
-    }
-    
-    EnumType{
-        name: "Qt::DockWidgetAreaSizes"
-    }
-    
-    EnumType{
-        name: "Qt::DropAction"
-        flags: "Qt::DropActions"
-    }
-    
-    EnumType{
-        name: "Qt::FillRule"
-    }
-    
-    EnumType{
-        name: "Qt::FocusPolicy"
-    }
-    
-    EnumType{
-        name: "Qt::FocusReason"
-    }
+
+        EnumType{
+            name: "ApplicationState"
+        }
+
+        EnumType{
+            name: "FindChildOption"
+        }
+
+        EnumType{
+            name: "ScreenOrientation"
+        }
+
+        EnumType{
+            name: "PermissionStatus"
+            since: [6, 5]
+        }
+
+        EnumType{
+            name: "ColorScheme"
+            since: [6, 5]
+        }
+
+        EnumType{
+            name: "DockWidgetArea"
+            RejectEnumValue{
+                name: "AllDockWidgetAreas"
+            }
+        }
+
+        EnumType{
+            name: "ImageConversionFlag"
+            RejectEnumValue{
+                name: "AutoDither"
+            }
+            RejectEnumValue{
+                name: "ColorOnly"
+            }
+            RejectEnumValue{
+                name: "DiffuseDither"
+            }
+            RejectEnumValue{
+                name: "NoAlpha"
+            }
+            RejectEnumValue{
+                name: "ThresholdAlphaDither"
+            }
+        }
+
+        EnumType{
+            name: "Key"
+            RejectEnumValue{
+                name: "Key_Any"
+            }
+        }
+
+        EnumType{
+            name: "SizeHint"
+        }
+
+        EnumType{
+            name: "SizeMode"
+        }
+
+        EnumType{
+            name: "WindowFrameSection"
+        }
+
+        EnumType{
+            name: "Axis"
+        }
+
+        EnumType{
+            name: "ApplicationAttribute"
+            RejectEnumValue{
+                name: "AA_MacPluginApplication"
+                since: [5, 7]
+            }
+        }
+
+        EnumType{
+            name: "ArrowType"
+        }
+
+        EnumType{
+            name: "AspectRatioMode"
+        }
+
+        EnumType{
+            name: "BGMode"
+        }
+
+        EnumType{
+            name: "BrushStyle"
+        }
+
+        EnumType{
+            name: "CaseSensitivity"
+        }
+
+        EnumType{
+            name: "CheckState"
+        }
+
+        EnumType{
+            name: "ClipOperation"
+        }
+
+        EnumType{
+            name: "ConnectionType"
+        }
+
+        EnumType{
+            name: "ContextMenuPolicy"
+        }
+
+        EnumType{
+            name: "Corner"
+        }
+
+        EnumType{
+            name: "DayOfWeek"
+        }
+
+        EnumType{
+            name: "DockWidgetAreaSizes"
+        }
+
+        EnumType{
+            name: "DropAction"
+        }
+
+        EnumType{
+            name: "FillRule"
+        }
+
+        EnumType{
+            name: "FocusPolicy"
+        }
+
+        EnumType{
+            name: "FocusReason"
+        }
+
+        EnumType{
+            name: "GlobalColor"
+        }
+
+        EnumType{
+            name: "HitTestAccuracy"
+        }
+
+        EnumType{
+            name: "ItemFlag"
+            RejectEnumValue{
+                name: "ItemIsTristate"
+            }
+        }
+
+        EnumType{
+            name: "ItemSelectionMode"
+        }
+
+        EnumType{
+            name: "KeyboardModifier"
+        }
+
+        EnumType{
+            name: "LayoutDirection"
+        }
+
+        EnumType{
+            name: "MatchFlag"
+            RejectEnumValue{
+                name: "MatchRegExp"
+                since: 6
+            }
+        }
+
+        EnumType{
+            name: "Orientation"
+        }
+
+        EnumType{
+            name: "PenCapStyle"
+        }
+
+        EnumType{
+            name: "PenJoinStyle"
+        }
+
+        EnumType{
+            name: "PenStyle"
+        }
+
+        EnumType{
+            name: "ScrollBarPolicy"
+        }
+
+        EnumType{
+            name: "ShortcutContext"
+        }
+
+        EnumType{
+            name: "SortOrder"
+        }
+
+        EnumType{
+            name: "TextElideMode"
+        }
+
+        EnumType{
+            name: "TextFlag"
+        }
+
+        EnumType{
+            name: "TextFormat"
+        }
+
+        EnumType{
+            name: "TextInteractionFlag"
+        }
+
+        EnumType{
+            name: "TimeSpec"
+        }
+
+        EnumType{
+            name: "ToolBarAreaSizes"
+        }
+
+        EnumType{
+            name: "ToolButtonStyle"
+        }
+
+        EnumType{
+            name: "TransformationMode"
+        }
+
+        EnumType{
+            name: "UIEffect"
+        }
+
+        EnumType{
+            name: "WhiteSpaceMode"
+        }
+
+        EnumType{
+            name: "WindowModality"
+        }
+
+        EnumType{
+            name: "GestureType"
+        }
+
+        EnumType{
+            name: "NativeGestureType"
+        }
+
+        EnumType{
+            name: "GestureFlag"
+        }
+
+        EnumType{
+            name: "MouseEventFlag"
+        }
+
+        EnumType{
+            name: "MouseEventSource"
+        }
+
+        EnumType{
+            name: "WindowState"
+        }
+
+        EnumType{
+            name: "WindowType"
+            RejectEnumValue{
+                name: "X11BypassWindowManagerHint"
+            }
+            RejectEnumValue{
+                name: "WindowOkButtonHint"
+            }
+            RejectEnumValue{
+                name: "WindowCancelButtonHint"
+            }
+        }
+
+        EnumType{
+            name: "EventPriority"
+        }
+
+        EnumType{
+            name: "MaskMode"
+        }
+
+        EnumType{
+            name: "ToolBarArea"
+            RejectEnumValue{
+                name: "AllToolBarAreas"
+            }
+        }
+
+        EnumType{
+            name: "WidgetAttribute"
+            RejectEnumValue{
+                name: "WA_ForceAcceptDrops"
+            }
+            RejectEnumValue{
+                name: "WA_NoBackground"
+            }
+            RejectEnumValue{
+                name: "WA_MacMetalStyle"
+            }
+        }
+
+        EnumType{
+            name: "ReturnByValueConstant"
+            generate: false
+            since: [5, 15]
+        }
+
+        EnumType{
+            name: "SplitBehaviorFlags"
+            since: [5, 14]
+        }
+
+        EnumType{
+            name: "Appearance"
+            since: [6, 5]
+        }
+
+        EnumType{
+            name: "AlignmentFlag"
+            RejectEnumValue{
+                name: "AlignLeading"
+            }
+            RejectEnumValue{
+                name: "AlignTrailing"
+            }
+        }
+
+        EnumType{
+            name: "CursorShape"
+            RejectEnumValue{
+                name: "LastCursor"
+            }
+        }
+
+        EnumType{
+            name: "DateFormat"
+            RejectEnumValue{
+                name: "LocalDate"
+            }
+        }
+
+        EnumType{
+            name: "ItemSelectionOperation"
+        }
+
+        EnumType{
+            name: "TabFocusBehavior"
+        }
+
+        EnumType{
+            name: "Edge"
+        }
+
+        EnumType{
+            name: "ScrollPhase"
+        }
+
+        EnumType{
+            name: "ItemDataRole"
+            forceInteger: true
+            RejectEnumValue{
+                name: "BackgroundColorRole"
+            }
+            RejectEnumValue{
+                name: "TextColorRole"
+            }
+        }
+
+        EnumType{
+            name: "MouseButton"
+            RejectEnumValue{
+                name: "MiddleButton"
+                until: 5
+            }
+            RejectEnumValue{
+                name: "XButton1"
+            }
+            RejectEnumValue{
+                name: "BackButton"
+            }
+            RejectEnumValue{
+                name: "ForwardButton"
+            }
+            RejectEnumValue{
+                name: "XButton2"
+            }
+            RejectEnumValue{
+                name: "TaskButton"
+            }
+            RejectEnumValue{
+                name: "MaxMouseButton"
+            }
+        }
+
+        Rejection{
+            className: "QtMsgType"
+        }
+
+        Rejection{
+            className: "Initialization"
+        }
+
+        PrimitiveType{
+            name: "HANDLE"
+            javaName: "long"
+            jniName: "jlong"
+            preferredConversion: false
+        }
+
+        InjectCode{
+            ImportFile{
+                name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
+                quoteAfterLine: "class Qt___"
+                quoteBeforeLine: "}// class"
+            }
+        }
+    }// namespace Qt
     
-    EnumType{
-        name: "Qt::GlobalColor"
-    }
+    NamespaceType{
+        name: "QtPrivate"
+        generate: false
+        Rejection{enumName: "Ordering"}
+        Rejection{className: "ExceptionStore"}
+        Rejection{functionName: "qTryMetaTypeInterfaceForType"}
+        Rejection{functionName: "qMetaTypeInterfaceForType"}
+        Rejection{functionName: "qMakeStringPrivate"}
+        Rejection{functionName: "qMakeForeachContainer"}
+        Rejection{functionName: "checkTypeIsSuitableForMetaType"}
+        Rejection{className: "BindingEvaluationState"}
+        Rejection{className: "Deprecated_t"}
+        Rejection{functionName: "fulfillPromise"}
+        Rejection{functionName: "warnIfContainerIsNotShared"}
+        Rejection{className: "BindingFunctionVTable"}
+        Rejection{className: "QMetaTypeInterface"}
+
+        ObjectType{
+            name: "QPropertyBindingData"
+            javaName: "QPropertyBindingData"
+            forceFriendly: true
+            ModifyField{
+                name: "BindingBit"
+                read: false
+                write: false
+            }
+            ModifyField{
+                name: "DelayedNotificationBit"
+                read: false
+                write: false
+                since: [6, 2]
+            }
+            ExtraIncludes{
+                Include{
+                    fileName: "utils_p.h"
+                    location: Include.Local
+                }
+            }
+            ModifyFunction{
+                signature: "setBinding(QUntypedPropertyBinding, QUntypedPropertyData *, QtPrivate::QPropertyObserverCallback, QtPrivate::QPropertyBindingWrapper)"
+                ModifyArgument{
+                    index: 2
+                    ReferenceCount{
+                        action: ReferenceCount.Ignore
+                    }
+                }
+                ModifyArgument{
+                    index: 3
+                    RemoveArgument{
+                    }
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "QtPrivate::QPropertyObserverCallback %out = qtjambi_get_signal_callback(%env, __qt_%2);"}
+                    }
+                }
+                ModifyArgument{
+                    index: 4
+                    RemoveArgument{
+                    }
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "QtPrivate::QPropertyBindingWrapper %out = nullptr;"}
+                    }
+                }
+            }
+            since: 6
+        }
+
+        ObjectType{
+            name: "QBindableInterface"
+            javaName: "QBindableInterface"
+            forceFriendly: true
+            Rejection{fieldName: "getter"}
+            Rejection{fieldName: "setter"}
+            Rejection{fieldName: "makeBinding"}
+            Rejection{fieldName: "setBinding"}
+            Rejection{fieldName: "getBinding"}
+            Rejection{fieldName: "setObserver"}
+            Rejection{fieldName: "metaType"}
+            Rejection{fieldName: "MetaTypeAccessorFlag"
+                since: [6, 2]
+            }
+            ModifyFunction{
+                signature: "QBindableInterface()"
+                remove: RemoveFlag.All
+            }
+            InjectCode{
+                ImportFile{
+                    name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
+                    quoteAfterLine: "class QBindableInterface__"
+                    quoteBeforeLine: "}// class"
+                }
+            }
+            since: 6
+        }
+
+        FunctionalType{
+            name: "QPropertyObserverCallback"
+            generate: false
+            javaName: "QPropertyObserverCallback"
+            since: 6
+        }
+
+        FunctionalType{
+            name: "QPropertyBindingWrapper"
+            generate: false
+            javaName: "QPropertyBindingWrapper"
+            since: 6
+        }
+    } // namespace QtPrivate
     
     EnumType{
-        name: "Qt::HitTestAccuracy"
+        name: "PropertyFlags"
+        flags: "PropertyAttributes"
+        packageName: "io.qt.internal"
     }
     
     EnumType{
-        name: "Qt::ItemFlag"
-        flags: "Qt::ItemFlags"
+        name: "MethodFlags"
+        flags: "MethodAttributes"
+        packageName: "io.qt.internal"
+        RejectEnumValue{
+            name: "MethodMethod"
+        }
         RejectEnumValue{
-            name: "ItemIsTristate"
+            name: "MethodTypeMask"
         }
     }
     
     EnumType{
-        name: "Qt::ItemSelectionMode"
-    }
-    
-    EnumType{
-        name: "Qt::KeyboardModifier"
-        flags: "Qt::KeyboardModifiers"
+        name: "EnumFlags"
+        flags: "EnumAttributes"
+        packageName: "io.qt.internal"
     }
     
     EnumType{
-        name: "Qt::LayoutDirection"
+        name: "MetaObjectFlags"
+        flags: "MetaObjectAttributes"
+        packageName: "io.qt.internal"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::MatchFlag"
-        flags: "Qt::MatchFlags"
-        RejectEnumValue{
-            name: "MatchRegExp"
-            since: 6
-        }
+        name: "MetaObjectFlag"
+        packageName: "io.qt.internal"
+        since: 6
     }
     
     EnumType{
-        name: "Qt::Orientation"
-        flags: "Qt::Orientations"
+        name: "MetaDataFlags"
+        flags: "MetaDataAttributes"
+        packageName: "io.qt.internal"
     }
     
     EnumType{
-        name: "Qt::PenCapStyle"
+        name: "QEasingCurve::Type"
     }
     
     EnumType{
-        name: "Qt::PenJoinStyle"
+        name: "QHistoryState::HistoryType"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::PenStyle"
+        name: "QState::ChildMode"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::ScrollBarPolicy"
+        name: "QState::RestorePolicy"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::ShortcutContext"
+        name: "QStateMachine::Error"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::SortOrder"
+        name: "QStateMachine::EventPriority"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::TextElideMode"
+        name: "QtMsgType"
+        RejectEnumValue{
+            name: "QtSystemMsg"
+        }
     }
     
     EnumType{
-        name: "Qt::TextFlag"
+        name: "QtPluginMetaDataKeys"
+        packageName: "io.qt.core.internal"
+        since: [6, 3]
     }
     
     EnumType{
-        name: "Qt::TextFormat"
+        name: "QTextBoundaryFinder::BoundaryReason"
     }
     
     EnumType{
-        name: "Qt::TextInteractionFlag"
-        flags: "Qt::TextInteractionFlags"
+        name: "QTextBoundaryFinder::BoundaryType"
     }
     
     EnumType{
-        name: "Qt::TimeSpec"
+        name: "QDir::Filter"
     }
     
     EnumType{
-        name: "Qt::ToolBarAreaSizes"
+        name: "QEvent::Type"
+        extensible: true
+        RejectEnumValue{
+            name: "ApplicationActivated"
+        }
+        RejectEnumValue{
+            name: "ApplicationDeactivated"
+        }
+        RenameEnumValue{
+            name: "DeferredDelete"
+            rename: "DeferredDispose"
+        }
     }
     
     EnumType{
-        name: "Qt::ToolButtonStyle"
+        name: "QEventLoop::ProcessEventsFlag"
     }
     
     EnumType{
-        name: "Qt::TransformationMode"
+        name: "QIODevice::OpenModeFlag"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::UIEffect"
+        name: "QIODeviceBase::OpenModeFlag"
+        since: 6
     }
     
     EnumType{
-        name: "Qt::WhiteSpaceMode"
+        name: "QLibraryInfo::LibraryLocation"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::WindowModality"
+        name: "QLibraryInfo::LibraryPath"
+        RejectEnumValue{
+            name: "Qml2ImportsPath"
+            since: [6, 2]
+        }
+        since: 6
     }
     
     EnumType{
-        name: "Qt::GestureType"
+        name: "QLocale::CurrencySymbolFormat"
     }
     
-    EnumType{
-        name: "Qt::NativeGestureType"
-    }
     
     EnumType{
-        name: "Qt::GestureFlag"
-        flags: "Qt::GestureFlags"
+        name: "QLocale::FormatType"
     }
     
     EnumType{
-        name: "Qt::MouseEventFlag"
-        flags: "Qt::MouseEventFlags"
+        name: "QLocale::NumberOption"
     }
     
     EnumType{
-        name: "Qt::MouseEventSource"
+        name: "QLocale::MeasurementSystem"
+        RejectEnumValue{
+            name: "ImperialSystem"
+        }
     }
     
     EnumType{
-        name: "Qt::WindowState"
-        flags: "Qt::WindowStates"
+        name: "QLocale::DataSizeFormat"
+        RejectEnumValue{
+            name: "DataSizeTraditionalFormat"
+        }
+        since: [5, 10]
     }
     
     EnumType{
-        name: "Qt::WindowType"
-        flags: "Qt::WindowFlags"
-        RejectEnumValue{
-            name: "X11BypassWindowManagerHint"
-        }
-        RejectEnumValue{
-            name: "WindowOkButtonHint"
-        }
+        name: "QLocale::LanguageCodeType"
         RejectEnumValue{
-            name: "WindowCancelButtonHint"
+            name: "ISO639Alpha2"
         }
+        since: [6, 3]
     }
     
     EnumType{
-        name: "QDirIterator::IteratorFlag"
-        flags: "QDirIterator::IteratorFlags"
+        name: "QProcessEnvironment::Initialization"
+        since: [6, 3]
     }
     
     EnumType{
-        name: "Qt::EventPriority"
+        name: "QLocale::QuotationStyle"
     }
     
+    
     EnumType{
-        name: "Qt::MaskMode"
-    }
-
-    EnumType{
-        name: "Qt::ToolBarArea"
-        flags: "Qt::ToolBarAreas"
-        RejectEnumValue{
-            name: "AllToolBarAreas"
-        }
+        name: "QLocale::FloatingPointPrecisionOption"
+        since: [5, 7]
     }
-
+    
     EnumType{
-        name: "Qt::WidgetAttribute"
-        RejectEnumValue{
-            name: "WA_ForceAcceptDrops"
-        }
-        RejectEnumValue{
-            name: "WA_NoBackground"
-        }
-        RejectEnumValue{
-            name: "WA_MacMetalStyle"
-        }
+        name: "QCommandLineOption::Flag"
+        since: [5, 8]
     }
-
+    
     EnumType{
-        name: "Qt::ReturnByValueConstant"
-        generate: false
-        since: [5, 15]
+        name: "QProcess::ExitStatus"
+        ppCondition: "QT_CONFIG(process)"
     }
-
+    
     EnumType{
-        name: "Qt::SplitBehaviorFlags"
-        flags: "Qt::SplitBehavior"
-        since: [5, 14]
+        name: "QProcess::ProcessChannel"
+        ppCondition: "QT_CONFIG(process)"
     }
-
+    
     EnumType{
-        name: "Qt::Appearance"
-        since: [6, 5]
+        name: "QProcess::ProcessChannelMode"
+        ppCondition: "QT_CONFIG(process)"
     }
     
     EnumType{
-        name: "QCryptographicHash::Algorithm"
-        RejectEnumValue{
-            name: "RealSha3_224"
-        }
-        RejectEnumValue{
-            name: "RealSha3_256"
-        }
-        RejectEnumValue{
-            name: "RealSha3_384"
-        }
-        RejectEnumValue{
-            name: "RealSha3_512"
-        }
+        name: "QProcess::ProcessError"
+        ppCondition: "QT_CONFIG(process)"
     }
     
     EnumType{
-        name: "QStandardPaths::LocateOption"
-        flags: "QStandardPaths::LocateOptions"
+        name: "QProcess::ProcessState"
+        ppCondition: "QT_CONFIG(process)"
     }
     
     EnumType{
-        name: "QStandardPaths::StandardLocation"
-        RejectEnumValue{
-            name: "DataLocation"
-        }
+        name: "QProcess::InputChannelMode"
+        ppCondition: "QT_CONFIG(process)"
     }
     
     EnumType{
-        name: "Qt::AlignmentFlag"
-        flags: "Qt::Alignment"
-        RejectEnumValue{
-            name: "AlignLeading"
-        }
-        RejectEnumValue{
-            name: "AlignTrailing"
-        }
+        name: "QCommandLineParser::SingleDashWordOptionMode"
     }
     
     EnumType{
-        name: "Qt::CursorShape"
-        RejectEnumValue{
-            name: "LastCursor"
-        }
+        name: "QCommandLineParser::OptionsAfterPositionalArgumentsMode"
     }
     
     EnumType{
-        name: "Qt::DateFormat"
-        RejectEnumValue{
-            name: "LocalDate"
-        }
+        name: "QRegExp::CaretMode"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::ItemSelectionOperation"
+        name: "QRegExp::PatternSyntax"
+        until: 5
     }
     
     EnumType{
-        name: "Qt::TabFocusBehavior"
+        name: "QSettings::Format"
     }
     
     EnumType{
-        name: "Qt::Edge"
-        flags: "Qt::Edges"
+        name: "QSettings::Scope"
     }
     
     EnumType{
-        name: "Qt::ScrollPhase"
+        name: "QSettings::Status"
     }
     
     EnumType{
-        name: "Qt::ItemDataRole"
-        forceInteger: true
-        RejectEnumValue{
-            name: "BackgroundColorRole"
-        }
-        RejectEnumValue{
-            name: "TextColorRole"
-        }
+        name: "QSocketNotifier::Type"
     }
     
     EnumType{
-        name: "Qt::MouseButton"
-        flags: "Qt::MouseButtons"
-        RejectEnumValue{
-            name: "MiddleButton"
-            until: 5
-        }
-        RejectEnumValue{
-            name: "XButton1"
-        }
-        RejectEnumValue{
-            name: "BackButton"
-        }
-        RejectEnumValue{
-            name: "ForwardButton"
-        }
-        RejectEnumValue{
-            name: "XButton2"
-        }
-        RejectEnumValue{
-            name: "TaskButton"
-        }
-        RejectEnumValue{
-            name: "MaxMouseButton"
-        }
+        name: "QTextCodec::ConversionFlag"
+        until: [5, 16]
     }
     
     EnumType{
-        name: "QDataStream::Version"
-        RejectEnumValue{
-            name: "Qt_4_1"
-        }
-        RejectEnumValue{
-            name: "Qt_4_7"
-        }
-        RejectEnumValue{
-            name: "Qt_4_8"
-        }
-        RejectEnumValue{
-            name: "Qt_4_9"
-        }
-        RejectEnumValue{
-            name: "Qt_5_3"
-        }
-        RejectEnumValue{
-            name: "Qt_5_5"
-        }
-        RejectEnumValue{
-            name: "Qt_5_7"
-            since: [5, 7]
-        }
-        RejectEnumValue{
-            name: "Qt_5_8"
-            since: [5, 8]
-        }
-        RejectEnumValue{
-            name: "Qt_5_9"
-            since: [5, 9]
-        }
-        RejectEnumValue{
-            name: "Qt_5_10"
-            since: [5, 10]
-        }
-        RejectEnumValue{
-            name: "Qt_5_11"
-            since: [5, 11]
-        }
-        RejectEnumValue{
-            name: "Qt_5_14"
-            since: [5, 14]
-        }
-        RejectEnumValue{
-            name: "Qt_5_15"
-            since: [5, 15]
-        }
-        RejectEnumValue{
-            name: "Qt_6_1"
-            since: [6, 1]
-        }
-        RejectEnumValue{
-            name: "Qt_6_2"
-            since: [6, 2]
-        }
-        RejectEnumValue{
-            name: "Qt_6_3"
-            since: [6, 3]
-        }
-        RejectEnumValue{
-            name: "Qt_6_4"
-            since: [6, 4]
-        }
-        RejectEnumValue{
-            name: "Qt_6_5"
-            since: [6, 5]
-        }
-        RejectEnumValue{
-            name: "Qt_DefaultCompiledVersion"
-        }
+        name: "QStringConverterBase::Flag"
+        since: 6
     }
     
     EnumType{
-        name: "QDir::SortFlag"
-        flags: "QDir::SortFlags"
-        RejectEnumValue{
-            name: "Unsorted"
-        }
+        name: "QTextStream::FieldAlignment"
+    }
+    
+    EnumType{
+        name: "QTextStream::NumberFlag"
+    }
+    
+    EnumType{
+        name: "QTextStream::RealNumberNotation"
+    }
+    
+    EnumType{
+        name: "QTextStream::Status"
+    }
+    
+    EnumType{
+        name: "QTimeLine::CurveShape"
+    }
+    
+    EnumType{
+        name: "QTimeLine::Direction"
+    }
+    
+    EnumType{
+        name: "QTimeLine::State"
+    }
+    
+    EnumType{
+        name: "QUuid::Variant"
     }
     
     EnumType{
-        name: "Qt::DockWidgetArea"
-        flags: "Qt::DockWidgetAreas"
+        name: "QUuid::Version"
         RejectEnumValue{
-            name: "AllDockWidgetAreas"
+            name: "Name"
         }
     }
+
+    EnumType{
+        name: "QDirIterator::IteratorFlag"
+    }
     
     EnumType{
-        name: "Qt::ImageConversionFlag"
-        flags: "Qt::ImageConversionFlags"
+        name: "QCryptographicHash::Algorithm"
         RejectEnumValue{
-            name: "AutoDither"
+            name: "RealSha3_224"
         }
         RejectEnumValue{
-            name: "ColorOnly"
+            name: "RealSha3_256"
         }
         RejectEnumValue{
-            name: "DiffuseDither"
+            name: "RealSha3_384"
         }
         RejectEnumValue{
-            name: "NoAlpha"
+            name: "RealSha3_512"
         }
+    }
+    
+    EnumType{
+        name: "QStandardPaths::LocateOption"
+    }
+    
+    EnumType{
+        name: "QStandardPaths::StandardLocation"
         RejectEnumValue{
-            name: "ThresholdAlphaDither"
+            name: "DataLocation"
         }
     }
     
     EnumType{
-        name: "Qt::Key"
+        name: "QDir::SortFlag"
         RejectEnumValue{
-            name: "Key_Any"
+            name: "Unsorted"
         }
     }
     
@@ -4904,10 +4139,6 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QElapsedTimer::ClockType"
-    }
-    
     EnumType{
         name: "QXmlStreamReader::Error"
     }
@@ -4931,12 +4162,10 @@ TypeSystem{
     
     EnumType{
         name: "QFileDevice::FileHandleFlag"
-        flags: "QFileDevice::FileHandleFlags"
     }
     
     EnumType{
         name: "QFileDevice::Permission"
-        flags: "QFileDevice::Permissions"
     }
     
     EnumType{
@@ -4946,7 +4175,6 @@ TypeSystem{
     
     EnumType{
         name: "QFileDevice::MemoryMapFlag"
-        flags: "QFileDevice::MemoryMapFlags"
         since: 6
     }
     
@@ -4973,7 +4201,6 @@ TypeSystem{
     
     EnumType{
         name: "QRegularExpression::MatchOption"
-        flags: "QRegularExpression::MatchOptions"
         RejectEnumValue{
             name: "AnchoredMatchOption"
             since: 6
@@ -4986,7 +4213,6 @@ TypeSystem{
     
     EnumType{
         name: "QRegularExpression::PatternOption"
-        flags: "QRegularExpression::PatternOptions"
     }
     
     EnumType{
@@ -4995,26 +4221,14 @@ TypeSystem{
     
     EnumType{
         name: "QAbstractItemModel::CheckIndexOption"
-        flags: "QAbstractItemModel::CheckIndexOptions"
     }
     
     EnumType{
         name: "QUuid::StringFormat"
     }
     
-    EnumType{
-        name: "QLineF::IntersectType"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QLineF::IntersectionType"
-        since: 6
-    }
-    
     EnumType{
         name: "QByteArray::Base64Option"
-        flags: "QByteArray::Base64Options"
         RejectEnumValue{
             name: "KeepTrailingEquals"
         }
@@ -5035,15 +4249,21 @@ TypeSystem{
         name: "QTimeZone::NameType"
     }
     
-    EnumType{
-        name: "QSysInfo::Endian"
-        RejectEnumValue{
-            name: "ByteOrder"
-        }
-    }
-    
     NamespaceType{
         name: "QSysInfo"
+
+        Rejection{enumName: "Sizes"}
+        Rejection{enumName: "MacVersion"}
+        Rejection{enumName: "WinVersion"}
+        Rejection{fieldName: "WindowsVersion"}
+        Rejection{fieldName: "MacintoshVersion"}
+
+        EnumType{
+            name: "Endian"
+            RejectEnumValue{
+                name: "ByteOrder"
+            }
+        }
         InjectCode{
             target: CodeClass.Java
             Text{content: "private native static int byteOrder();\n"+
@@ -5080,66 +4300,48 @@ TypeSystem{
     
     ValueType{
         name: "QLine"
+        ModifyFunction{
+            signature: "operator*(QLine,QTransform)"
+            remove: RemoveFlag.All
+        }
     }
     
     ValueType{
         name: "QLineF"
-        ModifyFunction{
-            signature: "intersect(QLineF,QPointF*)const"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPointF"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPointF* %out = qtjambi_cast<QPointF*>(%env, %in);"}
-                }
-            }
+
+        EnumType{
+            name: "IntersectType"
             until: 5
         }
+
+        EnumType{
+            name: "IntersectionType"
+            since: 6
+        }
         ModifyFunction{
-            signature: "intersects(QLineF,QPointF*)const"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPointF"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPointF* %out = qtjambi_cast<QPointF*>(%env, %in);"}
-                }
-            }
-            since: [5, 14]
+            signature: "operator*(QLineF,QTransform)"
+            remove: RemoveFlag.All
         }
     }
     
     ValueType{
         name: "QElapsedTimer"
+
+        EnumType{
+            name: "ClockType"
+        }
     }
     
     ValueType{
         name: "QProcessEnvironment"
-        ModifyFunction{
-            signature: "operator=(const QProcessEnvironment&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
         name: "QBasicTimer"
-        ModifyFunction{
-            signature: "operator=(const QBasicTimer&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QByteArrayMatcher"
-        ModifyFunction{
-            signature: "operator=(QByteArrayMatcher)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "QByteArrayMatcher(const char*,int)"
             remove: RemoveFlag.All
@@ -5172,6 +4374,9 @@ TypeSystem{
     
     ValueType{
         name: "QDate"
+        EnumType{
+            name: "MonthNameType"
+        }
         ModifyFunction{
             signature: "toString(QStringView) const"
             remove: RemoveFlag.All
@@ -5215,6 +4420,7 @@ TypeSystem{
             signature: "weekNumber(int*)const"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QDate$Week"
                 }
@@ -5248,10 +4454,6 @@ TypeSystem{
     
     ValueType{
         name: "QDateTime"
-        ModifyFunction{
-            signature: "operator=(QDateTime)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "toString(QStringView) const"
             remove: RemoveFlag.All
@@ -5283,7 +4485,7 @@ TypeSystem{
     ValueType{
         name: "QDir"
         ModifyFunction{
-            signature: "QDir(QString,QString,QFlags<QDir::SortFlag>,QFlags<QDir::Filter>)"
+            signature: "QDir(QString,QString,QDir::SortFlags,QDir::Filters)"
             ModifyArgument{
                 index: 3
                 ReplaceDefaultExpression{
@@ -5291,15 +4493,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "operator=(QDir)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(QString)"
-            remove: RemoveFlag.All
-            until: 5
-        }
         ModifyFunction{
             signature: "addResourceSearchPath(QString)"
             remove: RemoveFlag.All
@@ -5307,12 +4500,24 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator[](int)const"
-            rename: "at"
+            Delegate{name: "at"}
             until: [6,4]
         }
         ModifyFunction{
             signature: "operator[](qsizetype)const"
-            rename: "at"
+            Delegate{name: "at"}
+            since: [6,5]
+        }
+        ModifyFunction{
+            signature: "count(Qt::Disambiguated_t)const"
+            ModifyArgument{
+                index: 1
+                RemoveArgument{}
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "constexpr Qt::Disambiguated_t %out = Qt::Disambiguated;"}
+                }
+            }
             since: [6,5]
         }
         InjectCode{
@@ -5327,111 +4532,37 @@ TypeSystem{
     
     ValueType{
         name: "QPoint"
-        ModifyFunction{
-            signature: "operator-()"
-            rename: "unaryMinus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator+()"
-            rename: "unaryPlus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator-(QPoint)"
-            rename: "minus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator+(QPoint)"
-            rename: "plus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(int)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(float)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(double)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(qreal)"
-            rename: "div"
-            since: 6
-        }
-        ModifyFunction{
+        ModifyFunction{// don't provide assignment operator in favor to operator+
             signature: "operator*=(int)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator*=(double)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator*=(float)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(qreal)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(QPoint)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(QPoint)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-            }
+        }
+        ModifyFunction{
+            signature: "operator*(QPoint,QTransform)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "operator*(QPoint,QMatrix4x4)"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
             signature: "rx()"
@@ -5447,79 +4578,29 @@ TypeSystem{
     
     ValueType{
         name: "QPointF"
-        ModifyFunction{
-            signature: "operator-()"
-            rename: "unaryMinus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator+()"
-            rename: "unaryPlus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator-(QPointF)"
-            rename: "minus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator+(QPointF)"
-            rename: "plus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(qreal)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(qreal)"
-            rename: "div"
-            since: 6
-        }
         ModifyFunction{
             signature: "operator*=(qreal)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPointF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(qreal)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPointF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(QPointF)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPointF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(QPointF)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPointF"
-                }
-            }
+        }
+        ModifyFunction{
+            signature: "operator*(QPointF,QTransform)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "operator*(QPointF,QMatrix4x4)"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
             signature: "rx()"
@@ -5577,26 +4658,12 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "operator-=(const QMargins &)"
-            rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRect"
-                }
-            }
+            signature: "operator-=(const QMargins &)"
+            rename: "subtract"
         }
         ModifyFunction{
             signature: "operator+=(const QMargins &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRect"
-                }
-            }
         }
     }
     
@@ -5635,92 +4702,30 @@ TypeSystem{
         ModifyFunction{
             signature: "operator-=(const QMarginsF &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRectF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(const QMarginsF &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRectF"
-                }
-            }
         }
     }
     
     ValueType{
         name: "QSize"
-        ModifyFunction{
-            signature: "operator-(QSize)"
-            rename: "minus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator+(QSize)"
-            rename: "plus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(qreal)"
-            rename: "div"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(qreal)"
-            rename: "times"
-            since: 6
-        }
         ModifyFunction{
             signature: "operator*=(qreal)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSize"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(qreal)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSize"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(QSize)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSize"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(QSize)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSize"
-                }
-            }
         }
         ModifyFunction{
             signature: "rheight()"
@@ -5736,69 +4741,21 @@ TypeSystem{
     
     ValueType{
         name: "QSizeF"
-        ModifyFunction{
-            signature: "operator-(QSizeF)"
-            rename: "minus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator+(QSizeF)"
-            rename: "plus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(qreal)"
-            rename: "div"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(qreal)"
-            rename: "times"
-            since: 6
-        }
         ModifyFunction{
             signature: "operator*=(qreal)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSizeF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(qreal)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSizeF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(QSizeF)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSizeF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(QSizeF)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSizeF"
-                }
-            }
         }
         ModifyFunction{
             signature: "rheight()"
@@ -5874,21 +4831,6 @@ TypeSystem{
         }
     }
     
-    Rejection{
-        className: "QMetaMethod"
-        functionName: "invoke"
-    }
-    
-    Rejection{
-        className: "QMetaMethod"
-        functionName: "invokeOnGadget"
-    }
-    
-    Rejection{
-        className: "QMetaMethod"
-        functionName: "getParameterTypes"
-    }
-    
     ValueType{
         name: "QMetaMethod"
         ExtraIncludes{
@@ -5898,10 +4840,10 @@ TypeSystem{
             }
         }
 
-        ModifyFunction{
-            signature: "QMetaMethod()"
-            remove: RemoveFlag.All
-        }
+        Rejection{functionName: "invoke"}
+        Rejection{functionName: "invokeOnGadget"}
+        Rejection{functionName: "getParameterTypes"}
+        Rejection{functionName: "fromSignal"}
         ModifyFunction{
             signature: "methodSignature()const"
             rename: "cppMethodSignature"
@@ -5913,24 +4855,6 @@ TypeSystem{
                 quoteBeforeLine: "}// class"
             }
         }
-        ModifyFunction{
-            signature: "typeName()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "tag()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "name()const"
             InjectCode{
@@ -5973,10 +4897,6 @@ TypeSystem{
     
     ValueType{
         name: "QMetaProperty"
-        ModifyFunction{
-            signature: "QMetaProperty()"
-            remove: RemoveFlag.All
-        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
@@ -5984,32 +4904,10 @@ TypeSystem{
                 quoteBeforeLine: "}// class"
             }
         }
-        ModifyFunction{
-            signature: "name()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "typeName()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
     }
     
     ValueType{
         name: "QMetaEnum"
-        ModifyFunction{
-            signature: "QMetaEnum()"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "fromType<T>()"
             remove: RemoveFlag.All
@@ -6021,69 +4919,18 @@ TypeSystem{
                 quoteBeforeLine: "}// class"
             }
         }
-        ModifyFunction{
-            signature: "enumName()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "name()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "scope()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "key(int)const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "valueToKey(int)const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "keyToValue(const char *, bool *)const"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Integer"
+                    modifiedType: "java.lang.@Nullable Integer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = ok ? qtjambi_cast<jobject>(%env, %in) : nullptr;"}
                 }
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 RemoveArgument{
@@ -6100,19 +4947,13 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Integer"
+                    modifiedType: "java.lang.@Nullable Integer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = ok ? qtjambi_cast<jobject>(%env, %in) : nullptr;"}
                 }
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 RemoveArgument{
@@ -6147,20 +4988,13 @@ TypeSystem{
         ModifyFunction{
             signature: "constInternalPointer() const"
             remove: RemoveFlag.All
+            since: 6
         }
     }
     
     ValueType{
         name: "QPersistentModelIndex"
         threadAffinity: "model()"
-        ModifyFunction{
-            signature: "operator=(QPersistentModelIndex)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(QModelIndex)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "internalPointer()const"
             remove: RemoveFlag.All
@@ -6170,11 +5004,6 @@ TypeSystem{
             remove: RemoveFlag.All
             since: 6
         }
-        ModifyFunction{
-            signature: "qHashEquals(QPersistentModelIndex)"
-            remove: RemoveFlag.All
-            since: 6
-        }
         ModifyFunction{
             signature: "operator const QModelIndex&() const"
             rename: "toIndex"
@@ -6333,7 +5162,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "toString(unsigned long long) const"
+            signature: "toString(qulonglong) const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -6345,11 +5174,11 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "toString(unsigned short) const"
+            signature: "toString(ushort) const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "toString(unsigned int) const"
+            signature: "toString(uint) const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -6367,19 +5196,15 @@ TypeSystem{
             since: [5, 10]
         }
         ModifyFunction{
-            signature: "operator=(QLocale)"
+            signature: "toCurrencyString(ushort,const QString&)const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "toCurrencyString(unsigned short,const QString&)const"
+            signature: "toCurrencyString(uint,const QString&)const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "toCurrencyString(unsigned int,const QString&)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "toCurrencyString(unsigned long long,const QString&)const"
+            signature: "toCurrencyString(qulonglong,const QString&)const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -6408,7 +5233,7 @@ TypeSystem{
             since: [5, 10]
         }
         ModifyFunction{
-            signature: "formattedDataSize(long long, int, QFlags<QLocale::DataSizeFormat>)"
+            signature: "formattedDataSize(qint64, int, QLocale::DataSizeFormats)"
             remove: RemoveFlag.All
             since: [5, 12]
             until: 5
@@ -6526,37 +5351,78 @@ TypeSystem{
             }
         }
     }
+
+    ValueType{
+        name: "QBitRef"
+        generate: false
+    }
     
     ValueType{
         name: "QBitArray"
         ModifyFunction{
-            signature: "operator[](int)"
+            signature: "operator[](uint)const"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "operator[](int)const"
+            signature: "operator[](uint)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "operator[](uint)const"
-            remove: RemoveFlag.All
+            signature: "operator[](int)"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(index);"}
+            }
             until: 5
         }
         ModifyFunction{
-            signature: "operator[](uint)"
-            remove: RemoveFlag.All
+            signature: "operator[](int)const"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(index);"}
+            }
             until: 5
         }
         ModifyFunction{
             signature: "operator[](qsizetype)const"
-            remove: RemoveFlag.All
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(\"\"+index);"}
+            }
             since: 6
         }
         ModifyFunction{
             signature: "operator[](qsizetype)"
-            remove: RemoveFlag.All
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(\"\"+index);"}
+            }
             since: 6
         }
         InjectCode{
@@ -6574,65 +5440,42 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator&=(QBitArray)"
-            rename: "and"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QBitArray"
-                }
-            }
+            remove: RemoveFlag.All
         }
         ModifyFunction{
             signature: "operator=(QBitArray)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QBitArray"
-                }
-            }
+            Delegate{name: "set"; deprecated: true}
         }
         ModifyFunction{
             signature: "operator^=(QBitArray)"
-            rename: "xor"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QBitArray"
-                }
-            }
+            remove: RemoveFlag.All
         }
         ModifyFunction{
             signature: "operator|=(QBitArray)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "operator&(QBitArray,QBitArray)"
+            rename: "and"
+        }
+        ModifyFunction{
+            signature: "operator^(QBitArray,QBitArray)"
+            rename: "xor"
+        }
+        ModifyFunction{
+            signature: "operator|(QBitArray,QBitArray)"
             rename: "or"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QBitArray"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator~()const"
             rename: "inverted"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QBitArray"
-                }
-            }
         }
         ModifyFunction{
             signature: "bits()const"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@NonNull ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -6646,7 +5489,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -6668,7 +5511,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Integer"
+                    modifiedType: "java.lang.@Nullable Integer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -6689,14 +5532,11 @@ TypeSystem{
         }
     }
     
-    
-    EnumType{
-        name: "QCborError::Code"
-        since: [5, 12]
-    }
-    
     ValueType{
         name: "QCborError"
+        EnumType{
+            name: "Code"
+        }
         ModifyField{
             name: "c"
             rename: "code"
@@ -6735,6 +5575,21 @@ TypeSystem{
                 location: Include.Global
             }
         }
+
+        EnumType{
+            name: "EncodingOption"
+            since: [5, 12]
+        }
+
+        EnumType{
+            name: "DiagnosticNotationOption"
+            since: [5, 12]
+        }
+
+        EnumType{
+            name: "Type"
+            since: [5, 12]
+        }
         ModifyFunction{
             signature: "QCborValue(QLatin1String)"
             remove: RemoveFlag.All
@@ -6782,31 +5637,17 @@ TypeSystem{
             remove: RemoveFlag.All
             since: [6, 4]
         }
-        ModifyFunction{
-            signature: "operator[](QString)const"
-            rename: "value"
-        }
-        ModifyFunction{
-            signature: "operator[](long long)const"
-            rename: "value"
-        }
         ModifyFunction{
             signature: "fromCbor(const char *, qsizetype, QCborParserError *)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "fromCbor(const unsigned char *, qsizetype, QCborParserError *)"
+            signature: "fromCbor(const quint8 *, qsizetype, QCborParserError *)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
             signature: "operator=(const QCborValue &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
+            Delegate{name: "set"; deprecated: true}
         }
         ModifyFunction{
             signature: "QCborValue(const QRegularExpression &)"
@@ -6823,51 +5664,21 @@ TypeSystem{
                 quoteBeforeLine: "}// class"
             }
         }
+        ModifyFunction{
+            signature: "operator[](QString)const"
+            Delegate{name: "value"}
+        }
+        ModifyFunction{
+            signature: "operator[](qint64)const"
+            Delegate{name: "value"}
+        }
         ModifyFunction{
             signature: "operator[](const QString &)"
-            rename: "setValue"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-            AddArgument{
-                name: "value"
-                type: "io.qt.core.QCborValue"
-            }
-            InjectCode{
-                target: CodeClass.Native
-                position: Position.End
-                ArgumentMap{
-                    index: 0
-                    metaName: "%0"
-                }
-                Text{content: "%0 = qtjambi_cast<const QCborValue&>(%env, value);"}
-            }
+            Delegate{name: "setValue"}
         }
         ModifyFunction{
-            signature: "operator[](long long)"
-            rename: "setValue"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-            AddArgument{
-                name: "value"
-                type: "io.qt.core.QCborValue"
-            }
-            InjectCode{
-                target: CodeClass.Native
-                position: Position.End
-                ArgumentMap{
-                    index: 0
-                    metaName: "%0"
-                }
-                Text{content: "%0 = qtjambi_cast<const QCborValue&>(%env, value);"}
-            }
+            signature: "operator[](qint64)"
+            Delegate{name: "setValue"}
         }
         ModifyFunction{
             signature: "tag(QCborTag) const"
@@ -6892,6 +5703,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QCborValue$FromCborResult"
                 }
@@ -6900,38 +5712,24 @@ TypeSystem{
                     Text{content: "%out = Java::QtCore::QCborValue$FromCborResult::newInstance(%env, qtjambi_cast<jobject>(%env, %in), qtjambi_cast<jobject>(%env, %2));"}
                 }
             }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.util.concurrent.atomic.AtomicReference<QCborParserError>"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    InsertTemplate{
-                        name: "core.AtomicReference_to_ptr"
-                        Replace{
-                            from: "%TYPE"
-                            to: "QCborParserError"
-                        }
-                    }
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    InsertTemplate{
-                        name: "core.ptr_to_AtomicReference"
-                        Replace{
-                            from: "%TYPE"
-                            to: "QCborParserError"
-                        }
-                    }
-                }
-            }
         }
         since: [5, 12]
     }
     
     ValueType{
         name: "QCborArray"
+
+        Rejection{functionName: "empty"}
+        Rejection{functionName: "pop_back"}
+        Rejection{functionName: "pop_front"}
+        Rejection{functionName: "push_back"}
+        Rejection{functionName: "push_front"}
+        Rejection{functionName: "erase"}
+
+        IteratorType{
+            name: "ConstIterator"
+            since: [5, 12]
+        }
         ModifyFunction{
             signature: "extract(QCborArray::ConstIterator)"
             remove: RemoveFlag.All
@@ -6960,54 +5758,25 @@ TypeSystem{
             signature: "begin()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator[](qsizetype)const"
-            rename: "value"
+        ModifyFunction{//in favor of operator+
+            signature: "operator+=(QCborValue)"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
             signature: "operator=(const QCborArray &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "operator+(QCborValue) const"
-            rename: "plus"
+            Delegate{name: "set"; deprecated: true}
         }
         ModifyFunction{
-            signature: "operator+=(QCborValue)"
+            signature: "operator<<(QCborValue)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(QCborValue)"
-            remove: RemoveFlag.All
+            signature: "operator[](qsizetype)const"
+            Delegate{name: "value"}
         }
         ModifyFunction{
             signature: "operator[](qsizetype)"
-            rename: "setValueAt"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-            AddArgument{
-                name: "value"
-                type: "io.qt.core.QCborValue"
-            }
-            InjectCode{
-                target: CodeClass.Native
-                position: Position.End
-                ArgumentMap{
-                    index: 0
-                    metaName: "%0"
-                }
-                Text{content: "%0 = qtjambi_cast<const QCborValue&>(%env, value);"}
-            }
+            Delegate{name: "setValueAt"}
         }
         since: [5, 12]
     }
@@ -7028,30 +5797,20 @@ TypeSystem{
         since: [5, 12]
     }
     
-    EnumType{
-        name: "QCborValue::EncodingOption"
-        flags: "QCborValue::EncodingOptions"
-        since: [5, 12]
-    }
-    
-    EnumType{
-        name: "QCborValue::DiagnosticNotationOption"
-        flags: "QCborValue::DiagnosticNotationOptions"
-        since: [5, 12]
-    }
-    
-    EnumType{
-        name: "QCborValue::Type"
-        since: [5, 12]
-    }
-    
-    IteratorType{
-        name: "QCborArray::ConstIterator"
-        since: [5, 12]
-    }
-    
     ValueType{
         name: "QCborMap"
+
+        IteratorType{
+            name: "ConstIterator"
+            since: [5, 12]
+        }
+        IteratorType{
+            name: "Iterator"
+            since: [5, 12]
+        }
+        Rejection{
+            className: "Iterator"
+        }
         ModifyFunction{
             signature: "erase(QCborMap::Iterator)"
             remove: RemoveFlag.All
@@ -7149,11 +5908,11 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "find(long long)"
+            signature: "find(qint64)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "find(long long)const"
+            signature: "find(qint64)const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -7186,18 +5945,6 @@ TypeSystem{
             remove: RemoveFlag.All
             since: [6, 4]
         }
-        ModifyFunction{
-            signature: "operator[](QString)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator[](QCborValue)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator[](long long)const"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "remove(QLatin1StringView)"
             remove: RemoveFlag.All
@@ -7230,133 +5977,48 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QCborMap &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
+            Delegate{name: "set"; deprecated: true}
         }
         ModifyFunction{
             signature: "insert(QString,QCborValue)"
             ModifyArgument{
                 index: "return"
                 replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QCborMap"
-                }
             }
         }
         ModifyFunction{
-            signature: "insert(long long,QCborValue)"
+            signature: "insert(qint64,QCborValue)"
             ModifyArgument{
                 index: "return"
                 replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QCborMap"
-                }
             }
         }
         ModifyFunction{
             signature: "insert(QCborValue,QCborValue)"
             ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QCborMap"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "insert(QPair<QCborValue,QCborValue>)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QCborMap"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "operator[](QCborValue)"
-            rename: "setValue"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-            AddArgument{
-                name: "value"
-                type: "io.qt.core.QCborValue"
-            }
-            InjectCode{
-                target: CodeClass.Native
-                position: Position.End
-                ArgumentMap{
-                    index: 0
-                    metaName: "%0"
-                }
-                Text{content: "%0 = qtjambi_cast<const QCborValue&>(%env, value);"}
-            }
-        }
-        ModifyFunction{
-            signature: "operator[](const QString &)"
-            rename: "setValue"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-            AddArgument{
-                name: "value"
-                type: "io.qt.core.QCborValue"
-            }
-            InjectCode{
-                target: CodeClass.Native
-                position: Position.End
-                ArgumentMap{
-                    index: 0
-                    metaName: "%0"
-                }
-                Text{content: "%0 = qtjambi_cast<const QCborValue&>(%env, value);"}
+                index: "return"
+                replaceValue: "this"
             }
         }
         ModifyFunction{
-            signature: "operator[](long long)"
-            rename: "setValue"
+            signature: "insert(QPair<QCborValue,QCborValue>)"
             ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-            AddArgument{
-                name: "value"
-                type: "io.qt.core.QCborValue"
-            }
-            InjectCode{
-                target: CodeClass.Native
-                position: Position.End
-                ArgumentMap{
-                    index: 0
-                    metaName: "%0"
-                }
-                Text{content: "%0 = qtjambi_cast<const QCborValue&>(%env, value);"}
+                index: "return"
+                replaceValue: "this"
             }
         }
-        since: [5, 12]
-    }
-    
-    IteratorType{
-        name: "QCborMap::ConstIterator"
-        since: [5, 12]
-    }
-    
-    IteratorType{
-        name: "QCborMap::Iterator"
+        ModifyFunction{
+            signature: "operator[](QCborValue)"
+            Delegate{name: "setValue"}
+        }
+        ModifyFunction{
+            signature: "operator[](const QString &)"
+            Delegate{name: "setValue"}
+        }
+        ModifyFunction{
+            signature: "operator[](qint64)"
+            Delegate{name: "setValue"}
+        }
         since: [5, 12]
     }
     
@@ -7405,6 +6067,23 @@ TypeSystem{
     
     ObjectType{
         name: "QCborStreamReader"
+
+        EnumType{
+            name: "Type"
+            RejectEnumValue{
+                name: "ByteString"
+            }
+            RejectEnumValue{
+                name: "TextString"
+            }
+            RejectEnumValue{
+                name: "HalfFloat"
+            }
+        }
+
+        EnumType{
+            name: "StringResultCode"
+        }
         ExtraIncludes{
             Include{
                 fileName: "utils_p.h"
@@ -7412,7 +6091,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "QCborStreamReader(const unsigned char *, qsizetype)"
+            signature: "QCborStreamReader(const quint8*, qsizetype)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -7488,7 +6167,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addData(const unsigned char *, qsizetype)"
+            signature: "addData(const quint8*, qsizetype)"
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -7546,6 +6225,7 @@ TypeSystem{
             rename: "toBigInteger"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "java.math.BigInteger"
                 }
@@ -7568,14 +6248,14 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.core.QCborStreamReader.StringResult<String>"
+                    modifiedType: "io.qt.core.QCborStreamReader$@NonNull StringResult<@Nullable String>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "QCborStreamReader::StringResult<QVariant>* _%in = new QCborStreamReader::StringResult<QVariant>;\n"+
                                   "_%in->data = %in.data;\n"+
                                   "_%in->status = %in.status;\n"+
-                                  "%out = QtJambiAPI::convertNativeToJavaObject(%env, _%in, false);"}
+                                  "%out = QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(%env, _%in);"}
                 }
             }
         }
@@ -7584,14 +6264,14 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.core.QCborStreamReader.StringResult<io.qt.core.QByteArray>"
+                    modifiedType: "io.qt.core.QCborStreamReader$@NonNull StringResult<io.qt.core.@Nullable QByteArray>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "QCborStreamReader::StringResult<QVariant>* _%in = new QCborStreamReader::StringResult<QVariant>;\n"+
                                   "_%in->data = %in.data;\n"+
                                   "_%in->status = %in.status;\n"+
-                                  "%out = QtJambiAPI::convertNativeToJavaObject(%env, _%in, false);"}
+                                  "%out = QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(%env, _%in);"}
                 }
             }
         }
@@ -7600,14 +6280,14 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.core.QCborStreamReader.StringResult<Long>"
+                    modifiedType: "io.qt.core.QCborStreamReader$@NonNull StringResult<@Nullable Long>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "QCborStreamReader::StringResult<QVariant>* _%in = new QCborStreamReader::StringResult<QVariant>;\n"+
                                   "_%in->data = qint64(%in.data);\n"+
                                   "_%in->status = %in.status;\n"+
-                                  "%out = QtJambiAPI::convertNativeToJavaObject(%env, _%in, false);"}
+                                  "%out = QtJambiAPI::convertNativeToJavaOwnedObjectAsWrapper(%env, _%in);"}
                 }
             }
             ModifyArgument{
@@ -7662,7 +6342,7 @@ TypeSystem{
             until: [6, 3]
         }
         ModifyFunction{
-            signature: "append(unsigned int)"
+            signature: "append(uint)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -7693,11 +6373,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "append(unsigned long long)"
+            signature: "append(quint64)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.math.BigInteger"
+                    modifiedType: "java.math.@NonNull BigInteger"
                 }
                 NoNullPointer{
                 }
@@ -7730,15 +6410,6 @@ TypeSystem{
             signature: "QCborStreamWriter(QByteArray *)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray* %out = qtjambi_cast<QByteArray*>(%env, %in);"}
-                }
                 ReferenceCount{
                     variableName: "__rcDevice"
                     action: ReferenceCount.Set
@@ -7748,62 +6419,24 @@ TypeSystem{
         since: [5, 12]
     }
     
-    EnumType{
-        name: "QCborStreamReader::Type"
-        RejectEnumValue{
-            name: "ByteString"
-        }
-        RejectEnumValue{
-            name: "TextString"
-        }
-        RejectEnumValue{
-            name: "HalfFloat"
-        }
-        since: [5, 12]
-    }
-    
-    EnumType{
-        name: "QCborStreamReader::StringResultCode"
-        since: [5, 12]
-    }
-    
     ValueType{
         name: "QJsonArray"
-        ModifyFunction{
-            signature: "insert(QJsonArray::iterator,QJsonValue)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(const QJsonArray&)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator+=(const QJsonValue &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator+(const QJsonValue &) const"
-            rename: "plus"
-        }
-        ModifyFunction{
-            signature: "operator[](int) const"
-            remove: RemoveFlag.All
-            until: 5
-        }
-        ModifyFunction{
-            signature: "operator[](int)"
-            remove: RemoveFlag.All
-            until: 5
+        Rejection{functionName: "empty"}
+        Rejection{functionName: "pop_back"}
+        Rejection{functionName: "pop_front"}
+        Rejection{functionName: "push_back"}
+        Rejection{functionName: "push_front"}
+
+        IteratorType{
+            name: "const_iterator"
         }
-        ModifyFunction{
-            signature: "operator[](qsizetype) const"
-            remove: RemoveFlag.All
-            since: 6
+        IteratorType{
+            name: "iterator"
+            isConst: true
         }
         ModifyFunction{
-            signature: "operator[](qsizetype)"
+            signature: "insert(QJsonArray::iterator,QJsonValue)"
             remove: RemoveFlag.All
-            since: 6
         }
         ModifyFunction{
             signature: "operator<<(const QJsonValue &)"
@@ -7843,22 +6476,14 @@ TypeSystem{
             remove: RemoveFlag.All
             since: [5, 14]
         }
-    }
-    
-    IteratorType{
-        name: "QJsonArray::const_iterator"
-    }
-    IteratorType{
-        name: "QJsonArray::iterator"
-        isConst: true
+        ModifyFunction{// in favor to operator+
+            signature: "operator+=(QJsonValue)"
+            remove: RemoveFlag.All
+        }
     }
     
     ValueType{
         name: "QJsonDocument"
-        ModifyFunction{
-            signature: "operator=(const QJsonDocument&)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "operator[](QLatin1String) const"
             remove: RemoveFlag.All
@@ -7872,9 +6497,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator[](const QString &) const"
-            rename: "getObjectValue"
+            Delegate{name: "getObjectValue"}
             since: [5, 10]
-            until: [5, 13, 0]
+            until: [5, 13]
         }
         ModifyFunction{
             signature: "operator[](const QString &)const"
@@ -7883,18 +6508,18 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator[](QStringView)const"
-            rename: "getObjectValue"
+            Delegate{name: "getObjectValue"}
             since: [5, 14]
         }
         ModifyFunction{
             signature: "operator[](int) const"
-            rename: "getArrayValue"
+            Delegate{name: "getArrayValue"}
             since: [5, 10]
             until: 5
         }
         ModifyFunction{
             signature: "operator[](qsizetype) const"
-            rename: "getArrayValue"
+            Delegate{name: "getArrayValue"}
             since: 6
         }
         ExtraIncludes{
@@ -7922,6 +6547,7 @@ TypeSystem{
             signature: "rawData(int*)const"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "byte[]"
                 }
@@ -7957,6 +6583,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QJsonDocument$FromJsonResult"
                 }
@@ -7987,6 +6614,9 @@ TypeSystem{
     
     ValueType{
         name: "QJsonObject"
+        Rejection{
+            functionName: "empty"
+        }
         ModifyFunction{
             signature: "insert(QLatin1String,QJsonValue)"
             remove: RemoveFlag.All
@@ -7999,51 +6629,19 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "insert(QStringView,QJsonValue)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "insert(QString,QJsonValue)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(const QJsonObject&)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator[](const QString &) const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator[](QLatin1String) const"
-            remove: RemoveFlag.All
-            since: [5, 7]
-            until: [6, 3]
-        }
-        ModifyFunction{
-            signature: "operator[](QLatin1StringView) const"
-            remove: RemoveFlag.All
-            since: [6, 4]
-        }
-        ModifyFunction{
-            signature: "operator[](QLatin1String)"
-            remove: RemoveFlag.All
-            since: [5, 7]
-            until: [6, 3]
-        }
-        ModifyFunction{
-            signature: "operator[](QLatin1StringView)"
-            remove: RemoveFlag.All
-            since: [6, 4]
-        }
-        ModifyFunction{
-            signature: "operator[](QStringView) const"
-            remove: RemoveFlag.All
+            ModifyArgument{
+                index: 0
+                replaceValue: "this"
+            }
             since: [5, 14]
         }
         ModifyFunction{
-            signature: "operator[](QStringView)"
-            remove: RemoveFlag.All
-            since: [5, 14]
+            signature: "insert(QString,QJsonValue)"
+            ModifyArgument{
+                index: 0
+                replaceValue: "this"
+            }
+            Remove{since: [5, 14]}
         }
         ModifyFunction{
             signature: "value(QLatin1StringView) const"
@@ -8183,46 +6781,64 @@ TypeSystem{
             since: [5, 7]
         }
         ModifyFunction{
-            signature: "operator[](const QString &)"
-            rename: "setValue"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
-            AddArgument{
-                name: "value"
-                type: "io.qt.core.QJsonValue"
-            }
-            InjectCode{
-                target: CodeClass.Native
-                position: Position.End
-                ArgumentMap{
-                    index: 0
-                    metaName: "%0"
-                }
-                Text{content: "%0 = qtjambi_cast<const QJsonValue&>(%env, value);"}
+            signature: "operator[](QLatin1String) const"
+            remove: RemoveFlag.All
+            since: [5, 7]
+            until: [6, 3]
+        }
+        ModifyFunction{
+            signature: "operator[](QLatin1StringView) const"
+            remove: RemoveFlag.All
+            since: [6, 4]
+        }
+        ModifyFunction{
+            signature: "operator[](QLatin1String)"
+            remove: RemoveFlag.All
+            since: [5, 7]
+            until: [6, 3]
+        }
+        ModifyFunction{
+            signature: "operator[](QLatin1StringView)"
+            remove: RemoveFlag.All
+            since: [6, 4]
+        }
+        ModifyFunction{
+            signature: "operator[](QStringView)"
+            Delegate{name: "setValue"; deprecated: true}
+            since: [5, 14]
+        }
+        ModifyFunction{
+            signature: "operator[](QString)const"
+            remove: RemoveFlag.All
+            since: [5, 14]
+        }
+        ModifyFunction{
+            signature: "operator[](QString)"
+            Delegate{
+                name: "setValue"
+                deprecated: true
+                until: [5, 13]
             }
+            Remove{since: [5, 14]}
         }
         ModifyFunction{
             signature: "fromVariantMap(const QMap<QString,QVariant> &)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.NavigableMap<java.lang.String, java.lang.Object>"
+                    modifiedType: "java.util.@Nullable NavigableMap<java.lang.@NonNull String, java.lang.@Nullable Object>"
                 }
             }
         }
-    }
-    
-    IteratorType{
-        name: "QJsonObject::const_iterator"
-    }
 
-    IteratorType{
-        name: "QJsonObject::iterator"
-        isConst: true
+        IteratorType{
+            name: "const_iterator"
+        }
+
+        IteratorType{
+            name: "iterator"
+            isConst: true
+        }
     }
     
     ValueType{
@@ -8258,10 +6874,6 @@ TypeSystem{
             signature: "QJsonValue(const char*)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QJsonValue)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "toBool(bool)const"
             rename: "toBoolean"
@@ -8278,8 +6890,8 @@ TypeSystem{
             since: [6, 4]
         }
         ModifyFunction{
-            signature: "operator[](const QString &) const"
-            rename: "getObjectValue"
+            signature: "operator[](const QString &)const"
+            Delegate{name: "getObjectValue"}
             since: [5, 10]
             until: [5, 13, 0]
         }
@@ -8290,42 +6902,33 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator[](QStringView)const"
-            rename: "getObjectValue"
+            Delegate{name: "getObjectValue"}
             since: [5, 14]
         }
         ModifyFunction{
-            signature: "operator[](int) const"
-            rename: "getArrayValue"
+            signature: "operator[](int)const"
+            Delegate{name: "getArrayValue"}
             since: [5, 10]
             until: 5
         }
         ModifyFunction{
-            signature: "operator[](qsizetype) const"
-            rename: "getArrayValue"
+            signature: "operator[](qsizetype)const"
+            Delegate{name: "getArrayValue"}
             since: 6
         }
     }
     
     ValueType{
         name: "QMimeType"
-        ModifyFunction{
-            signature: "operator=(QMimeType)"
-            remove: RemoveFlag.All
-        }
     }
     
     EnumType{
         name: "QRegularExpression::WildcardConversionOption"
-        flags: "QRegularExpression::WildcardConversionOptions"
         since: 6
     }
     
     ValueType{
         name: "QRegularExpression"
-        ModifyFunction{
-            signature: "operator=(QRegularExpression)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "anchoredPattern(QStringView)"
             remove: RemoveFlag.All
@@ -8338,7 +6941,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "wildcardToRegularExpression(QStringView,QFlags<QRegularExpression::WildcardConversionOption>)"
+            signature: "wildcardToRegularExpression(QStringView,QRegularExpression::WildcardConversionOptions)"
             remove: RemoveFlag.All
             since: 6
         }
@@ -8348,32 +6951,32 @@ TypeSystem{
             since: [5, 15]
         }
         ModifyFunction{
-            signature: "globalMatch(const QStringRef &, int, QRegularExpression::MatchType, QFlags<QRegularExpression::MatchOption>) const"
+            signature: "globalMatch(const QStringRef &, int, QRegularExpression::MatchType, QRegularExpression::MatchOptions) const"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "globalMatch(QString, int, QRegularExpression::MatchType, QFlags<QRegularExpression::MatchOption>) const"
+            signature: "globalMatch(QString, int, QRegularExpression::MatchType, QRegularExpression::MatchOptions) const"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "globalMatch(QString, qsizetype, QRegularExpression::MatchType, QFlags<QRegularExpression::MatchOption>) const"
+            signature: "globalMatch(QString, qsizetype, QRegularExpression::MatchType, QRegularExpression::MatchOptions) const"
             remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "match(const QStringRef &, int, QRegularExpression::MatchType, QFlags<QRegularExpression::MatchOption>) const"
+            signature: "match(const QStringRef &, int, QRegularExpression::MatchType, QRegularExpression::MatchOptions) const"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "match(QString, int, QRegularExpression::MatchType, QFlags<QRegularExpression::MatchOption>) const"
+            signature: "match(QString, int, QRegularExpression::MatchType, QRegularExpression::MatchOptions) const"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "match(QString, qsizetype, QRegularExpression::MatchType, QFlags<QRegularExpression::MatchOption>) const"
+            signature: "match(QString, qsizetype, QRegularExpression::MatchType, QRegularExpression::MatchOptions) const"
             remove: RemoveFlag.All
             since: 6
         }
@@ -8385,10 +6988,6 @@ TypeSystem{
             signature: "QRegularExpressionMatch(QRegularExpressionMatch)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QRegularExpressionMatch)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "captured(QStringView) const"
             remove: RemoveFlag.All
@@ -8446,15 +7045,19 @@ TypeSystem{
     
     ValueType{
         name: "QRegularExpressionMatchIterator"
+
+        Rejection{
+            functionName: "begin"
+        }
+
+        Rejection{
+            functionName: "end"
+        }
         implementing: "Iterable<QRegularExpressionMatch>, java.util.Iterator<QRegularExpressionMatch>"
         ModifyFunction{
             signature: "QRegularExpressionMatchIterator(QRegularExpressionMatchIterator)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QRegularExpressionMatchIterator)"
-            remove: RemoveFlag.All
-        }
         InjectCode{
             InsertTemplate{
                 name: "core.self_iterator"
@@ -8468,18 +7071,10 @@ TypeSystem{
     
     ValueType{
         name: "QUrlQuery"
-        ModifyFunction{
-            signature: "operator=(QUrlQuery)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QTimeZone"
-        ModifyFunction{
-            signature: "operator=(QTimeZone)"
-            remove: RemoveFlag.All
-        }
         InjectCode{
             target: CodeClass.Java
             ImportFile{
@@ -8619,7 +7214,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "match(QModelIndex,int,QVariant,int,QFlags<Qt::MatchFlag>)const"
+            signature: "match(QModelIndex,int,QVariant,int,Qt::MatchFlags)const"
             ModifyArgument{
                 index: 5
                 ReplaceDefaultExpression{
@@ -8698,12 +7293,13 @@ TypeSystem{
     ObjectType{
         name: "QStringListModel"
     }
-    
-    ValueType{
-        name: "QUrl::FormattingOptions"
-        disableNativeIdUsage: true
-        generate: false
-    }
+
+//    ValueType{
+//        name: "QUrlTwoFlags"
+//        disableNativeIdUsage: true
+//        generate: false
+//    }
+    Rejection{className: "QUrlTwoFlags"}
     
     ValueType{
         name: "QUrl"
@@ -8712,21 +7308,40 @@ TypeSystem{
                 fileName: "QStringList"
                 location: Include.Global
             }
-        }
-        ModifyFunction{
-            signature: "operator=(QUrl)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(QString)"
-            remove: RemoveFlag.All
-        }
-        ExtraIncludes{
             Include{
                 fileName: "QtJambi/JavaAPI"
                 location: Include.Global
             }
         }
+
+        ValueType{
+            name: "FormattingOptions"
+            disableNativeIdUsage: true
+            generate: false
+        }
+
+        EnumType{
+            name: "UserInputResolutionOption"
+        }
+
+        EnumType{
+            name: "UrlFormattingOption"
+            implementing: "FormattingOption"
+        }
+
+        EnumType{
+            name: "ComponentFormattingOption"
+            implementing: "FormattingOption"
+        }
+
+        EnumType{
+            name: "ParsingMode"
+        }
+
+        EnumType{
+            name: "AceProcessingOption"
+            since: [6, 3]
+        }
         InjectCode{
             target: CodeClass.Java
             ImportFile{
@@ -8790,10 +7405,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator=(QRegExp)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "pos(int)const"
             Remove{
@@ -8828,14 +7439,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator!=(const QFileInfo &)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(QFileInfo)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "setFile(QFile)"
             ModifyArgument{
@@ -8859,6 +7462,23 @@ TypeSystem{
     
     ValueType{
         name: "QByteArrayView"
+
+        IteratorType{
+            name: "const_iterator"
+        }
+
+        IteratorType{
+            name: "iterator"
+            isConst: true
+        }
+
+        TypeAliasType{
+            name: "const_pointer"
+        }
+
+        TypeAliasType{
+            name: "value_type"
+        }
         ModifyFunction{
             signature: "QByteArrayView(std::nullptr_t)"
             remove: RemoveFlag.All
@@ -8869,7 +7489,16 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator[](qsizetype)const"
-            remove: RemoveFlag.All
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(\"\"+index);"}
+            }
         }
         ModifyFunction{
             signature: "toLong(bool*, int) const"
@@ -8915,6 +7544,7 @@ TypeSystem{
             signature: "data() const"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "java.nio.ByteBuffer"
                 }
@@ -9041,32 +7671,61 @@ TypeSystem{
         }
         since: 6
     }
-    
-    IteratorType{
-        name: "QByteArrayView::const_iterator"
-    }
 
-    IteratorType{
-        name: "QByteArrayView::iterator"
-        isConst: true
-    }
-    
-    TypeAliasType{
-        name: "QByteArrayView::const_pointer"
-    }
-    
-    TypeAliasType{
-        name: "QByteArrayView::value_type"
-    }
-    
     ValueType{
-        name: "QByteArray::FromBase64Result"
+        name: "QByteRef"
         generate: false
-        since: [5, 15]
     }
     
     ValueType{
         name: "QByteArray"
+        Rejection{
+            functionName: "rbegin"
+        }
+        Rejection{
+            functionName: "rend"
+        }
+        Rejection{
+            functionName: "cend"
+        }
+        Rejection{
+            functionName: "cbegin"
+        }
+        Rejection{
+            functionName: "crend"
+        }
+        Rejection{
+            functionName: "crbegin"
+        }
+        Rejection{
+            functionName: "empty"
+        }
+        Rejection{
+            functionName: "erase"
+        }
+        Rejection{
+            functionName: "fromStdString"
+        }
+        Rejection{
+            functionName: "reallocData"
+        }
+        Rejection{
+            functionName: "reallocGrowData"
+        }
+
+        ValueType{
+            name: "FromBase64Result"
+            generate: false
+            since: [5, 15]
+        }
+        ModifyFunction{
+            signature: "front()"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "back()"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "setNum(ulong, int)"
             remove: RemoveFlag.All
@@ -9083,7 +7742,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "number(unsigned long long, int)"
+            signature: "number(qulonglong, int)"
             remove: RemoveFlag.All
             since: 6
         }
@@ -9136,7 +7795,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "number(unsigned long long,int)"
+            signature: "number(qulonglong,int)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -9148,39 +7807,65 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator+=(const char*)"
+            signature: "operator[](uint)"
             remove: RemoveFlag.All
+            until: 5
         }
         ModifyFunction{
-            signature: "operator[](int)"
+            signature: "operator<(QByteArray,QStringRef)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "operator[](int)const"
+            signature: "operator>(QByteArray,QStringRef)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "operator[](uint)"
+            signature: "operator==(QByteArray,QStringRef)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "operator[](uint)const"
+            signature: "operator!=(QByteArray,QStringRef)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "operator[](qsizetype)const"
+            signature: "operator<(QByteArray,const char*)"
+            remove: RemoveFlag.All
+            until: 5
+        }
+        ModifyFunction{
+            signature: "operator==(QByteArray,const char*)"
+            remove: RemoveFlag.All
+            until: 5
+        }
+        ModifyFunction{
+            signature: "operator!=(QByteArray,const char*)"
+            remove: RemoveFlag.All
+            until: 5
+        }
+        ModifyFunction{
+            signature: "operator==(const char*)"
             remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "operator[](qsizetype)"
+            signature: "operator<(const char*)"
+            remove: RemoveFlag.All
+            since: 6
+        }
+        ModifyFunction{
+            signature: "operator!=(const char*)"
             remove: RemoveFlag.All
             since: 6
         }
+        ModifyFunction{
+            signature: "operator[](uint)const"
+            remove: RemoveFlag.All
+            until: 5
+        }
         ModifyFunction{
             signature: "push_back(char)"
             remove: RemoveFlag.All
@@ -9210,11 +7895,11 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setNum(unsigned long long,int)"
+            signature: "setNum(qulonglong,int)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setNum(unsigned short,int)"
+            signature: "setNum(ushort,int)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -9241,19 +7926,28 @@ TypeSystem{
             signature: "toUShort(bool*, int) const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
+        ModifyFunction{// in favor of operator+
+            signature: "operator+=(QString)"
+            remove: RemoveFlag.All
+            until: 5
+        }
+        ModifyFunction{// in favor of operator+
             signature: "operator+=(QByteArray)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator+=(QString)"
+        ModifyFunction{// in favor of operator+
+            signature: "operator+=(QByteArrayView)"
             remove: RemoveFlag.All
-            until: 5
+            since: 6
         }
-        ModifyFunction{
+        ModifyFunction{// in favor of operator+
             signature: "operator+=(char)"
             remove: RemoveFlag.All
         }
+        ModifyFunction{// in favor of operator+
+            signature: "operator+=(const char*)"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "simplified_helper(const QByteArray &)"
             remove: RemoveFlag.All
@@ -9270,6 +7964,18 @@ TypeSystem{
             signature: "trimmed_helper(const QByteArray &)"
             remove: RemoveFlag.All
         }
+        FunctionalType{
+            name: "Predicate"
+            using: "std::function<bool(char)>"
+        }
+        ModifyFunction{
+            signature: "removeIf<Predicate>(Predicate)"
+            Instantiation{
+                Argument{
+                    type: "std::function<bool(char)>"
+                }
+            }
+        }
         InjectCode{
             target: CodeClass.Java
             position: Position.Equals
@@ -9353,11 +8059,6 @@ TypeSystem{
                 location: Include.Local
             }
         }
-        ModifyFunction{
-            signature: "operator+=(QByteArrayView)"
-            remove: RemoveFlag.All
-            since: 6
-        }
         ModifyFunction{
             signature: "toShort(bool*, int) const"
             throwing: "NumberFormatException"
@@ -9443,7 +8144,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9471,7 +8172,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9494,124 +8195,12 @@ TypeSystem{
             }
             since: 6
         }
-        ModifyFunction{
-            signature: "append(QString)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "append(int, char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "append(qsizetype, char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "insert(int, int, char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "insert(qsizetype, qsizetype, char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "insert(qsizetype, const char*)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "insert(qsizetype, QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "prepend(int, char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "prepend(qsizetype, char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
         ModifyFunction{
             signature: "append(const char*)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9621,17 +8210,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "append(const char*,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9656,17 +8238,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "append(const char*,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9689,43 +8264,12 @@ TypeSystem{
             }
             since: 6
         }
-        ModifyFunction{
-            signature: "append(QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "append(QByteArrayView)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "append(char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-        }
         ModifyFunction{
             signature: "contains(const char*)const"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9739,7 +8283,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9754,7 +8298,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9768,7 +8312,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9777,34 +8321,12 @@ TypeSystem{
             }
             until: 5
         }
-        ModifyFunction{
-            signature: "fill(char,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "fill(char,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
         ModifyFunction{
             signature: "indexOf(const char*,int)const"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9813,74 +8335,12 @@ TypeSystem{
             }
             until: 5
         }
-        ModifyFunction{
-            signature: "insert(int,QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "insert(int,char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "insert(qsizetype,QByteArrayView)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "insert(qsizetype,char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "insert(int,QString)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
         ModifyFunction{
             signature: "insert(int,const char*)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9891,17 +8351,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "lastIndexOf(const char*,int)const"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9910,50 +8363,12 @@ TypeSystem{
             }
             until: 5
         }
-        ModifyFunction{
-            signature: "prepend(QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "prepend(QByteArrayView)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "prepend(char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-        }
         ModifyFunction{
             signature: "prepend(const char*)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9963,17 +8378,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "prepend(const char*, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -9998,17 +8406,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "prepend(const char*, qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10033,17 +8434,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "replace(int, int, const char *, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 3
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10068,17 +8462,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "replace(qsizetype, qsizetype, const char *, qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 3
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10103,17 +8490,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "insert(int, const char *, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10138,17 +8518,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "insert(qsizetype, const char *, qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10171,41 +8544,12 @@ TypeSystem{
             }
             since: 6
         }
-        ModifyFunction{
-            signature: "remove(int,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "remove(qsizetype,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
         ModifyFunction{
             signature: "replace(QByteArray,const char*)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10214,41 +8558,12 @@ TypeSystem{
             }
             until: 5
         }
-        ModifyFunction{
-            signature: "replace(char,QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "replace(char,QByteArrayView)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
         ModifyFunction{
             signature: "replace(QString,const char*)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10259,17 +8574,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "replace(int,int,const char*)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 3
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10280,17 +8588,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "replace(const char*,const char*)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10300,7 +8601,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10311,17 +8612,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "replace(const char*,int,const char*,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10345,7 +8639,7 @@ TypeSystem{
             ModifyArgument{
                 index: 3
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10366,21 +8660,14 @@ TypeSystem{
                                   "}"}
                 }
             }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "replace(const char*,qsizetype,const char*,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
+            until: 5
+        }
+        ModifyFunction{
+            signature: "replace(const char*,qsizetype,const char*,qsizetype)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10404,7 +8691,7 @@ TypeSystem{
             ModifyArgument{
                 index: 3
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10429,17 +8716,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "replace(const char*,QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10448,41 +8728,12 @@ TypeSystem{
             }
             until: 5
         }
-        ModifyFunction{
-            signature: "replace(int,int,QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "replace(qsizetype,qsizetype,QByteArrayView)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
         ModifyFunction{
             signature: "replace(char,const char*)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10491,79 +8742,8 @@ TypeSystem{
             }
             until: 5
         }
-        ModifyFunction{
-            signature: "replace(char,QString)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "replace(char,char)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "replace(QByteArray,QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "replace(QByteArrayView,QByteArrayView)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "replace(QString,QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "setNum(int,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-        }
         ModifyFunction{
             signature: "setNum(float,char,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -10571,25 +8751,8 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "setNum(long long,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-        }
         ModifyFunction{
             signature: "setNum(double,char,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -10597,22 +8760,12 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "setNum(short,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
-        }
         ModifyFunction{
             signature: "startsWith(const char*)const"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10626,7 +8779,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10647,7 +8800,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10665,17 +8818,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setRawData(const char*,uint)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10693,17 +8839,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setRawData(const char*,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10723,6 +8862,7 @@ TypeSystem{
             signature: "data() const"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "java.nio.ByteBuffer"
                 }
@@ -10738,6 +8878,7 @@ TypeSystem{
             rename: "toByteArray"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "byte[]"
                 }
@@ -10750,18 +8891,14 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const char*)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10770,9 +8907,10 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "operator<(const char*)"
+            signature: "operator<(QByteArray,const char*)"
             ModifyArgument{
                 index: 1
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QByteArrayView"
                 }
@@ -10784,9 +8922,10 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "operator==(const char*)"
+            signature: "operator==(QByteArray,const char*)"
             ModifyArgument{
                 index: 1
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QByteArrayView"
                 }
@@ -10799,22 +8938,15 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(QByteArray)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyFunction{
-            signature: "fromBase64Encoding(const QByteArray &, QFlags<QByteArray::Base64Option>)"
+            signature: "fromBase64Encoding(const QByteArray &, QByteArray::Base64Options)"
             ModifyArgument{
                 index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray$FromBase64Result"
-                }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtCore::QByteArray$FromBase64Result::newInstance(%env, qtjambi_cast<jobject>(%env, %in.decoded), jint(%in.decodingStatus));"}
@@ -10823,38 +8955,80 @@ TypeSystem{
             since: [5, 15]
         }
         ModifyFunction{
-            signature: "removeAt(qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
+            signature: "operator[](int)"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(index);"}
             }
-            since: [6,5]
+            until: 5
         }
         ModifyFunction{
-            signature: "removeFirst()"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
+            signature: "operator[](int)const"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(index);"}
             }
-            since: [6,5]
+            until: 5
         }
         ModifyFunction{
-            signature: "removeLast()"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
+            signature: "operator[](qsizetype)"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(\"\"+index);"}
             }
-            since: [6,5]
+            since: 6
+        }
+        ModifyFunction{
+            signature: "operator[](qsizetype)const"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(\"\"+index);"}
+            }
+            since: 6
+        }
+
+        IteratorType{
+            name: "const_iterator"
+        }
+
+        IteratorType{
+            name: "iterator"
+            isConst: true
         }
     }
-    
-    IteratorType{
-        name: "QByteArray::const_iterator"
+
+    GlobalFunction{
+        signature: "qCompress(QByteArray, int)"
+        targetType: "QByteArray"
     }
 
-    IteratorType{
-        name: "QByteArray::iterator"
-        isConst: true
+    GlobalFunction{
+        signature: "qUncompress(QByteArray)"
+        targetType: "QByteArray"
     }
     
     ValueType{
@@ -10874,28 +9048,15 @@ TypeSystem{
             remove: RemoveFlag.All
             since: 6
         }
-        ModifyFunction{
-            signature: "operator=(QTextBoundaryFinder)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QEasingCurve"
-        ModifyFunction{
-            signature: "operator!=(const QEasingCurve &)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(const QEasingCurve &)"
-            remove: RemoveFlag.All
+        FunctionalType{
+            name: "EasingFunction"
         }
     }
     
-    FunctionalType{
-        name: "QEasingCurve::EasingFunction"
-    }
-    
     ValueType{
         name: "QItemSelection"
         InjectCode{
@@ -10921,6 +9082,7 @@ TypeSystem{
             signature: "split(QItemSelectionRange,QItemSelectionRange,QItemSelection*)"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QItemSelection"
                 }
@@ -10945,16 +9107,10 @@ TypeSystem{
     ValueType{
         name: "QItemSelectionRange"
         threadAffinity: "model()"
-        ModifyFunction{
-            signature: "operator=(QItemSelectionRange)"
-            remove: RemoveFlag.All
-            until: 5
-        }
     }
     
     EnumType{
         name: "QItemSelectionModel::SelectionFlag"
-        flags: "QItemSelectionModel::SelectionFlags"
     }
     
     ObjectType{
@@ -10976,10 +9132,24 @@ TypeSystem{
     
     ObjectType{
         name: "QAbstractAnimation"
+
+        EnumType{
+            name: "State"
+        }
+
+        EnumType{
+            name: "DeletionPolicy"
+        }
+
+        EnumType{
+            name: "Direction"
+        }
     }
     
     ObjectType{
         name: "QVariantAnimation"
+        Rejection{className: "Interpolator"}
+        Rejection{functionName: "qRegisterAnimationInterpolator"}
     }
     
     ObjectType{
@@ -11157,7 +9327,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "match(QModelIndex, int, QVariant, int, QFlags<Qt::MatchFlag>) const"
+            signature: "match(QModelIndex, int, QVariant, int, Qt::MatchFlags) const"
             ModifyArgument{
                 index: 5
                 RemoveDefaultExpression{
@@ -11321,12 +9491,6 @@ TypeSystem{
                     action: ReferenceCount.Ignore
                 }
             }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 3
                 NoNullPointer{
@@ -11386,20 +9550,11 @@ TypeSystem{
                     index: 0
                     metaName: "%0"
                 }
-                ArgumentMap{
-                    index: 1
-                    metaName: "%1"
-                }
-                Text{content: "QtJambi_LibraryUtilities.internal.addReferenceCount(%0, QAbstractTransition.class, \"__rcTargetStates\", false, false, %1);"}
-            }
-        }
-        ModifyFunction{
-            signature: "assignProperty(QObject *, const char *, const QVariant &)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                ArgumentMap{
+                    index: 1
+                    metaName: "%1"
                 }
+                Text{content: "QtJambi_LibraryUtilities.internal.addReferenceCount(%0, QAbstractTransition.class, \"__rcTargetStates\", false, false, %1);"}
             }
         }
         InjectCode{
@@ -11546,12 +9701,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "QSignalTransition(const QObject *, const char *, QState *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -11614,163 +9763,75 @@ TypeSystem{
     
     ValueType{
         name: "QMargins"
-        ModifyFunction{
+        ModifyFunction{// don't provide assignment operator in favor to operator-
             signature: "operator-=(int)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMargins"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(int)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMargins"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator*=(int)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMargins"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(int)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMargins"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator*=(qreal)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMargins"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(qreal)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMargins"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMargins &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMargins"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(const QMargins &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMargins"
-                }
-            }
+        }
+        ModifyFunction{
+            signature: "operator|(const QMargins &,const QMargins &)"
+            rename: "maximum"
+            since: 6
         }
     }
     
     ValueType{
         name: "QMarginsF"
-        ModifyFunction{
+        ModifyFunction{// don't provide assignment operator in favor to operator-
             signature: "operator-=(qreal)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMarginsF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(qreal)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMarginsF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator*=(qreal)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMarginsF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(qreal)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMarginsF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMarginsF &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMarginsF"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(const QMarginsF &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QMarginsF"
-                }
-            }
+        }
+        ModifyFunction{
+            signature: "operator|(const QMarginsF &,const QMarginsF &)"
+            rename: "maximum"
+            since: 6
         }
     }
     
@@ -11868,7 +9929,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "registerTimer(long long, Qt::TimerType, QObject*)"
+            signature: "registerTimer(qint64, Qt::TimerType, QObject*)"
             threadAffinity: true
             ModifyArgument{
                 index: 3
@@ -11908,7 +9969,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "registerTimer(int, long long, Qt::TimerType, QObject*)"
+            signature: "registerTimer(int, qint64, Qt::TimerType, QObject*)"
             threadAffinity: true
             ModifyArgument{
                 index: 4
@@ -11999,7 +10060,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "int[]"
+                    modifiedType: "int @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -12051,15 +10112,6 @@ TypeSystem{
                 location: Include.Local
             }
         }
-        ModifyFunction{
-            signature: "decodeName(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "moveToTrash(const QString &, QString *)"
             ModifyArgument{
@@ -12074,6 +10126,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QFile$TrashResult"
                 }
@@ -12103,11 +10156,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "map(long long, long long, QFileDevice::MemoryMapFlags)"
+            signature: "map(qint64, qint64, QFileDevice::MemoryMapFlags)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@Nullable ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -12117,11 +10170,11 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "map(long long, long long, QFlags<QFileDevice::MemoryMapFlag>)"
+            signature: "map(qint64, qint64, QFileDevice::MemoryMapFlags)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@Nullable ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -12131,11 +10184,11 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "unmap(unsigned char*)"
+            signature: "unmap(uchar*)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@Nullable ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -12209,7 +10262,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Byte"
+                    modifiedType: "java.lang.@Nullable Byte"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -12232,7 +10285,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "peek(char*,long long)"
+            signature: "peek(char*,qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -12241,10 +10294,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(INT_MAX), %2)));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2)));\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, %1_buffer2.array());\n"+
                                   "    %out += %in;\n"+
                                   "}"}
@@ -12256,27 +10309,17 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, jsize(qMin(qint64(INT_MAX), %2)));"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jsize %2 = 0;\n"+
-                                  "char * %out = qtjambi_array_cast<char *>(%env, %scope, jbyteArray(%in), %2);"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
         }
         ModifyFunction{
-            signature: "read(char*,long long)"
+            signature: "read(char*,qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -12285,10 +10328,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(INT_MAX), %2)));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2)));\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, %1_buffer2.array());\n"+
                                   "    %out += %in;\n"+
                                   "}"}
@@ -12300,27 +10343,17 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, jsize(qMin(qint64(INT_MAX), %2)));"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jsize %2 = 0;\n"+
-                                  "char * %out = qtjambi_array_cast<char *>(%env, %scope, jbyteArray(%in), %2);"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
         }
         ModifyFunction{
-            signature: "readLine(char*,long long)"
+            signature: "readLine(char*,qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -12329,10 +10362,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(INT_MAX), %2)));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2)));\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, %1_buffer2.array());\n"+
                                   "    %out += %in;\n"+
                                   "}"}
@@ -12344,27 +10377,17 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, jsize(qMin(qint64(INT_MAX), %2)));"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jsize %2 = 0;\n"+
-                                  "char * %out = qtjambi_array_cast<char *>(%env, %scope, jbyteArray(%in), %2);"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
         }
         ModifyFunction{
-            signature: "write(const char*,long long)"
+            signature: "write(const char*,qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -12373,10 +10396,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    j%2 = jsize(qMin(qint64(INT_MAX), %2));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    j%2 = jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2));\n"+
                                   "    ConstCharPointerArray __%1(%env, %1, j%2);\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, __%1.array());\n"+
                                   "    %out += %in;\n"+
@@ -12389,28 +10412,17 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jsize j%2 = jsize(qMin(qint64(INT_MAX), %2));\n"+
-                                  "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, j%2);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jsize %2 = 0;\n"+
-                                  "char * %out = qtjambi_array_cast<char *>(%env, %scope, jbyteArray(%in), %2);"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
         }
         ModifyFunction{
-            signature: "readData(char*,long long)"
+            signature: "readData(char*,qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -12419,10 +10431,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(INT_MAX), %2)));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2)));\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, %1_buffer2.array());\n"+
                                   "    %out += %in;\n"+
                                   "}"}
@@ -12434,27 +10446,17 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, jsize(qMin(qint64(INT_MAX), %2)));"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jsize %2 = 0;\n"+
-                                  "char * %out = qtjambi_array_cast<char *>(%env, %scope, jbyteArray(%in), %2);"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
         }
         ModifyFunction{
-            signature: "writeData(const char*,long long)"
+            signature: "writeData(const char*,qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -12463,10 +10465,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    j%2 = jsize(qMin(qint64(INT_MAX), %2));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    jsize j%2 = jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2));\n"+
                                   "    ConstCharPointerArray __%1(%env, %1, j%2);\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, __%1.array());\n"+
                                   "    %out += %in;\n"+
@@ -12479,28 +10481,17 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jsize j%2 = jsize(qMin(qint64(INT_MAX), %2));\n"+
-                                  "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, j%2);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jsize %2 = 0;\n"+
-                                  "char * %out = qtjambi_array_cast<char *>(%env, %scope, jbyteArray(%in), %2);"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
         }
         ModifyFunction{
-            signature: "readLineData(char*,long long)"
+            signature: "readLineData(char*,qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -12509,10 +10500,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(INT_MAX), %2)));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2)));\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, %1_buffer2.array());\n"+
                                   "    %out += %in;\n"+
                                   "}"}
@@ -12524,23 +10515,13 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, jsize(qMin(qint64(INT_MAX), %2)));"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jsize %2 = 0;\n"+
-                                  "char * %out = qtjambi_array_cast<char *>(%env, %scope, jbyteArray(%in), %2);"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
         }
     }
@@ -12690,62 +10671,35 @@ TypeSystem{
         }
     }
     
-    ObjectType{
-        name: "QStringConverterBase::State"
-        since: 6
-    }
-    
     ObjectType{
         name: "QStringConverterBase"
-        ModifyFunction{
-            signature: "QStringConverterBase()"
-            remove: RemoveFlag.All
-            since: [6, 4]
-        }
-        since: 6
-    }
-    
-    ObjectType{
-        name: "QStringConverter"
-        ModifyField{
-            name: "state"
-            read: true
-            write: false
-        }
-        ModifyFunction{
-            signature: "name() const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "QStringConverter(const char *, QFlags<QStringConverterBase::Flag>)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+        ObjectType{
+            name: "State"
+            Rejection{functionName: "reset"}
+            since: 6
         }
         ModifyFunction{
-            signature: "encodingForName(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            signature: "QStringConverterBase()"
+            remove: RemoveFlag.All
+            since: [6, 4]
         }
-        ModifyFunction{
-            signature: "nameForEncoding(QStringConverter::Encoding)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
+        since: 6
+    }
+    
+    ObjectType{
+        name: "QStringConverter"
+
+        Rejection{
+            className: "Interface"
+        }
+        ModifyField{
+            name: "state"
+            read: true
+            write: false
+            ConversionRule{
+                codeClass: CodeClass.NativeGetter
+                Text{content: "jobject %out = qtjambi_cast<jobject>(%env, const_cast<QStringConverterBase::State*>(&%in));\n"
+                            + "QtJambiAPI::registerDependency(%env, %out, __this_nativeId);"}
             }
         }
         InjectCode{
@@ -12807,51 +10761,15 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "convertFromUnicode(const QChar*,int,QTextCodec::ConverterState*)const"
-            ModifyArgument{
-                index: 0
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "delete[] __qt_charbuffer;\n"+
-                                  "const QByteArray&  %out = qtjambi_cast<QByteArray>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);\n"+
-                                  "%env->ReleaseCharArrayElements(jcharArray(%1), reinterpret_cast<jchar *>(__qt_%1_tmp), 0);\n"+
-                                  "delete[] __qt_%1;"}
-                }
-            }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "char[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "// Convert directly QChar * -> ushort *\n"+
-                                  "jsize __length = jsize(%2);\n"+
-                                  "jcharArray %out = %env->NewCharArray(__length);\n"+
-                                  "jchar* __qt_charbuffer = new jchar[size_t(%2)];\n"+
-                                  "for(int i=0; i<__length; ++i){\n"+
-                                  "    __qt_charbuffer[i] = jchar(%in[i].unicode());\n"+
-                                  "}\n"+
-                                  "%env->SetCharArrayRegion(%out, 0, __length, __qt_charbuffer);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "// Convert directly ushort * -> QChar *\n"+
-                                  "jchar *__qt_%1_tmp = %env->GetCharArrayElements(%in, nullptr);\n"+
-                                  "jsize %2 = %env->GetArrayLength(%in);\n"+
-                                  "QChar* %out = new QChar[size_t(%2)];\n"+
-                                  "for(int i=0; i<%2; ++i){\n"+
-                                  "    %out[i] = QChar(__qt_%1_tmp[i]);\n"+
-                                  "}"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
             ModifyArgument{
                 index: 3
@@ -12861,40 +10779,15 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "convertToUnicode(const char*,int,QTextCodec::ConverterState*)const"
-            ModifyArgument{
-                index: 0
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jstring %out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "ConstCharPointerArray _%in(%env, %in, jsize(%2));\n"+
-                                  "jbyteArray %out = _%in;"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JByteArrayPointer %out(%env, jbyteArray(%in));"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "// nothing"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "int %out = __qt_%1.size();"}
-                }
+                RemoveArgument{}
             }
             ModifyArgument{
                 index: 3
@@ -12904,51 +10797,15 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const"
-            ModifyArgument{
-                index: 0
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "delete[] __qt_charbuffer;\n"+
-                                  "const QByteArray&  %out = qtjambi_cast<QByteArray>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);\n"+
-                                  "%env->ReleaseCharArrayElements(%1, reinterpret_cast<jchar *>(__qt_%1_tmp), 0);\n"+
-                                  "delete[] __qt_%1;"}
-                }
-            }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "char[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "// Convert directly QChar * -> ushort *\n"+
-                                  "jsize __length = jsize(%2);\n"+
-                                  "jcharArray %out = %env->NewCharArray(__length);\n"+
-                                  "jchar* __qt_charbuffer = new jchar[size_t(%2)];\n"+
-                                  "for(int i=0; i<__length; ++i){\n"+
-                                  "    __qt_charbuffer[i] = jchar(%in[i].unicode());\n"+
-                                  "}\n"+
-                                  "%env->SetCharArrayRegion(%out, 0, __length, __qt_charbuffer);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "// Convert directly ushort * -> QChar *\n"+
-                                  "jchar *__qt_%1_tmp = %env->GetCharArrayElements(%in, nullptr);\n"+
-                                  "jsize %2 = %env->GetArrayLength(%in);\n"+
-                                  "QChar* %out = new QChar[size_t(%2)];\n"+
-                                  "for(int i=0; i<%2; ++i){\n"+
-                                  "    %out[i] = QChar(__qt_%1_tmp[i]);\n"+
-                                  "}"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
             ModifyArgument{
                 index: 3
@@ -12958,40 +10815,15 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "toUnicode(const char*,int,QTextCodec::ConverterState*)const"
-            ModifyArgument{
-                index: 0
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "ConstCharPointerArray _%in(%env, %in, jsize(%2));\n"+
-                                  "jbyteArray %out = _%in;"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JByteArrayPointer %out(%env, jbyteArray(%in));"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "// nothing"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "int %out = __qt_%1.size();"}
-                }
+                RemoveArgument{}
             }
             ModifyArgument{
                 index: 3
@@ -13001,51 +10833,15 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "convertFromUnicode(const QChar*,int,QStringConverterBase::State*)const"
-            ModifyArgument{
-                index: 0
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "delete[] __qt_charbuffer;\n"+
-                                  "const QByteArray&  %out = qtjambi_cast<QByteArray>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);\n"+
-                                  "%env->ReleaseCharArrayElements(jcharArray(%1), reinterpret_cast<jchar *>(__qt_%1_tmp), 0);\n"+
-                                  "delete[] __qt_%1;"}
-                }
-            }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "char[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "// Convert directly QChar * -> ushort *\n"+
-                                  "jsize __length = jsize(%2);\n"+
-                                  "jcharArray %out = %env->NewCharArray(__length);\n"+
-                                  "jchar* __qt_charbuffer = new jchar[size_t(%2)];\n"+
-                                  "for(int i=0; i<__length; ++i){\n"+
-                                  "    __qt_charbuffer[i] = jchar(%in[i].unicode());\n"+
-                                  "}\n"+
-                                  "%env->SetCharArrayRegion(%out, 0, __length, __qt_charbuffer);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "// Convert directly ushort * -> QChar *\n"+
-                                  "jchar *__qt_%1_tmp = %env->GetCharArrayElements(%in, nullptr);\n"+
-                                  "jsize %2 = %env->GetArrayLength(%in);\n"+
-                                  "QChar* %out = new QChar[size_t(%2)];\n"+
-                                  "for(int i=0; i<%2; ++i){\n"+
-                                  "    %out[i] = QChar(__qt_%1_tmp[i]);\n"+
-                                  "}"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
             ModifyArgument{
                 index: 3
@@ -13055,40 +10851,15 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "convertToUnicode(const char*,int,QStringConverterBase::State*)const"
-            ModifyArgument{
-                index: 0
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "ConstCharPointerArray _%in(%env, %in, jsize(%2));\n"+
-                                  "jbyteArray %out = _%in;"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JByteArrayPointer %out(%env, jbyteArray(%in));"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "// nothing"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "int %out = __qt_%1.size();"}
-                }
+                RemoveArgument{}
             }
             ModifyArgument{
                 index: 3
@@ -13098,51 +10869,15 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "fromUnicode(const QChar*,int,QStringConverterBase::State*)const"
-            ModifyArgument{
-                index: 0
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "delete[] __qt_charbuffer;\n"+
-                                  "const QByteArray&  %out = qtjambi_cast<QByteArray>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);\n"+
-                                  "%env->ReleaseCharArrayElements(%1, reinterpret_cast<jchar *>(__qt_%1_tmp), 0);\n"+
-                                  "delete[] __qt_%1;"}
-                }
-            }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "char[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "// Convert directly QChar * -> ushort *\n"+
-                                  "jsize __length = jsize(%2);\n"+
-                                  "jcharArray %out = %env->NewCharArray(__length);\n"+
-                                  "jchar* __qt_charbuffer = new jchar[size_t(%2)];\n"+
-                                  "for(int i=0; i<__length; ++i){\n"+
-                                  "    __qt_charbuffer[i] = jchar(%in[i].unicode());\n"+
-                                  "}\n"+
-                                  "%env->SetCharArrayRegion(%out, 0, __length, __qt_charbuffer);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "// Convert directly ushort * -> QChar *\n"+
-                                  "jchar *__qt_%1_tmp = %env->GetCharArrayElements(%in, nullptr);\n"+
-                                  "jsize %2 = %env->GetArrayLength(%in);\n"+
-                                  "QChar* %out = new QChar[size_t(%2)];\n"+
-                                  "for(int i=0; i<%2; ++i){\n"+
-                                  "    %out[i] = QChar(__qt_%1_tmp[i]);\n"+
-                                  "}"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
+                RemoveArgument{}
             }
             ModifyArgument{
                 index: 3
@@ -13152,40 +10887,15 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "toUnicode(const char*,int,QStringConverterBase::State*)const"
-            ModifyArgument{
-                index: 0
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "ConstCharPointerArray _%in(%env, %in, jsize(%2));\n"+
-                                  "jbyteArray %out = _%in;"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JByteArrayPointer %out(%env, jbyteArray(%in));"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
                 index: 2
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "// nothing"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "int %out = __qt_%1.size();"}
-                }
+                RemoveArgument{}
             }
             ModifyArgument{
                 index: 3
@@ -13194,16 +10904,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "codecForName(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "makeDecoder(QFlags<QStringConverterBase::Flag>) const"
+            signature: "makeDecoder(QStringConverterBase::Flags) const"
             ModifyArgument{
                 index: 1
                 ReplaceDefaultExpression{
@@ -13213,7 +10914,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "makeEncoder(QFlags<QStringConverterBase::Flag>) const"
+            signature: "makeEncoder(QStringConverterBase::Flags) const"
             ModifyArgument{
                 index: 1
                 ReplaceDefaultExpression{
@@ -13280,11 +10981,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "load(const unsigned char*,int,QString)"
+            signature: "load(const uchar*,int,QString)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "byte[]"
+                    modifiedType: "byte @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -13318,27 +11019,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "translate(const char*,const char*,const char*,int)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -13371,47 +11051,28 @@ TypeSystem{
             signature: "QBuffer(QByteArray*,QObject*)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
                 ReferenceCount{
                     variableName: "strongDataReference"
                     action: ReferenceCount.Set
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray* %out = qtjambi_cast<QByteArray*>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
             signature: "setBuffer(QByteArray*)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
                 ReferenceCount{
                     variableName: "strongDataReference"
                     action: ReferenceCount.Set
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray* %out = qtjambi_cast<QByteArray*>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
-            signature: "setData(const char*,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JByteArrayPointer %out(%env, jbyteArray(%in));\n"+
-                                  "jint %2 = %out.size();"}
+            signature: "setData(const char*,int)"
+            ModifyArgument{
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
@@ -13425,13 +11086,8 @@ TypeSystem{
             signature: "setData(const char*,qsizetype)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JByteArrayPointer %out(%env, jbyteArray(%in));\n"+
-                                  "jint %2 = %out.size();"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             ModifyArgument{
@@ -13445,6 +11101,12 @@ TypeSystem{
     
     ObjectType{
         name: "QTimer"
+
+        Rejection{functionName: "singleShot"}
+        ModifyFunction{
+            signature: "callOnTimeout<Args...>(Args&&)"
+            remove: RemoveFlag.All
+        }
         InjectCode{
             target: CodeClass.Java
             ImportFile{
@@ -13479,7 +11141,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setStandardOutputFile(QString,QFlags<QIODevice::OpenModeFlag>)"
+            signature: "setStandardOutputFile(QString,QIODevice::OpenMode)"
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -13493,7 +11155,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "setStandardErrorFile(QString,QFlags<QIODevice::OpenModeFlag>)"
+            signature: "setStandardErrorFile(QString,QIODevice::OpenMode)"
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -13507,7 +11169,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "setStandardOutputFile(QString,QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "setStandardOutputFile(QString,QIODeviceBase::OpenMode)"
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -13521,7 +11183,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "setStandardErrorFile(QString,QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "setStandardErrorFile(QString,QIODeviceBase::OpenMode)"
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -13535,7 +11197,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "start(const QString &, const QStringList &,QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "start(const QString &, const QStringList &,QIODeviceBase::OpenMode)"
             ModifyArgument{
                 index: 2
                 ReplaceDefaultExpression{
@@ -13555,7 +11217,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "startDetached(QString,QStringList,QString,long long*)"
+            signature: "startDetached(QString,QStringList,QString,qint64*)"
             ModifyArgument{
                 index: 2
                 since: 6
@@ -13566,7 +11228,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Long"
+                    modifiedType: "java.lang.@Nullable Long"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -13585,11 +11247,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "startDetached(long long*)"
+            signature: "startDetached(qint64*)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Long"
+                    modifiedType: "java.lang.@Nullable Long"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -13642,7 +11304,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QWidget"
+                    modifiedType: "io.qt.widgets.@Nullable QWidget"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -13660,7 +11322,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QWidget"
+                    modifiedType: "io.qt.widgets.@Nullable QWidget"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -13734,7 +11396,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QWidget"
+                    modifiedType: "io.qt.widgets.@Nullable QWidget"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -13792,7 +11454,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QWidget"
+                    modifiedType: "io.qt.widgets.@Nullable QWidget"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -13824,6 +11486,16 @@ TypeSystem{
                 location: Include.Global
             }
         }
+        ModifyFunction{
+            signature: "localData()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -13834,6 +11506,19 @@ TypeSystem{
                 location: Include.Global
             }
         }
+        EnumType{
+            name: "Priority"
+        }
+        ModifyFunction{
+            signature: "create<Function>(Function&&)"
+            remove: RemoveFlag.All
+            until: 5
+        }
+        ModifyFunction{
+            signature: "create<Function,Args...>(Function&&,Args&&)"
+            remove: RemoveFlag.All
+            since: 6
+        }
         ModifyFunction{
             signature: "wait(ulong)"
             rename: "join"
@@ -13956,10 +11641,6 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QThread::Priority"
-    }
-    
     ObjectType{
         name: "QObjectCleanupHandler"
         ModifyFunction{
@@ -14007,6 +11688,17 @@ TypeSystem{
                 location: Include.Local
             }
         }
+
+        Rejection{functionName: "setUserData"}
+        Rejection{functionName: "userData"}
+        Rejection{functionName: "connect"}
+        Rejection{functionName: "disconnect"}
+        Rejection{functionName: "registerUserData"}
+        Rejection{functionName: "connectImpl"}
+        Rejection{functionName: "connect_functor"}
+        Rejection{functionName: "disconnectImpl"}
+        Rejection{fieldName: "staticQtMetaObject"}
+
         ModifyFunction{
             signature: "destroyed(QObject *)"
             ModifyArgument{
@@ -14124,10 +11816,6 @@ TypeSystem{
             }
         }
         ExtraIncludes{
-            Include{
-                fileName: "io.qt.*"
-                location: Include.Java
-            }
             Include{
                 fileName: "java.util.function.Supplier"
                 location: Include.Java
@@ -14221,15 +11909,6 @@ TypeSystem{
                               "}"}
             }
         }
-        ModifyFunction{
-            signature: "inherits(const char*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "receivers(const char*)const"
             InjectCode{
@@ -14247,21 +11926,9 @@ TypeSystem{
                               "    }\n"+
                               "}"}
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
         }
         ModifyFunction{
             signature: "property(const char*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Native
                 position: Position.Beginning
@@ -14281,12 +11948,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setProperty(const char*,QVariant)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Native
                 position: Position.Beginning
@@ -14321,7 +11982,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "findChild<T>(QString, QFlags<Qt::FindChildOption>) const"
+            signature: "findChild<T>(QString, Qt::FindChildOptions) const"
             Instantiation{
                 proxyCall: "qtjambi_findChild"
                 Argument{
@@ -14336,11 +11997,11 @@ TypeSystem{
                 }
                 AddTypeParameter{
                     name: "T"
-                    extending: "io.qt.core.QObject"
+                    extending: "io.qt.core.@Nullable QObject"
                 }
                 AddArgument{
                     index: 1
-                    defaultExpression: "QObject.class"
+                    defaultExpression: "io.qt.core.QObject.class"
                     name: "type"
                     type: "java.lang.Class<T>"
                 }
@@ -14353,13 +12014,13 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QObject"
+                        modifiedType: "io.qt.core.@Nullable QObject"
                     }
                 }
             }
         }
         ModifyFunction{
-            signature: "findChildren<T>(QString, QFlags<Qt::FindChildOption>) const"
+            signature: "findChildren<T>(QString, Qt::FindChildOptions) const"
             Instantiation{
                 proxyCall: "qtjambi_findChildren"
                 Argument{
@@ -14368,16 +12029,16 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<T>"
+                        modifiedType: "io.qt.core.@NonNull QList<T>"
                     }
                 }
                 AddTypeParameter{
                     name: "T"
-                    extending: "io.qt.core.QObject"
+                    extending: "io.qt.core.@Nullable QObject"
                 }
                 AddArgument{
                     index: 1
-                    defaultExpression: "QObject.class"
+                    defaultExpression: "io.qt.core.QObject.class"
                     name: "type"
                     type: "java.lang.Class<T>"
                 }
@@ -14390,13 +12051,13 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<io.qt.core.QObject>"
+                        modifiedType: "io.qt.core.@NonNull QList<io.qt.core.@Nullable QObject>"
                     }
                 }
             }
         }
         ModifyFunction{
-            signature: "findChildren<T>(QRegularExpression, QFlags<Qt::FindChildOption>) const"
+            signature: "findChildren<T>(QRegularExpression, Qt::FindChildOptions) const"
             Instantiation{
                 proxyCall: "qtjambi_findChildren"
                 Argument{
@@ -14405,12 +12066,12 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<T>"
+                        modifiedType: "io.qt.core.@NonNull QList<T>"
                     }
                 }
                 AddTypeParameter{
                     name: "T"
-                    extending: "io.qt.core.QObject"
+                    extending: "io.qt.core.@Nullable QObject"
                 }
                 AddArgument{
                     index: 1
@@ -14426,13 +12087,13 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<io.qt.core.QObject>"
+                        modifiedType: "io.qt.core.@NonNull QList<io.qt.core.@Nullable QObject>"
                     }
                 }
             }
         }
         ModifyFunction{
-            signature: "findChildren<T>(QFlags<Qt::FindChildOption>) const"
+            signature: "findChildren<T>(Qt::FindChildOptions) const"
             Instantiation{
                 proxyCall: "qtjambi_findChildren"
                 Argument{
@@ -14441,12 +12102,12 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<T>"
+                        modifiedType: "io.qt.core.@NonNull QList<T>"
                     }
                 }
                 AddTypeParameter{
                     name: "T"
-                    extending: "io.qt.core.QObject"
+                    extending: "io.qt.core.@Nullable QObject"
                 }
                 AddArgument{
                     index: 1
@@ -14462,13 +12123,13 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<io.qt.core.QObject>"
+                        modifiedType: "io.qt.core.@NonNull QList<io.qt.core.@Nullable QObject>"
                     }
                 }
             }
         }
         ModifyFunction{
-            signature: "findChildren<T>(QRegExp, QFlags<Qt::FindChildOption>) const"
+            signature: "findChildren<T>(QRegExp, Qt::FindChildOptions) const"
             Instantiation{
                 proxyCall: "qtjambi_findChildren"
                 Argument{
@@ -14477,12 +12138,12 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<T>"
+                        modifiedType: "io.qt.core.@NonNull QList<T>"
                     }
                 }
                 AddTypeParameter{
                     name: "T"
-                    extending: "io.qt.core.QObject"
+                    extending: "io.qt.core.@Nullable QObject"
                 }
                 AddArgument{
                     index: 1
@@ -14498,7 +12159,7 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<io.qt.core.QObject>"
+                        modifiedType: "io.qt.core.@NonNull QList<io.qt.core.@Nullable QObject>"
                     }
                 }
             }
@@ -14671,7 +12332,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.String[]"
+                    modifiedType: "java.lang.@Nullable String @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -14758,39 +12419,21 @@ TypeSystem{
                 quoteBeforeLine: "}// class"
             }
         }
-        ModifyFunction{
-            signature: "translate(const char*,const char*,const char*,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "resolveInterface(const char *, int)const"
             access: Modification.Private
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "<QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface"
+                    modifiedType: "<QNativeInterface extends io.qt.@Nullable QtObjectInterface> QNativeInterface"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObject(%env, %in, %1, false, false);\n"+
-                                  "CoreAPI::registerDependency(%env, %out, __this_nativeId);"}
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, %in, %1);"}
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
                 }
             }
             ModifyArgument{
@@ -14828,90 +12471,73 @@ TypeSystem{
         ModifyFunction{
             signature: "checkPermission(QPermission)"
             ppCondition: "QT_CONFIG(permissions)"
+            ModifyArgument{
+                index: 1
+                NoNullPointer{}
+                ReplaceType{
+                    modifiedType: "io.qt.core.QPermission"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "struct{\n"
+                                  + "    Qt::PermissionStatus status = Qt::PermissionStatus::Undetermined;\n"
+                                  + "    QVariant data;\n"
+                                  + "}permission;\n"
+                                  + "permission.data = qtjambi_cast<QVariant>(%env, %in);\n"
+                                  + "const QPermission& %out = *reinterpret_cast<const QPermission*>(&permission);"}
+                }
+            }
             since: [6, 5]
         }
     }
     
-
-    ValueType{
-        name: "QPermission"
-        InjectCode{
-            ImportFile{
-                name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
-                quoteAfterLine: "class QPermission___"
-                quoteBeforeLine: "}// class"
-            }
-        }
-        since: [6, 5]
-    }
-
     ValueType{
         name: "QLocationPermission"
-        ModifyFunction{
-            signature: "operator=(QLocationPermission)"
-            remove: RemoveFlag.All
-        }
-        implementing: "QPermission.Request"
-        since: [6, 5]
-    }
 
-    EnumType{
-        name: "QLocationPermission::Accuracy"
-        since: [6, 5]
-    }
+        EnumType{
+            name: "Accuracy"
+        }
 
-    EnumType{
-        name: "QLocationPermission::Availability"
+        EnumType{
+            name: "Availability"
+        }
+        defaultSuperClass: "QPermission"
         since: [6, 5]
     }
 
     ValueType{
         name: "QCalendarPermission"
-        ModifyFunction{
-            signature: "operator=(QCalendarPermission)"
-            remove: RemoveFlag.All
+        EnumType{
+            name: "AccessMode"
         }
-        implementing: "QPermission.Request"
+        defaultSuperClass: "QPermission"
         since: [6, 5]
     }
 
     ValueType{
         name: "QContactsPermission"
-        ModifyFunction{
-            signature: "operator=(QContactsPermission)"
-            remove: RemoveFlag.All
+        EnumType{
+            name: "AccessMode"
         }
-        implementing: "QPermission.Request"
+        defaultSuperClass: "QPermission"
         since: [6, 5]
     }
 
     ValueType{
         name: "QCameraPermission"
-        ModifyFunction{
-            signature: "operator=(QCameraPermission)"
-            remove: RemoveFlag.All
-        }
-        implementing: "QPermission.Request"
+        defaultSuperClass: "QPermission"
         since: [6, 5]
     }
 
     ValueType{
         name: "QMicrophonePermission"
-        ModifyFunction{
-            signature: "operator=(QMicrophonePermission)"
-            remove: RemoveFlag.All
-        }
-        implementing: "QPermission.Request"
+        defaultSuperClass: "QPermission"
         since: [6, 5]
     }
 
     ValueType{
         name: "QBluetoothPermission"
-        ModifyFunction{
-            signature: "operator=(QBluetoothPermission)"
-            remove: RemoveFlag.All
-        }
-        implementing: "QPermission.Request"
+        defaultSuperClass: "QPermission"
         since: [6, 5]
     }
 
@@ -14943,7 +12569,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -14975,7 +12601,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -15040,20 +12666,6 @@ TypeSystem{
             signature: "QSettings(const QString&, const QString&, QObject*)"
             blockExceptions: true
         }
-        ModifyFunction{
-            signature: "setIniCodec(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-            until: 5
-        }
     }
     
     FunctionalType{
@@ -15097,11 +12709,7 @@ TypeSystem{
         name: "QEvent"
         ModifyFunction{
             signature: "operator=(const QEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
-            }
+            Delegate{name: "set"; deprecated: true}
         }
         ModifyFunction{
             signature: "clone()const"
@@ -15134,11 +12742,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QChildEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
-            }
+            Delegate{name: "set"; deprecated: true}
         }
         ModifyFunction{
             signature: "clone()const"
@@ -15167,11 +12771,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QTimerEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
-            }
+            Delegate{name: "set"; deprecated: true}
         }
         ModifyFunction{
             signature: "clone()const"
@@ -15195,11 +12795,7 @@ TypeSystem{
         javaName: "QDeferredDisposeEvent"
         ModifyFunction{
             signature: "operator=(const QDeferredDeleteEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
-            }
+            Delegate{name: "set"; deprecated: true}
         }
         ModifyFunction{
             signature: "clone()const"
@@ -15222,11 +12818,7 @@ TypeSystem{
         name: "QDynamicPropertyChangeEvent"
         ModifyFunction{
             signature: "operator=(const QDynamicPropertyChangeEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
-            }
+            Delegate{name: "set"; deprecated: true}
         }
         ModifyFunction{
             signature: "clone()const"
@@ -15253,6 +12845,91 @@ TypeSystem{
                 location: Include.Global
             }
         }
+
+        EnumType{
+            name: "FloatingPointPrecision"
+        }
+
+        EnumType{
+            name: "ByteOrder"
+        }
+
+        EnumType{
+            name: "Status"
+        }
+
+        EnumType{
+            name: "Version"
+            RejectEnumValue{
+                name: "Qt_4_1"
+            }
+            RejectEnumValue{
+                name: "Qt_4_7"
+            }
+            RejectEnumValue{
+                name: "Qt_4_8"
+            }
+            RejectEnumValue{
+                name: "Qt_4_9"
+            }
+            RejectEnumValue{
+                name: "Qt_5_3"
+            }
+            RejectEnumValue{
+                name: "Qt_5_5"
+            }
+            RejectEnumValue{
+                name: "Qt_5_7"
+                since: [5, 7]
+            }
+            RejectEnumValue{
+                name: "Qt_5_8"
+                since: [5, 8]
+            }
+            RejectEnumValue{
+                name: "Qt_5_9"
+                since: [5, 9]
+            }
+            RejectEnumValue{
+                name: "Qt_5_10"
+                since: [5, 10]
+            }
+            RejectEnumValue{
+                name: "Qt_5_11"
+                since: [5, 11]
+            }
+            RejectEnumValue{
+                name: "Qt_5_14"
+                since: [5, 14]
+            }
+            RejectEnumValue{
+                name: "Qt_5_15"
+                since: [5, 15]
+            }
+            RejectEnumValue{
+                name: "Qt_6_1"
+                since: [6, 1]
+            }
+            RejectEnumValue{
+                name: "Qt_6_2"
+                since: [6, 2]
+            }
+            RejectEnumValue{
+                name: "Qt_6_3"
+                since: [6, 3]
+            }
+            RejectEnumValue{
+                name: "Qt_6_4"
+                since: [6, 4]
+            }
+            RejectEnumValue{
+                name: "Qt_6_5"
+                since: [6, 5]
+            }
+            RejectEnumValue{
+                name: "Qt_DefaultCompiledVersion"
+            }
+        }
         ModifyFunction{
             signature: "QDataStream(QIODevice*)"
             ModifyArgument{
@@ -15283,15 +12960,15 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(unsigned int)"
+            signature: "operator<<(quint32)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(unsigned long long)"
+            signature: "operator<<(quint64)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(unsigned char)"
+            signature: "operator<<(quint8)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -15310,11 +12987,11 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "operator>>(uint&)"
+            signature: "operator>>(quint32&)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator>>(unsigned char&)"
+            signature: "operator>>(quint8&)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -15328,7 +13005,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "operator>>(unsigned long long&)"
+            signature: "operator>>(quint64&)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -15347,14 +13024,8 @@ TypeSystem{
             template: "Stream"
         }
         ModifyFunction{
-            signature: "operator<<(unsigned short)"
-            Rename{
-                to: "writeChar"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator<<(quint16)"
+            rename: "append"
             ModifyArgument{
                 index: 1
                 ReplaceType{
@@ -15363,7 +13034,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "operator>>(unsigned short&)"
+            signature: "operator>>(quint16&)"
             Rename{
                 to: "readChar"
             }
@@ -15390,13 +13061,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator<<(qfloat16)"
-            Rename{
-                to: "writeFloat16"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            rename: "writeFloat16"
         }
         ModifyFunction{
             signature: "operator>>(qfloat16&)"
@@ -15426,13 +13091,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator<<(bool)"
-            Rename{
-                to: "writeBoolean"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            rename: "append"
         }
         ModifyFunction{
             signature: "operator>>(bool&)"
@@ -15461,44 +13120,52 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "operator<<(signed char)"
-            Rename{
-                to: "writeByte"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator<<(qint8)"
+            rename: "append"
         }
         ModifyFunction{
-            signature: "operator<<(int)"
-            Rename{
-                to: "writeInt"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator<<(qint32)"
+            rename: "append"
+        }
+        ModifyFunction{
+            signature: "operator<<(qint16)"
+            rename: "append"
         }
         ModifyFunction{
-            signature: "operator<<(short)"
+            signature: "operator>>(qint32&)"
             Rename{
-                to: "writeShort"
+                to: "readInt"
             }
             ModifyArgument{
                 index: 0
-                replaceValue: "this"
+                ReplaceType{
+                    modifiedType: "int"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = __qt_%1;"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "int %out = 0;"}
+                }
             }
         }
         ModifyFunction{
-            signature: "operator>>(int&)"
+            signature: "operator>>(qint8&)"
             Rename{
-                to: "readInt"
+                to: "readByte"
             }
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "int"
+                    modifiedType: "byte"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -15512,19 +13179,19 @@ TypeSystem{
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "int %out = 0;"}
+                    Text{content: "signed char %out = 0;"}
                 }
             }
         }
         ModifyFunction{
-            signature: "operator>>(signed char&)"
+            signature: "operator>>(qint16&)"
             Rename{
-                to: "readByte"
+                to: "readShort"
             }
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "byte"
+                    modifiedType: "short"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -15538,19 +13205,23 @@ TypeSystem{
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "signed char %out = 0;"}
+                    Text{content: "short %out = 0;"}
                 }
             }
         }
         ModifyFunction{
-            signature: "operator>>(short&)"
+            signature: "operator<<(qint64)"
+            rename: "append"
+        }
+        ModifyFunction{
+            signature: "operator>>(qint64&)"
             Rename{
-                to: "readShort"
+                to: "readLong"
             }
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "short"
+                    modifiedType: "long"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -15564,7 +13235,7 @@ TypeSystem{
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "short %out = 0;"}
+                    Text{content: "qint64 %out = 0;"}
                 }
             }
         }
@@ -15576,7 +13247,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "java.lang.@Nullable String"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -15599,19 +13270,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator<<(const char*)"
-            Rename{
-                to: "writeString"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            rename: "append"
         }
         ModifyFunction{
             signature: "unsetDevice()"
@@ -15622,42 +13281,24 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "QDataStream(QByteArray*,QFlags<QIODevice::OpenModeFlag>)"
+            signature: "QDataStream(QByteArray*,QIODevice::OpenMode)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-                NoNullPointer{
-                }
                 ReferenceCount{
                     variableName: "__rcDevice"
                     action: ReferenceCount.Set
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray* %out = qtjambi_cast<QByteArray*>(%env, %in);"}
-                }
             }
             until: 5
         }
         ModifyFunction{
-            signature: "QDataStream(QByteArray*,QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "QDataStream(QByteArray*,QIODeviceBase::OpenMode)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-                NoNullPointer{
-                }
                 ReferenceCount{
                     variableName: "__rcDevice"
                     action: ReferenceCount.Set
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray* %out = qtjambi_cast<QByteArray*>(%env, %in);"}
-                }
             }
             since: 6
         }
@@ -15716,22 +13357,22 @@ TypeSystem{
         name: "QTextStream"
         implementing: "java.lang.Appendable"
         ModifyFunction{
-            signature: "QTextStream(const QByteArray&, QFlags<QIODevice::OpenModeFlag>)"
+            signature: "QTextStream(const QByteArray&, QIODevice::OpenMode)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "QTextStream(const QByteArray&, QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "QTextStream(const QByteArray&, QIODeviceBase::OpenMode)"
             remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "QTextStream(QString*,QFlags<QIODevice::OpenModeFlag>)"
+            signature: "QTextStream(QString*,QIODevice::OpenMode)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "QTextStream(QString*,QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "QTextStream(QString*,QIODeviceBase::OpenMode)"
             remove: RemoveFlag.All
             since: 6
         }
@@ -15741,7 +13382,7 @@ TypeSystem{
             access: Modification.Private
         }
         ModifyFunction{
-            signature: "readLineInto(QString *, long long)"
+            signature: "readLineInto(QString *, qint64)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -15778,7 +13419,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(unsigned int)"
+            signature: "operator<<(uint)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -15790,7 +13431,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator>>(unsigned long long&)"
+            signature: "operator>>(qulonglong&)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -15798,7 +13439,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(unsigned long)"
+            signature: "operator<<(ulong)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -15806,7 +13447,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(unsigned long long)"
+            signature: "operator<<(qulonglong)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -15818,12 +13459,12 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setString(QString*,QFlags<QIODevice::OpenModeFlag>)"
+            signature: "setString(QString*,QIODevice::OpenMode)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "setString(QString*,QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "setString(QString*,QIODeviceBase::OpenMode)"
             remove: RemoveFlag.All
             since: 6
         }
@@ -15875,49 +13516,69 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator<<(char)"
-            Rename{
-                to: "writeByte"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            rename: "append"
         }
         ModifyFunction{
             signature: "operator<<(signed int)"
-            Rename{
-                to: "writeInt"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            rename: "append"
         }
         ModifyFunction{
             signature: "operator<<(signed short)"
-            Rename{
-                to: "writeShort"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            rename: "append"
+        }
+        ModifyFunction{
+            signature: "operator<<(qlonglong)"
+            rename: "append"
         }
         ModifyFunction{
             signature: "operator<<(QChar)"
-            Rename{
-                to: "writeChar"
+            rename: "append"
+        }
+        ModifyFunction{
+            signature: "operator<<(const QByteArray&)"
+            rename: "append"
+        }
+        ModifyFunction{
+            signature: "operator<<(const char*)"
+            rename: "append"
+        }
+        ModifyFunction{
+            signature: "operator<<(QString)"
+            rename: "append"
+            ModifyArgument{
+                index: 1
+                ReplaceType{
+                    modifiedType: "java.lang.@Nullable CharSequence"
+                }
             }
+        }
+        ModifyFunction{
+            signature: "operator>>(qlonglong&)"
+            rename: "readLong"
             ModifyArgument{
                 index: 0
-                replaceValue: "this"
+                ReplaceType{
+                    modifiedType: "long"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = __qt_%1;"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "qlonglong %out = 0;"}
+                }
             }
         }
         ModifyFunction{
             signature: "operator>>(QChar&)"
-            Rename{
-                to: "readChar"
-            }
+            rename: "readChar"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -15941,9 +13602,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator>>(signed int&)"
-            Rename{
-                to: "readInt"
-            }
+            rename: "readInt"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -15967,9 +13626,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator>>(char&)"
-            Rename{
-                to: "readByte"
-            }
+            rename: "readByte"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -15993,9 +13650,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator>>(signed short&)"
-            Rename{
-                to: "readShort"
-            }
+            rename: "readShort"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -16019,11 +13674,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator>>(QByteArray&)"
-            Rename{
-                to: "readBytes"
-            }
+            rename: "readBytes"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QByteArray"
                 }
@@ -16043,23 +13697,12 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "operator<<(const QByteArray&)"
-            Rename{
-                to: "writeBytes"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-        }
         ModifyFunction{
             signature: "operator>>(QString&)"
-            Rename{
-                to: "readQString"
-            }
+            rename: "readQString"
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QString"
                 }
@@ -16081,9 +13724,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator>>(char*)"
-            Rename{
-                to: "readString"
-            }
+            rename: "readString"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -16106,91 +13747,27 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "operator<<(const char*)"
-            Rename{
-                to: "writeString"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "operator<<(QString)"
-            Rename{
-                to: "writeString"
-            }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.CharSequence"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QString %out = qtjambi_cast<QString>(%env, %1);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "QTextStream(QByteArray*,QFlags<QIODevice::OpenModeFlag>)"
+            signature: "QTextStream(QByteArray*,QIODevice::OpenMode)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
                     variableName: "__rcDevice"
                     action: ReferenceCount.Set
                 }
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray* %out = qtjambi_cast<QByteArray*>(%env, %in);"}
-                }
             }
             until: 5
         }
         ModifyFunction{
-            signature: "QTextStream(QByteArray*,QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "QTextStream(QByteArray*,QIODeviceBase::OpenMode)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
                     variableName: "__rcDevice"
                     action: ReferenceCount.Set
                 }
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray* %out = qtjambi_cast<QByteArray*>(%env, %in);"}
-                }
             }
             since: 6
         }
-        ModifyFunction{
-            signature: "setCodec(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            until: 5
-        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
@@ -16254,6 +13831,25 @@ TypeSystem{
                 location: Include.Global
             }
         }
+
+        Rejection{
+            className: "WhenAnyResult"
+            since: [6, 3]
+        }
+
+        Rejection{functionName: "makeExceptionalFuture"}
+        Rejection{functionName: "makeReadyFuture"}
+        Rejection{functionName: "makeReadyFuture"}
+
+        EnumType{
+            name: "Launch"
+        }
+
+        ModifyFunction{
+            signature: "connect<Sender,Signal,>(Sender*,Signal)"
+            remove: RemoveFlag.All
+        }
+
         InjectCode{
             target: CodeClass.Java
             ImportFile{
@@ -16277,22 +13873,6 @@ TypeSystem{
         since: 6
     }
     
-    EnumType{
-        name: "QtFuture::Launch"
-        since: 6
-    }
-    
-    EnumType{
-        name: "QFutureInterfaceBase::State"
-        extensible: true
-    }
-    
-    FunctionalType{
-        name: "QFutureInterfaceBase::Continuation"
-        generate: false
-        using: "std::function<void(const QFutureInterfaceBase&)>"
-    }
-    
     ValueType{
         name: "QFutureInterfaceBase"
         ExtraIncludes{
@@ -16309,6 +13889,39 @@ TypeSystem{
                 location: Include.Global
             }
         }
+
+        Rejection{
+            functionName: "get"
+            since: [6, 3]
+        }
+
+        Rejection{
+            functionName: "resultStoreBase"
+        }
+
+        Rejection{
+            functionName: "reportException"
+        }
+
+        Rejection{
+            functionName: "exceptionStore"
+        }
+
+        EnumType{
+            name: "CancelMode"
+            since: [6, 3]
+        }
+
+        EnumType{
+            name: "State"
+            extensible: true
+        }
+
+        FunctionalType{
+            name: "Continuation"
+            generate: false
+            using: "std::function<void(const QFutureInterfaceBase&)>"
+        }
         ModifyFunction{
             // in Qt6.4.0 this was removed but re-added in 6.4.1 leading to undefined symbol exception
             signature: "cleanContinuation()"
@@ -16316,10 +13929,6 @@ TypeSystem{
             since: 6.4
             until: 6.4
         }
-        ModifyFunction{
-            signature: "operator=(const QFutureInterfaceBase&)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "waitForFinished()"
             InjectCode{
@@ -16369,7 +13978,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.core.QRunnable"
+                    modifiedType: "io.qt.core.@Nullable QRunnable"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -16382,10 +13991,31 @@ TypeSystem{
                     action: ReferenceCount.Set
                 }
             }
-        }
-        ModifyFunction{
-            signature: "reportFinished()"
-            access: Modification.NonFinal
+        }
+        ModifyFunction{
+            signature: "reportFinished()"
+            access: Modification.NonFinal
+        }
+        ModifyFunction{
+            signature: "mutex()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "mutex(int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+            until: 5
         }
         InjectCode{
             target: CodeClass.Java
@@ -16507,7 +14137,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Runnable"
+                    modifiedType: "java.lang.@Nullable Runnable"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -16515,7 +14145,7 @@ TypeSystem{
                                   "if(Java::QtCore::QRunnable::isInstanceOf(%env, %in)){\n"+
                                   "    %out = qtjambi_cast<QRunnable*>(%env, %in);\n"+
                                   "    QtJambiAPI::setCppOwnership(%env, %in);\n"+
-                                  "}else{\n"+
+                                  "}else if(%in){\n"+
                                   "    JObjectWrapper __wrapper_%in(%env, %in);\n"+
                                   "    %out = QRunnable::create([__wrapper_%in](){\n"+
                                   "            QTJAMBI_TRY_ANY{\n"+
@@ -16539,7 +14169,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Runnable"
+                    modifiedType: "java.lang.@Nullable Runnable"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -16547,7 +14177,7 @@ TypeSystem{
                                   "if(Java::QtCore::QRunnable::isInstanceOf(%env, %in)){\n"+
                                   "    %out = qtjambi_cast<QRunnable*>(%env, %in);\n"+
                                   "    QtJambiAPI::setCppOwnership(%env, %in);\n"+
-                                  "}else{\n"+
+                                  "}else if(%in){\n"+
                                   "    JObjectWrapper __wrapper_%in(%env, %in);\n"+
                                   "    %out = QRunnable::create([__wrapper_%in](){\n"+
                                   "            QTJAMBI_TRY_ANY{\n"+
@@ -16574,6 +14204,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.lang.Runnable"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "QRunnable* %out = nullptr;\n"+
@@ -16609,6 +14240,8 @@ TypeSystem{
     InterfaceType{
         name: "QRunnable"
         implementing: "Runnable"
+
+        Rejection{functionName: "create"}
         ModifyFunction{
             signature: "run()"
             noExcept: true
@@ -16631,11 +14264,6 @@ TypeSystem{
     
     ValueType{
         name: "QXmlStreamAttribute"
-        ModifyFunction{
-            signature: "operator=(QXmlStreamAttribute)"
-            remove: RemoveFlag.All
-            until: 5
-        }
         CustomConstructor{
             type: CustomConstructor.Copy
             until: 5
@@ -16728,29 +14356,14 @@ TypeSystem{
     
     ValueType{
         name: "QXmlStreamNamespaceDeclaration"
-        ModifyFunction{
-            signature: "operator=(QXmlStreamNamespaceDeclaration)"
-            remove: RemoveFlag.All
-            until: 5
-        }
     }
     
     ValueType{
         name: "QXmlStreamNotationDeclaration"
-        ModifyFunction{
-            signature: "operator=(QXmlStreamNotationDeclaration)"
-            remove: RemoveFlag.All
-            until: 5
-        }
     }
     
     ValueType{
         name: "QXmlStreamEntityDeclaration"
-        ModifyFunction{
-            signature: "operator=(QXmlStreamEntityDeclaration)"
-            remove: RemoveFlag.All
-            until: 5
-        }
     }
     
     ObjectType{
@@ -16809,8 +14422,7 @@ TypeSystem{
         name: "QXmlStreamWriter"
         ModifyFunction{
             signature: "QXmlStreamWriter(QString *)"
-            Remove{
-            }
+            remove: RemoveFlag.All
         }
         ModifyFunction{
             signature: "QXmlStreamWriter(QIODevice*)"
@@ -16826,30 +14438,11 @@ TypeSystem{
             signature: "QXmlStreamWriter(QByteArray *)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-                NoNullPointer{
-                }
                 ReferenceCount{
                     variableName: "__rcDevice"
                     action: ReferenceCount.Set
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray* %out = qtjambi_cast<QByteArray*>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setCodec(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
             }
-            until: 5
         }
         ModifyFunction{
             signature: "setCodec(QTextCodec*)"
@@ -16894,7 +14487,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getLockInfo(long long *, QString *, QString *) const"
+            signature: "getLockInfo(qint64*, QString *, QString *) const"
             ModifyArgument{
                 index: 1
                 RemoveArgument{
@@ -16927,6 +14520,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.core.QLockFile$LockInfo"
                 }
@@ -16982,7 +14576,7 @@ TypeSystem{
             since: 6
         }
         InjectCode{
-            Text{content: "@io.qt.QtUninvokable\n"+
+            Text{content: "@QtUninvokable\n"+
                           "public final void addData(byte[] array){\n"+
                           "    addData(java.nio.ByteBuffer.wrap(array));\n"+
                           "}"}
@@ -16998,7 +14592,6 @@ TypeSystem{
     EnumType{
         name: "QAbstractFileEngine::FileFlag"
         packageName: "io.qt.core.internal"
-        flags: "QAbstractFileEngine::FileFlags"
     }
     
     EnumType{
@@ -17083,7 +14676,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "beginEntryList(QFlags<QDir::Filter>,const QStringList)"
+            signature: "beginEntryList(QDir::Filters,const QStringList)"
             ModifyArgument{
                 index: "return"
                 DefineOwnership{
@@ -17097,7 +14690,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "beginEntryList(QFlags<QDir::Filter>,const QStringList)"
+            signature: "beginEntryList(QDir::Filters,const QStringList)"
             ModifyArgument{
                 index: "return"
                 DefineOwnership{
@@ -17138,11 +14731,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "map(long long, long long, QFileDevice::MemoryMapFlags)"
+            signature: "map(qint64, qint64, QFileDevice::MemoryMapFlags)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@Nullable ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -17152,11 +14745,11 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "map(long long, long long, QFlags<QFileDevice::MemoryMapFlag>)"
+            signature: "map(qint64, qint64, QFileDevice::MemoryMapFlags)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@Nullable ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -17166,15 +14759,16 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "unmap(unsigned char*)"
+            signature: "unmap(uchar*)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
                     modifiedType: "java.nio.ByteBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "if(!Java::Runtime::Buffer::isDirect(%env,%in)){\n"+
+                    Text{content: "if(%in && !Java::Runtime::Buffer::isDirect(%env,%in)){\n"+
                                   "    JavaException::raiseIllegalArgumentException(%env, \"Direct buffer expected but given buffer is indirect.\" QTJAMBI_STACKTRACEINFO );\n"+
                                   "}\n"+
                                   "uchar* %out = %in ? reinterpret_cast<uchar*>(%env->GetDirectBufferAddress(%in)) : nullptr;"}
@@ -17182,7 +14776,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "read(char *, long long)"
+            signature: "read(char *, qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -17191,10 +14785,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(INT_MAX), %2)));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    CharPointerArray %1_buffer2(%env, %1, jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2)));\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, %1_buffer2.array());\n"+
                                   "    %out += %in;\n"+
                                   "}"}
@@ -17207,11 +14801,11 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "byte[]"
+                    modifiedType: "byte @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
-                    Text{content: "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, jsize(qMin(qint64(INT_MAX), %2)));"}
+                    Text{content: "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2)));"}
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -17226,7 +14820,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "readLine(char *, long long)"
+            signature: "readLine(char *, qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -17235,10 +14829,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    CharPointerArray __%1(%env, %1, jsize(qMin(qint64(INT_MAX), %2)));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    CharPointerArray __%1(%env, %1, jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2)));\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, __%1.array());\n"+
                                   "    %out += %in;\n"+
                                   "}"}
@@ -17251,11 +14845,11 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "byte[]"
+                    modifiedType: "byte @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
-                    Text{content: "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, jsize(qMin(qint64(INT_MAX), %2)));"}
+                    Text{content: "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2)));"}
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -17270,7 +14864,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "write(const char *, long long)"
+            signature: "write(const char *, qint64)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -17279,10 +14873,10 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "qint64 %out = qint64(%in);\n"+
-                                  "while(%2 > INT_MAX && %in == INT_MAX){\n"+
-                                  "    %2 -= INT_MAX;\n"+
-                                  "    %1 = &%1[INT_MAX];\n"+
-                                  "    j%2 = jsize(qMin(qint64(INT_MAX), %2));\n"+
+                                  "while(%2 > std::numeric_limits<jsize>::max() && %in == std::numeric_limits<jsize>::max()){\n"+
+                                  "    %2 -= std::numeric_limits<jsize>::max();\n"+
+                                  "    %1 = &%1[std::numeric_limits<jsize>::max()];\n"+
+                                  "    j%2 = jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2));\n"+
                                   "    ConstCharPointerArray __%1(%env, %1, j%2);\n"+
                                   "    %in = %env->CallIntMethod(__java_this, method_id, __%1.array());\n"+
                                   "    %out += %in;\n"+
@@ -17296,11 +14890,11 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "byte[]"
+                    modifiedType: "byte @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
-                    Text{content: "jsize j%2 = jsize(qMin(qint64(INT_MAX), %2));\n"+
+                    Text{content: "jsize j%2 = jsize(qMin(qint64(std::numeric_limits<jsize>::max()), %2));\n"+
                                   "jbyteArray %out = qtjambi_array_cast<jbyteArray>(%env, %scope, %in, j%2);"}
                 }
                 ConversionRule{
@@ -17389,17 +14983,13 @@ TypeSystem{
             type: CustomConstructor.Default
             Text{content: "new(placement) QCommandLineOption(QLatin1String(\" \"));"}
         }
-        ModifyFunction{
-            signature: "operator=(const QCommandLineOption&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QCollator"
         ModifyFunction{
             signature: "operator()(const QString &, const QString &)const"
-            rename: "isLessThan"
+            Delegate{name: "isLessThan"}
             until: [5, 13, 0]
         }
         ModifyFunction{
@@ -17409,13 +14999,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator()(QStringView, QStringView)const"
-            rename: "isLessThan"
+            Delegate{name: "isLessThan"}
             since: [5, 14]
         }
-        ModifyFunction{
-            signature: "operator=(const QCollator&)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "compare(const QStringRef &, const QStringRef &) const"
             remove: RemoveFlag.All
@@ -17447,10 +15033,6 @@ TypeSystem{
             signature: "compare(QCollatorSortKey) const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(const QCollatorSortKey&)"
-            remove: RemoveFlag.All
-        }
         CustomConstructor{
             Text{content: "if(copy){\n"+
                           "    return new(placement) QCollatorSortKey(*copy);\n"+
@@ -17466,15 +15048,11 @@ TypeSystem{
     
     ValueType{
         name: "QStorageInfo"
-        ModifyFunction{
-            signature: "operator=(const QStorageInfo&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QOperatingSystemVersion"
-        defaultSuperClass: "io.qt.QtObject"
+        defaultSuperClass: "QtObject"
         CustomConstructor{
             Text{content: "if(copy){\n"+
                           "    return new(placement) QOperatingSystemVersion(*copy);\n"+
@@ -17511,15 +15089,6 @@ TypeSystem{
     
     ObjectType{
         name: "QLibraryInfo"
-        ModifyFunction{
-            signature: "build()"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -17549,33 +15118,15 @@ TypeSystem{
                           "pointer->setPreciseRemainingTime(0, copy->remainingTimeNSecs(), copy->timerType());"}
         }
         ModifyFunction{
-            signature: "operator-(QDeadlineTimer)"
-            rename: "minus"
-        }
-        ModifyFunction{
-            signature: "operator-(long long)"
-            rename: "minus"
-        }
-        ModifyFunction{
-            signature: "operator+=(long long)"
-            rename: "addMSecs"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDeadlineTimer"
-                }
+            signature: "operator+=(qint64)"
+            Delegate{
+                name: "addMSecs"
             }
         }
         ModifyFunction{
-            signature: "operator-=(long long)"
-            rename: "subtractMSecs"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDeadlineTimer"
-                }
+            signature: "operator-=(qint64)"
+            Delegate{
+                name: "subtractMSecs"
             }
         }
     }
@@ -17635,58 +15186,62 @@ TypeSystem{
     
     ObjectType{
         name: "QLibrary"
-        ModifyFunction{
-            signature: "resolve(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "resolve(const QString &, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "resolve(const QString &, int, const char *)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "resolve(const QString &, const QString &, const char *)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
     }
-    
-    EnumType{
-        name: "QString::SplitBehavior"
-        until: [5, 13]
-    }
-    
-    EnumType{
-        name: "QString::SectionFlag"
-        flags: "QString::SectionFlags"
+
+    ValueType{
+        name: "QCharRef"
+        generate: false
+        until: 5
     }
     
     ValueType{
         name: "QString"
         implementing: "Appendable, CharSequence"
         targetType: "final class"
+
+        Rejection{enumName: "NormalizationForm"}
+        Rejection{className: "DataPointer"}
+        Rejection{functionName: "rightRef"}
+        Rejection{functionName: "leftRef"}
+        Rejection{functionName: "midRef"}
+        Rejection{functionName: "splitRef"}
+        Rejection{functionName: "sprintf"}
+        Rejection{functionName: "asprintf"}
+        Rejection{functionName: "vasprintf"}
+        Rejection{functionName: "fromStdU32String"}
+        Rejection{functionName: "crend"}
+        Rejection{functionName: "normalized"}
+        Rejection{functionName: "fromStdU16String"}
+        Rejection{functionName: "fromWCharArray"}
+        Rejection{functionName: "fromStdWString"}
+        Rejection{functionName: "tokenize"}
+        Rejection{functionName: "crbegin"}
+        Rejection{functionName: "rbegin"}
+        Rejection{functionName: "fromStdString"}
+        Rejection{functionName: "rend"}
+        Rejection{functionName: "toWCharArray"}
+        Rejection{functionName: "toUInt"}
+        Rejection{functionName: "toUShort"}
+        Rejection{functionName: "toULong"}
+        Rejection{functionName: "toULongLong"}
+        Rejection{functionName: "toLong"}
+        Rejection{functionName: "push_back"}
+        Rejection{functionName: "push_front"}
+
+        Rejection{
+            enumName: "SplitBehavior"
+            until: [5, 15]
+        }
+
+        Rejection{
+            className: "QString::Null"
+            until: [5, 15]
+        }
+
+        EnumType{
+            name: "SectionFlag"
+        }
+
         ModifyFunction{
             signature: "QString(const char*)"
             remove: RemoveFlag.All
@@ -18128,861 +15683,589 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "number(unsigned long,int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "number(unsigned int,int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "number(unsigned long long,int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "arg(long,int,int,QChar)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "arg(unsigned long,int,int,QChar)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "arg(unsigned long long,int,int,QChar)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "arg(unsigned int,int,int,QChar)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "arg(unsigned short,int,int,QChar)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "front()"
-            remove: RemoveFlag.All
-            since: 6
-        }
-        ModifyFunction{
-            signature: "back()"
-            remove: RemoveFlag.All
-            since: 6
-        }
-        ModifyFunction{
-            signature: "end()"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "cend()const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "constEnd()const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "begin()"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "cbegin()const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "constBegin()const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "constData()const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "end()const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "begin()const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "data()"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "data()const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "localeAwareCompare(QStringView)const"
-            remove: RemoveFlag.All
-            since: 6
-        }
-        ModifyFunction{
-            signature: "arg(QLatin1StringView,int,QChar)const"
-            remove: RemoveFlag.All
-            since: [6, 4]
-        }
-        ModifyFunction{
-            signature: "arg(QLatin1String,int,QChar)const"
-            remove: RemoveFlag.All
-            until: [6, 3]
-        }
-        ModifyFunction{
-            signature: "arg(QStringView,int,QChar)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setNum(long, int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setNum(unsigned long long, int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setNum(unsigned long, int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setNum(unsigned int, int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setNum(unsigned short, int)"
+            signature: "number(ulong,int)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator=(char)"
+            signature: "number(uint,int)"
             remove: RemoveFlag.All
-            until: 5
         }
         ModifyFunction{
-            signature: "operator+=(char)"
+            signature: "number(qulonglong,int)"
             remove: RemoveFlag.All
-            until: 5
         }
         ModifyFunction{
-            signature: "operator+=(QChar)"
+            signature: "arg(long,int,int,QChar)const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator+=(QStringRef)"
+            signature: "arg(ulong,int,int,QChar)const"
             remove: RemoveFlag.All
-            until: 5
         }
         ModifyFunction{
-            signature: "operator+=(QLatin1String)"
+            signature: "arg(qulonglong,int,int,QChar)const"
             remove: RemoveFlag.All
-            until: [6, 3]
         }
         ModifyFunction{
-            signature: "operator+=(QLatin1StringView)"
+            signature: "arg(uint,int,int,QChar)const"
             remove: RemoveFlag.All
-            since: [6, 4]
         }
         ModifyFunction{
-            signature: "operator+=(QUtf8StringView)"
+            signature: "arg(ushort,int,int,QChar)const"
             remove: RemoveFlag.All
-            since: [6, 5]
         }
         ModifyFunction{
-            signature: "operator+=(QStringView)"
+            signature: "front()"
             remove: RemoveFlag.All
+            since: 6
         }
         ModifyFunction{
-            signature: "operator+=(QByteArray)"
+            signature: "back()"
             remove: RemoveFlag.All
+            since: 6
         }
         ModifyFunction{
-            signature: "operator+=(QString)"
+            signature: "end()"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator+=(const char*)"
+            signature: "cend()const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator=(QChar)"
+            signature: "constEnd()const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator=(QLatin1String)"
+            signature: "begin()"
             remove: RemoveFlag.All
-            until: [6, 3]
         }
         ModifyFunction{
-            signature: "operator=(QLatin1StringView)"
+            signature: "cbegin()const"
             remove: RemoveFlag.All
-            since: [6, 4]
         }
         ModifyFunction{
-            signature: "operator=(QByteArray)"
+            signature: "constBegin()const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator=(QString)"
+            signature: "constData()const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator=(const char*)"
+            signature: "end()const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator>(const char16_t*)"
+            signature: "begin()const"
             remove: RemoveFlag.All
-            since: 6
         }
         ModifyFunction{
-            signature: "operator>=(const char16_t*)"
+            signature: "data()"
             remove: RemoveFlag.All
-            since: 6
         }
         ModifyFunction{
-            signature: "operator<=(const char16_t*)"
+            signature: "data()const"
             remove: RemoveFlag.All
-            since: 6
         }
         ModifyFunction{
-            signature: "operator<(const char16_t*)"
+            signature: "localeAwareCompare(QStringView)const"
             remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "operator==(const char16_t*)"
+            signature: "arg(QLatin1StringView,int,QChar)const"
             remove: RemoveFlag.All
-            since: 6
+            since: [6, 4]
         }
         ModifyFunction{
-            signature: "operator!=(const char16_t*)"
+            signature: "arg(QLatin1String,int,QChar)const"
             remove: RemoveFlag.All
-            since: 6
+            until: [6, 3]
         }
         ModifyFunction{
-            signature: "operator[](uint)const"
+            signature: "arg(QStringView,int,QChar)const"
             remove: RemoveFlag.All
-            until: 5
         }
         ModifyFunction{
-            signature: "operator[](qsizetype)"
+            signature: "setNum(long, int)"
             remove: RemoveFlag.All
-            since: 6
         }
         ModifyFunction{
-            signature: "operator[](int)const"
+            signature: "setNum(qulonglong, int)"
             remove: RemoveFlag.All
-            until: 5
         }
         ModifyFunction{
-            signature: "operator[](qsizetype)const"
+            signature: "setNum(ulong, int)"
             remove: RemoveFlag.All
-            since: 6
         }
         ModifyFunction{
-            signature: "operator<(const char*)const"
+            signature: "setNum(uint, int)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<(std::nullptr_t)"
+            signature: "setNum(ushort, int)"
             remove: RemoveFlag.All
-            since: 6
         }
         ModifyFunction{
-            signature: "operator<=(std::nullptr_t)"
+            signature: "operator=(char)"
             remove: RemoveFlag.All
-            since: 6
+            until: 5
         }
         ModifyFunction{
-            signature: "operator>=(std::nullptr_t)"
+            signature: "operator+=(char)"
             remove: RemoveFlag.All
-            since: 6
+            until: 5
         }
         ModifyFunction{
-            signature: "operator>(std::nullptr_t)"
+            signature: "operator+=(QStringRef)"
             remove: RemoveFlag.All
-            since: 6
+            until: 5
         }
         ModifyFunction{
-            signature: "operator==(std::nullptr_t)"
+            signature: "operator+=(QLatin1String)"
             remove: RemoveFlag.All
-            since: 6
+            until: [6, 3]
         }
         ModifyFunction{
-            signature: "operator==(const char*)const"
+            signature: "operator+=(QLatin1StringView)"
             remove: RemoveFlag.All
+            since: [6, 4]
         }
         ModifyFunction{
-            signature: "operator!=(const char*)const"
+            signature: "operator+=(QUtf8StringView)"
             remove: RemoveFlag.All
+            since: [6, 5]
         }
         ModifyFunction{
-            signature: "operator>(const char*)const"
+            signature: "operator+=(QStringView)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator>=(const char*)const"
+        ModifyFunction{//in favor to operator+
+            signature: "operator+=(QString)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<=(const char*)const"
+            signature: "operator+=(QChar)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<(QLatin1String)const"
+            signature: "operator+=(QByteArray)"
             remove: RemoveFlag.All
-            until: [5, 10]
         }
         ModifyFunction{
-            signature: "operator<(QLatin1String)"
+            signature: "operator+=(const char*)"
             remove: RemoveFlag.All
-            since: 6
-            until: [6, 3]
         }
         ModifyFunction{
-            signature: "operator<(QLatin1StringView)"
+            signature: "front()"
             remove: RemoveFlag.All
-            since: [6, 4]
+            until: 5
         }
         ModifyFunction{
-            signature: "operator<=(QLatin1String)"
+            signature: "back()"
             remove: RemoveFlag.All
-            since: 6
-            until: [6, 3]
+            until: 5
         }
         ModifyFunction{
-            signature: "operator<=(QLatin1StringView)"
+            signature: "operator==(QLatin1String)const"
             remove: RemoveFlag.All
-            since: [6, 4]
+            until: 5
         }
         ModifyFunction{
-            signature: "operator>(QLatin1String)"
+            signature: "operator!=(QLatin1String)const"
             remove: RemoveFlag.All
-            since: 6
-            until: [6, 3]
+            until: 5
         }
         ModifyFunction{
-            signature: "operator>(QLatin1StringView)"
+            signature: "operator<(QString,QStringRef)"
             remove: RemoveFlag.All
-            since: [6, 4]
+            until: 5
         }
         ModifyFunction{
-            signature: "operator>=(QLatin1String)"
+            signature: "operator==(QString,QStringRef)"
             remove: RemoveFlag.All
-            since: 6
-            until: [6, 3]
+            until: 5
         }
         ModifyFunction{
-            signature: "operator>=(QLatin1StringView)"
+            signature: "operator!=(QString,QStringRef)"
             remove: RemoveFlag.All
-            since: [6, 4]
+            until: 5
         }
         ModifyFunction{
-            signature: "operator==(QLatin1String)"
+            signature: "operator=(QLatin1String)"
             remove: RemoveFlag.All
-            since: 6
             until: [6, 3]
         }
         ModifyFunction{
-            signature: "operator==(QLatin1StringView)"
+            signature: "operator=(QLatin1StringView)"
             remove: RemoveFlag.All
             since: [6, 4]
         }
-        ExtraIncludes{
-            Include{
-                fileName: "QtJambi/JavaAPI"
-                location: Include.Global
-            }
-        }
         ModifyFunction{
-            signature: "QString(const QChar*,qsizetype)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
-            ModifyArgument{
-                index: 2
-                RemoveDefaultExpression{
-                }
-            }
+            signature: "operator>(const char16_t*)"
+            remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "QString(const QChar*,int)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
-            ModifyArgument{
-                index: 2
-                RemoveDefaultExpression{
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "fromLatin1(const char*,int)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
-            until: 5
+            signature: "operator>=(const char16_t*)"
+            remove: RemoveFlag.All
+            since: 6
         }
         ModifyFunction{
-            signature: "fromLocal8Bit(const char*,int)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
-            until: 5
+            signature: "operator<=(const char16_t*)"
+            remove: RemoveFlag.All
+            since: 6
         }
         ModifyFunction{
-            signature: "fromLatin1(const char*,qsizetype)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
+            signature: "operator<(const char16_t*)"
+            remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "fromLocal8Bit(const char*,qsizetype)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
+            signature: "operator==(const char16_t*)"
+            remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "fromRawData(const QChar*,qsizetype)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
+            signature: "operator!=(const char16_t*)"
+            remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "fromRawData(const QChar*,int)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
+            signature: "operator[](uint)"
+            remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "fromUcs4(const char32_t*,qsizetype)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "fromUcs4(const unsigned int*,qsizetype)"
+            signature: "operator[](uint)const"
             remove: RemoveFlag.All
-            since: [6, 2]
+            until: 5
         }
         ModifyFunction{
-            signature: "fromUcs4(const unsigned int*,qsizetype)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
+            signature: "operator[](int)"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
                 }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(index);"}
             }
-            since: 6
-            until: [6, 2]
+            until: 5
         }
         ModifyFunction{
-            signature: "fromUcs4(const unsigned int*,int)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
+            signature: "operator[](int)const"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
                 }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(index);"}
             }
             until: 5
         }
         ModifyFunction{
-            signature: "fromUtf16(const char16_t*,qsizetype)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
+            signature: "operator[](qsizetype)"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "i"
                 }
+                Text{content: "if(i<0 || i>size())\n"+
+                              "    throw new IndexOutOfBoundsException(\"\"+i);"}
             }
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "fromUtf16(const unsigned short*,qsizetype)"
-            remove: RemoveFlag.All
-            since: [6, 4]
+            since: 6
         }
         ModifyFunction{
-            signature: "fromUtf16(const unsigned short*,qsizetype)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
+            signature: "operator[](qsizetype)const"
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
                 }
+                Text{content: "if(index<0 || index>size())\n"+
+                              "    throw new IndexOutOfBoundsException(\"\"+index);"}
             }
             since: 6
-            until: [6, 3]
         }
         ModifyFunction{
-            signature: "fromUtf16(const unsigned short*,int)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
-            until: 5
+            signature: "operator<(const char*)const"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "fromUtf8(const char*,int)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
-            until: 5
+            signature: "operator<(std::nullptr_t)"
+            remove: RemoveFlag.All
+            since: 6
         }
         ModifyFunction{
-            signature: "fromUtf8(const char*,qsizetype)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
+            signature: "operator<=(std::nullptr_t)"
+            remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "fill(QChar,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator>=(std::nullptr_t)"
+            remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "fill(QChar,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            until: 5
+            signature: "operator>(std::nullptr_t)"
+            remove: RemoveFlag.All
+            since: 6
         }
         ModifyFunction{
-            signature: "append(QChar)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator==(std::nullptr_t)"
+            remove: RemoveFlag.All
+            since: 6
         }
         ModifyFunction{
-            signature: "append(QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator==(const char*)const"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "append(QString)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator!=(const char*)const"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "prepend(QString)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator>(const char*)const"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "insert(qsizetype,QString)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            since: 6
+            signature: "operator>=(const char*)const"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "insert(int,QString)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            until: 5
+            signature: "operator<=(const char*)const"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "append(const QChar*,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
-            since: 6
+            signature: "operator>(QLatin1String)const"
+            remove: RemoveFlag.All
+            until: 5
         }
         ModifyFunction{
-            signature: "append(const QChar*,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    lengthParameter: 2
-                }
-            }
+            signature: "operator<(QLatin1String)const"
+            remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "insert(qsizetype,const QChar*,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-            since: 6
+            signature: "operator<(QStringRef)"
+            remove: RemoveFlag.All
+            until: 5
         }
         ModifyFunction{
-            signature: "insert(qsizetype,QChar)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator<(QLatin1String)"
+            remove: RemoveFlag.All
             since: 6
+            until: [6, 3]
         }
         ModifyFunction{
-            signature: "insert(qsizetype,QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            since: 6
+            signature: "operator<(QLatin1StringView)"
+            remove: RemoveFlag.All
+            since: [6, 4]
         }
         ModifyFunction{
-            signature: "remove(qsizetype, qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator<=(QLatin1String)"
+            remove: RemoveFlag.All
             since: 6
+            until: [6, 3]
         }
         ModifyFunction{
-            signature: "insert(int,const QChar*,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-            until: 5
+            signature: "operator<=(QLatin1StringView)"
+            remove: RemoveFlag.All
+            since: [6, 4]
         }
         ModifyFunction{
-            signature: "insert(int,QChar)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            until: 5
+            signature: "operator>(QLatin1String)"
+            remove: RemoveFlag.All
+            since: 6
+            until: [6, 3]
         }
         ModifyFunction{
-            signature: "insert(int,QByteArray)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            until: 5
+            signature: "operator>(QLatin1StringView)"
+            remove: RemoveFlag.All
+            since: [6, 4]
         }
         ModifyFunction{
-            signature: "remove(int, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            until: 5
+            signature: "operator>=(QLatin1String)"
+            remove: RemoveFlag.All
+            since: 6
+            until: [6, 3]
         }
         ModifyFunction{
-            signature: "replace(QChar, QChar, Qt::CaseSensitivity)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator>=(QLatin1StringView)"
+            remove: RemoveFlag.All
+            since: [6, 4]
         }
         ModifyFunction{
-            signature: "replace(QString, QString, Qt::CaseSensitivity)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "operator==(QLatin1String)"
+            remove: RemoveFlag.All
+            since: 6
+            until: [6, 3]
         }
         ModifyFunction{
-            signature: "replace(qsizetype, qsizetype, QChar)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
+            signature: "operator==(QLatin1StringView)"
+            remove: RemoveFlag.All
+            since: [6, 4]
+        }
+        ExtraIncludes{
+            Include{
+                fileName: "QtJambi/JavaAPI"
+                location: Include.Global
             }
-            since: 6
         }
         ModifyFunction{
-            signature: "replace(qsizetype, qsizetype, const QChar*, qsizetype)"
+            signature: "QString(const QChar*,qsizetype)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
             }
             ModifyArgument{
-                index: 3
-                ArrayType{
-                    lengthParameter: 4
+                index: 2
+                RemoveDefaultExpression{
                 }
             }
             since: 6
         }
         ModifyFunction{
-            signature: "replace(int, int, QChar)"
+            signature: "QString(const QChar*,int)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
+            }
+            ModifyArgument{
+                index: 2
+                RemoveDefaultExpression{
+                }
             }
             until: 5
         }
         ModifyFunction{
-            signature: "replace(int, int, const QChar*, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "fromLatin1(const char*,int)"
             ModifyArgument{
-                index: 3
+                index: 1
                 ArrayType{
-                    lengthParameter: 4
+                    lengthParameter: 2
                 }
             }
             until: 5
         }
         ModifyFunction{
-            signature: "remove(QChar, Qt::CaseSensitivity)"
+            signature: "fromLocal8Bit(const char*,int)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
             }
+            until: 5
         }
         ModifyFunction{
-            signature: "remove(QRegularExpression)"
+            signature: "fromLatin1(const char*,qsizetype)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
             }
+            since: 6
         }
         ModifyFunction{
-            signature: "remove(QRegExp)"
+            signature: "fromLocal8Bit(const char*,qsizetype)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
             }
-            until: 5
+            since: 6
         }
         ModifyFunction{
-            signature: "prepend(QChar)"
+            signature: "fromRawData(const QChar*,qsizetype)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
             }
+            since: 6
         }
         ModifyFunction{
-            signature: "prepend(QByteArray)"
+            signature: "fromRawData(const QChar*,int)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
             }
+            until: 5
         }
         ModifyFunction{
-            signature: "remove(QString,Qt::CaseSensitivity)"
+            signature: "fromUcs4(const char32_t*,qsizetype)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
             }
+            since: [6, 2]
         }
         ModifyFunction{
-            signature: "replace(QChar,QString,Qt::CaseSensitivity)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "fromUcs4(const uint*,qsizetype)"
+            remove: RemoveFlag.All
+            since: [6, 2]
         }
         ModifyFunction{
-            signature: "replace(QRegularExpression,QString)"
+            signature: "fromUcs4(const uint*,qsizetype)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
             }
+            since: 6
+            until: [6, 2]
         }
         ModifyFunction{
-            signature: "replace(QRegExp,QString)"
+            signature: "fromUcs4(const uint*,int)"
             ModifyArgument{
-                index: 0
-                replaceValue: "this"
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
             }
             until: 5
         }
         ModifyFunction{
-            signature: "swap(QString&)"
+            signature: "fromUtf16(const char16_t*,qsizetype)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QString"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QString& %out = *QtJambiAPI::convertJavaObjectToNative<QString>(%env, %in);"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
+            since: [6, 2]
         }
         ModifyFunction{
-            signature: "prepend(const QChar*,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "fromUtf16(const ushort*,qsizetype)"
+            remove: RemoveFlag.All
+            since: [6, 4]
+        }
+        ModifyFunction{
+            signature: "fromUtf16(const ushort*,qsizetype)"
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -18990,13 +16273,10 @@ TypeSystem{
                 }
             }
             since: 6
+            until: [6, 3]
         }
         ModifyFunction{
-            signature: "prepend(const QChar*,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "fromUtf16(const ushort*,int)"
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -19006,39 +16286,27 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "replace(qsizetype, qsizetype, QString)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "replace(const QChar*,qsizetype,const QChar*,qsizetype,Qt::CaseSensitivity)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "fromUtf8(const char*,int)"
             ModifyArgument{
                 index: 1
                 ArrayType{
                     lengthParameter: 2
                 }
             }
+            until: 5
+        }
+        ModifyFunction{
+            signature: "fromUtf8(const char*,qsizetype)"
             ModifyArgument{
-                index: 3
+                index: 1
                 ArrayType{
-                    lengthParameter: 4
+                    lengthParameter: 2
                 }
             }
             since: 6
         }
         ModifyFunction{
-            signature: "prepend(const QChar*,qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "append(const QChar*,qsizetype)"
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -19048,163 +16316,141 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "replace(int, int, QString)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "replace(const QChar*,int,const QChar*,int,Qt::CaseSensitivity)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "append(const QChar*,int)"
             ModifyArgument{
                 index: 1
                 ArrayType{
                     lengthParameter: 2
                 }
             }
+            until: 5
+        }
+        ModifyFunction{
+            signature: "insert(qsizetype,const QChar*,qsizetype)"
             ModifyArgument{
-                index: 3
+                index: 2
                 ArrayType{
-                    lengthParameter: 4
+                    lengthParameter: 3
                 }
             }
-            until: 5
+            since: 6
         }
         ModifyFunction{
-            signature: "prepend(const QChar*,int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "insert(int,const QChar*,int)"
             ModifyArgument{
-                index: 1
+                index: 2
                 ArrayType{
-                    lengthParameter: 2
+                    lengthParameter: 3
                 }
             }
             until: 5
         }
         ModifyFunction{
-            signature: "lastIndexOf(QRegularExpression,qsizetype,QRegularExpressionMatch*)const"
+            signature: "replace(qsizetype, qsizetype, const QChar*, qsizetype)"
             ModifyArgument{
                 index: 3
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRegularExpressionMatch"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegularExpressionMatch* %out = qtjambi_cast<QRegularExpressionMatch*>(%env, %in);"}
+                ArrayType{
+                    lengthParameter: 4
                 }
             }
             since: 6
         }
         ModifyFunction{
-            signature: "indexOf(QRegularExpression,qsizetype,QRegularExpressionMatch*)const"
+            signature: "replace(int, int, const QChar*, int)"
             ModifyArgument{
                 index: 3
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRegularExpressionMatch"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegularExpressionMatch* %out = qtjambi_cast<QRegularExpressionMatch*>(%env, %in);"}
+                ArrayType{
+                    lengthParameter: 4
                 }
             }
-            since: 6
+            until: 5
         }
         ModifyFunction{
-            signature: "lastIndexOf(QRegularExpression,int,QRegularExpressionMatch*)const"
+            signature: "swap(QString&)"
             ModifyArgument{
-                index: 3
+                index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.core.QRegularExpressionMatch"
+                    modifiedType: "io.qt.core.QString"
+                }
+                NoNullPointer{
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "QRegularExpressionMatch* %out = qtjambi_cast<QRegularExpressionMatch*>(%env, %in);"}
+                    Text{content: "QString& %out = *QtJambiAPI::convertJavaObjectToNative<QString>(%env, %in);"}
                 }
             }
-            until: 5
         }
         ModifyFunction{
-            signature: "indexOf(QRegularExpression,int,QRegularExpressionMatch*)const"
+            signature: "prepend(const QChar*,qsizetype)"
             ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRegularExpressionMatch"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegularExpressionMatch* %out = qtjambi_cast<QRegularExpressionMatch*>(%env, %in);"}
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
-            until: 5
+            since: 6
         }
         ModifyFunction{
-            signature: "lastIndexOf(QRegExp&,int)const"
+            signature: "prepend(const QChar*,int)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRegExp"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegExp& %out = qtjambi_cast<QRegExp&>(%env, %in);"}
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
             until: 5
         }
         ModifyFunction{
-            signature: "indexOf(QRegExp&,int)const"
+            signature: "replace(const QChar*,qsizetype,const QChar*,qsizetype,Qt::CaseSensitivity)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRegExp"
-                }
-                NoNullPointer{
+                ArrayType{
+                    lengthParameter: 2
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegExp& %out = qtjambi_cast<QRegExp&>(%env, %in);"}
+            }
+            ModifyArgument{
+                index: 3
+                ArrayType{
+                    lengthParameter: 4
                 }
             }
-            until: 5
+            since: 6
         }
         ModifyFunction{
-            signature: "contains(QRegExp&)const"
+            signature: "prepend(const QChar*,qsizetype)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRegExp"
-                }
-                NoNullPointer{
+                ArrayType{
+                    lengthParameter: 2
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegExp& %out = qtjambi_cast<QRegExp&>(%env, %in);"}
+            }
+            since: 6
+        }
+        ModifyFunction{
+            signature: "replace(const QChar*,int,const QChar*,int,Qt::CaseSensitivity)"
+            ModifyArgument{
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
+                }
+            }
+            ModifyArgument{
+                index: 3
+                ArrayType{
+                    lengthParameter: 4
                 }
             }
             until: 5
         }
         ModifyFunction{
-            signature: "contains(QRegularExpression,QRegularExpressionMatch*)const"
+            signature: "prepend(const QChar*,int)"
             ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRegularExpressionMatch"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegularExpressionMatch* %out = qtjambi_cast<QRegularExpressionMatch*>(%env, %in);"}
+                index: 1
+                ArrayType{
+                    lengthParameter: 2
                 }
             }
+            until: 5
         }
         ModifyFunction{
             signature: "toInt(bool*,int) const"
@@ -19307,47 +16553,8 @@ TypeSystem{
                               "    Java::Runtime::NumberFormatException::throwNew(%env, \"Unable to parse number.\" QTJAMBI_STACKTRACEINFO );"}
             }
         }
-        ModifyFunction{
-            signature: "setNum(double, char, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "setNum(float, char, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "setNum(int, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "setNum(long long, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "setNum(short, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-        }
         ModifyFunction{
             signature: "setRawData(const QChar *, qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -19358,10 +16565,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUnicode(const QChar *, qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -19371,11 +16574,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "setUtf16(const unsigned short *, qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "setUtf16(const ushort *, qsizetype)"
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -19386,10 +16585,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setRawData(const QChar *, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -19400,10 +16595,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUnicode(const QChar *, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -19413,11 +16604,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "setUtf16(const unsigned short *, int)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
+            signature: "setUtf16(const ushort *, int)"
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -19448,6 +16635,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "char[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "jint size = jint(__qt_this->size());\n"+
@@ -19462,6 +16650,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "short[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "jint size = 0;\n"+
@@ -19501,29 +16690,17 @@ TypeSystem{
             remove: RemoveFlag.All
             since: [6,5]
         }
-        ModifyFunction{
-            signature: "removeAt(qsizetype)"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            since: [6,5]
-        }
-        ModifyFunction{
-            signature: "removeFirst()"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            since: [6,5]
+        FunctionalType{
+            name: "Predicate"
+            using: "std::function<bool(QChar)>"
         }
         ModifyFunction{
-            signature: "removeLast()"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
+            signature: "removeIf<Predicate>(Predicate)"
+            Instantiation{
+                Argument{
+                    type: "std::function<bool(QChar)>"
+                }
             }
-            since: [6,5]
         }
         InjectCode{
             ImportFile{
@@ -19533,6 +16710,10 @@ TypeSystem{
             }
         }
     }
+    GlobalFunction{
+        signature: "operator+(QString,const char*)"
+        remove: RemoveFlag.All
+    }
     
     
     ObjectType{
@@ -19548,7 +16729,6 @@ TypeSystem{
     
     EnumType{
         name: "QLibrary::LoadHint"
-        flags: "QLibrary::LoadHints"
     }
     
     ObjectType{
@@ -19582,10 +16762,6 @@ TypeSystem{
                 fileName: "java.util.logging.*"
                 location: Include.Java
             }
-            Include{
-                fileName: "io.qt.*"
-                location: Include.Java
-            }
             Include{
                 fileName: "io.qt.core.internal.*"
                 location: Include.Java
@@ -19630,10 +16806,6 @@ TypeSystem{
                 fileName: "io.qt.core.*"
                 location: Include.Java
             }
-            Include{
-                fileName: "io.qt.*"
-                location: Include.Java
-            }
             Include{
                 fileName: "java.lang.reflect.*"
                 location: Include.Java
@@ -19656,8 +16828,9 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Class<? extends io.qt.QtObjectInterface>"
+                    modifiedType: "java.lang.Class<? extends QtObjectInterface>"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "const char* %out = CoreAPI::getInterfaceIID(%env, jclass(%in));\n"+
@@ -19672,7 +16845,7 @@ TypeSystem{
                     index: 1
                     metaName: "%1"
                 }
-                Text{content: "io.qt.QtUtilities.initializePackage(%1);"}
+                Text{content: "QtUtilities.initializePackage(%1);"}
             }
             InjectCode{
                 target: CodeClass.Java
@@ -19803,67 +16976,97 @@ TypeSystem{
         since: [5, 13]
     }
     
-    Rejection{
-        className: "QMetaType"
-        functionName: "destroy"
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "construct"
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "destruct"
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "registerDebugStreamOperator"
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "registerConverter"
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "registerComparators"
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "registerEqualsComparator"
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "registerNormalizedTypedef"
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "registerTypedef"
-    }
-    
-    Rejection{
-        className: "QMetaType"
-        functionName: "registerConverterFunction"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QMetaType::ConverterFunction"
-    }
-    
-    Rejection{
-        className: "QtPrivate::QMetaTypeInterface"
-    }
-    
     ValueType{
         name: "QMetaType"
+
+        Rejection{functionName: "destroy"}
+        Rejection{functionName: "construct"}
+        Rejection{functionName: "destruct"}
+        Rejection{functionName: "registerDebugStreamOperator"}
+        Rejection{functionName: "registerConverter"}
+        Rejection{functionName: "registerComparators"}
+        Rejection{functionName: "registerEqualsComparator"}
+        Rejection{functionName: "registerNormalizedTypedef"}
+        Rejection{functionName: "registerTypedef"}
+        Rejection{className: "ConverterFunction"}
+        Rejection{className: "Constructor"}
+        Rejection{className: "Creator"}
+        Rejection{className: "Deleter"}
+        Rejection{className: "Destructor"}
+        Rejection{className: "LoadOperator"}
+        Rejection{className: "SaveOperator"}
+        Rejection{className: "TypedConstructor"}
+        Rejection{className: "TypedDestructor"}
+        Rejection{className: "MutableViewFunction"}
+
+        Rejection{
+            functionName: "registerConverterFunction"
+            since: 6
+        }
+
+        Rejection{
+            functionName: "registerMutableViewFunction"
+            since: 6
+        }
+
+        Rejection{
+            functionName: "registerMutableView"
+            since: 6
+        }
+
+        Rejection{
+            functionName: "unregisterMutableViewFunction"
+            since: 6
+        }
+
+        Rejection{
+            functionName: "view"
+            since: 6
+        }
+
+        Rejection{
+            functionName: "iface"
+            since: 6
+        }
+
+        EnumType{
+            name: "TypeFlag"
+            RejectEnumValue{
+                name: "MovableType"
+                since: 6
+            }
+        }
+
+        EnumType{
+            name: "Type"
+            extensible: true
+            RejectEnumValue{
+                name: "QReal"
+                remove: true
+            }
+            RejectEnumValue{
+                name: "FirstCoreType"
+            }
+            RejectEnumValue{
+                name: "LastCoreType"
+            }
+            RejectEnumValue{
+                name: "FirstGuiType"
+            }
+            RejectEnumValue{
+                name: "LastGuiType"
+            }
+            RejectEnumValue{
+                name: "FirstWidgetsType"
+            }
+            RejectEnumValue{
+                name: "LastWidgetsType"
+            }
+            RejectEnumValue{
+                name: "HighestInternalId"
+            }
+        }
+
         CustomConstructor{
             Text{content: "if(copy){\n"+
                           "    return new(placement) QMetaType(copy->id());\n"+
@@ -19905,11 +17108,6 @@ TypeSystem{
             remove: RemoveFlag.All
             since: 6
         }
-        ModifyFunction{
-            signature: "operator=(const QMetaType &)"
-            remove: RemoveFlag.All
-            until: 5
-        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
@@ -20001,7 +17199,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20012,7 +17210,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20044,6 +17242,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "java.util.OptionalInt"
                 }
@@ -20059,7 +17258,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20070,7 +17269,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20108,7 +17307,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20119,7 +17318,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20151,6 +17350,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "java.util.OptionalInt"
                 }
@@ -20166,7 +17366,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20177,7 +17377,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20210,7 +17410,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20221,7 +17421,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20248,7 +17448,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20259,7 +17459,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20287,7 +17487,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.util.Optional<Object>"
+                    modifiedType: "java.util.@NonNull Optional<@Nullable Object>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20319,7 +17519,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.util.Optional<Object>"
+                    modifiedType: "java.util.@NonNull Optional<@Nullable Object>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20345,7 +17545,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20373,7 +17573,7 @@ TypeSystem{
             ModifyArgument{
                 index: 3
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20393,22 +17593,10 @@ TypeSystem{
                 }
                 Text{content: "%2 = cast(javaType(), %2);"}
             }
-            ModifyArgument{
-                index: 1
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QDebug& %out = qtjambi_cast<QDebug&>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20433,22 +17621,10 @@ TypeSystem{
                 }
                 Text{content: "%2 = cast(javaType(%3), %2);"}
             }
-            ModifyArgument{
-                index: 1
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QDebug& %out = qtjambi_cast<QDebug&>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20462,7 +17638,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.util.Optional<Object>"
+                    modifiedType: "java.util.@NonNull Optional<@Nullable Object>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20505,7 +17681,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.util.Optional<Object>"
+                    modifiedType: "java.util.@NonNull Optional<@Nullable Object>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20519,7 +17695,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20541,64 +17717,7 @@ TypeSystem{
                                   "void * %out = variant3.data();"}
                 }
             }
-        }
-        ModifyFunction{
-            signature: "type(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "typeName(int)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "name()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            since: 6
-        }
-    }
-    
-    EnumType{
-        name: "QMetaType::TypeFlag"
-        flags: "QMetaType::TypeFlags"
-        RejectEnumValue{
-            name: "MovableType"
-            since: 6
-        }
-    }
-    
-    Rejection{
-        className: "QVariant"
-        functionName: "view"
-    }
-    
-    Rejection{
-        className: "QVariant"
-        functionName: "view<T>"
-    }
-    
-    Rejection{
-        className: "QVariant"
-        functionName: "canView"
-    }
-    
-    Rejection{
-        className: "QVariant"
-        functionName: "canView<T>"
+        }
     }
     
     ValueType{
@@ -20617,21 +17736,28 @@ TypeSystem{
                 location: Include.Global
             }
         }
+        Rejection{functionName: "view"}
+        Rejection{functionName: "view<T>"}
+        Rejection{functionName: "canView"}
+        Rejection{functionName: "canView<T>"}
+        Rejection{className: "Private"}
+        Rejection{className: "PrivateShared"}
+
         ModifyFunction{
             signature: "QVariant(QMap<QString,QVariant>)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.NavigableMap<String,? extends Object>"
+                    modifiedType: "java.util.@Nullable NavigableMap<@NonNull String,? extends @Nullable Object>"
                 }
             }
         }
         ModifyFunction{
-            signature: "QVariant(unsigned long long)"
+            signature: "QVariant(qulonglong)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "QVariant(unsigned int)"
+            signature: "QVariant(uint)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -20660,10 +17786,6 @@ TypeSystem{
             signature: "constData()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QVariant)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "toReal(bool*)const"
             remove: RemoveFlag.All
@@ -20680,6 +17802,16 @@ TypeSystem{
             signature: "canConvert<T>()const"
             remove: RemoveFlag.All
         }
+        ModifyFunction{
+            signature: "setValue<T,>(T&&)"
+            remove: RemoveFlag.All
+            since: 6
+        }
+        ModifyFunction{
+            signature: "setValue<T>(T)"
+            remove: RemoveFlag.All
+            until: 5
+        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
@@ -20713,7 +17845,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20736,7 +17868,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20753,7 +17885,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20812,7 +17944,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20826,7 +17958,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20863,7 +17995,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20878,7 +18010,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.util.Optional<Object>"
+                    modifiedType: "java.util.@NonNull Optional<@Nullable Object>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20923,7 +18055,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20950,7 +18082,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -20960,33 +18092,6 @@ TypeSystem{
             }
             since: 6
         }
-        ModifyFunction{
-            signature: "nameToType(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "typeName()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "typeToName(int)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "fromValue<T>(T)"
             Instantiation{
@@ -21005,6 +18110,7 @@ TypeSystem{
                     ReplaceType{
                         modifiedType: "io.qt.core.QVariant"
                     }
+                    NoNullPointer{}
                     ConversionRule{
                         codeClass: CodeClass.Native
                         Text{content: "%out = %in;"}
@@ -21075,15 +18181,15 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "qHash(QPartialOrdering)"
+            signature: "operator==(QPartialOrdering)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator==(QPartialOrdering)"
+            signature: "operator!=(QPartialOrdering)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator!=(QPartialOrdering)"
+            signature: "qHash(QPartialOrdering)"
             remove: RemoveFlag.All
         }
         ModifyField{
@@ -21147,6 +18253,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.ByteBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(const_cast<char*>(reinterpret_cast<const char*>(%in)), jlong(__qt_this->size()));\n"+
@@ -21155,7 +18262,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "registerResource(const unsigned char *, const QString &)"
+            signature: "registerResource(const uchar*, const QString &)"
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -21184,17 +18291,18 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "java.nio.ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "const unsigned char * %out = reinterpret_cast<const unsigned char *>(%env->GetDirectBufferAddress(%in));"}
+                    Text{content: "const uchar* %out = reinterpret_cast<const uchar*>(%env->GetDirectBufferAddress(%in));"}
                 }
             }
         }
         ModifyFunction{
-            signature: "unregisterResource(const unsigned char *, const QString &)"
+            signature: "unregisterResource(const uchar*, const QString &)"
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -21223,12 +18331,13 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 1
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "java.nio.ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "const unsigned char * %out = reinterpret_cast<const unsigned char *>(%env->GetDirectBufferAddress(%in));"}
+                    Text{content: "const uchar* %out = reinterpret_cast<const uchar*>(%env->GetDirectBufferAddress(%in));"}
                 }
             }
         }
@@ -21273,6 +18382,7 @@ TypeSystem{
             access: Modification.Private
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "java.nio.ByteBuffer"
                 }
@@ -21326,36 +18436,6 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QMetaType::Type"
-        extensible: true
-        RejectEnumValue{
-            name: "QReal"
-            remove: true
-        }
-        RejectEnumValue{
-            name: "FirstCoreType"
-        }
-        RejectEnumValue{
-            name: "LastCoreType"
-        }
-        RejectEnumValue{
-            name: "FirstGuiType"
-        }
-        RejectEnumValue{
-            name: "LastGuiType"
-        }
-        RejectEnumValue{
-            name: "FirstWidgetsType"
-        }
-        RejectEnumValue{
-            name: "LastWidgetsType"
-        }
-        RejectEnumValue{
-            name: "HighestInternalId"
-        }
-    }
-    
     ValueType{
         name: "QCalendar"
         ModifyFunction{
@@ -21434,16 +18514,15 @@ TypeSystem{
         name: "QSemaphore"
     }
     
-    EnumType{
-        name: "QSystemSemaphore::AccessMode"
-    }
-    
-    EnumType{
-        name: "QSystemSemaphore::SystemSemaphoreError"
-    }
-    
     ObjectType{
         name: "QSystemSemaphore"
+        EnumType{
+            name: "AccessMode"
+        }
+
+        EnumType{
+            name: "SystemSemaphoreError"
+        }
         ModifyFunction{
             signature: "tr(const char *, const char *, int)"
             remove: RemoveFlag.All
@@ -21453,12 +18532,15 @@ TypeSystem{
     
     ObjectType{
         name: "QReadWriteLock"
+
+        Rejection{
+            functionName: "stateForWaitCondition"
+        }
+        EnumType{
+            name: "RecursionMode"
+        }
     }
-    
-    EnumType{
-        name: "QReadWriteLock::RecursionMode"
-    }
-    
+        
     EnumType{
         name: "QMutex::RecursionMode"
     }
@@ -21504,6 +18586,10 @@ TypeSystem{
             signature: "QUntypedBindable(QUntypedPropertyData *, const QtPrivate::QBindableInterface *)"
             remove: RemoveFlag.JavaOnly
         }
+        ModifyFunction{
+            signature: "QUntypedBindable<Property>(Property*)"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "QUntypedBindable(QObject*,const char*,const QtPrivate::QBindableInterface *)"
             remove: RemoveFlag.All
@@ -21592,75 +18678,12 @@ TypeSystem{
             signature: "QPropertyObserverBase()"
             remove: RemoveFlag.All
         }
+
+        Rejection{className: "ChangeHandler"}
+        Rejection{enumName: "ObserverTag"}
         since: 6
     }
     
-    ObjectType{
-        name: "QtPrivate::QBindableInterface"
-        javaName: "QBindableInterface"
-        forceFriendly: true
-        ModifyFunction{
-            signature: "QBindableInterface()"
-            remove: RemoveFlag.All
-        }
-        InjectCode{
-            ImportFile{
-                name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
-                quoteAfterLine: "class QBindableInterface__"
-                quoteBeforeLine: "}// class"
-            }
-        }
-        since: 6
-    }
-    
-    Rejection{
-        className: "QtPrivate::QBindableInterface"
-        fieldName: "getter"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QtPrivate::QBindableInterface"
-        fieldName: "setter"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QtPrivate::QBindableInterface"
-        fieldName: "makeBinding"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QtPrivate::QBindableInterface"
-        fieldName: "setBinding"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QtPrivate::QBindableInterface"
-        fieldName: "getBinding"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QtPrivate::QBindableInterface"
-        fieldName: "setObserver"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QtPrivate::QBindableInterface"
-        fieldName: "metaType"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QtPrivate::QBindableInterface"
-        fieldName: "MetaTypeAccessorFlag"
-        since: [6, 2]
-    }
-    
     ObjectType{
         name: "QPropertyObserver"
         ExtraIncludes{
@@ -21669,6 +18692,10 @@ TypeSystem{
                 location: Include.Local
             }
         }
+        ModifyFunction{
+            signature: "setSource<Property,>(Property)"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "setSource(QtPrivate::QPropertyBindingData)"
             access: Modification.Friendly
@@ -21695,10 +18722,6 @@ TypeSystem{
     
     ValueType{
         name: "QPropertyBindingError"
-        ModifyFunction{
-            signature: "operator=(const QPropertyBindingError&)"
-            remove: RemoveFlag.All
-        }
         since: 6
     }
     
@@ -21714,7 +18737,7 @@ TypeSystem{
             remove: RemoveFlag.JavaOnly
         }
         ModifyFunction{
-            signature: "operator=(const QUntypedPropertyBinding&)"
+            signature: "QUntypedPropertyBinding<Functor>(QMetaType,Functor&&,QPropertyBindingSourceLocation)"
             remove: RemoveFlag.All
         }
         InjectCode{
@@ -21727,61 +18750,6 @@ TypeSystem{
         since: 6
     }
     
-    Rejection{
-        className: "QPropertyObserverBase::ChangeHandler"
-    }
-    
-    ObjectType{
-        name: "QtPrivate::QPropertyBindingData"
-        javaName: "QPropertyBindingData"
-        forceFriendly: true
-        ModifyField{
-            name: "BindingBit"
-            read: false
-            write: false
-        }
-        ModifyField{
-            name: "DelayedNotificationBit"
-            read: false
-            write: false
-            since: [6, 2]
-        }
-        ExtraIncludes{
-            Include{
-                fileName: "utils_p.h"
-                location: Include.Local
-            }
-        }
-        ModifyFunction{
-            signature: "setBinding(QUntypedPropertyBinding, QUntypedPropertyData *, QtPrivate::QPropertyObserverCallback, QtPrivate::QPropertyBindingWrapper)"
-            ModifyArgument{
-                index: 2
-                ReferenceCount{
-                    action: ReferenceCount.Ignore
-                }
-            }
-            ModifyArgument{
-                index: 3
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QtPrivate::QPropertyObserverCallback %out = qtjambi_get_signal_callback(%env, __qt_%2);"}
-                }
-            }
-            ModifyArgument{
-                index: 4
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QtPrivate::QPropertyBindingWrapper %out = nullptr;"}
-                }
-            }
-        }
-        since: 6
-    }
-    
     ValueType{
         name: "QPropertyBindingSourceLocation"
         generate: false
@@ -21791,20 +18759,7 @@ TypeSystem{
     ObjectType{
         name: "QBindingStorage"
         forceFriendly: true
-        since: 6
-    }
-    
-    FunctionalType{
-        name: "QtPrivate::QPropertyObserverCallback"
-        generate: false
-        javaName: "QPropertyObserverCallback"
-        since: 6
-    }
-    
-    FunctionalType{
-        name: "QtPrivate::QPropertyBindingWrapper"
-        generate: false
-        javaName: "QPropertyBindingWrapper"
+        Rejection{functionName: "status"}
         since: 6
     }
     
@@ -21818,6 +18773,15 @@ TypeSystem{
             signature: "operator()()const"
             remove: RemoveFlag.All
         }
+        ModifyFunction{
+            signature: "defaultCategory()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "QLoggingCategory(const char *, QtMsgType)"
             access: Modification.Private
@@ -21867,15 +18831,6 @@ TypeSystem{
             }
             until: 5
         }
-        ModifyFunction{
-            signature: "categoryName() const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
@@ -21893,45 +18848,19 @@ TypeSystem{
         name: "QMessageLogContext"
         ModifyFunction{
             signature: "QMessageLogContext(const char *, int, const char *, const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            remove: RemoveFlag.All
         }
         ModifyField{
             name: "file"
             write: false
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
         }
         ModifyField{
             name: "function"
             write: false
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
         }
         ModifyField{
             name: "category"
             write: false
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
         }
         ModifyField{
             name: "line"
@@ -21948,11 +18877,6 @@ TypeSystem{
         className: "QDebug::Stream"
     }
     
-    Rejection{
-        className: "QDebug"
-        enumName: "Latin1Content"
-    }
-    
     EnumType{
         name: "QDebug::VerbosityLevel"
         forceInteger: true
@@ -21962,32 +18886,19 @@ TypeSystem{
         name: "QDebugStateSaver"
         implementing: "java.lang.AutoCloseable"
         InjectCode{
-            ImportFile{
-                name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
-                quoteAfterLine: "class autoclosedelete"
-                quoteBeforeLine: "}// class"
-            }
-        }
-        ModifyFunction{
-            signature: "QDebugStateSaver(QDebug&)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QDebug* _%out = qtjambi_cast<QDebug*>(%env, %in);\n"+
-                                  "QDebug& %out = *_%out;"}
-                }
+            ImportFile{
+                name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
+                quoteAfterLine: "class autoclosedelete"
+                quoteBeforeLine: "}// class"
             }
         }
     }
     
     ValueType{
         name: "QDebug"
+        Rejection{
+            enumName: "Latin1Content"
+        }
         implementing: "java.lang.AutoCloseable, java.lang.Appendable"
         CustomConstructor{
             Text{content: "if(copy){\n"+
@@ -22053,7 +18964,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(unsigned long long)"
+            signature: "operator<<(quint64)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -22078,6 +18989,11 @@ TypeSystem{
             signature: "operator<<(char32_t)"
             remove: RemoveFlag.All
         }
+        ModifyFunction{
+            signature: "toString<T>(T&&)"
+            remove: RemoveFlag.All
+            since: 6
+        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiCore.java"
@@ -22114,88 +19030,21 @@ TypeSystem{
                               "other.__rcDevice = __rcDevice;"}
             }
         }
-        ModifyFunction{
-            signature: "maybeQuote(char)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "maybeSpace()"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "noquote()"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "nospace()"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
-        }
         ModifyFunction{
             signature: "operator<<(QChar)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator<<(const char*)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator<<(QString)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.CharSequence"
+                    modifiedType: "java.lang.@Nullable CharSequence"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -22206,192 +19055,126 @@ TypeSystem{
         ModifyFunction{
             signature: "operator<<(bool)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator<<(char)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator<<(QByteArray)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator<<(QByteArrayView)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
             since: 6
         }
         ModifyFunction{
             signature: "operator<<(double)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator<<(float)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
         }
         ModifyFunction{
-            signature: "operator<<(long long)"
+            signature: "operator<<(qint64)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator<<(signed short)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator<<(signed int)"
             rename: "append"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "quote()"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "resetFormat()"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "space()"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "verbosity(int)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.core.QDebug"
-                }
-            }
         }
     }
-    
-    EnumType{
-        name: "QRandomGenerator::System"
-        generate: false
+
+    Rejection{
+        className: "QRandomGenerator64"
     }
     
-    ObjectType{
+    ValueType{
         name: "QRandomGenerator"
-        ModifyFunction{
-            signature: "operator()()"
-            remove: RemoveFlag.All
+        Rejection{
+            enumName: "System"
+        }
+        Rejection{
+            functionName: "bounded"
         }
         ModifyFunction{
-            signature: "QRandomGenerator(QRandomGenerator::System)"
+            signature: "QRandomGenerator(const quint32*, const quint32*)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "QRandomGenerator(QRandomGenerator)"
+            signature: "generate<ForwardIterator>(ForwardIterator,ForwardIterator)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "QRandomGenerator(const unsigned int *, const unsigned int *)"
-            remove: RemoveFlag.All
+            signature: "generate(quint32*, quint32*)"
+            ModifyArgument{
+                index: 1
+                ReplaceType{
+                    modifiedType: "int[]"
+                }
+                rename: "array"
+                NoNullPointer{}
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content:
+                             "jsize size = 0;\n"
+                            +"quint32* %out = qtjambi_array_cast<quint32*>(%env, %scope, %in, size);\n"
+                            +"quint32* __qt_%2 = %out + size;"
+                    }
+                }
+            }
+            ModifyArgument{
+                index: 2
+                RemoveArgument{}
+            }
         }
         ModifyFunction{
-            signature: "generate(unsigned int *, unsigned int *)"
+            signature: "QRandomGenerator(const quint32*, qsizetype)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "QRandomGenerator(const unsigned int *, qsizetype)"
-            remove: RemoveFlag.All
+            signature: "QRandomGenerator(std::initializer_list<uint>)"
+            ModifyArgument{
+                index: 1
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "std::initializer_list<uint> seed = qtjambi_cast<std::initializer_list<uint>>(%env, %scope, %in);\n"
+                                  +"std::seed_seq %out(seed.begin(), seed.end());"}
+                }
+            }
         }
         ModifyFunction{
-            signature: "operator=(QRandomGenerator)"
-            remove: RemoveFlag.All
+            signature: "seed(std::initializer_list<uint>)"
+            ModifyArgument{
+                index: 1
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "std::initializer_list<uint> seed = qtjambi_cast<std::initializer_list<uint>>(%env, %scope, %in);\n"
+                                  +"std::seed_seq %out(seed.begin(), seed.end());"}
+                }
+            }
         }
         ModifyFunction{
-            signature: "securelySeeded()"
+            signature: "system()"
             ModifyArgument{
                 index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRandomGenerator"
-                }
-                NoNullPointer{
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObject(%env, new QRandomGenerator(%in), false, false);"}
+            }
+        }
+        ModifyFunction{
+            signature: "global()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
             }
         }
@@ -22409,10 +19192,6 @@ TypeSystem{
         className: "QPropertyData::DisableRValueRefs"
     }
     
-    Rejection{
-        className: "QtPrivate::BindingFunctionVTable"
-    }
-    
     Rejection{
         className: "QUntypedPropertyBinding::BindingFunctionVTable"
     }
@@ -22420,12 +19199,17 @@ TypeSystem{
     NamespaceType{
         name: "QNativeInterface"
         generate: false
-        since: 6
-    }
-    
-    NamespaceType{
-        name: "QNativeInterface::Private"
-        generate: false
+        Rejection{className: "NativeInterface"}
+        Rejection{className: "has_type_info"}
+
+        NamespaceType{
+            name: "Private"
+            Rejection{functionName: "hasTypeInfo"}
+            Rejection{className: "NativeInterface"}
+            Rejection{className: "TypeInfo"}
+            Rejection{className: "has_type_info"}
+            generate: false
+        }
         since: 6
     }
     
@@ -22436,6 +19220,8 @@ TypeSystem{
         ppCondition: "defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)"
         isNativeInterface: true
         generate: "no-shell"
+        Rejection{ className: "TypeInfo" }
+        Rejection{ functionName: "runOnAndroidMainThread" }
         ModifyFunction{
             signature: "QAndroidApplication()"
             remove: RemoveFlag.All
@@ -22528,7 +19314,6 @@ TypeSystem{
     }
     
     Rejection{
-        className: ""
         functionName: "static_assert"
     }
     
@@ -23117,16 +19902,6 @@ TypeSystem{
         functionName: "qFormatLogMessage"
     }
     
-    GlobalFunction{
-        signature: "qCompress(QByteArray, int)"
-        targetType: "QByteArray"
-    }
-    
-    GlobalFunction{
-        signature: "qUncompress(QByteArray)"
-        targetType: "QByteArray"
-    }
-    
     GlobalFunction{
         signature: "qChecksum(QByteArrayView, Qt::ChecksumType)"
         targetType: "QByteArrayView"
@@ -23147,11 +19922,6 @@ TypeSystem{
         remove: RemoveFlag.All
     }
     
-    GlobalFunction{
-        signature: "qHash(QPointF, QHashDummyValue, hash_type)"
-        remove: RemoveFlag.All
-    }
-    
     GlobalFunction{
         signature: "qFuzzyIsNull(qfloat16)"
         remove: RemoveFlag.All
@@ -24225,6 +20995,36 @@ TypeSystem{
         remove: RemoveFlag.All
         until: [5, 15]
     }
+
+    GlobalFunction{
+        signature: "operator<<<T1,T2>(QDataStream&,QPair<T1,T2>)"
+        remove: RemoveFlag.All
+        until: 5
+    }
+
+    GlobalFunction{
+        signature: "operator>><Key,T>(QDataStream&,QHash<Key,T>&)"
+        remove: RemoveFlag.All
+        until: 5
+    }
+
+    GlobalFunction{
+        signature: "operator>><T>(QDataStream&,QList<T>&)"
+        remove: RemoveFlag.All
+        until: 5
+    }
+
+    GlobalFunction{
+        signature: "operator>><Key,T>(QDataStream&,QMap<Key,T>&)"
+        remove: RemoveFlag.All
+        until: 5
+    }
+
+    GlobalFunction{
+        signature: "operator>><T1,T2>(QDataStream&,QPair<T1,T2>&)"
+        remove: RemoveFlag.All
+        until: 5
+    }
     
     HeaderType{
         name: "QtAlgorithms"
@@ -24274,6 +21074,7 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'operator<<(char32_t)' for function modification in 'QDebug' not found.*"}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QHashSeed."}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QDebug."}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Class 'QRandomGenerator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QUtf8StringView'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAnyStringView'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QLatin1StringView'"}
@@ -24329,10 +21130,6 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constEnd*', unmatched return type 'const_iterator'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QFuture::QFuture', unmatched parameter type 'QFutureInterface<T>*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QFuture::begin*', unmatched return type 'const_iterator'"}
-    SuppressedWarning{text: "WARNING(Parser) :: ** WARNING scope not found for function definition: 'QtPrivate::IsMetaTypePair<T,true>::registerConverter' - definition *ignored*"}
-    SuppressedWarning{text: "WARNING(Parser) :: ** WARNING scope not found for function definition: 'QFuture<void>::operator=' - definition *ignored*"}
-    SuppressedWarning{text: "WARNING(Parser) :: ** WARNING scope not found for function definition: 'QFutureInterface<void>::future' - definition *ignored*"}
-    SuppressedWarning{text: "WARNING(Parser) :: ** WARNING scope not found for function definition: 'QFutureWatcher<void>::setFuture' - definition *ignored*"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: unmatched enum ~0u"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: unhandled enum value: ~0u in Qt::GestureType"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'mapped(QWidget*)' for function modification in 'QSignalMapper' not found. Possible candidates: mapped(QObject*) in QSignalMapper, mapped(QString) in QSignalMapper, mapped(int) in QSignalMapper"}
@@ -24356,7 +21153,6 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QJsonArray::QJsonArray', unmatched parameter type '*QJsonPrivate::Data*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: type * is specified in typesystem, but not defined. This could potentially lead to compilation errors."}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: enum * is specified in typesystem, but not declared"}
-    SuppressedWarning{text: "WARNING(Parser) :: ** WARNING scope not found for function definition: '*' - definition *ignored*"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched parameter type '*QListData::*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched parameter type '*QtPrivate::*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QPair::*', unmatched parameter type '*'"}
@@ -24365,13 +21161,6 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: template baseclass 'QListSpecialMethods<T>' of 'List' is not known"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'parent()const' for function modification in '*' not found. Possible candidates: parent(QModelIndex)const in *"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'operator<(QCollatorSortKey,QCollatorSortKey)' for function modification in 'QCollatorSortKey' not found. Possible candidates: operator<(QCollatorSortKey) in QCollatorSortKey"}
-    SuppressedWarning{text: "WARNING(Parser) :: scope not found for function definition: 'QListSpecialMethods*::*' - definition *ignored*"}
-    SuppressedWarning{text: "WARNING(Parser) :: scope not found for function definition: 'QtPrivate::IsMetaTypePair*::registerConverter' - definition *ignored*"}
-    SuppressedWarning{text: "WARNING(Parser) :: scope not found for function definition: 'QSharedPointer*::toWeakRef' - definition *ignored*"}
-    SuppressedWarning{text: "WARNING(Parser) :: scope not found for function definition: 'QFutureInterface*::future' - definition *ignored*"}
-    SuppressedWarning{text: "WARNING(Parser) :: scope not found for function definition: 'QFutureWatcher*::setFuture' - definition *ignored*"}
-    SuppressedWarning{text: "WARNING(Parser) :: scope not found for function definition: 'QVectorSpecialMethods<QString>::*' - definition *ignored*"}
-    SuppressedWarning{text: "WARNING(Parser) :: scope not found for symbol: QMetaTypeForType<T>::*"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: enum 'ObjectDeletionPolicy' does not have a type entry or is not an enum"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: enum 'InternalFunction' does not have a type entry or is not an enum"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QMap::*', *"}
@@ -24407,14 +21196,11 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'const QJsonObject::iterator&'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping * 'QSysInfo::*', *type 'QSysInfo::WinVersion'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping * 'QSysInfo::*', *type 'QSysInfo::MacVersion'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Enum constant 'QSysInfo::BigEndian' belongs to unknown type QSysInfo"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Enum constant 'QSysInfo::LittleEndian' belongs to unknown type QSysInfo"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping field 'QSysInfo::*' with unmatched type 'QSysInfo::MacVersion'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping field 'QSysInfo::*' with unmatched type 'QSysInfo::WinVersion'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: enum 'QSysInfo::*' does not have a type entry or is not an enum"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: unknown operator 'Code'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'Qt::operator|', unmatched return type 'QIncompatibleFlag'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'Qt::operator|', unmatched return type 'QFlags<*::enum_type>'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'unsigned'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QCborMap::*', unmatched parameter type 'const char[N]'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Something has happened when trying to read array initialization: N"}
@@ -24454,7 +21240,6 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: enum 'QtPrivate::Deprecated_t' does not have a type entry or is not an enum"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QKeyCombination::QKeyCombination', unmatched parameter type 'Qt::Modifiers'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*QException*'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: enum 'QtPrivate::Ordering' does not have a type entry or is not an enum"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: enum 'QtPrivate::Uncomparable' does not have a type entry or is not an enum"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Operator type unknown: QList::const_iterator::operator const T*()const"}
     SuppressedWarning{text: "WARNING(CppImplGenerator) :: class '*' inherits from interface 'QIODeviceBase', but has no polymorphic id set"}
@@ -24471,23 +21256,18 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QUntypedBindable."}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QUntypedPropertyBinding."}
     SuppressedWarning{
-        text: "WARNING(CppImplGenerator) :: Value type 'QItemSelection' is missing a default constructor. The resulting C++ code will not compile.*"
+        text: "WARNING(CppImplGenerator) :: Value type 'QItemSelection' is missing a default constructor.*"
         since: 6
     }
     SuppressedWarning{text: "WARNING(CppImplGenerator) :: Unknown class 'QVariant' for enum 'QVariant::Type'"}
     SuppressedWarning{text: "WARNING(CppImplGenerator) :: Unknown class 'QMetaObject' for enum 'QMetaObject::Call'"}
     SuppressedWarning{text: "WARNING(CppImplGenerator) :: enum not found: 'QMetaObject::Call'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type const char (&)[Size] (is_busted)"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type std::function<void()> (is_busted)"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type std::function<void ()> (is_busted)"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*BindingFunctionVTable*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*std::chrono*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*QPropertyChangeHandler*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*QPropertyNotifier*'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*QPropertyObserverBase::ChangeHandler*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: function 'QtMessageHandler' is specified in typesystem, but not declared"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QRandomGenerator::QRandomGenerator*', unmatched parameter type 'const quint32[N]'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type const quint32 (&)[N] (is_busted)"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QRandomGenerator::_fillRange', unmatched parameter type 'qptrdiff'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QtFuture::makeReadyFuture*'*"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'reportFinished(const JObjectWrapper*)' for function modification in 'QtJambiFutureInterface' not found.*"}
@@ -24501,8 +21281,6 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Shadowing: QOperatingSystemVersionBase::* and QOperatingSystemVersion::* Java code will not compile"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature '*qfloat16*' for function modification in '*' not found.*"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping *, unmatched *type '*std::exception_ptr*'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type std::function<bool(const void*,void*)> (is_busted)"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type std::function<bool(void*,void*)> (is_busted)"}
     SuppressedWarning{
         text: "WARNING(MetaJavaBuilder) :: signature 'QStringConverterBase()' for function modification in 'QStringConverterBase' not found. Possible candidates:"
         since: [6, 4]
@@ -24511,10 +21289,6 @@ TypeSystem{
         text: "WARNING(MetaJavaBuilder) :: skipping function 'QVersionNumber::QVersionNumber*', unmatched parameter type '*QVarLengthArray*'"
         since: [6, 4]
     }
-    SuppressedWarning{
-        text: "WARNING(Parser) :: scope not found for function definition: 'QLatin1StringView::*' - definition *ignored*"
-        since: [6, 4]
-    }
     SuppressedWarning{
         text: "WARNING(Parser) :: scope not found for symbol: q23::invoke_r*"
         since: [6, 4]
@@ -24525,19 +21299,22 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'QCharRef'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'va_list'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*QString::Null*'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Qt::Disambiguated_t*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'QStringDataPtr'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'QChar::SpecialCharacter'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'QString::SplitBehavior'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: enum 'QString::SplitBehavior' does not have a type entry or is not an enum"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type To (From::*)() (is_busted)"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: missing instantiations for template method QPromise*"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: missing instantiations for template method QFuture*"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: template baseclass 'QUrlTwoFlags<QUrl::UrlFormattingOption,QUrl::ComponentFormattingOption>' of 'QUrl$FormattingOptions' is not known"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Missing instantiations for template method QPromise*"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Missing instantiations for template method QFuture*"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: template baseclass 'QUrlTwoFlags*' of 'QUrl$FormattingOptions' is not known"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched parameter type '*std::variant*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Class 'QVariant' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'QPartialOrdering()' for function modification in 'QPartialOrdering' not found. Possible candidates:"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'qHash(QPartialOrdering)' for function modification in 'QPartialOrdering' not found. Possible candidates:"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping field 'QSequentialConstIterator::i' with unmatched type 'Node'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: class 'QSequentialConstIterator' inherits from unknown base class 'QByteArrayView::pointer'"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: template baseclass 'QList<QString>' of 'QStringList' is not known"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QVariant::fromValue<>', unmatched parameter type 'const std::monostate&'"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Missing instantiations for template method operator<<<T1,T2>(std::pair<T1,T2>)"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Missing instantiations for template method operator>><T1,T2>(std::pair<T1,T2>&)"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping field 'QSequentialConstIterator::i' with unmatched type '*::Node*'"}
+    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QTreeWidgetItem."}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtDBus.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtDBus.qml
index 13c92e66..bc2f89ed 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtDBus.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtDBus.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.dbus"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtDBus"
     module: "qtjambi.dbus"
     description: "Classes for inter-process communication over the D-Bus protocol."
@@ -66,11 +66,6 @@ TypeSystem{
         className: "DBusError"
     }
     
-    Rejection{
-        className: "QDBusConnection"
-        functionName: "registerVirtualObject"
-    }
-    
     Rejection{
         className: ""
         functionName: "qDBusReplyFill"
@@ -104,90 +99,12 @@ TypeSystem{
                 location: Include.Global
             }
         }
-    }
-    
-    EnumType{
-        name: "QDBus::CallMode"
-    }
-    
-    EnumType{
-        name: "QDBusConnectionInterface::ServiceQueueOptions"
-    }
-    
-    EnumType{
-        name: "QDBusConnectionInterface::RegisterServiceReply"
-    }
-    
-    EnumType{
-        name: "QDBusConnectionInterface::ServiceReplacementOptions"
-    }
-    
-    EnumType{
-        name: "QDBusConnection::VirtualObjectRegisterOption"
-    }
-    
-    EnumType{
-        name: "QDBusConnection::RegisterOption"
-        flags: "QDBusConnection::RegisterOptions"
-        RejectEnumValue{
-            name: "ExportAllSignal"
-        }
-    }
-    
-    EnumType{
-        name: "QDBusConnection::UnregisterMode"
-    }
-    
-    
-    EnumType{
-        name: "QDBusArgument::ElementType"
-    }
-    
-    
-    EnumType{
-        name: "QDBusConnection::BusType"
-    }
-    
-    
-    EnumType{
-        name: "QDBusConnection::ConnectionCapability"
-        flags: "QDBusConnection::ConnectionCapabilities"
-    }
-    
-    
-    EnumType{
-        name: "QDBusConnection::RegisterServiceReply"
-    }
-    
-    
-    EnumType{
-        name: "QDBusConnection::ServiceQueueOptions"
-    }
-    
-    
-    EnumType{
-        name: "QDBusConnection::ServiceReplacementOption"
-        flags: "QDBusConnection::ServiceReplacementOptions"
-    }
-    
-    
-    EnumType{
-        name: "QDBusError::ErrorType"
-        RejectEnumValue{
-            name: "LastErrorType"
+
+        EnumType{
+            name: "CallMode"
         }
     }
     
-    EnumType{
-        name: "QDBusMessage::MessageType"
-    }
-    
-    EnumType{
-        name: "QDBusServiceWatcher::WatchModeFlag"
-        flags: "QDBusServiceWatcher::WatchMode"
-    }
-    
-    
     ObjectType{
         name: "QDBusServer"
     }
@@ -207,6 +124,18 @@ TypeSystem{
             signature: "interface() const"
             rename: "interfaceName"
         }
+        ModifyFunction{
+            signature: "call<Args...>(QString,Args&&)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "call<Args...>(QDBus::CallMode,QString,Args&&)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "asyncCall<Args...>(QString,Args&&)"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "asyncCall(const QString &, const QVariant &, const QVariant &, const QVariant &, const QVariant &, const QVariant &, const QVariant &, const QVariant &, const QVariant &)"
             remove: RemoveFlag.All
@@ -230,54 +159,8 @@ TypeSystem{
             signature: "call(QDBus::CallMode, const QString &)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "asyncCallWithArgumentList(const QString &, const QList<QVariant > &)"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "io.qt.dbus.QDBusPendingCall"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "QDBusAbstractInterface(const QString &, const QString &, const char *, const QDBusConnection &, QObject *)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "internalPropSet(const char *,const QVariant &)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "internalPropGet(const char *)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "callWithCallback(const QString &,const QList<QVariant> &,QObject *, const char *)"
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -302,18 +185,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "callWithCallback(const QString &,const QList<QVariant> &,QObject *, const char *, const char *)"
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -350,17 +221,17 @@ TypeSystem{
             }
         }
         InjectCode{
-            Text{content: "@io.qt.QtUninvokable\n"+
+            Text{content: "@QtUninvokable\n"+
                           "public final io.qt.dbus.QDBusPendingCall asyncCall(java.lang.String method, java.lang.Object... args){\n"+
                           "    return asyncCallWithArgumentList(method, java.util.Arrays.asList(args));\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public final io.qt.dbus.QDBusMessage call(io.qt.dbus.QDBus.CallMode mode, java.lang.String method, java.lang.Object... args){\n"+
                           "    return callWithArgumentList(mode, method, java.util.Arrays.asList(args));\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public final io.qt.dbus.QDBusMessage call(java.lang.String method, java.lang.Object... args){\n"+
                           "    return callWithArgumentList(io.qt.dbus.QDBus.CallMode.AutoDetect, method, java.util.Arrays.asList(args));\n"+
                           "}"}
@@ -377,6 +248,9 @@ TypeSystem{
     
     ValueType{
         name: "QDBusArgument"
+        EnumType{
+            name: "ElementType"
+        }
         ModifyFunction{
             signature: "beginMapEntry() const"
             remove: RemoveFlag.All
@@ -406,19 +280,15 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(unsigned long long)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator<<(unsigned short)"
+            signature: "operator<<(qulonglong)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator=(const QDBusArgument &)"
+            signature: "operator<<(ushort)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator>>(unsigned short &)const"
+            signature: "operator>>(ushort &)const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -426,7 +296,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator>>(unsigned long long &)const"
+            signature: "operator>>(qulonglong &)const"
             remove: RemoveFlag.All
         }
         InjectCode{
@@ -568,23 +438,15 @@ TypeSystem{
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
-            signature: "operator<<(long long)"
+            signature: "operator<<(qlonglong)"
             rename: "append"
             InjectCode{
                 target: CodeClass.Native
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(short)"
@@ -594,23 +456,15 @@ TypeSystem{
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
-            signature: "operator<<(unsigned char)"
+            signature: "operator<<(uchar)"
             rename: "append"
             InjectCode{
                 target: CodeClass.Native
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(bool)"
@@ -620,10 +474,6 @@ TypeSystem{
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(double)"
@@ -633,23 +483,21 @@ TypeSystem{
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(const QString &)"
             rename: "append"
+            ModifyArgument{
+                index: 1
+                ReplaceType{
+                    modifiedType: "java.lang.@Nullable CharSequence"
+                }
+            }
             InjectCode{
                 target: CodeClass.Native
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(const QDBusVariant &)"
@@ -659,23 +507,19 @@ TypeSystem{
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(const QStringList &)"
             rename: "append"
+            ModifyArgument{
+                index: 1
+                replaceType: "java.util.@NonNull List<java.lang.@NonNull String>"
+            }
             InjectCode{
                 target: CodeClass.Native
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(const QByteArray &)"
@@ -685,10 +529,6 @@ TypeSystem{
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(const QDBusObjectPath &)"
@@ -698,10 +538,6 @@ TypeSystem{
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(const QDBusSignature &)"
@@ -711,10 +547,6 @@ TypeSystem{
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator<<(const QDBusUnixFileDescriptor &)"
@@ -724,13 +556,9 @@ TypeSystem{
                 position: Position.Beginning
                 Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
             }
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
-            signature: "operator>>(unsigned char &)const"
+            signature: "operator>>(uchar &)const"
             rename: "extractByte"
             InjectCode{
                 target: CodeClass.Native
@@ -754,7 +582,7 @@ TypeSystem{
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "jbyte __java_return_value;\n"+
-                                  "unsigned char& %out = *reinterpret_cast<unsigned char*>(&__java_return_value);"}
+                                  "uchar& %out = *reinterpret_cast<uchar*>(&__java_return_value);"}
                 }
             }
         }
@@ -846,7 +674,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "operator>>(long long &)const"
+            signature: "operator>>(qlonglong &)const"
             rename: "extractLong"
             InjectCode{
                 target: CodeClass.Native
@@ -904,7 +732,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "operator>>(QString &)const"
+            signature: "operator>>(uint &)const"
             rename: "extractString"
             InjectCode{
                 target: CodeClass.Native
@@ -932,6 +760,35 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "operator>>(QString &)const"
+            rename: "extractQString"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.QString"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = QtJambiAPI::convertQStringToJavaObject(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QString %out;"}
+                }
+            }
+        }
         ModifyFunction{
             signature: "operator>>(QDBusVariant &)const"
             rename: "extractVariant"
@@ -943,7 +800,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.dbus.QDBusVariant"
+                    modifiedType: "io.qt.dbus.@NonNull QDBusVariant"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -972,7 +829,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.dbus.QDBusObjectPath"
+                    modifiedType: "io.qt.dbus.@NonNull QDBusObjectPath"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1001,7 +858,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.dbus.QDBusObjectPath"
+                    modifiedType: "io.qt.dbus.@NonNull QDBusObjectPath"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1030,7 +887,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.dbus.QDBusUnixFileDescriptor"
+                    modifiedType: "io.qt.dbus.@NonNull QDBusUnixFileDescriptor"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1059,7 +916,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.util.List<java.lang.String>"
+                    modifiedType: "io.qt.core.@NonNull QStringList"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1088,7 +945,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
+                    modifiedType: "io.qt.core.@NonNull QByteArray"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1106,67 +963,440 @@ TypeSystem{
                 }
             }
         }
-    }
-    
-    ValueType{
-        name: "QDBusConnection"
-        ExtraIncludes{
-            Include{
-                fileName: "QDBusConnection"
-                location: Include.Global
-            }
-        }
-        CustomConstructor{
-            Text{content: "if(copy){\n"+
-                          "    return new(placement) QDBusConnection(*copy);\n"+
-                          "}else{\n"+
-                          "    return new(placement) QDBusConnection(\"\");\n"+
-                          "}"}
-        }
-        CustomConstructor{
-            type: CustomConstructor.Default
-            Text{content: "new(placement) QDBusConnection(\"\");"}
-        }
-        ModifyFunction{
-            signature: "interface() const"
-            rename: "connectionInterface"
-        }
-        ModifyFunction{
-            signature: "internalPointer() const"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
-            signature: "operator=(const QDBusConnection &)"
-            remove: RemoveFlag.All
+            signature: "operator<<(QDBusArgument&,QMap<QString,QVariant>)"
+            ModifyArgument{
+                index: 2
+                replaceType: "java.util.@NonNull NavigableMap<java.lang.@NonNull String, ? extends java.lang.Object>"
+            }
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_write_argument(%env, __qt_this);"}
+            }
+            since: 6
         }
         ModifyFunction{
-            signature: "asyncCall(const QDBusMessage &, int) const"
+            signature: "operator>>(QDBusArgument,QDate &)"
+            rename: "extractDate"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
             ModifyArgument{
-                index: "return"
+                index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.dbus.QDBusPendingCall"
+                    modifiedType: "io.qt.core.@NonNull QDate"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
+                    Text{content: "QDate %out;"}
                 }
             }
         }
         ModifyFunction{
-            signature: "callWithCallback(const QDBusMessage &, QObject *, const char *, const char *, int) const"
+            signature: "operator>>(QDBusArgument,QDateTime &)"
+            rename: "extractDateTime"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
             ModifyArgument{
-                index: 3
+                index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "io.qt.core.@NonNull QDateTime"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
                 }
             }
             ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QDateTime %out;"}
                 }
             }
-            InjectCode{
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QLine &)"
+            rename: "extractLine"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QLine"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QLine %out;"}
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QLineF &)"
+            rename: "extractLineF"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QLineF"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QLineF %out;"}
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QPoint &)"
+            rename: "extractPoint"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QPoint"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QPoint %out;"}
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QPointF &)"
+            rename: "extractPointF"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QPointF"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QPointF %out;"}
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QRect &)"
+            rename: "extractRect"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QRect"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QRect %out;"}
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QRectF &)"
+            rename: "extractRectF"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QRectF"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QRectF %out;"}
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QSize &)"
+            rename: "extractSize"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QSize"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QSize %out;"}
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QSizeF &)"
+            rename: "extractSizeF"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QSizeF"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QSizeF %out;"}
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QTime &)"
+            rename: "extractTime"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QTime"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QTime %out;"}
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "operator>>(QDBusArgument,QVariant &)"
+            rename: "extractObject"
+            InjectCode{
+                target: CodeClass.Native
+                position: Position.Beginning
+                Text{content: "qtjambi_dbus_check_read_argument(%env, __qt_this);"}
+            }
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.core.@NonNull QVariant"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "Q_UNUSED(__qt_return_value)\n"+
+                                  "%out = qtjambi_cast<jobject>(%env, __qt_%1);"}
+                }
+            }
+            ModifyArgument{
+                index: 1
+                RemoveArgument{
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "QVariant %out;"}
+                }
+            }
+        }
+    }
+    
+    ValueType{
+        name: "QDBusConnection"
+        ExtraIncludes{
+            Include{
+                fileName: "QDBusConnection"
+                location: Include.Global
+            }
+        }
+
+        Rejection{functionName: "registerVirtualObject"}
+
+        EnumType{
+            name: "VirtualObjectRegisterOption"
+        }
+
+        EnumType{
+            name: "RegisterOption"
+            RejectEnumValue{
+                name: "ExportAllSignal"
+            }
+        }
+
+        EnumType{
+            name: "UnregisterMode"
+        }
+
+        EnumType{
+            name: "BusType"
+        }
+
+
+        EnumType{
+            name: "ConnectionCapability"
+        }
+
+
+        EnumType{
+            name: "RegisterServiceReply"
+        }
+
+
+        EnumType{
+            name: "ServiceQueueOptions"
+        }
+
+        EnumType{
+            name: "ServiceReplacementOption"
+        }
+
+        CustomConstructor{
+            Text{content: "if(copy){\n"+
+                          "    return new(placement) QDBusConnection(*copy);\n"+
+                          "}else{\n"+
+                          "    return new(placement) QDBusConnection(\"\");\n"+
+                          "}"}
+        }
+        CustomConstructor{
+            type: CustomConstructor.Default
+            Text{content: "new(placement) QDBusConnection(\"\");"}
+        }
+        ModifyFunction{
+            signature: "interface() const"
+            rename: "connectionInterface"
+        }
+        ModifyFunction{
+            signature: "internalPointer() const"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "callWithCallback(const QDBusMessage &, QObject *, const char *, const char *, int) const"
+            InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
                 ArgumentMap{
@@ -1203,12 +1433,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "callWithCallback(const QDBusMessage &, QObject *, const char *, int) const"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -1233,12 +1457,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "connect(const QString &, const QString &, const QString &, const QString &, QObject *, const char *)"
-            ModifyArgument{
-                index: 6
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -1263,12 +1481,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "connect(const QString &, const QString &, const QString &, const QString &, const QString &, QObject *, const char *)"
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -1293,12 +1505,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "connect(const QString &, const QString &, const QString &, const QString &, const QStringList &, const QString &, QObject *, const char *)"
-            ModifyArgument{
-                index: 8
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -1323,12 +1529,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "disconnect(const QString &, const QString &, const QString &, const QString &, QObject *, const char *)"
-            ModifyArgument{
-                index: 6
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -1353,12 +1553,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "disconnect(const QString &, const QString &, const QString &, const QString &, const QString &, QObject *, const char *)"
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -1383,12 +1577,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "disconnect(const QString &, const QString &, const QString &, const QString &, const QStringList &, const QString &, QObject *, const char *)"
-            ModifyArgument{
-                index: 8
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -1415,6 +1603,18 @@ TypeSystem{
     
     ObjectType{
         name: "QDBusConnectionInterface"
+
+        EnumType{
+            name: "ServiceQueueOptions"
+        }
+
+        EnumType{
+            name: "RegisterServiceReply"
+        }
+
+        EnumType{
+            name: "ServiceReplacementOptions"
+        }
     }
     
     InterfaceType{
@@ -1480,13 +1680,11 @@ TypeSystem{
     
     ValueType{
         name: "QDBusError"
-        ModifyFunction{
-            signature: "operator=(const QDBusError &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(const QDBusMessage &)"
-            remove: RemoveFlag.All
+        EnumType{
+            name: "ErrorType"
+            RejectEnumValue{
+                name: "LastErrorType"
+            }
         }
     }
     
@@ -1496,17 +1694,16 @@ TypeSystem{
     
     ValueType{
         name: "QDBusMessage"
+        EnumType{
+            name: "MessageType"
+        }
         ModifyFunction{
             signature: "interface() const"
             rename: "interfaceName"
         }
-        ModifyFunction{
-            signature: "operator=(const QDBusMessage &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "operator<<(const QVariant &)"
-            remove: RemoveFlag.All
+            rename: "append"
         }
     }
     
@@ -1546,10 +1743,6 @@ TypeSystem{
             remove: RemoveFlag.All
             since: [5, 14]
         }
-        ModifyFunction{
-            signature: "operator=(const QDBusPendingCall &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "QDBusPendingCall(const QDBusPendingCall &)"
             ModifyArgument{
@@ -1558,21 +1751,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "swap(QDBusPendingCall &)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.dbus.QDBusPendingCall"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QDBusPendingCall& %out = QtJambiAPI::convertJavaInterfaceToNativeReference<QDBusPendingCall>(%env, %in, \"io/qt/dbus/QDBusPendingCall\");"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -1601,12 +1779,15 @@ TypeSystem{
     
     ObjectType{
         name: "QDBusServiceWatcher"
+        EnumType{
+            name: "WatchModeFlag"
+        }
         ModifyFunction{
             signature: "connection() const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "QDBusServiceWatcher(const QString &,const QDBusConnection &,QFlags<QDBusServiceWatcher::WatchModeFlag>,QObject *)"
+            signature: "QDBusServiceWatcher(const QString &,const QDBusConnection &,QDBusServiceWatcher::WatchMode,QObject *)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -1635,10 +1816,6 @@ TypeSystem{
     
     ValueType{
         name: "QDBusUnixFileDescriptor"
-        ModifyFunction{
-            signature: "operator=(const QDBusUnixFileDescriptor &)"
-            remove: RemoveFlag.All
-        }
     }
     
     Rejection{
@@ -1676,7 +1853,7 @@ TypeSystem{
             }
         }
         InjectCode{
-            Text{content: "@io.qt.QtUninvokable\n"+
+            Text{content: "@QtUninvokable\n"+
                           "final void setMetaTypes(io.qt.core.QMetaType[] metaTypes){\n"+
                           "    int[] metaTypeIDs = new int[metaTypes.length];\n"+
                           "    for(int i=0; i<metaTypes.length; ++i){\n"+
@@ -1723,7 +1900,46 @@ TypeSystem{
     ObjectType{
         name: "QDBusVariant"
     }
-    
+
+    GlobalFunction{
+        signature: "operator<<<T1,T2>(QDBusArgument&,std::pair<T1,T2>)"
+        remove: RemoveFlag.All
+    }
+
+    GlobalFunction{
+        signature: "operator>><T1,T2>(QDBusArgument,std::pair<T1,T2>&)"
+        remove: RemoveFlag.All
+    }
+
+    GlobalFunction{
+        signature: "operator<<<T1,T2>(QDBusArgument&,QPair<T1,T2>)"
+        remove: RemoveFlag.All
+        until: 5
+    }
+
+    GlobalFunction{
+        signature: "operator>><T1,T2>(QDBusArgument,QPair<T1,T2>&)"
+        remove: RemoveFlag.All
+        until: 5
+    }
+
+    GlobalFunction{
+        signature: "operator>><Key,T>(QDBusArgument,QHash<Key,T>&)"
+        remove: RemoveFlag.All
+        until: 5
+    }
+
+    GlobalFunction{
+        signature: "operator>><T>(QDBusArgument,QList<T>&)"
+        remove: RemoveFlag.All
+        until: 5
+    }
+
+    GlobalFunction{
+        signature: "operator>><Key,T>(QDBusArgument,QMap<Key,T>&)"
+        remove: RemoveFlag.All
+        until: 5
+    }
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Object type 'QDBusPendingCall' passed as value. Resulting code will not compile.*"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QDBusError::QDBusError', unmatched parameter type '*DBusError*'"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtDataVisualization.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtDataVisualization.qml
index 6c142cd8..caee3521 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtDataVisualization.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtDataVisualization.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.datavis"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtDataVisualization"
     module: "qtjambi.datavisualization"
     description: "UI Components for creating stunning 3D data visualizations."
@@ -101,19 +101,6 @@ TypeSystem{
     
     ObjectType{
         name: "QtDataVisualization::Q3DBars"
-        ModifyFunction{
-            signature: "Q3DBars(const QSurfaceFormat*,QWindow*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QSurfaceFormat"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "const QSurfaceFormat* %out = qtjambi_cast<const QSurfaceFormat*>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "setColumnAxis(QtDataVisualization::QCategory3DAxis *)"
             threadAffinity: true
@@ -215,12 +202,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtDataVisualization::Q3DCamera::CameraPreset"
-    }
-    
     ObjectType{
         name: "QtDataVisualization::Q3DCamera"
+
+        EnumType{
+            name: "CameraPreset"
+        }
     }
     
     ObjectType{
@@ -265,19 +252,6 @@ TypeSystem{
     
     ObjectType{
         name: "QtDataVisualization::Q3DScatter"
-        ModifyFunction{
-            signature: "Q3DScatter(const QSurfaceFormat*,QWindow*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QSurfaceFormat"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "const QSurfaceFormat* %out = qtjambi_cast<const QSurfaceFormat*>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "setAxisX(QtDataVisualization::QValue3DAxis *)"
             threadAffinity: true
@@ -385,19 +359,6 @@ TypeSystem{
     
     ObjectType{
         name: "QtDataVisualization::Q3DSurface"
-        ModifyFunction{
-            signature: "Q3DSurface(const QSurfaceFormat*,QWindow*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QSurfaceFormat"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "const QSurfaceFormat* %out = qtjambi_cast<const QSurfaceFormat*>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "addAxis(QtDataVisualization::QValue3DAxis *)"
             threadAffinity: true
@@ -466,28 +427,28 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtDataVisualization::Q3DTheme::ColorStyle"
-    }
-    
-    EnumType{
-        name: "QtDataVisualization::Q3DTheme::Theme"
-    }
-    
     ObjectType{
         name: "QtDataVisualization::Q3DTheme"
-    }
-    
-    EnumType{
-        name: "QtDataVisualization::QAbstract3DAxis::AxisOrientation"
-    }
-    
-    EnumType{
-        name: "QtDataVisualization::QAbstract3DAxis::AxisType"
+
+        EnumType{
+            name: "ColorStyle"
+        }
+
+        EnumType{
+            name: "Theme"
+        }
     }
     
     ObjectType{
         name: "QtDataVisualization::QAbstract3DAxis"
+
+        EnumType{
+            name: "AxisOrientation"
+        }
+
+        EnumType{
+            name: "AxisType"
+        }
         ModifyFunction{
             signature: "QAbstract3DAxis(QtDataVisualization::QAbstract3DAxisPrivate *, QObject *)"
             remove: RemoveFlag.All
@@ -502,26 +463,24 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtDataVisualization::QAbstract3DGraph::ElementType"
-    }
-    
-    EnumType{
-        name: "QtDataVisualization::QAbstract3DGraph::ShadowQuality"
-    }
-    
-    EnumType{
-        name: "QtDataVisualization::QAbstract3DGraph::OptimizationHint"
-        flags: "QtDataVisualization::QAbstract3DGraph::OptimizationHints"
-    }
-    
-    EnumType{
-        name: "QtDataVisualization::QAbstract3DGraph::SelectionFlag"
-        flags: "QtDataVisualization::QAbstract3DGraph::SelectionFlags"
-    }
-    
     ObjectType{
         name: "QtDataVisualization::QAbstract3DGraph"
+
+        EnumType{
+            name: "ElementType"
+        }
+
+        EnumType{
+            name: "ShadowQuality"
+        }
+
+        EnumType{
+            name: "OptimizationHint"
+        }
+
+        EnumType{
+            name: "SelectionFlag"
+        }
         ModifyFunction{
             signature: "QAbstract3DGraph(QtDataVisualization::QAbstract3DGraphPrivate *,const QSurfaceFormat *, QWindow *)"
             remove: RemoveFlag.All
@@ -631,12 +590,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtDataVisualization::QAbstract3DInputHandler::InputView"
-    }
-    
     ObjectType{
         name: "QtDataVisualization::QAbstract3DInputHandler"
+
+        EnumType{
+            name: "InputView"
+        }
         ModifyFunction{
             signature: "mouseMoveEvent(QMouseEvent *,QPoint)"
             ModifyArgument{
@@ -691,28 +650,28 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtDataVisualization::QAbstract3DSeries::Mesh"
-    }
-    
-    EnumType{
-        name: "QtDataVisualization::QAbstract3DSeries::SeriesType"
-    }
-    
     ObjectType{
         name: "QtDataVisualization::QAbstract3DSeries"
+
+        EnumType{
+            name: "Mesh"
+        }
+
+        EnumType{
+            name: "SeriesType"
+        }
         ModifyFunction{
             signature: "QAbstract3DSeries(QtDataVisualization::QAbstract3DSeriesPrivate *, QObject *)"
             remove: RemoveFlag.All
         }
     }
     
-    EnumType{
-        name: "QtDataVisualization::QAbstractDataProxy::DataType"
-    }
-    
     ObjectType{
         name: "QtDataVisualization::QAbstractDataProxy"
+
+        EnumType{
+            name: "DataType"
+        }
         ModifyFunction{
             signature: "QAbstractDataProxy(QtDataVisualization::QAbstractDataProxyPrivate *, QObject *)"
             remove: RemoveFlag.All
@@ -752,10 +711,6 @@ TypeSystem{
     
     ValueType{
         name: "QtDataVisualization::QBarDataItem"
-        ModifyFunction{
-            signature: "operator=(QtDataVisualization::QBarDataItem)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -820,45 +775,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "array()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QBarDataArray"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "itemAt(int,int)const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QBarDataItem"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "itemAt(QPoint)const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QBarDataItem"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "resetArray(QtDataVisualization::QBarDataArray*)"
             InjectCode{
@@ -880,19 +796,6 @@ TypeSystem{
                     codeClass: CodeClass.Java
                     ownership: Ownership.Cpp
                 }
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QBarDataArray"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QtDataVisualization::QBarDataArray* %out = %in ? qtjambi_cast<QtDataVisualization::QBarDataArray*>(%env, %in) : nullptr;"}
-                    until: 5
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QBarDataArray* %out = %in ? qtjambi_cast<QBarDataArray*>(%env, %in) : nullptr;"}
-                    since: 6
-                }
             }
         }
         ModifyFunction{
@@ -916,19 +819,6 @@ TypeSystem{
                     codeClass: CodeClass.Java
                     ownership: Ownership.Cpp
                 }
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QBarDataArray"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QtDataVisualization::QBarDataArray* %out = %in ? qtjambi_cast<QtDataVisualization::QBarDataArray*>(%env, %in) : nullptr;"}
-                    until: 5
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QBarDataArray* %out = %in ? qtjambi_cast<QBarDataArray*>(%env, %in) : nullptr;"}
-                    since: 6
-                }
             }
         }
         InjectCode{
@@ -971,7 +861,7 @@ TypeSystem{
     ObjectType{
         name: "QtDataVisualization::QCustom3DVolume"
         ModifyFunction{
-            signature: "setSubTextureData(Qt::Axis,int,const unsigned char*)"
+            signature: "setSubTextureData(Qt::Axis,int,const uchar*)"
             ModifyArgument{
                 index: 3
                 ArrayType{
@@ -981,27 +871,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "createTextureData(QVector<QImage*>)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.util.Collection<io.qt.gui.QImage>"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "const QVector<QImage*>& %out = qtjambi_cast<const QVector<QImage*>&>(%env, %scope, %in);\n"+
-                                  "for(QImage* image : %out){\n"+
-                                  "    if(!image)\n"+
-                                  "        JavaException::raiseIllegalArgumentException(%env, \"Collection must not contain null.\" QTJAMBI_STACKTRACEINFO );\n"+
-                                  "}"}
-                }
-            }
-            ModifyArgument{
-                index: 0
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
             InjectCode{
                 position: Position.Beginning
                 Text{content: "QtJambi_LibraryUtilities.internal.invalidateObject(__rcTextureData);"}
@@ -1017,7 +886,7 @@ TypeSystem{
             }
         }
         InjectCode{
-            Text{content: "private io.qt.QtObject __rcTextureData;"}
+            Text{content: "private QtObject __rcTextureData;"}
         }
     }
     
@@ -1025,12 +894,12 @@ TypeSystem{
         name: "QtDataVisualization::QHeightMapSurfaceDataProxy"
     }
     
-    EnumType{
-        name: "QtDataVisualization::QItemModelBarDataProxy::MultiMatchBehavior"
-    }
-    
     ObjectType{
         name: "QtDataVisualization::QItemModelBarDataProxy"
+
+        EnumType{
+            name: "MultiMatchBehavior"
+        }
         ModifyFunction{
             signature: "setItemModel(QAbstractItemModel*)"
             threadAffinity: true
@@ -1060,12 +929,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtDataVisualization::QItemModelSurfaceDataProxy::MultiMatchBehavior"
-    }
-    
     ObjectType{
         name: "QtDataVisualization::QItemModelSurfaceDataProxy"
+
+        EnumType{
+            name: "MultiMatchBehavior"
+        }
         ModifyFunction{
             signature: "setItemModel(QAbstractItemModel *)"
             threadAffinity: true
@@ -1126,40 +995,10 @@ TypeSystem{
     
     ValueType{
         name: "QtDataVisualization::QScatterDataItem"
-        ModifyFunction{
-            signature: "operator=(QtDataVisualization::QScatterDataItem)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
         name: "QtDataVisualization::QScatterDataProxy"
-        ModifyFunction{
-            signature: "array()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QScatterDataArray"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "itemAt(int)const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QScatterDataItem"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "resetArray(QtDataVisualization::QScatterDataArray*)"
             InjectCode{
@@ -1181,19 +1020,6 @@ TypeSystem{
                     codeClass: CodeClass.Java
                     ownership: Ownership.Cpp
                 }
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QScatterDataArray"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QtDataVisualization::QScatterDataArray* %out = %in ? qtjambi_cast<QtDataVisualization::QScatterDataArray*>(%env, %in) : nullptr;"}
-                    until: 5
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QScatterDataArray* %out = %in ? qtjambi_cast<QScatterDataArray*>(%env, %in) : nullptr;"}
-                    since: 6
-                }
             }
         }
         InjectCode{
@@ -1221,13 +1047,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtDataVisualization::QSurface3DSeries::DrawFlag"
-        flags: "QtDataVisualization::QSurface3DSeries::DrawFlags"
-    }
-    
     ObjectType{
         name: "QtDataVisualization::QSurface3DSeries"
+
+        EnumType{
+            name: "DrawFlag"
+        }
         ModifyFunction{
             signature: "setDataProxy(QtDataVisualization::QSurfaceDataProxy *)"
             threadAffinity: true
@@ -1259,10 +1084,6 @@ TypeSystem{
     
     ValueType{
         name: "QtDataVisualization::QSurfaceDataItem"
-        ModifyFunction{
-            signature: "operator=(QtDataVisualization::QSurfaceDataItem)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -1297,45 +1118,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "array()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QSurfaceDataArray"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "itemAt(int,int)const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QSurfaceDataItem"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "itemAt(QPoint)const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QSurfaceDataItem"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "resetArray(QtDataVisualization::QSurfaceDataArray*)"
             InjectCode{
@@ -1357,19 +1139,6 @@ TypeSystem{
                     codeClass: CodeClass.Java
                     ownership: Ownership.Cpp
                 }
-                ReplaceType{
-                    modifiedType: "io.qt.datavis.QSurfaceDataArray"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QtDataVisualization::QSurfaceDataArray* %out = %in ? qtjambi_cast<QtDataVisualization::QSurfaceDataArray*>(%env, %in) : nullptr;"}
-                    until: 5
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSurfaceDataArray* %out = %in ? qtjambi_cast<QSurfaceDataArray*>(%env, %in) : nullptr;"}
-                    since: 6
-                }
             }
         }
         InjectCode{
@@ -1421,13 +1190,53 @@ TypeSystem{
         ModifyFunction{
             signature: "createNewInstance()const"
             ModifyArgument{
-                index: "return"
+                index: 0
                 DefineOwnership{
                     codeClass: CodeClass.Native
                     ownership: Ownership.Java
                 }
             }
         }
+        ModifyFunction{
+            signature: "gridPositions()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "labelPositions()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "labelStrings()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "subGridPositions()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
     }
     
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type *Q*DataArray."}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtDesigner.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtDesigner.qml
index 4d4e8dd3..13157ea9 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtDesigner.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtDesigner.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.designer"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtDesigner"
     module: "qtjambi.designer"
     description: "Classes for loading QWidget based forms created in Qt Designer dynamically, at runtime."
@@ -74,291 +74,6 @@ TypeSystem{
         functionName: "qt_extension"
     }
     
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "toString"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "propertyMap"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "domPixmap"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "addItem"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "applyProperties"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "applyTabStops"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "computeProperties"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "create"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "createActionRefDom"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "createConnections"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "createCustomWidgets"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "createDom"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "createProperty"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "createResources"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "initialize"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "layoutInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "loadButtonExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "loadComboBoxExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "loadExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "loadItemViewExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "loadListWidgetExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "loadTreeWidgetExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "loadTableWidgetExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveButtonExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveComboBoxExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveItemViewExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveListWidgetExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveTreeWidgetExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveTableWidgetExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveBrush"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveButtonExtraInfo"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveButtonGroups"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveColorGroup"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveConnections"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveCustomWidgets"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveDom"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveResources"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveTabStops"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveResource"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "saveText"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "toVariant"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "setIconProperty"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "setPixmapProperty"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "setupBrush"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "setupColorGroup"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "domPropertyToIcon"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "domPropertyToPixmap"
-    }
-    
-    Rejection{
-        className: "QAbstractFormBuilder"
-        functionName: "iconToDomProperty"
-    }
-    
-    Rejection{
-        className: "QFormBuilder"
-        functionName: "addItem"
-    }
-    
-    Rejection{
-        className: "QFormBuilder"
-        functionName: "applyProperties"
-    }
-    
-    Rejection{
-        className: "QFormBuilder"
-        functionName: "create"
-    }
-    
-    Rejection{
-        className: "QFormBuilder"
-        functionName: "createConnections"
-    }
-    
-    Rejection{
-        className: "QDesignerFormWindowToolInterface"
-        functionName: "loadFromDom"
-    }
-    
-    Rejection{
-        className: "QDesignerFormWindowToolInterface"
-        functionName: "saveToDom"
-    }
-    
-    Rejection{
-        className: "QDesignerFormWindowInterface"
-        functionName: "resourceSet"
-    }
-    
-    Rejection{
-        className: "QDesignerFormWindowInterface"
-        functionName: "setResourceSet"
-    }
-    
     Rejection{
         className: "QDesignerFormWindowManagerInterface"
         enumName: "Action"
@@ -401,14 +116,6 @@ TypeSystem{
         className: "QTextBuilder"
     }
     
-    Rejection{
-        className: "QAbstractFormBuilder::DomPropertyHash"
-    }
-    
-    Rejection{
-        className: "QDesignerDnDItemInterface"
-    }
-    
     Rejection{
         className: "QDesignerExtraInfoExtension"
     }
@@ -417,8 +124,36 @@ TypeSystem{
         className: "QResourceBuilder"
     }
     
-    Rejection{
-        className: "QDesignerDnDItemInterface"
+    InterfaceType{
+        name: "QDesignerDnDItemInterface"
+        ExtraIncludes{
+            Include{
+                fileName: "QtDesigner/private/ui4_p.h"
+                location: Include.Global
+                suppressed: true
+            }
+            Include{
+                fileName: "utils_p.h"
+                location: Include.Local
+            }
+        }
+        ModifyFunction{
+            signature: "domUi()const"
+            ModifyArgument{
+                index: 0
+                ReplaceType{
+                    modifiedType: "io.qt.@Nullable QtObject"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Shell
+                    Text{content:  "DomUI* %out = Java::QtUIC::DomUI::isInstanceOf(%env, %in) ? reinterpret_cast<DomUI*>(QtJambiAPI::convertJavaObjectToNative(%env, %in)) : nullptr;"}
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, %in, Java::QtUIC::DomUI::getClass(%env));"}
+                }
+            }
+        }
     }
     
     InterfaceType{
@@ -612,29 +347,49 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "promotion()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "settingsManager()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
         name: "QDesignerWidgetBoxInterface"
-    }
-    
-    EnumType{
-        name: "QDesignerWidgetBoxInterface::Category::Type"
-    }
-    
-    ValueType{
-        name: "QDesignerWidgetBoxInterface::Category"
-    }
-    
-    EnumType{
-        name: "QDesignerWidgetBoxInterface::Widget::Type"
-    }
-    
-    ValueType{
-        name: "QDesignerWidgetBoxInterface::Widget"
+
+        ValueType{
+            name: "Category"
+            EnumType{
+                name: "Type"
+            }
+        }
+
+        ValueType{
+            name: "Widget"
+            EnumType{
+                name: "Type"
+            }
+        }
+
         ModifyFunction{
-            signature: "operator=(QDesignerWidgetBoxInterface::Widget)"
-            remove: RemoveFlag.All
+            signature: "dropWidgets(QList<QDesignerDnDItemInterface*>,QPoint)"
+            ModifyArgument{
+                index: 1
+                invalidateAfterUse: true
+            }
         }
     }
     
@@ -684,6 +439,56 @@ TypeSystem{
     
     ObjectType{
         name: "QAbstractFormBuilder"
+        Rejection{className: "DomPropertyHash"}
+        Rejection{functionName: "toString"}
+        Rejection{functionName: "propertyMap"}
+        Rejection{functionName: "domPixmap"}
+        Rejection{functionName: "addItem"}
+        Rejection{functionName: "applyProperties"}
+        Rejection{functionName: "applyTabStops"}
+        Rejection{functionName: "computeProperties"}
+        Rejection{functionName: "create"}
+        Rejection{functionName: "createActionRefDom"}
+        Rejection{functionName: "createConnections"}
+        Rejection{functionName: "createCustomWidgets"}
+        Rejection{functionName: "createDom"}
+        Rejection{functionName: "createProperty"}
+        Rejection{functionName: "createResources"}
+        Rejection{functionName: "initialize"}
+        Rejection{functionName: "layoutInfo"}
+        Rejection{functionName: "loadButtonExtraInfo"}
+        Rejection{functionName: "loadComboBoxExtraInfo"}
+        Rejection{functionName: "loadExtraInfo"}
+        Rejection{functionName: "loadItemViewExtraInfo"}
+        Rejection{functionName: "loadListWidgetExtraInfo"}
+        Rejection{functionName: "loadTreeWidgetExtraInfo"}
+        Rejection{functionName: "loadTableWidgetExtraInfo"}
+        Rejection{functionName: "saveButtonExtraInfo"}
+        Rejection{functionName: "saveComboBoxExtraInfo"}
+        Rejection{functionName: "saveExtraInfo"}
+        Rejection{functionName: "saveItemViewExtraInfo"}
+        Rejection{functionName: "saveListWidgetExtraInfo"}
+        Rejection{functionName: "saveTreeWidgetExtraInfo"}
+        Rejection{functionName: "saveTableWidgetExtraInfo"}
+        Rejection{functionName: "saveBrush"}
+        Rejection{functionName: "saveButtonExtraInfo"}
+        Rejection{functionName: "saveButtonGroups"}
+        Rejection{functionName: "saveColorGroup"}
+        Rejection{functionName: "saveConnections"}
+        Rejection{functionName: "saveCustomWidgets"}
+        Rejection{functionName: "saveDom"}
+        Rejection{functionName: "saveResources"}
+        Rejection{functionName: "saveTabStops"}
+        Rejection{functionName: "saveResource"}
+        Rejection{functionName: "saveText"}
+        Rejection{functionName: "toVariant"}
+        Rejection{functionName: "setIconProperty"}
+        Rejection{functionName: "setPixmapProperty"}
+        Rejection{functionName: "setupBrush"}
+        Rejection{functionName: "setupColorGroup"}
+        Rejection{functionName: "domPropertyToIcon"}
+        Rejection{functionName: "domPropertyToPixmap"}
+        Rejection{functionName: "iconToDomProperty"}
         ExtraIncludes{
             Include{
                 fileName: "QtDesigner/private/ui4_p.h"
@@ -858,16 +663,14 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QDesignerFormWindowCursorInterface::MoveOperation"
-    }
-    
-    EnumType{
-        name: "QDesignerFormWindowCursorInterface::MoveMode"
-    }
-    
     InterfaceType{
         name: "QDesignerFormWindowCursorInterface"
+        EnumType{
+            name: "MoveOperation"
+        }
+        EnumType{
+            name: "MoveMode"
+        }
         ModifyFunction{
             signature: "setWidgetProperty(QWidget*,QString,QVariant)"
             ModifyArgument{
@@ -881,6 +684,17 @@ TypeSystem{
     
     ObjectType{
         name: "QDesignerFormWindowInterface"
+        Rejection{functionName: "resourceSet"}
+        Rejection{functionName: "setResourceSet"}
+
+        EnumType{
+            name: "FeatureFlag"
+        }
+
+        EnumType{
+            name: "ResourceFileSaveMode"
+        }
+
         InjectCode{
             target: CodeClass.ShellDeclaration
             position: Position.End
@@ -893,6 +707,12 @@ TypeSystem{
         ModifyFunction{
             signature: "cursor() const"
             rename: "cursorInterface"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
         }
         ModifyFunction{
             signature: "registerTool(QDesignerFormWindowToolInterface *)"
@@ -980,26 +800,10 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QDesignerFormWindowInterface::FeatureFlag"
-        flags: "QDesignerFormWindowInterface::Feature"
-    }
-    
-    EnumType{
-        name: "QDesignerFormWindowInterface::ResourceFileSaveMode"
-    }
-    
-    EnumType{
-        name: "QDesignerIntegrationInterface::ResourceFileWatcherBehaviour"
-    }
-    
-    EnumType{
-        name: "QDesignerIntegrationInterface::FeatureFlag"
-        flags: "QDesignerIntegrationInterface::Feature"
-    }
-    
     ObjectType{
         name: "QDesignerFormWindowToolInterface"
+        Rejection{functionName: "loadFromDom"}
+        Rejection{functionName: "saveToDom"}
         ModifyFunction{
             signature: "handleEvent(QWidget*,QWidget*,QEvent*)"
             ModifyArgument{
@@ -1015,6 +819,13 @@ TypeSystem{
     
     ObjectType{
         name: "QDesignerIntegrationInterface"
+
+        EnumType{
+            name: "ResourceFileWatcherBehaviour"
+        }
+        EnumType{
+            name: "FeatureFlag"
+        }
         ModifyFunction{
             signature: "createResourceBrowser(QWidget*)"
             ModifyArgument{
@@ -1040,12 +851,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QDesignerLayoutDecorationExtension::InsertMode"
-    }
-    
     InterfaceType{
         name: "QDesignerLayoutDecorationExtension"
+
+        EnumType{
+            name: "InsertMode"
+        }
         ModifyFunction{
             signature: "insertWidget(QWidget*,std::pair<int,int>)"
             ModifyArgument{
@@ -1112,6 +923,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "item(QObject*)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     InterfaceType{
@@ -1204,6 +1024,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "item(int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     InterfaceType{
@@ -1306,6 +1135,10 @@ TypeSystem{
     
     ObjectType{
         name: "QFormBuilder"
+        Rejection{functionName: "addItem"}
+        Rejection{functionName: "applyProperties"}
+        Rejection{functionName: "create"}
+        Rejection{functionName: "createConnections"}
         ExtraIncludes{
             Include{
                 fileName: "QtDesigner/private/ui4_p.h"
@@ -1358,6 +1191,34 @@ TypeSystem{
     
     InterfaceType{
         name: "QDesignerPromotionInterface"
+
+        ValueType{
+            name: "PromotedClass"
+            ExtraIncludes{
+                Include{
+                    fileName: "QtDesigner/QDesignerWidgetDataBaseItemInterface"
+                    location: Include.Global
+                }
+            }
+            ModifyField{
+                name: "baseItem"
+                ReferenceCount{
+                    action: ReferenceCount.Ignore
+                }
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+            ModifyField{
+                name: "promotedItem"
+                ReferenceCount{
+                    action: ReferenceCount.Ignore
+                }
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "addPromotedClass(QString,QString,QString,QString*)"
             ModifyArgument{
@@ -1396,28 +1257,6 @@ TypeSystem{
         }
     }
     
-    ValueType{
-        name: "QDesignerPromotionInterface::PromotedClass"
-        ExtraIncludes{
-            Include{
-                fileName: "QtDesigner/QDesignerWidgetDataBaseItemInterface"
-                location: Include.Global
-            }
-        }
-        ModifyField{
-            name: "baseItem"
-            ReferenceCount{
-                action: ReferenceCount.Ignore
-            }
-        }
-        ModifyField{
-            name: "promotedItem"
-            ReferenceCount{
-                action: ReferenceCount.Ignore
-            }
-        }
-    }
-    
     InterfaceType{
         name: "QDesignerScriptExtension"
     }
@@ -1525,6 +1364,5 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*QDesignerFormEditorPluginInterface*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*Dom*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*QList<Dom*'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*QList<QDesignerDnDItemInterface*'"}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QDesigner*::*."}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtGamepad.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtGamepad.qml
index 936309ca..03358482 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtGamepad.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtGamepad.qml
@@ -31,17 +31,10 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.gamepad"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtGamepad"
     module: "qtjambi.gamepad"
     description: "Enables Qt applications to support the use of gamepad hardware."
-    EnumType{
-        name: "QGamepadManager::GamepadButton"
-    }
-    
-    EnumType{
-        name: "QGamepadManager::GamepadAxis"
-    }
     
     ObjectType{
         name: "QGamepad"
@@ -63,6 +56,13 @@ TypeSystem{
     
     ObjectType{
         name: "QGamepadManager"
+        EnumType{
+            name: "GamepadButton"
+        }
+
+        EnumType{
+            name: "GamepadAxis"
+        }
     }
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping *, unmatched *type 'NSData*'"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtGui.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtGui.qml
index dca74781..4050ebe3 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtGui.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtGui.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.gui"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtGui"
     module: "qtjambi"    
 
@@ -2413,7 +2413,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -2794,6 +2794,15 @@ TypeSystem{
     
     TemplateType{
         name: "QOpenGLFunctions_3_2"
+        ModifyFunction{
+            signature: "glFenceSync(GLenum,GLbitfield)"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "glGetSynciv(__GLsync *, GLenum, GLsizei, GLsizei *, GLint *)"
             ModifyArgument{
@@ -3295,11 +3304,11 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "%out = %env->NewDirectByteBuffer(%in, INT_MAX);"}
+                    Text{content: "%out = %in ? %env->NewDirectByteBuffer(%in, INT_MAX) : nullptr;"}
                 }
             }
         }
@@ -3430,7 +3439,7 @@ TypeSystem{
                       "    this(wrap(values));\n"+
                       "}\n"+
                       "\n"+
-                      "@io.qt.QtUninvokable\n"+
+                      "@QtUninvokable\n"+
                       "public final void copyDataTo(float[] values)    {\n"+
                       "    copyDataTo(wrap(values));\n"+
                       "}"}
@@ -3439,7 +3448,7 @@ TypeSystem{
     Template{
         name: "gui.getter_returning_nativepointer"
         Text{content: "public final %RETURN_TYPE %FUNCTION_NAME() {\n"+
-                      "    io.qt.QNativePointer np = %FUNCTION_NAME_private();\n"+
+                      "    QNativePointer np = %FUNCTION_NAME_private();\n"+
                       "    %RETURN_TYPE tmp = np == null || np.isNull() ? null : np.object(%RETURN_TYPE.class);\n"+
                       "    return tmp == null ? null : new %RETURN_TYPE(tmp);\n"+
                       "}"}
@@ -3520,18 +3529,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator*=(float)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator/=(float)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
     }
     
@@ -3722,30 +3723,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QColor::CT"
-    }
-    
-    Rejection{
-        className: "QWindowsWindowFunctions::SetTouchWindowTouchType"
-    }
-    
-    Rejection{
-        className: "QWindowsWindowFunctions::SetHasBorderInFullScreen"
-    }
-    
-    Rejection{
-        className: "QWindowsWindowFunctions::SetHasBorderInFullScreenDefault"
-    }
-    
-    Rejection{
-        className: "QWindowsWindowFunctions::SetWindowActivationBehaviorType"
-    }
-    
-    Rejection{
-        className: "QWindowsWindowFunctions::IsTabletModeType"
-    }
-    
     Rejection{
         className: "QEglFSFunctions::SwitchLangType"
     }
@@ -3796,23 +3773,6 @@ TypeSystem{
         functionName: "trUtf8"
     }
     
-    
-    
-    Rejection{
-        className: "QAccessibleInterface"
-        functionName: "cast_helper"
-    }
-    
-    Rejection{
-        className: "QAccessibleInterface"
-        functionName: "virtual_hook"
-    }
-    
-    Rejection{
-        className: "QAccessibleInterface"
-        functionName: "interface_cast"
-    }
-    
     Rejection{
         className: "QAccessibleInterfaceEx"
         functionName: "interface_cast"
@@ -3871,11 +3831,6 @@ TypeSystem{
         className: "QImageTextKeyLang"
     }
     
-    Rejection{
-        className: "QMatrix4x4"
-        functionName: "toGenericMatrix"
-    }
-    
     Rejection{
         className: "QPaintEngine"
         functionName: "fix_neg_rect"
@@ -3917,50 +3872,11 @@ TypeSystem{
         className: "QPolygon"
         functionName: "point"
     }
-    
+
     Rejection{
         className: "QRegionData"
     }
     
-    Rejection{
-        className: "QRegion"
-        functionName: "cleanUp"
-    }
-    
-    Rejection{
-        className: "QRegion"
-        functionName: "cbegin"
-    }
-    
-    Rejection{
-        className: "QRegion"
-        functionName: "rbegin"
-    }
-    
-    Rejection{
-        className: "QRegion"
-        functionName: "crbegin"
-    }
-    
-    Rejection{
-        className: "QRegion"
-        functionName: "cend"
-    }
-    
-    Rejection{
-        className: "QRegion"
-        functionName: "rend"
-    }
-    
-    Rejection{
-        className: "QRegion"
-        functionName: "crend"
-    }
-    
-    Rejection{
-        className: "QRegion::QRegionData"
-    }
-    
     Rejection{
         className: "QSupportedWritingSystems"
     }
@@ -3974,16 +3890,6 @@ TypeSystem{
         className: "QTextFrameLayoutData"
     }
     
-    Rejection{
-        className: "QPixelFormat"
-        functionName: "get"
-    }
-    
-    Rejection{
-        className: "QPixelFormat"
-        functionName: "set"
-    }
-    
     Rejection{
         className: "QWheelEvent"
         enumName: "enum_1"
@@ -4075,17 +3981,6 @@ TypeSystem{
         since: [5, 10]
     }
     
-    Rejection{
-        className: "QGradient"
-        enumName: "Type"
-    }
-    
-    
-    Rejection{
-        className: "QGradient"
-        functionName: "type"
-    }
-    
     Rejection{
         className: "QActionGroup"
         functionName: "selected"
@@ -4156,13 +4051,6 @@ TypeSystem{
         name: "QInputMethodEvent::AttributeType"
     }
     
-    EnumType{
-        name: "QClipboard::Mode"
-        RejectEnumValue{
-            name: "LastMode"
-        }
-    }
-    
     EnumType{
         name: "QColor::Spec"
     }
@@ -4259,7 +4147,6 @@ TypeSystem{
     
     EnumType{
         name: "QImageIOHandler::Transformation"
-        flags: "QImageIOHandler::Transformations"
     }
     
     EnumType{
@@ -4272,7 +4159,6 @@ TypeSystem{
     
     EnumType{
         name: "QImageIOPlugin::Capability"
-        flags: "QImageIOPlugin::Capabilities"
     }
     
     EnumType{
@@ -4309,12 +4195,10 @@ TypeSystem{
     
     EnumType{
         name: "QPaintEngine::DirtyFlag"
-        flags: "QPaintEngine::DirtyFlags"
     }
     
     EnumType{
         name: "QPaintEngine::PaintEngineFeature"
-        flags: "QPaintEngine::PaintEngineFeatures"
     }
     
     EnumType{
@@ -4328,24 +4212,6 @@ TypeSystem{
         extensible: true
     }
     
-    EnumType{
-        name: "QPainter::CompositionMode"
-    }
-    
-    EnumType{
-        name: "QPainter::RenderHint"
-        flags: "QPainter::RenderHints"
-    }
-    
-    EnumType{
-        name: "QPainterPath::ElementType"
-    }
-    
-    EnumType{
-        name: "QPainter::PixmapFragmentHint"
-        flags: "QPainter::PixmapFragmentHints"
-    }
-    
     EnumType{
         name: "QPagedPaintDevice::PageSize"
         RejectEnumValue{
@@ -4374,10 +4240,6 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QRegion::RegionType"
-    }
-    
     EnumType{
         name: "QStandardItem::ItemType"
     }
@@ -4388,7 +4250,6 @@ TypeSystem{
     
     EnumType{
         name: "QSurfaceFormat::FormatOption"
-        flags: "QSurfaceFormat::FormatOptions"
     }
     
     EnumType{
@@ -4442,7 +4303,6 @@ TypeSystem{
     
     EnumType{
         name: "QTextDocument::FindFlag"
-        flags: "QTextDocument::FindFlags"
     }
     
     EnumType{
@@ -4459,7 +4319,6 @@ TypeSystem{
     
     EnumType{
         name: "QTextDocument::MarkdownFeature"
-        flags: "QTextDocument::MarkdownFeatures"
         since: [5, 14]
     }
     
@@ -4469,7 +4328,6 @@ TypeSystem{
     
     EnumType{
         name: "QTextFormat::PageBreakFlag"
-        flags: "QTextFormat::PageBreakFlags"
     }
     
     EnumType{
@@ -4482,7 +4340,6 @@ TypeSystem{
     
     EnumType{
         name: "QTextItem::RenderFlag"
-        flags: "QTextItem::RenderFlags"
     }
     
     EnumType{
@@ -4507,7 +4364,6 @@ TypeSystem{
     
     EnumType{
         name: "QTextOption::Flag"
-        flags: "QTextOption::Flags"
     }
     
     EnumType{
@@ -4541,7 +4397,6 @@ TypeSystem{
     
     EnumType{
         name: "QTouchDevice::CapabilityFlag"
-        flags: "QTouchDevice::Capabilities"
         until: 5
     }
     
@@ -4550,10 +4405,6 @@ TypeSystem{
         until: 5
     }
     
-    EnumType{
-        name: "QTransform::TransformationType"
-    }
-    
     EnumType{
         name: "QValidator::State"
     }
@@ -4568,24 +4419,9 @@ TypeSystem{
     
     EnumType{
         name: "QTouchEvent::TouchPoint::InfoFlag"
-        flags: "QTouchEvent::TouchPoint::InfoFlags"
         until: 5
     }
     
-    EnumType{
-        name: "QGradient::Spread"
-        upperBound: "QGradient.RepeatSpread"
-        lowerBound: "QGradient.PadSpread"
-    }
-    
-    EnumType{
-        name: "QGradient::CoordinateMode"
-    }
-    
-    EnumType{
-        name: "QGradient::Preset"
-    }
-    
     EnumType{
         name: "QSessionManager::RestartHint"
     }
@@ -4623,18 +4459,6 @@ TypeSystem{
         name: "QTextCharFormat::FontPropertiesInheritanceBehavior"
     }
     
-    EnumType{
-        name: "QPageLayout::Mode"
-    }
-    
-    EnumType{
-        name: "QPageLayout::Orientation"
-    }
-    
-    EnumType{
-        name: "QPageLayout::Unit"
-    }
-    
     EnumType{
         name: "QPageSize::PageSizeId"
         RejectEnumValue{
@@ -4671,120 +4495,27 @@ TypeSystem{
         name: "QPageSize::Unit"
     }
     
-    EnumType{
-        name: "QPixelFormat::AlphaPosition"
-    }
-    
-    EnumType{
-        name: "QPixelFormat::AlphaPremultiplied"
-    }
-    
-    EnumType{
-        name: "QPixelFormat::AlphaUsage"
-    }
-    
-    EnumType{
-        name: "QPixelFormat::ByteOrder"
-    }
-    
-    EnumType{
-        name: "QPixelFormat::ColorModel"
-    }
-    
-    EnumType{
-        name: "QPixelFormat::TypeInterpretation"
-    }
-    
-    EnumType{
-        name: "QPixelFormat::YUVLayout"
-    }
-    
-    EnumType{
-        name: "QGradient::InterpolationMode"
-    }
-    
     ValueType{
-        name: "QInputMethodEvent::Attribute"
-        Include{
-            fileName: "QInputMethodEvent"
-            location: Include.Global
-        }
-        CustomConstructor{
-            Text{content: "if(copy){\n"+
-                          "    return new(placement) QInputMethodEvent::Attribute(copy->type, copy->start, copy->length, copy->value);\n"+
-                          "}else{\n"+
-                          "    return new(placement) QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, 0);\n"+
-                          "}"}
-        }
-        CustomConstructor{
-            type: CustomConstructor.Copy
-            Text{content: "new(placement) QInputMethodEvent::Attribute(copy->type, copy->start, copy->length, copy->value);"}
+        name: "QPageLayout"
+        EnumType{
+            name: "Mode"
         }
-        CustomConstructor{
-            type: CustomConstructor.Default
-            Text{content: "new(placement) QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, 0);"}
+        EnumType{
+            name: "Orientation"
         }
-    }
-    
-    ValueType{
-        name: "QPageLayout"
-        ModifyFunction{
-            signature: "operator=(const QPageLayout&)"
-            remove: RemoveFlag.All
+        EnumType{
+            name: "Unit"
         }
     }
     
     NamespaceType{
         name: "QColorConstants"
-    }
-    
-    NamespaceType{
-        name: "QColorConstants::Svg"
-    }
-    
-    
-    EnumType{
-        name: "QAccessible::Event"
-    }
-    
-    
-    EnumType{
-        name: "QAccessible::RelationFlag"
-        flags: "QAccessible::Relation"
-    }
-    
-    EnumType{
-        name: "QAccessible::Role"
-        RejectEnumValue{
-            name: "PushButton"
+
+        NamespaceType{
+            name: "Svg"
         }
     }
     
-    InterfaceType{
-        name: "QAccessible::ActivationObserver"
-    }
-    
-    EnumType{
-        name: "QAccessible::InterfaceType"
-    }
-    
-    EnumType{
-        name: "QAccessible::TextBoundaryType"
-    }
-    
-    
-    ValueType{
-        name: "QAccessible::State"
-    }
-    
-    EnumType{
-        name: "QAccessible::Text"
-    }
-    
-    EnumType{
-        name: "QAccessibleTableModelChangeEvent::ModelChangeType"
-    }
-    
     EnumType{
         name: "QSurfaceFormat::ColorSpace"
     }
@@ -4792,6 +4523,75 @@ TypeSystem{
     
     ObjectType{
         name: "QAccessible"
+
+        EnumType{
+            name: "Event"
+        }
+
+        EnumType{
+            name: "RelationFlag"
+        }
+
+        EnumType{
+            name: "Role"
+            RejectEnumValue{
+                name: "PushButton"
+            }
+        }
+
+        InterfaceType{
+            name: "ActivationObserver"
+        }
+
+        EnumType{
+            name: "InterfaceType"
+        }
+
+        EnumType{
+            name: "TextBoundaryType"
+        }
+
+        ValueType{
+            name: "State"
+        }
+
+        EnumType{
+            name: "Text"
+        }
+
+        FunctionalType{
+            name: "InterfaceFactory"
+            ExtraIncludes{
+                Include{
+                    fileName: "QAccessible"
+                    location: Include.Global
+                }
+                since: [6, 4]
+            }
+        }
+
+        FunctionalType{
+            name: "RootObjectHandler"
+            ExtraIncludes{
+                Include{
+                    fileName: "QAccessible"
+                    location: Include.Global
+                }
+                since: [6, 4]
+            }
+        }
+
+        FunctionalType{
+            name: "UpdateHandler"
+            ExtraIncludes{
+                Include{
+                    fileName: "QAccessible"
+                    location: Include.Global
+                }
+                since: [6, 4]
+            }
+        }
+
         ModifyFunction{
             signature: "cleanup()"
             remove: RemoveFlag.All
@@ -4847,38 +4647,14 @@ TypeSystem{
                 }
             }
         }
-    }
-    
-    FunctionalType{
-        name: "QAccessible::InterfaceFactory"
-        ExtraIncludes{
-            Include{
-                fileName: "QAccessible"
-                location: Include.Global
+        ModifyFunction{
+            signature: "accessibleInterface(QAccessible::Id)"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
             }
-            since: [6, 4]
-        }
-    }
-    
-    FunctionalType{
-        name: "QAccessible::RootObjectHandler"
-        ExtraIncludes{
-            Include{
-                fileName: "QAccessible"
-                location: Include.Global
-            }
-            since: [6, 4]
-        }
-    }
-    
-    FunctionalType{
-        name: "QAccessible::UpdateHandler"
-        ExtraIncludes{
-            Include{
-                fileName: "QAccessible"
-                location: Include.Global
-            }
-            since: [6, 4]
         }
     }
     
@@ -4972,6 +4748,15 @@ TypeSystem{
     
     InterfaceType{
         name: "QAccessibleInterface"
+        Rejection{
+            functionName: "cast_helper"
+        }
+        Rejection{
+            functionName: "virtual_hook"
+        }
+        Rejection{
+            functionName: "interface_cast"
+        }
         ModifyFunction{
             signature: "indexOfChild(const QAccessibleInterface*)const"
             ModifyArgument{
@@ -4979,6 +4764,105 @@ TypeSystem{
                 invalidateAfterUse: true
             }
         }
+        ModifyFunction{
+            signature: "actionInterface()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "editableTextInterface()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "imageInterface()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "tableCellInterface()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "tableInterface()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "textInterface()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "valueInterface()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "focusChild()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "parent()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "childAt(int,int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "child(int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     InterfaceType{
@@ -5017,6 +4901,15 @@ TypeSystem{
     
     InterfaceType{
         name: "QAccessibleTableCellInterface"
+        ModifyFunction{
+            signature: "table()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     InterfaceType{
@@ -5028,6 +4921,33 @@ TypeSystem{
                 invalidateAfterUse: true
             }
         }
+        ModifyFunction{
+            signature: "caption()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "cellAt(int,int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "summary()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     InterfaceType{
@@ -5224,10 +5144,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    
-    
-    
-    
     ObjectType{
         name: "QAccessiblePlugin"
         ModifyFunction{
@@ -5248,12 +5164,34 @@ TypeSystem{
     
     ObjectType{
         name: "QInputMethodEvent"
+
+        ValueType{
+            name: "Attribute"
+            Include{
+                fileName: "QInputMethodEvent"
+                location: Include.Global
+            }
+            CustomConstructor{
+                Text{content: "if(copy){\n"+
+                              "    return new(placement) QInputMethodEvent::Attribute(copy->type, copy->start, copy->length, copy->value);\n"+
+                              "}else{\n"+
+                              "    return new(placement) QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, 0);\n"+
+                              "}"}
+            }
+            CustomConstructor{
+                type: CustomConstructor.Copy
+                Text{content: "new(placement) QInputMethodEvent::Attribute(copy->type, copy->start, copy->length, copy->value);"}
+            }
+            CustomConstructor{
+                type: CustomConstructor.Default
+                Text{content: "new(placement) QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, 0);"}
+            }
+        }
         ModifyFunction{
             signature: "operator=(const QInputMethodEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5277,10 +5215,9 @@ TypeSystem{
         name: "QActionEvent"
         ModifyFunction{
             signature: "operator=(const QActionEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5351,10 +5288,9 @@ TypeSystem{
         name: "QNativeGestureEvent"
         ModifyFunction{
             signature: "operator=(const QNativeGestureEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyField{
@@ -5399,6 +5335,16 @@ TypeSystem{
             write: true
             rename: "intValue"
         }
+        ModifyFunction{
+            signature: "device()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+            until: 5
+        }
         ModifyFunction{
             signature: "clone()const"
             ModifyArgument{
@@ -5415,7 +5361,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "QNativeGestureEvent(Qt::NativeGestureType, const QPointingDevice *, int, QPointF, QPointF, QPointF, qreal, QPointF, unsigned long long)"
+            signature: "QNativeGestureEvent(Qt::NativeGestureType, const QPointingDevice *, int, QPointF, QPointF, QPointF, qreal, QPointF, quint64)"
             ModifyArgument{
                 index: 9
                 ReplaceDefaultExpression{
@@ -5430,10 +5376,9 @@ TypeSystem{
         name: "QCloseEvent"
         ModifyFunction{
             signature: "operator=(const QCloseEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5475,10 +5420,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QContextMenuEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5541,10 +5485,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QInputEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5568,10 +5511,9 @@ TypeSystem{
         name: "QInputMethodQueryEvent"
         ModifyFunction{
             signature: "operator=(const QInputMethodQueryEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5634,10 +5576,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QMouseEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5673,10 +5614,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QMoveEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5712,10 +5652,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QResizeEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5775,10 +5714,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QShortcutEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5829,10 +5767,9 @@ TypeSystem{
         name: "QStatusTipEvent"
         ModifyFunction{
             signature: "operator=(const QStatusTipEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -5933,10 +5870,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QTabletEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6025,10 +5961,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QWheelEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6052,10 +5987,9 @@ TypeSystem{
         name: "QWindowStateChangeEvent"
         ModifyFunction{
             signature: "operator=(const QWindowStateChangeEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6079,10 +6013,9 @@ TypeSystem{
         name: "QWhatsThisClickedEvent"
         ModifyFunction{
             signature: "operator=(const QWhatsThisClickedEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6124,10 +6057,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QPaintEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6151,10 +6083,9 @@ TypeSystem{
         name: "QScrollEvent"
         ModifyFunction{
             signature: "operator=(const QScrollEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6178,10 +6109,9 @@ TypeSystem{
         name: "QScrollPrepareEvent"
         ModifyFunction{
             signature: "operator=(const QScrollPrepareEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6201,20 +6131,20 @@ TypeSystem{
         }
     }
     
-    ValueType{
-        name: "QAbstractTextDocumentLayout::PaintContext"
-        Include{
-            fileName: "QAbstractTextDocumentLayout"
-            location: Include.Global
-        }
-    }
-    
-    ValueType{
-        name: "QAbstractTextDocumentLayout::Selection"
-    }
-    
     ObjectType{
         name: "QAbstractTextDocumentLayout"
+
+        ValueType{
+            name: "PaintContext"
+            Include{
+                fileName: "QAbstractTextDocumentLayout"
+                location: Include.Global
+            }
+        }
+
+        ValueType{
+            name: "Selection"
+        }
         forceAbstract: true
         ModifyFunction{
             signature: "setPaintDevice(QPaintDevice*)"
@@ -6226,6 +6156,16 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "paintDevice()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "draw(QPainter*,QAbstractTextDocumentLayout::PaintContext)"
             ModifyArgument{
@@ -6257,35 +6197,27 @@ TypeSystem{
             rename: "_unregisterHandler"
             access: Modification.Private
         }
+        ModifyFunction{
+            signature: "handlerForObject(int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
     }
     
     ValueType{
         name: "QBitmap"
         threadAffinity: "pixmap"
         ModifyFunction{
-            signature: "operator=(const QPixmap &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(const QBitmap &)"
+            signature: "operator=(QPixmap)"
             remove: RemoveFlag.All
-            until: 5
         }
         ModifyFunction{
-            signature: "QBitmap(QString,const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "fromData(QSize,const unsigned char*,QImage::Format)"
+            signature: "fromData(QSize,const uchar*,QImage::Format)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -6301,6 +6233,16 @@ TypeSystem{
     
     ObjectType{
         name: "QBackingStore"
+        ModifyFunction{
+            signature: "paintDevice()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ValueType{
@@ -6309,10 +6251,6 @@ TypeSystem{
             signature: "QBrush(Qt::GlobalColor, Qt::BrushStyle)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(const QBrush &)"
-            remove: RemoveFlag.All
-        }
         ExtraIncludes{
             Include{
                 fileName: "QPixmap"
@@ -6326,19 +6264,6 @@ TypeSystem{
                 quoteBeforeLine: "}// class"
             }
         }
-        ModifyFunction{
-            signature: "gradient()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QGradient"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -6353,6 +6278,12 @@ TypeSystem{
                 location: Include.Global
             }
         }
+        EnumType{
+            name: "Mode"
+            RejectEnumValue{
+                name: "LastMode"
+            }
+        }
         ModifyFunction{
             signature: "setMimeData(QMimeData *, QClipboard::Mode)"
             ModifyArgument{
@@ -6390,6 +6321,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.gui.QClipboard$Text"
                 }
@@ -6407,14 +6339,11 @@ TypeSystem{
             signature: "operator quint64()const"
             rename: "toRgba64"
         }
-        ModifyFunction{
-            signature: "operator=(unsigned long long)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QColor"
+        Rejection{className: "CT"}
         ModifyFunction{
             signature: "QColor(QColor::Spec)"
             remove: RemoveFlag.All
@@ -6435,16 +6364,6 @@ TypeSystem{
             remove: RemoveFlag.All
             since: [5, 8]
         }
-        ModifyFunction{
-            signature: "operator=(QColor)"
-            remove: RemoveFlag.All
-            since: [5, 8]
-            until: 5
-        }
-        ModifyFunction{
-            signature: "operator=(Qt::GlobalColor)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "setNamedColor(QLatin1String)"
             remove: RemoveFlag.All
@@ -6580,7 +6499,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "fromRgba64(unsigned short,unsigned short,unsigned short,unsigned short)"
+            signature: "fromRgba64(ushort,ushort,ushort,ushort)"
             ModifyArgument{
                 index: 4
                 ReplaceDefaultExpression{
@@ -6641,7 +6560,7 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(QCursor)"
-            remove: RemoveFlag.All
+            threadAffinity: Affinity.Pixmap
         }
         ModifyFunction{
             signature: "setPos(QScreen*,QPoint)"
@@ -6661,34 +6580,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "bitmap()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QBitmap"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-            until: [5, 14]
-        }
-        ModifyFunction{
-            signature: "mask()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QBitmap"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-            until: [5, 14]
-        }
         ModifyFunction{
             signature: "bitmap()const"
             remove: RemoveFlag.All
@@ -6801,7 +6692,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "start(QFlags<Qt::DropAction>)"
+            signature: "start(Qt::DropActions)"
             remove: RemoveFlag.All
             until: 5
         }
@@ -6811,10 +6702,9 @@ TypeSystem{
         name: "QDragEnterEvent"
         ModifyFunction{
             signature: "operator=(const QDragEnterEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6838,10 +6728,9 @@ TypeSystem{
         name: "QDragLeaveEvent"
         ModifyFunction{
             signature: "operator=(const QDragLeaveEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6865,10 +6754,9 @@ TypeSystem{
         name: "QDragMoveEvent"
         ModifyFunction{
             signature: "operator=(const QDragMoveEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -6906,10 +6794,9 @@ TypeSystem{
         name: "QDropEvent"
         ModifyFunction{
             signature: "operator=(const QDropEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyField{
@@ -7023,10 +6910,9 @@ TypeSystem{
         name: "QEnterEvent"
         ModifyFunction{
             signature: "operator=(const QEnterEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyField{
@@ -7068,10 +6954,9 @@ TypeSystem{
         name: "QExposeEvent"
         ModifyFunction{
             signature: "operator=(const QExposeEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyField{
@@ -7099,6 +6984,10 @@ TypeSystem{
     
     ObjectType{
         name: "QPlatformSurfaceEvent"
+
+        EnumType{
+            name: "SurfaceEventType"
+        }
         ModifyField{
             name: "m_surfaceEventType"
             read: false
@@ -7107,10 +6996,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QPlatformSurfaceEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -7130,18 +7018,13 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QPlatformSurfaceEvent::SurfaceEventType"
-    }
-    
     ObjectType{
         name: "QFileOpenEvent"
         ModifyFunction{
             signature: "operator=(const QFileOpenEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -7165,10 +7048,9 @@ TypeSystem{
         name: "QFocusEvent"
         ModifyFunction{
             signature: "operator=(const QFocusEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -7192,10 +7074,9 @@ TypeSystem{
         name: "QHelpEvent"
         ModifyFunction{
             signature: "operator=(const QHelpEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -7219,10 +7100,9 @@ TypeSystem{
         name: "QHideEvent"
         ModifyFunction{
             signature: "operator=(const QHideEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -7272,10 +7152,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QHoverEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -7299,10 +7178,9 @@ TypeSystem{
         name: "QIconDragEvent"
         ModifyFunction{
             signature: "operator=(const QIconDragEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyFunction{
@@ -7371,6 +7249,9 @@ TypeSystem{
             read: false
             write: true
             rename: "autoRepeat"
+            ReplaceType{
+                modifiedType: "boolean"
+            }
         }
         ModifyField{
             name: "m_autoRepeat"
@@ -7383,12 +7264,12 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QKeyEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
+
         ModifyFunction{
             signature: "clone()const"
             ModifyArgument{
@@ -7404,16 +7285,26 @@ TypeSystem{
             }
             since: 6
         }
+
+        ModifyFunction{
+            signature: "operator==(QKeySequence::StandardKey)"
+            remove: RemoveFlag.All
+            since: 6
+        }
+    }
+    GlobalFunction{
+        signature: "operator==(QKeyEvent*,QKeySequence::StandardKey)"
+        remove: RemoveFlag.All
+        until: 5
     }
     
     ObjectType{
         name: "QTouchEvent"
         ModifyFunction{
             signature: "operator=(const QTouchEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyField{
@@ -7487,18 +7378,17 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QAccessibleEvent::Event"
-    }
-    
     ObjectType{
         name: "QAccessibleEvent"
+
+        EnumType{
+            name: "Event"
+        }
         ModifyFunction{
             signature: "operator=(const QAccessibleEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                deprecated: true
+                name: "set"
             }
         }
         ModifyField{
@@ -7521,6 +7411,15 @@ TypeSystem{
             read: false
             write: false
         }
+        ModifyFunction{
+            signature: "accessibleInterface()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -7559,6 +7458,10 @@ TypeSystem{
     
     ObjectType{
         name: "QAccessibleTableModelChangeEvent"
+
+        EnumType{
+            name: "ModelChangeType"
+        }
     }
     
     ValueType{
@@ -7578,10 +7481,6 @@ TypeSystem{
             type: CustomConstructor.Default
             Text{content: "new(placement) QFontInfo(QFont());"}
         }
-        ModifyFunction{
-            signature: "operator=(QFontInfo)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -7592,10 +7491,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator=(QFont)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "QFont(const QFont &, QPaintDevice*)"
             remove: RemoveFlag.All
@@ -7640,22 +7535,6 @@ TypeSystem{
             type: CustomConstructor.Default
             Text{content: "new(placement) QFontMetricsF(QFont());"}
         }
-        ModifyFunction{
-            signature: "operator!=(const QFontMetricsF &)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator==(const QFontMetricsF &)const"
-            access: Modification.Private
-        }
-        ModifyFunction{
-            signature: "operator=(QFontMetrics)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(QFontMetricsF)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "boundingRect(QRectF,int,QString,int,int*)const"
             ModifyArgument{
@@ -7711,18 +7590,6 @@ TypeSystem{
             type: CustomConstructor.Default
             Text{content: "new(placement) QFontMetrics(QFont());"}
         }
-        ModifyFunction{
-            signature: "operator!=(const QFontMetrics &)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator==(const QFontMetrics &)const"
-            access: Modification.Private
-        }
-        ModifyFunction{
-            signature: "operator=(QFontMetrics)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "boundingRect(int,int,int,int,int,QString,int,int*)const"
             ModifyArgument{
@@ -7781,62 +7648,64 @@ TypeSystem{
     
     ValueType{
         name: "QGlyphRun"
-        ModifyFunction{
-            signature: "operator=(const QGlyphRun&)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "GlyphRunFlag"
         }
         ModifyFunction{
-            signature: "setRawData(const unsigned int *, const QPointF *, int)"
+            signature: "setRawData(const quint32 *, const QPointF *, int)"
             remove: RemoveFlag.All
         }
     }
     
-    EnumType{
-        name: "QGlyphRun::GlyphRunFlag"
-        flags: "QGlyphRun::GlyphRunFlags"
-    }
-    
     ValueType{
         name: "QRawFont"
-        ModifyFunction{
-            signature: "operator=(const QRawFont&)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "AntialiasingType"
         }
-        ModifyFunction{
-            signature: "advancesForGlyphIndexes(const uint *, QPointF *, int, QFlags<QRawFont::LayoutFlag>) const"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "LayoutFlag"
         }
         ModifyFunction{
-            signature: "advancesForGlyphIndexes(const uint *, QPointF *, int) const"
+            signature: "advancesForGlyphIndexes(const quint32 *, QPointF *, int, QRawFont::LayoutFlags) const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "glyphIndexesForChars(const QChar *, int, unsigned int *, int *) const"
+            signature: "advancesForGlyphIndexes(const quint32 *, QPointF *, int) const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "fontTable(const char *) const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            signature: "glyphIndexesForChars(const QChar *, int, quint32 *, int *) const"
+            remove: RemoveFlag.All
         }
     }
     
-    EnumType{
-        name: "QRawFont::AntialiasingType"
-    }
-    
-    EnumType{
-        name: "QRawFont::LayoutFlag"
-        flags: "QRawFont::LayoutFlags"
-    }
-    
     
     ValueType{
         name: "QGradient"
+        Rejection{enumName: "Type"}
+        Rejection{functionName: "type"}
+
+        EnumType{
+            name: "Spread"
+            upperBound: "QGradient.RepeatSpread"
+            lowerBound: "QGradient.PadSpread"
+        }
+
+        EnumType{
+            name: "CoordinateMode"
+        }
+
+        EnumType{
+            name: "Preset"
+        }
+
+        EnumType{
+            name: "InterpolationMode"
+        }
+
         isPolymorphicBase: true
         polymorphicIdExpression: "%1->type() == QGradient::NoGradient"
         CustomConstructor{
@@ -8035,9 +7904,6 @@ TypeSystem{
             signature: "overrideCursor()"
             ModifyArgument{
                 index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QCursor"
-                }
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
@@ -8050,12 +7916,15 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "<QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface"
+                    modifiedType: "<QNativeInterface extends io.qt.@Nullable QtObjectInterface> QNativeInterface"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObject(%env, %in, %1, false, false);\n"+
-                                  "CoreAPI::registerDependency(%env, %out, __this_nativeId);"}
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, %in, %1);"}
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
                 }
             }
             ModifyArgument{
@@ -8124,10 +7993,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "operator=(QIcon)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -8210,34 +8075,30 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "operator=(QImage)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "QImage(unsigned char *, int, int, QImage::Format, QImageCleanupFunction, void *)"
+            signature: "QImage(uchar *, int, int, QImage::Format, QImageCleanupFunction, void *)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "QImage(const unsigned char *, int, int, QImage::Format, QImageCleanupFunction, void *)"
+            signature: "QImage(const uchar *, int, int, QImage::Format, QImageCleanupFunction, void *)"
             remove: RemoveFlag.JavaAndNative
         }
         ModifyFunction{
-            signature: "QImage(unsigned char *, int, int, int, QImage::Format, QImageCleanupFunction, void *)"
+            signature: "QImage(uchar *, int, int, int, QImage::Format, QImageCleanupFunction, void *)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "QImage(unsigned char *, int, int, qsizetype, QImage::Format, QImageCleanupFunction, void *)"
+            signature: "QImage(uchar *, int, int, qsizetype, QImage::Format, QImageCleanupFunction, void *)"
             remove: RemoveFlag.All
             since: 6
         }
         ModifyFunction{
-            signature: "QImage(const unsigned char *, int, int, int, QImage::Format, QImageCleanupFunction, void *)"
+            signature: "QImage(const uchar *, int, int, int, QImage::Format, QImageCleanupFunction, void *)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "QImage(const unsigned char *, int, int, qsizetype, QImage::Format, QImageCleanupFunction, void *)"
+            signature: "QImage(const uchar *, int, int, qsizetype, QImage::Format, QImageCleanupFunction, void *)"
             remove: RemoveFlag.All
             since: 6
         }
@@ -8284,104 +8145,28 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "QImage(QString,const char*)"
+            signature: "fromData(const uchar*,int,const char*)"
             ModifyArgument{
-                index: 2
+                index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "byte[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
+                    Text{content: "JByteArrayPointer %out(%env, jbyteArray(%in));\n"+
+                                  "int %2 = %out.size();"}
                 }
             }
-        }
-        ModifyFunction{
-            signature: "load(QString,const char*)"
             ModifyArgument{
                 index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
+                RemoveArgument{
                 }
             }
         }
         ModifyFunction{
-            signature: "load(QIODevice*,const char*)"
+            signature: "loadFromData(const uchar*,int,const char*)"
             ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "fromData(QByteArray,const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "fromData(QByteArrayView,const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "fromData(const unsigned char*,int,const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "byte[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JByteArrayPointer %out(%env, jbyteArray(%in));\n"+
-                                  "int %2 = %out.size();"}
-                }
-            }
-            ModifyArgument{
-                index: 2
-                RemoveArgument{
-                }
-            }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "loadFromData(const unsigned char*,int,const char*)"
-            ModifyArgument{
-                index: 1
+                index: 1
                 ReplaceType{
                     modifiedType: "byte[]"
                 }
@@ -8396,69 +8181,6 @@ TypeSystem{
                 RemoveArgument{
                 }
             }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "loadFromData(QByteArray,const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "loadFromData(QByteArrayView,const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "save(const QString &, const char *, int) const"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "save(QIODevice *, const char *, int) const"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
         }
         ModifyFunction{
             signature: "bits()const"
@@ -8467,6 +8189,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.ByteBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(reinterpret_cast<jbyte*>(const_cast<unsigned char*>(%in)), __qt_this->sizeInBytes());\n"+
@@ -8482,6 +8205,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "byte[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "qsizetype sizeInBytes = __qt_this->sizeInBytes();\n"+
@@ -8498,7 +8222,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@NonNull ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -8579,7 +8303,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.gui.QImage"
+                    modifiedType: "io.qt.gui.@Nullable QImage"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -8593,38 +8317,13 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "allocateImage(QSize, QImage::Format, QImage *)"
-            ModifyArgument{
-                index: 3
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QImage __image;\n"+
-                                  "QImage* %out = &__image;"}
-                }
-            }
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QImage"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "bool %out = __java_return_value!=nullptr;\n"+
-                                  "if(%out && %3)\n"+
-                                  "    *%1 = qtjambi_cast<const QImage&>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, __image) : nullptr;"}
-                }
-            }
+        InjectCode{
             since: 6
+            ImportFile{
+                name: ":/io/qtjambi/generator/typesystem/QtJambiGui.java"
+                quoteAfterLine: "class QImageIOHandler_6__"
+                quoteBeforeLine: "}// class"
+            }
         }
     }
     
@@ -8721,14 +8420,6 @@ TypeSystem{
     
     ValueType{
         name: "QKeySequence"
-        ModifyFunction{
-            signature: "operator=(QKeySequence)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator[](uint)const"
-            access: Modification.Private
-        }
         InjectCode{
             until: 5
             ImportFile{
@@ -8796,6 +8487,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -8812,24 +8504,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator+=(const QMatrix4x3 &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x3"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMatrix4x3 &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x3"
-                }
-            }
         }
         ModifyFunction{
             signature: "constData()const"
@@ -8842,6 +8520,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferData %out(%env, %in);\n"+
@@ -8860,6 +8539,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "float[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewFloatArray(12);\n"+
@@ -8874,6 +8554,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(%in, 12);\n"+
@@ -8911,6 +8592,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -8927,24 +8609,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator+=(const QMatrix4x2 &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x2"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMatrix4x2 &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x2"
-                }
-            }
         }
         ModifyFunction{
             signature: "constData()const"
@@ -8957,6 +8625,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferData %out(%env, %in);\n"+
@@ -8975,6 +8644,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "float[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewFloatArray(8);\n"+
@@ -8989,6 +8659,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(%in, 8);\n"+
@@ -9026,6 +8697,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -9042,24 +8714,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator+=(const QMatrix3x4 &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix3x4"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMatrix3x4 &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix3x4"
-                }
-            }
         }
         ModifyFunction{
             signature: "constData()const"
@@ -9072,6 +8730,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferData %out(%env, %in);\n"+
@@ -9090,6 +8749,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "float[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewFloatArray(12);\n"+
@@ -9104,6 +8764,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(%in, 12);\n"+
@@ -9141,6 +8802,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -9157,24 +8819,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator+=(const QMatrix3x3 &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix3x3"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMatrix3x3 &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix3x3"
-                }
-            }
         }
         ModifyFunction{
             signature: "constData()const"
@@ -9187,6 +8835,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferData %out(%env, %in);\n"+
@@ -9205,6 +8854,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "float[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewFloatArray(9);\n"+
@@ -9219,6 +8869,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(%in, 9);\n"+
@@ -9256,6 +8907,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -9272,24 +8924,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator+=(const QMatrix3x2 &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix3x2"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMatrix3x2 &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix3x2"
-                }
-            }
         }
         ModifyFunction{
             signature: "constData()const"
@@ -9302,6 +8940,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferData %out(%env, %in);\n"+
@@ -9320,6 +8959,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "float[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewFloatArray(6);\n"+
@@ -9334,6 +8974,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(%in, 6);\n"+
@@ -9371,6 +9012,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -9387,24 +9029,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator+=(const QMatrix2x4 &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix2x4"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMatrix2x4 &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix2x4"
-                }
-            }
         }
         ModifyFunction{
             signature: "constData()const"
@@ -9417,6 +9045,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferData %out(%env, %in);\n"+
@@ -9435,6 +9064,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "float[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewFloatArray(8);\n"+
@@ -9449,6 +9079,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(%in, 8);\n"+
@@ -9486,6 +9117,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -9502,24 +9134,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator+=(const QMatrix2x3 &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix2x3"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMatrix2x3 &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix2x3"
-                }
-            }
         }
         ModifyFunction{
             signature: "constData()const"
@@ -9532,6 +9150,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferData %out(%env, %in);\n"+
@@ -9550,6 +9169,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "float[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewFloatArray(6);\n"+
@@ -9564,6 +9184,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(%in, 6);\n"+
@@ -9601,6 +9222,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -9617,24 +9239,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator+=(const QMatrix2x2 &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix2x2"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMatrix2x2 &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix2x2"
-                }
-            }
         }
         ModifyFunction{
             signature: "constData()const"
@@ -9647,6 +9255,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferData %out(%env, %in);\n"+
@@ -9665,6 +9274,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "float[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewFloatArray(4);\n"+
@@ -9679,6 +9289,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(%in, 4);\n"+
@@ -9701,14 +9312,16 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QMatrix4x4::Flag"
-        flags: "QMatrix4x4::Flags"
-        since: 6
-    }
-    
     ValueType{
         name: "QMatrix4x4"
+        Rejection{
+            functionName: "toGenericMatrix"
+        }
+
+        EnumType{
+            name: "Flag"
+            since: 6
+        }
         ModifyFunction{
             signature: "data()"
             remove: RemoveFlag.All
@@ -9733,6 +9346,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -9750,6 +9364,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferConstData %out(%env, %in);\n"+
@@ -9763,26 +9378,14 @@ TypeSystem{
         ModifyFunction{
             signature: "operator*=(const QMatrix4x4 &)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator+=(const QMatrix4x4 &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QMatrix4x4 &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "inverted(bool *)const"
@@ -9815,6 +9418,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "JBufferData %out(%env, %in);\n"+
@@ -9833,6 +9437,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "float[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewFloatArray(16);\n"+
@@ -9847,6 +9452,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.FloatBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewDirectByteBuffer(%in, 16);\n"+
@@ -9868,6 +9474,26 @@ TypeSystem{
             }
         }
     }
+
+    /*GlobalFunction{
+        signature: "operator*(const QMatrix4x4&, const QPoint&)"
+        targetType: "QMatrix4x4"
+    }
+
+    GlobalFunction{
+        signature: "operator*(const QMatrix4x4&, const QPointf&)"
+        targetType: "QMatrix4x4"
+    }
+
+    GlobalFunction{
+        signature: "operator*(const QMatrix4x4&, const QVector3D&)"
+        targetType: "QMatrix4x4"
+    }
+
+    GlobalFunction{
+        signature: "operator*(const QMatrix4x4&, const QVector4D&)"
+        targetType: "QMatrix4x4"
+    }*/
     
     ObjectType{
         name: "QMovie"
@@ -10005,12 +9631,15 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "<QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface"
+                    modifiedType: "<QNativeInterface extends io.qt.@Nullable QtObjectInterface> QNativeInterface"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObject(%env, %in, %1, false, false);\n"+
-                                  "CoreAPI::registerDependency(%env, %out, __this_nativeId);"}
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, %in, %1);"}
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
                 }
             }
             ModifyArgument{
@@ -10042,12 +9671,15 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "<QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface"
+                    modifiedType: "<QNativeInterface extends io.qt.@Nullable QtObjectInterface> QNativeInterface"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObject(%env, %in, %1, false, false);\n"+
-                                  "CoreAPI::registerDependency(%env, %out, __this_nativeId);"}
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, %in, %1);"}
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
                 }
             }
             ModifyArgument{
@@ -10126,29 +9758,38 @@ TypeSystem{
                           "}"}
         }
         ModifyFunction{
-            signature: "redirected(QPoint*)const"
+            signature: "devicePixelRatio()const"
             ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
+                index: "return"
                 ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
+                    modifiedType: "double"
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
+            }
+        }
+        ModifyFunction{
+            signature: "paintEngine()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPoint *%out = qtjambi_cast<QPoint *>(%env, %scope, %in);"}
+            }
+        }
+        ModifyFunction{
+            signature: "redirected(QPoint*)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
             }
         }
         ModifyFunction{
-            signature: "devicePixelRatio()const"
+            signature: "sharedPainter()const"
             ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "double"
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
             }
         }
@@ -10312,6 +9953,24 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "paintDevice()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "painter()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -10322,21 +9981,22 @@ TypeSystem{
                 location: Include.Global
             }
         }
+        ModifyFunction{
+            signature: "painter()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ValueType{
         name: "QPainterPath"
-        ModifyFunction{
-            signature: "operator=(QPainterPath)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator-(const QPainterPath &)const"
-            rename: "minus"
-        }
-        ModifyFunction{
-            signature: "operator+(const QPainterPath &)const"
-            rename: "plus"
+
+        EnumType{
+            name: "ElementType"
         }
         ModifyFunction{
             signature: "operator|(const QPainterPath &)const"
@@ -10353,22 +10013,10 @@ TypeSystem{
         ModifyFunction{
             signature: "operator-=(const QPainterPath &)"
             rename: "subtract"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(const QPainterPath &)"
             rename: "unite"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator&=(const QPainterPath &)"
@@ -10430,6 +10078,36 @@ TypeSystem{
                 location: Include.Local
             }
         }
+
+        EnumType{
+            name: "CompositionMode"
+        }
+
+        EnumType{
+            name: "RenderHint"
+        }
+
+        EnumType{
+            name: "PixmapFragmentHint"
+        }
+        ModifyFunction{
+            signature: "device()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "paintEngine()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "drawText(const QPointF &, const QString &, int, int)"
             remove: RemoveFlag.All
@@ -10631,7 +10309,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "drawPixmapFragments(const QPainter::PixmapFragment *, int, const QPixmap &, QFlags<QPainter::PixmapFragmentHint>)"
+            signature: "drawPixmapFragments(const QPainter::PixmapFragment *, int, const QPixmap &, QPainter::PixmapFragmentHints)"
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -10781,69 +10459,22 @@ TypeSystem{
         ModifyFunction{
             signature: "redirected(const QPaintDevice*,QPoint*)"
             ModifyArgument{
-                index: 1
-                NoNullPointer{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
             }
             ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPoint* %out = qtjambi_cast<QPoint*>(%env, %in);"}
+                index: 1
+                NoNullPointer{
                 }
             }
             until: 5
         }
-        ModifyFunction{
-            signature: "drawText(QRect,int,QString,QRect*)"
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRect"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRect* %out = qtjambi_cast<QRect*>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "drawText(QRectF,int,QString,QRectF*)"
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRectF"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRectF* %out = qtjambi_cast<QRectF*>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "drawText(int,int,int,int,int,QString,QRect*)"
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRect"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRect* %out = qtjambi_cast<QRect*>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ValueType{
         name: "QPalette"
-        ModifyFunction{
-            signature: "operator=(const QPalette&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -10852,56 +10483,6 @@ TypeSystem{
             signature: "devType() const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QPicture)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "pictureFormat(QString)"
-            Remove{
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "load(QIODevice*,const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "load(QString,const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "save(QIODevice*,const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "save(QString,const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            until: 5
-        }
         ModifyFunction{
             signature: "setData(const char*,uint)"
             ModifyArgument{
@@ -10911,16 +10492,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "pictureFormat(QString)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            until: 5
-        }
         ModifyFunction{
             signature: "data()const"
             ModifyArgument{
@@ -11029,97 +10600,25 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "defineIOHandler(const char *, const char *, const char *, picture_io_handler, picture_io_handler)"
+            signature: "setFormat(const char*)"
+            access: Modification.Private
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
+                NoNullPointer{
                 }
-            }
-            ModifyArgument{
-                index: 3
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "io.qt.core.QByteArray"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
+                    Text{content: "QByteArray& %out_ba = qtjambi_cast<QByteArray&>(%env, %in);\n"+
+                                  "const char* %out = %out_ba.data();"}
                 }
             }
-        }
-        ModifyFunction{
-            signature: "format()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %env->NewStringUTF(%in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "parameters()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %env->NewStringUTF(%in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setFormat(const char*)"
-            access: Modification.Private
-            ModifyArgument{
-                index: 1
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray& %out_ba = qtjambi_cast<QByteArray&>(%env, %in);\n"+
-                                  "const char* %out = %out_ba.data();"}
-                }
-            }
-            InjectCode{
-                target: CodeClass.Java
-                position: Position.End
-                Text{content: "__rc_format = arg__1;"}
-            }
-        }
-        ModifyFunction{
-            signature: "setParameters(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, jstring(%in));"}
-                }
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.End
+                Text{content: "__rc_format = arg__1;"}
             }
         }
         until: 5
@@ -11143,22 +10642,23 @@ TypeSystem{
     
     ValueType{
         name: "QRegion"
-        ModifyFunction{
-            signature: "operator=(QRegion)"
-            remove: RemoveFlag.All
+
+        Rejection{functionName: "cleanUp"}
+        Rejection{functionName: "cbegin"}
+        Rejection{functionName: "rbegin"}
+        Rejection{functionName: "crbegin"}
+        Rejection{functionName: "cend"}
+        Rejection{functionName: "rend"}
+        Rejection{functionName: "crend"}
+        Rejection{className: "QRegionData"}
+
+        EnumType{
+            name: "RegionType"
         }
         ModifyFunction{
             signature: "operator&=(QRegion)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator+=(QRegion)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator-=(QRegion)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "operator^=(QRegion)"
             remove: RemoveFlag.All
@@ -11171,36 +10671,32 @@ TypeSystem{
             signature: "operator&(QRegion)const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator+(QRegion)const"
-            rename: "plus"
-        }
         ModifyFunction{
             signature: "operator&(QRect)const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator+(QRect)const"
-            rename: "plus"
+            signature: "operator^(QRegion)const"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator-(QRegion)const"
-            rename: "minus"
+            signature: "operator|(QRegion)const"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator^(QRegion)const"
+            signature: "operator+=(QRect)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator|(QRegion)const"
+            signature: "operator+=(QRegion)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator&=(QRect)"
+            signature: "operator-=(QRegion)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator+=(QRect)"
+            signature: "operator&=(QRect)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -11239,10 +10735,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator=(QPen)"
-            remove: RemoveFlag.All
-        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiGui.java"
@@ -11254,10 +10746,6 @@ TypeSystem{
     
     ValueType{
         name: "QPixmapCache::Key"
-        ModifyFunction{
-            signature: "operator=(QPixmapCache::Key)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -11267,10 +10755,6 @@ TypeSystem{
             signature: "devType() const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QPixmap)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "fill(const QPaintDevice *, const QPoint &)"
             remove: RemoveFlag.All
@@ -11282,11 +10766,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "operator!()const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "fromImageInPlace(QImage &, QFlags<Qt::ImageConversionFlag>)"
+            signature: "fromImageInPlace(QImage &, Qt::ImageConversionFlags)"
             remove: RemoveFlag.All
         }
         InjectCode{
@@ -11296,15 +10776,6 @@ TypeSystem{
                 quoteBeforeLine: "}// class"
             }
         }
-        ModifyFunction{
-            signature: "QPixmap(QString,const char*,QFlags<Qt::ImageConversionFlag>)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "QPixmap(const char*const*)"
             ModifyArgument{
@@ -11326,32 +10797,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "scroll(int, int, int, int, int, int, QRegion *)"
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QRegion"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegion *%out = qtjambi_cast<QRegion *>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "scroll(int, int, const QRect &, QRegion *)"
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QRegion"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegion *%out = qtjambi_cast<QRegion *>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "fill(const QColor &)"
             ModifyArgument{
@@ -11362,55 +10807,13 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "save(QIODevice *, const char *, int) const"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "save(const QString &, const char *, int) const"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "load(QString,const char*,QFlags<Qt::ImageConversionFlag>)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "loadFromData(const unsigned char*,uint,const char*,QFlags<Qt::ImageConversionFlag>)"
+            signature: "loadFromData(const uchar*,uint,const char*,Qt::ImageConversionFlags)"
             ModifyArgument{
                 index: 1
                 ArrayType{
                     lengthParameter: 2
                 }
             }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "loadFromData(QByteArray,const char*,QFlags<Qt::ImageConversionFlag>)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
         }
     }
     
@@ -11418,8 +10821,7 @@ TypeSystem{
         name: "QPixmapCache"
         ModifyFunction{
             signature: "find(QString)"
-            Remove{
-            }
+            remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
@@ -11427,61 +10829,17 @@ TypeSystem{
             remove: RemoveFlag.All
             until: 5
         }
-        ModifyFunction{
-            signature: "find(QString,QPixmap*)"
-            ModifyArgument{
-                index: 2
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPixmap pixmap;\n"+
-                                  "QPixmap* %out = &pixmap;"}
-                }
-            }
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QPixmap"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, pixmap) : nullptr;"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "find(QPixmapCache::Key,QPixmap*)"
-            ModifyArgument{
-                index: 2
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPixmap pixmap;\n"+
-                                  "QPixmap* %out = &pixmap;"}
-                }
-            }
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QPixmap"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, pixmap) : nullptr;"}
-                }
+        InjectCode{
+            ImportFile{
+                name: ":/io/qtjambi/generator/typesystem/QtJambiGui.java"
+                quoteAfterLine: "class QPixmapCache___"
+                quoteBeforeLine: "}// class"
             }
         }
     }
     
     ValueType{
         name: "QPolygon"
-        ModifyFunction{
-            signature: "operator=(const QPolygon &)"
-            remove: RemoveFlag.All
-            until: 5
-        }
         ExtraIncludes{
             Include{
                 fileName: "io.qt.core.QPoint"
@@ -11509,11 +10867,6 @@ TypeSystem{
     
     ValueType{
         name: "QPolygonF"
-        ModifyFunction{
-            signature: "operator=(const QPolygonF &)"
-            remove: RemoveFlag.All
-            until: 5
-        }
         ExtraIncludes{
             Include{
                 fileName: "io.qt.core.QPointF"
@@ -11544,57 +10897,22 @@ TypeSystem{
         ModifyFunction{
             signature: "operator*=(const QQuaternion &)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QQuaternion"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator*=(float)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QQuaternion"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(const QQuaternion &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QQuaternion"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QQuaternion &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QQuaternion"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(float)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QQuaternion"
-                }
-            }
         }
         ModifyFunction{
             signature: "getAxes(QVector3D *, QVector3D *, QVector3D *) const"
@@ -11630,6 +10948,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.gui.QQuaternion$Axes"
                 }
@@ -11663,6 +10982,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.gui.QQuaternion$AxisAndAngle"
                 }
@@ -11706,6 +11026,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.gui.QQuaternion$EulerAngles"
                 }
@@ -11723,6 +11044,11 @@ TypeSystem{
             }
         }
     }
+
+    GlobalFunction{
+        signature: "operator*(const QQuaternion&, const QVector3D&)"
+        targetType: "QQuaternion"
+    }
     
     ValueType{
         name: "QRadialGradient"
@@ -11781,8 +11107,8 @@ TypeSystem{
                           "                const char* __qt_name0 = info.name;\n"+
                           "                int __qt_revision1 = info.revision;\n"+
                           "                void* __qt_return_value = resolveInterface(__qt_name0, static_cast<int>(__qt_revision1));\n"+
-                          "                jobject __java_return_value = QtJambiAPI::convertNativeToJavaObject(__jni_env, __qt_return_value, name0, false, false);\n"+
-                          "                CoreAPI::registerDependency(__jni_env, __java_return_value, __this_nativeId);\n"+
+                          "                jobject __java_return_value = QtJambiAPI::convertNativeToJavaObjectAsWrapper(__jni_env, __qt_return_value, name0);\n"+
+                          "                QtJambiAPI::registerDependency(__jni_env, __java_return_value, __this_nativeId);\n"+
                           "                return __java_return_value;\n"+
                           "            }\n"+
                           "        };\n"+
@@ -11800,36 +11126,18 @@ TypeSystem{
         InjectCode{
             target: CodeClass.Java
             since: [6, 2]
-            Text{content: "@io.qt.QtUninvokable\n"+
-                          "public final <QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface nativeInterface(java.lang.Class<QNativeInterface> name){\n"+
+            Text{content: "@QtUninvokable\n"+
+                          "public final <QNativeInterface extends QtObjectInterface> QNativeInterface nativeInterface(java.lang.Class<QNativeInterface> name){\n"+
                           "    return nativeInterface(QtJambi_LibraryUtilities.internal.nativeId(this), name);\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
-                          "private native <QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface nativeInterface(long __this__nativeId, java.lang.Class<QNativeInterface> name);"}
+                          "@QtUninvokable\n"+
+                          "private native <QNativeInterface extends QtObjectInterface> QNativeInterface nativeInterface(long __this__nativeId, java.lang.Class<QNativeInterface> name);"}
         }
     }
     
     ObjectType{
         name: "QStandardItem"
-        ModifyFunction{
-            signature: "operator=(QStandardItem)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "read(QDataStream&)"
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-            }
-        }
-        ModifyFunction{
-            signature: "write(QDataStream&)const"
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-            }
-        }
         ModifyFunction{
             signature: "appendColumn(const QList<QStandardItem *> &)"
             ModifyArgument{
@@ -12144,10 +11452,6 @@ TypeSystem{
     
     ValueType{
         name: "QStaticText"
-        ModifyFunction{
-            signature: "operator=(QStaticText)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -12156,10 +11460,6 @@ TypeSystem{
     
     ValueType{
         name: "QSurfaceFormat"
-        ModifyFunction{
-            signature: "operator=(const QSurfaceFormat&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -12189,10 +11489,6 @@ TypeSystem{
     ValueType{
         name: "QTextBlock"
         implementing: "java.lang.Iterable<QTextFragment>"
-        ModifyFunction{
-            signature: "operator=(QTextBlock)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "setUserData(QTextBlockUserData *)"
             ModifyArgument{
@@ -12240,10 +11536,6 @@ TypeSystem{
     
     ValueType{
         name: "QTextFormat"
-        ModifyFunction{
-            signature: "operator=(QTextFormat)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "isValid()const"
             access: Modification.NonFinal
@@ -12365,10 +11657,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator=(QTextCursor)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "createList(QTextListFormat::Style)"
             ModifyArgument{
@@ -12446,6 +11734,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.gui.QTextCursor$SelectedTableCells"
                 }
@@ -12473,10 +11762,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator=(QTextTableCell)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -12571,7 +11856,6 @@ TypeSystem{
 
     EnumType{
         name: "QTextLayout::GlyphRunRetrievalFlag"
-        flags: "QTextLayout::GlyphRunRetrievalFlags"
         since: [6,5]
     }
     
@@ -12635,32 +11919,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "undo(QTextCursor *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QTextCursor"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QTextCursor *%out = qtjambi_cast<QTextCursor *>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "redo(QTextCursor *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QTextCursor"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QTextCursor *%out = qtjambi_cast<QTextCursor *>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -12706,10 +11964,6 @@ TypeSystem{
     
     ValueType{
         name: "QTextFragment"
-        ModifyFunction{
-            signature: "operator=(QTextFragment)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -12724,18 +11978,10 @@ TypeSystem{
     
     ValueType{
         name: "QTextDocumentFragment"
-        ModifyFunction{
-            signature: "operator=(QTextDocumentFragment)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QTextOption"
-        ModifyFunction{
-            signature: "operator=(const QTextOption &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -12786,9 +12032,9 @@ TypeSystem{
     
     ValueType{
         name: "QTransform"
-        ModifyFunction{
-            signature: "operator=(QTransform)"
-            remove: RemoveFlag.All
+        Rejection{functionName: "asAffineMatrix"}
+        EnumType{
+            name: "TransformationType"
         }
         ModifyFunction{
             signature: "map(int,int,int*,int*)const"
@@ -12801,34 +12047,18 @@ TypeSystem{
         ModifyFunction{
             signature: "operator*=(qreal)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator+=(qreal)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator-=(qreal)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator/=(qreal)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "operator*(QTransform)const"
@@ -12837,10 +12067,6 @@ TypeSystem{
         ModifyFunction{
             signature: "operator*=(QTransform)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
         }
         ModifyFunction{
             signature: "inverted(bool*)const"
@@ -12862,121 +12088,11 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "rotate(qreal,Qt::Axis)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "rotateRadians(qreal,Qt::Axis)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "rotate(qreal,Qt::Axis,qreal)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
-            since: [6,5]
-        }
-        ModifyFunction{
-            signature: "rotateRadians(qreal,Qt::Axis,qreal)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
-            since: [6,5]
-        }
-        ModifyFunction{
-            signature: "scale(qreal,qreal)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "shear(qreal,qreal)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "translate(qreal,qreal)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
-        }
-        ModifyFunction{
-            signature: "quadToQuad(QPolygonF,QPolygonF,QTransform&)"
-            ModifyArgument{
-                index: 3
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QTransform %out;"}
-                }
-            }
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QTransform"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, __qt_%3) : nullptr;"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "quadToSquare(QPolygonF,QTransform&)"
-            ModifyArgument{
-                index: 2
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QTransform %out;"}
-                }
-            }
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QTransform"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, __qt_%2) : nullptr;"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "squareToQuad(QPolygonF,QTransform&)"
-            ModifyArgument{
-                index: 2
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QTransform %out;"}
-                }
-            }
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QTransform"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, __qt_%2) : nullptr;"}
-                }
+        InjectCode{
+            ImportFile{
+                name: ":/io/qtjambi/generator/typesystem/QtJambiGui.java"
+                quoteAfterLine: "class QTransform___"
+                quoteBeforeLine: "}// class"
             }
         }
     }
@@ -12996,38 +12112,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "fixup(QString&)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jstring %out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QString %out = qtjambi_cast<QString>(%env, %in);\n"+
-                                  "QString *__qt_converted = &%out;"}
-                }
-            }
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jstring %out = qtjambi_cast<jstring>(%env, *__qt_converted);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%1 = qtjambi_cast<QString>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "validate(QString&,int&)const"
             ModifyArgument{
@@ -13108,112 +12192,53 @@ TypeSystem{
         name: "QVector2D"
         ModifyFunction{
             signature: "operator[](int)"
-            remove: RemoveFlag.All
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "i"
+                }
+                Text{content: "if(i<0 || i>2)\n"+
+                              "    throw new IndexOutOfBoundsException(i);"}
+            }
         }
         ModifyFunction{
             signature: "operator[](int)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator-()"
-            rename: "unaryMinus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator-(QVector2D)"
-            rename: "minus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator+(QVector2D)"
-            rename: "plus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(QVector2D)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(float)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(QVector2D)"
-            rename: "div"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(float)"
-            rename: "div"
-            since: 6
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "i"
+                }
+                Text{content: "if(i<0 || i>2)\n"+
+                              "    throw new IndexOutOfBoundsException(i);"}
+            }
         }
         ModifyFunction{
             signature: "operator*=(const QVector2D &)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector2D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator*=(float)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector2D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(const QVector2D &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector2D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QVector2D &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector2D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(float)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector2D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(QVector2D)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector2D"
-                }
-            }
         }
     }
     
@@ -13221,112 +12246,53 @@ TypeSystem{
         name: "QVector3D"
         ModifyFunction{
             signature: "operator[](int)"
-            remove: RemoveFlag.All
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "i"
+                }
+                Text{content: "if(i<0 || i>3)\n"+
+                              "    throw new IndexOutOfBoundsException(i);"}
+            }
         }
         ModifyFunction{
             signature: "operator[](int)const"
-            remove: RemoveFlag.All
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "i"
+                }
+                Text{content: "if(i<0 || i>3)\n"+
+                              "    throw new IndexOutOfBoundsException(i);"}
+            }
         }
         ModifyFunction{
-            signature: "operator-()"
-            rename: "unaryMinus"
-            since: 6
+            signature: "operator*=(const QVector3D &)"
+            rename: "multiply"
         }
         ModifyFunction{
-            signature: "operator-(QVector3D)"
-            rename: "minus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator+(QVector3D)"
-            rename: "plus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(QVector3D)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(float)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(QVector3D)"
-            rename: "div"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(float)"
-            rename: "div"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*=(const QVector3D &)"
-            rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector3D"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "operator*=(float)"
-            rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector3D"
-                }
-            }
+            signature: "operator*=(float)"
+            rename: "multiply"
         }
         ModifyFunction{
             signature: "operator+=(const QVector3D &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector3D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QVector3D &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector3D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(float)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector3D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(QVector3D)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector3D"
-                }
-            }
         }
     }
     
@@ -13334,112 +12300,53 @@ TypeSystem{
         name: "QVector4D"
         ModifyFunction{
             signature: "operator[](int)"
-            remove: RemoveFlag.All
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "i"
+                }
+                Text{content: "if(i<0 || i>4)\n"+
+                              "    throw new IndexOutOfBoundsException(i);"}
+            }
         }
         ModifyFunction{
             signature: "operator[](int)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator-()"
-            rename: "unaryMinus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator-(QVector4D)"
-            rename: "minus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator+(QVector4D)"
-            rename: "plus"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(QVector4D)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator*(float)"
-            rename: "times"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(QVector4D)"
-            rename: "div"
-            since: 6
-        }
-        ModifyFunction{
-            signature: "operator/(float)"
-            rename: "div"
-            since: 6
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "i"
+                }
+                Text{content: "if(i<0 || i>4)\n"+
+                              "    throw new IndexOutOfBoundsException(i);"}
+            }
         }
         ModifyFunction{
             signature: "operator*=(const QVector4D &)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector4D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator*=(float)"
             rename: "multiply"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector4D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator+=(const QVector4D &)"
             rename: "add"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector4D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator-=(const QVector4D &)"
             rename: "subtract"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector4D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(float)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector4D"
-                }
-            }
         }
         ModifyFunction{
             signature: "operator/=(QVector4D)"
             rename: "divide"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QVector4D"
-                }
-            }
         }
     }
     
@@ -13490,7 +12397,7 @@ TypeSystem{
             threadAffinity: true
         }
         ModifyFunction{
-            signature: "setWindowStates(QFlags<Qt::WindowState>)"
+            signature: "setWindowStates(Qt::WindowStates)"
             threadAffinity: true
         }
         ModifyFunction{
@@ -13712,12 +12619,15 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "<QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface"
+                    modifiedType: "<QNativeInterface extends io.qt.@Nullable QtObjectInterface> QNativeInterface"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObject(%env, %in, %1, false, false);\n"+
-                                  "CoreAPI::registerDependency(%env, %out, __this_nativeId);"}
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, %in, %1);"}
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
                 }
             }
             ModifyArgument{
@@ -13746,10 +12656,6 @@ TypeSystem{
     
     ValueType{
         name: "QTouchEvent::TouchPoint"
-        ModifyFunction{
-            signature: "operator=(QTouchEvent::TouchPoint)"
-            remove: RemoveFlag.All
-        }
         until: 5
     }
     
@@ -13779,18 +12685,10 @@ TypeSystem{
     
     ValueType{
         name: "QPageSize"
-        ModifyFunction{
-            signature: "operator=(const QPageSize&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QPageRanges"
-        ModifyFunction{
-            signature: "operator=(const QPageRanges&)"
-            remove: RemoveFlag.All
-        }
         since: 6
     }
     
@@ -13801,6 +12699,37 @@ TypeSystem{
     
     ValueType{
         name: "QPixelFormat"
+
+        Rejection{functionName: "get"}
+        Rejection{functionName: "set"}
+
+        EnumType{
+            name: "AlphaPosition"
+        }
+
+        EnumType{
+            name: "AlphaPremultiplied"
+        }
+
+        EnumType{
+            name: "AlphaUsage"
+        }
+
+        EnumType{
+            name: "ByteOrder"
+        }
+
+        EnumType{
+            name: "ColorModel"
+        }
+
+        EnumType{
+            name: "TypeInterpretation"
+        }
+
+        EnumType{
+            name: "YUVLayout"
+        }
         CustomConstructor{
             Text{content: "if(copy) return new(placement) QPixelFormat(*copy); else return new(placement) QPixelFormat();"}
         }
@@ -13874,10 +12803,9 @@ TypeSystem{
         name: "QApplicationStateChangeEvent"
         ModifyFunction{
             signature: "operator=(const QApplicationStateChangeEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyFunction{
@@ -13901,10 +12829,9 @@ TypeSystem{
         name: "QScreenOrientationChangeEvent"
         ModifyFunction{
             signature: "operator=(const QScreenOrientationChangeEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyFunction{
@@ -13924,24 +12851,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QXcbWindowFunctions::WmWindowType"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWindowsWindowFunctions::TouchWindowTouchType"
-        flags: "QWindowsWindowFunctions::TouchWindowTouchTypes"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWindowsWindowFunctions::WindowActivationBehavior"
-        until: 5
-    }
-    
     NamespaceType{
         name: "QXcbWindowFunctions"
+
+        EnumType{
+            name: "WmWindowType"
+        }
         ModifyFunction{
             signature: "setWmWindowTypeIdentifier()"
             remove: RemoveFlag.All
@@ -14001,6 +12916,20 @@ TypeSystem{
     
     NamespaceType{
         name: "QWindowsWindowFunctions"
+
+        Rejection{className: "SetTouchWindowTouchType"}
+        Rejection{className: "SetHasBorderInFullScreen"}
+        Rejection{className: "SetHasBorderInFullScreenDefault"}
+        Rejection{className: "SetWindowActivationBehaviorType"}
+        Rejection{className: "IsTabletModeType"}
+
+        EnumType{
+            name: "TouchWindowTouchType"
+        }
+
+        EnumType{
+            name: "WindowActivationBehavior"
+        }
         ModifyFunction{
             signature: "setTouchWindowTouchTypeIdentifier()"
             remove: RemoveFlag.All
@@ -14027,7 +12956,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setTouchWindowTouchType(QWindow*,QFlags<QWindowsWindowFunctions::TouchWindowTouchType>)"
+            signature: "setTouchWindowTouchType(QWindow*,QWindowsWindowFunctions::TouchWindowTouchTypes)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
@@ -14134,19 +13063,11 @@ TypeSystem{
         CustomConstructor{
             Text{content: "return new(placement) QColorSpace(copy->primaries(), copy->transferFunction(), copy->gamma());"}
         }
-        ModifyFunction{
-            signature: "operator=(QColorSpace)"
-            remove: RemoveFlag.All
-        }
         since: [5, 14]
     }
     
     ValueType{
         name: "QColorTransform"
-        ModifyFunction{
-            signature: "operator=(QColorTransform)"
-            remove: RemoveFlag.All
-        }
         InjectCode{
             target: CodeClass.Native
             position: Position.Beginning
@@ -14309,7 +13230,7 @@ TypeSystem{
                 ModifyArgument{
                     index: 1
                     ReplaceType{
-                        modifiedType: "io.qt.widgets.QMenu"
+                        modifiedType: "io.qt.widgets.@Nullable QMenu"
                     }
                     ReferenceCount{
                         variableName: "__rcMenu"
@@ -14336,7 +13257,7 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.widgets.QMenu"
+                        modifiedType: "io.qt.widgets.@Nullable QMenu"
                     }
                 }
             }
@@ -14351,7 +13272,7 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.widgets.QWidget"
+                        modifiedType: "io.qt.widgets.@Nullable QWidget"
                     }
                 }
             }
@@ -14366,7 +13287,7 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<io.qt.widgets.QWidget>"
+                        modifiedType: "io.qt.core.@NonNull QList<io.qt.widgets.@Nullable QWidget>"
                     }
                 }
             }
@@ -14381,7 +13302,7 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.core.QList<io.qt.widgets.QGraphicsWidget>"
+                        modifiedType: "io.qt.core.@NonNull QList<io.qt.widgets.@Nullable QGraphicsWidget>"
                     }
                 }
             }
@@ -14510,6 +13431,24 @@ TypeSystem{
     
     ObjectType{
         name: "QShortcut"
+        ModifyFunction{
+            signature: "QShortcut<Func1>(QKeySequence::StandardKey,QWidget*,Func1,Qt::ShortcutContext)"
+            remove: RemoveFlag.All
+            until: 5
+        }
+        ModifyFunction{
+            signature: "QShortcut<Func1>(QKeySequence,QWidget*,Func1,Qt::ShortcutContext)"
+            remove: RemoveFlag.All
+            until: 5
+        }
+        ModifyFunction{
+            signature: "QShortcut<Func1>(QKeySequence::StandardKey,QObject*,Func1,Qt::ShortcutContext)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "QShortcut<Func1>(QKeySequence,QObject*,Func1,Qt::ShortcutContext)"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "QShortcut(QKeySequence::StandardKey,QObject*,const char*,const char*,Qt::ShortcutContext)"
             access: Modification.Private
@@ -14590,7 +13529,7 @@ TypeSystem{
                 ModifyArgument{
                     index: 0
                     ReplaceType{
-                        modifiedType: "io.qt.widgets.QWidget"
+                        modifiedType: "io.qt.widgets.@Nullable QWidget"
                     }
                 }
             }
@@ -14628,19 +13567,16 @@ TypeSystem{
     
     EnumType{
         name: "QFileSystemModel::Option"
-        flags: "QFileSystemModel::Options"
         since: 6
     }
     
     EnumType{
         name: "QInputDevice::DeviceType"
-        flags: "QInputDevice::DeviceTypes"
         since: 6
     }
     
     EnumType{
         name: "QInputDevice::Capability"
-        flags: "QInputDevice::Capabilities"
         since: 6
     }
     
@@ -14651,7 +13587,6 @@ TypeSystem{
     
     EnumType{
         name: "QPointingDevice::PointerType"
-        flags: "QPointingDevice::PointerTypes"
         since: 6
     }
     
@@ -14667,7 +13602,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setCapabilities(QFlags<QInputDevice::Capability>)"
+            signature: "setCapabilities(QInputDevice::Capabilities)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -14681,12 +13616,9 @@ TypeSystem{
         name: "QEventPoint"
         ModifyFunction{
             signature: "operator=(QEventPoint)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyFunction{
@@ -14852,10 +13784,9 @@ TypeSystem{
         name: "QPointerEvent"
         ModifyFunction{
             signature: "operator=(const QPointerEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyFunction{
@@ -14877,26 +13808,28 @@ TypeSystem{
             signature: "point(qsizetype)"
             ModifyArgument{
                 index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QEventPoint"
-                }
-                ConversionRule{
+                DefineOwnership{
                     codeClass: CodeClass.Native
-                    Text{content: "const QEventPoint& ptr = %in;\n"+
-                                  "%out = qtjambi_cast<jobject>(%env, ptr);"}
+                    ownership: Ownership.Dependent
+                }
+            }
+            InjectCode{
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "%COUNT"
                 }
+                Text{content: "if(pointCount() <= %COUNT)\n"+
+                              "    throw new IndexOutOfBoundsException(\"Index out of range: \"+%COUNT);"}
             }
         }
         ModifyFunction{
             signature: "pointById(int)"
             ModifyArgument{
                 index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QEventPoint"
-                }
-                ConversionRule{
+                DefineOwnership{
                     codeClass: CodeClass.Native
-                    Text{content: "%out = %in ? qtjambi_cast<jobject>(%env, *%in) : nullptr;"}
+                    ownership: Ownership.Dependent
                 }
             }
         }
@@ -14942,14 +13875,6 @@ TypeSystem{
     
     ObjectType{
         name: "QSinglePointEvent"
-        ModifyFunction{
-            signature: "operator=(const QSinglePointEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
-            }
-        }
         ModifyField{
             name: "m_reserved"
             read: false
@@ -15038,7 +13963,6 @@ TypeSystem{
     
     EnumType{
         name: "QEventPoint::State"
-        flags: "QEventPoint::States"
         since: 6
     }
     
@@ -15129,7 +14053,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLBuffer::RangeAccessFlag"
-        flags: "QOpenGLBuffer::RangeAccessFlags"
         until: 5
     }
     
@@ -15145,7 +14068,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLDebugMessage::Severity"
-        flags: "QOpenGLDebugMessage::Severities"
         RejectEnumValue{
             name: "LastSeverity"
         }
@@ -15154,7 +14076,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLDebugMessage::Source"
-        flags: "QOpenGLDebugMessage::Sources"
         RejectEnumValue{
             name: "LastSource"
         }
@@ -15163,7 +14084,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLDebugMessage::Type"
-        flags: "QOpenGLDebugMessage::Types"
         RejectEnumValue{
             name: "LastType"
         }
@@ -15182,12 +14102,10 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLFunctions::OpenGLFeature"
-        flags: "QOpenGLFunctions::OpenGLFeatures"
     }
     
     EnumType{
         name: "QOpenGLShader::ShaderTypeBit"
-        flags: "QOpenGLShader::ShaderType"
         until: 5
     }
     
@@ -15208,7 +14126,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLTexture::Feature"
-        flags: "QOpenGLTexture::Features"
         until: 5
     }
     
@@ -15282,10 +14199,6 @@ TypeSystem{
         until: 5
     }
     
-    EnumType{
-        name: "QOpenGLContext::OpenGLModuleType"
-    }
-    
     EnumType{
         name: "QOpenGLVersionStatus::OpenGLStatus"
         until: 5
@@ -15293,10 +14206,6 @@ TypeSystem{
     
     ValueType{
         name: "QOpenGLBuffer"
-        ModifyFunction{
-            signature: "operator=(const QOpenGLBuffer &)"
-            remove: RemoveFlag.All
-        }
         ExtraIncludes{
             Include{
                 fileName: "QtJambi/JavaAPI"
@@ -15335,7 +14244,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@NonNull ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -15344,11 +14253,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "mapRange(int, int, QFlags<QOpenGLBuffer::RangeAccessFlag>)"
+            signature: "mapRange(int, int, QOpenGLBuffer::RangeAccessFlags)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@NonNull ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -15361,6 +14270,9 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLContext"
+        EnumType{
+            name: "OpenGLModuleType"
+        }
         ExtraIncludes{
             Include{
                 fileName: "QtJambi/CoreAPI"
@@ -15382,6 +14294,33 @@ TypeSystem{
                 location: Include.Global
             }
         }
+        ModifyFunction{
+            signature: "extraFunctions()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "functions()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "surface()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setScreen(QScreen*)"
             ModifyArgument{
@@ -15410,15 +14349,6 @@ TypeSystem{
             signature: "makeCurrent(QSurface *)"
             threadAffinity: true
         }
-        ModifyFunction{
-            signature: "getProcAddress(const char*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         InjectCode{
             target: CodeClass.Native
             position: Position.Beginning
@@ -15456,7 +14386,7 @@ TypeSystem{
                 }
                 AddTypeParameter{
                     name: "T"
-                    extending: "io.qt.gui.QAbstractOpenGLFunctions"
+                    extending: "io.qt.gui.@Nullable QAbstractOpenGLFunctions"
                 }
                 AddArgument{
                     index: 1
@@ -15473,12 +14403,15 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "<QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface"
+                    modifiedType: "<QNativeInterface extends io.qt.@Nullable QtObjectInterface> QNativeInterface"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObject(%env, %in, %1, false, false);\n"+
-                                  "CoreAPI::registerDependency(%env, %out, __this_nativeId);"}
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, %in, %1);"}
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
                 }
             }
             ModifyArgument{
@@ -15521,7 +14454,6 @@ TypeSystem{
     
     EnumType{
         name: "QAbstractFileIconProvider::Option"
-        flags: "QAbstractFileIconProvider::Options"
         since: 6
     }
     
@@ -15532,27 +14464,11 @@ TypeSystem{
     
     ValueType{
         name: "QOpenGLDebugMessage"
-        ModifyFunction{
-            signature: "operator=(const QOpenGLDebugMessage&)"
-            remove: RemoveFlag.All
-        }
         until: 5
     }
     
     ValueType{
         name: "QOpenGLFramebufferObjectFormat"
-        ModifyFunction{
-            signature: "operator!=(const QOpenGLFramebufferObjectFormat &) const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(const QOpenGLFramebufferObjectFormat &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator==(const QOpenGLFramebufferObjectFormat &) const"
-            access: Modification.Private
-        }
         until: 5
     }
     
@@ -15569,15 +14485,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "glBindAttribLocation(GLuint,GLuint,const char*)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "glGetVertexAttribPointerv(GLuint, GLenum, void **)"
             ModifyArgument{
@@ -15697,15 +14604,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "glGetAttribLocation(GLuint, const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "glGetProgramInfoLog(GLuint, GLsizei, GLsizei*, char*)"
             ModifyArgument{
@@ -15798,15 +14696,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "glGetUniformLocation(GLuint, const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "glGetShaderSource(GLuint, GLsizei, GLsizei*, char*)"
             ModifyArgument{
@@ -15903,6 +14792,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "glFenceSync(GLenum,GLbitfield)"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "glClearBufferfv(GLenum, GLint, const GLfloat *)"
             ModifyArgument{
@@ -18534,7 +17432,7 @@ TypeSystem{
     ObjectType{
         name: "QOpenGLShaderProgram"
         ModifyFunction{
-            signature: "addCacheableShaderFromSourceCode(QFlags<QOpenGLShader::ShaderTypeBit>, const char *)"
+            signature: "addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType, const char *)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -18559,506 +17457,164 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(int, const GLuint *, int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const GLuint *, int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addShaderFromSourceCode(QFlags<QOpenGLShader::ShaderTypeBit>, const char *)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "attributeLocation(const char *)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "bindAttributeLocation(const char *, int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addShader(QOpenGLShader*)"
-            ModifyArgument{
-                index: 1
-                ReferenceCount{
-                    variableName: "__rcSharers"
-                    action: ReferenceCount.Add
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "removeShader(QOpenGLShader*)"
-            ModifyArgument{
-                index: 1
-                ReferenceCount{
-                    variableName: "__rcSharers"
-                    action: ReferenceCount.Take
-                }
-            }
-        }
-        InjectCode{
-            ImportFile{
-                name: ":/io/qtjambi/generator/typesystem/QtJambiGui.java"
-                quoteAfterLine: "class QOpenGLShaderProgram___"
-                quoteBeforeLine: "}// class"
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(int, const GLfloat *, int, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    asBuffer: true
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(const char *, const GLfloat *, int, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    asBuffer: true
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(int, const QVector2D *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(int, const QVector3D *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(int, const QVector4D *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(const char *, const QVector2D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(const char *, const QVector3D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(const char *, const QVector4D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(int, GLenum, const void *, int, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.nio.Buffer"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JBufferConstData %out(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeArray(const char *, GLenum, const void *, int, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.nio.Buffer"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JBufferConstData %out(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue(int, const GLfloat *, int, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    asBuffer: true
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeBuffer ( const char *, GLenum, int, int, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "disableAttributeArray ( const char * )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "enableAttributeArray ( const char * )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue(const char *, GLfloat)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue ( const char * , GLfloat , GLfloat )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue ( const char *, GLfloat, GLfloat, GLfloat )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue ( const char * , GLfloat , GLfloat , GLfloat , GLfloat )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue ( const char * , const QVector2D )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue ( const char * , const QVector3D )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue ( const char * , const QVector4D )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue ( const char *, const QColor )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setAttributeValue ( const char * , const GLfloat * , int , int )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    asBuffer: true
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue(const char *, const QPointF )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue(const char *, const QSize )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue(const char *, const QSizeF )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix2x2 )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix2x3 )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            signature: "setUniformValueArray(const char*, const GLuint *, int)"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix2x4 )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            signature: "addShaderFromSourceCode(QOpenGLShader::ShaderType, const char *)"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix3x2 )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            signature: "attributeLocation(const char *)const"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix3x3 )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            signature: "bindAttributeLocation(const char *, int)"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix3x4 )"
+            signature: "addShader(QOpenGLShader*)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                ReferenceCount{
+                    variableName: "__rcSharers"
+                    action: ReferenceCount.Add
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix4x2 )"
+            signature: "removeShader(QOpenGLShader*)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                ReferenceCount{
+                    variableName: "__rcSharers"
+                    action: ReferenceCount.Take
                 }
             }
         }
-        ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix4x3 )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
+        InjectCode{
+            ImportFile{
+                name: ":/io/qtjambi/generator/typesystem/QtJambiGui.java"
+                quoteAfterLine: "class QOpenGLShaderProgram___"
+                quoteBeforeLine: "}// class"
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix4x4 )"
+            signature: "setAttributeArray(int, const GLfloat *, int, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    asBuffer: true
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QTransform )"
+            signature: "setAttributeArray(const char *, const GLfloat *, int, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    asBuffer: true
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, GLfloat)"
+            signature: "setAttributeArray(int, const QVector2D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, GLint)"
+            signature: "setAttributeArray(int, const QVector3D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, GLfloat, GLfloat)"
+            signature: "setAttributeArray(int, const QVector4D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, GLfloat, GLfloat, GLfloat)"
+            signature: "setAttributeArray(const char *, const QVector2D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, GLfloat, GLfloat, GLfloat, GLfloat)"
+            signature: "setAttributeArray(const char *, const QVector3D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, QVector2D )"
+            signature: "setAttributeArray(const char *, const QVector4D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, QVector3D )"
+            signature: "setAttributeArray(int, GLenum, const void *, int, int)"
             ModifyArgument{
-                index: 1
+                index: 3
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "java.nio.Buffer"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "JBufferConstData %out(%env, %in);"}
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, QVector4D )"
+            signature: "setAttributeArray(const char *, GLenum, const void *, int, int)"
             ModifyArgument{
-                index: 1
+                index: 3
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "java.nio.Buffer"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "JBufferConstData %out(%env, %in);"}
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, QPoint )"
+            signature: "setAttributeValue(int, const GLfloat *, int, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    asBuffer: true
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue ( const char *, QColor )"
+            signature: "setAttributeValue ( const char * , const GLfloat * , int , int )"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    asBuffer: true
                 }
             }
         }
@@ -19198,12 +17754,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const GLint *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19213,12 +17763,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const GLfloat *, int, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19228,12 +17772,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QVector2D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19243,12 +17781,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QVector3D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19258,12 +17790,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QVector4D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19273,12 +17799,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix4x4 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19288,12 +17808,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix2x2 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19303,12 +17817,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix3x2 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19318,12 +17826,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix4x2 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19333,12 +17835,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix2x3 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19348,12 +17844,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix3x3 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19363,12 +17853,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix4x3 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19378,12 +17862,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix2x4 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19393,12 +17871,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix3x4 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -19417,10 +17889,6 @@ TypeSystem{
     
     ValueType{
         name: "QOpenGLVersionProfile"
-        ModifyFunction{
-            signature: "operator=(const QOpenGLVersionProfile &)"
-            remove: RemoveFlag.All
-        }
         until: 5
     }
     
@@ -19435,7 +17903,7 @@ TypeSystem{
         InjectCode{
             target: CodeClass.Java
             Text{content: "@Override\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public final void close(){\n"+
                           "    dispose();\n"+
                           "}"}
@@ -19531,42 +17999,14 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 14
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
             since: [5, 14]
         }
         ModifyFunction{
-            signature: "setData(int, int, int, int, int, int, int, int, QOpenGLTexture::CubeMapFace, QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions *const)"
-            ModifyArgument{
-                index: 12
-                ArrayType{
-                    asBuffer: true
-                }
-            }
-            ModifyArgument{
-                index: 13
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
+            signature: "setData(int, int, int, int, int, int, int, int, QOpenGLTexture::CubeMapFace, QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions *const)"
+            ModifyArgument{
+                index: 12
+                ArrayType{
+                    asBuffer: true
                 }
             }
             since: [5, 14]
@@ -19579,20 +18019,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 12
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
             since: [5, 14]
         }
         ModifyFunction{
@@ -19603,20 +18029,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 11
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
             since: [5, 14]
         }
         ModifyFunction{
@@ -19627,20 +18039,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 10
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
             since: [5, 14]
         }
         ModifyFunction{
@@ -19651,20 +18049,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setData(int, int, int, QOpenGLTexture::CubeMapFace, QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions * const)"
@@ -19674,20 +18058,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 8
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setData(int, int, QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions * const)"
@@ -19697,20 +18067,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 6
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setData(int, QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions * const)"
@@ -19720,20 +18076,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setData(QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions * const)"
@@ -19743,16 +18085,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, int, int, QOpenGLTexture::CubeMapFace, int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -19762,16 +18094,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, int, QOpenGLTexture::CubeMapFace, int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -19781,16 +18103,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 6
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, int, int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -19800,16 +18112,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -19819,16 +18121,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -19838,26 +18130,12 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         until: 5
     }
     
     ValueType{
         name: "QOpenGLPixelTransferOptions"
-        ModifyFunction{
-            signature: "operator=(const QOpenGLPixelTransferOptions&)"
-            remove: RemoveFlag.All
-        }
         until: 5
     }
     
@@ -19876,18 +18154,6 @@ TypeSystem{
         until: 5
     }
     
-    ValueType{
-        name: "xcb_connection_t"
-        generate: false
-        since: [6, 2]
-    }
-    
-    ValueType{
-        name: "Display"
-        generate: false
-        since: [6, 2]
-    }
-    
     ValueType{
         name: "HWND__"
         generate: false
@@ -20118,20 +18384,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QNativeInterface::Private::QWindowsApplication::TypeInfo"
-    }
-    
-    Rejection{
-        className: "QNativeInterface::Private::QWindowsApplication"
-        functionName: "registerMime"
-    }
-    
-    Rejection{
-        className: "QNativeInterface::Private::QWindowsApplication"
-        functionName: "unregisterMime"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::Private::QWindowsApplication"
         packageName: "io.qt.gui.nativeinterface"
@@ -20139,6 +18391,30 @@ TypeSystem{
         ppCondition: "defined(Q_OS_WIN)"
         isNativeInterface: true
         generate: "no-shell"
+
+        Rejection{
+            className: "TypeInfo"
+        }
+
+        Rejection{
+            functionName: "registerMime"
+        }
+
+        Rejection{
+            functionName: "unregisterMime"
+        }
+
+        EnumType{
+            name: "WindowActivationBehavior"
+        }
+
+        EnumType{
+            name: "DarkModeHandlingFlag"
+        }
+
+        EnumType{
+            name: "TouchWindowTouchType"
+        }
         ModifyFunction{
             signature: "QWindowsApplication()"
             remove: RemoveFlag.All
@@ -20151,28 +18427,23 @@ TypeSystem{
         }
         since: [6, 2]
     }
-    
-    EnumType{
-        name: "QNativeInterface::Private::QWindowsApplication::WindowActivationBehavior"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QNativeInterface::Private::QWindowsApplication::DarkModeHandlingFlag"
-        flags: "QNativeInterface::Private::QWindowsApplication::DarkModeHandling"
+
+    PrimitiveType{
+        name: "xcb_connection_t"
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
         since: [6, 2]
     }
-    
-    EnumType{
-        name: "QNativeInterface::Private::QWindowsApplication::TouchWindowTouchType"
-        flags: "QNativeInterface::Private::QWindowsApplication::TouchWindowTouchTypes"
+
+    PrimitiveType{
+        name: "Display"
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QNativeInterface::QX11Application::TypeInfo"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::QX11Application"
         packageName: "io.qt.gui.nativeinterface"
@@ -20180,6 +18451,10 @@ TypeSystem{
         ppCondition: "QT_CONFIG(xcb)"
         isNativeInterface: true
         generate: "no-shell"
+
+        Rejection{
+            className: "TypeInfo"
+        }
         ModifyFunction{
             signature: "QX11Application()"
             remove: RemoveFlag.All
@@ -20193,10 +18468,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QNativeInterface::Private::QXcbWindow::TypeInfo"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::Private::QXcbWindow"
         packageName: "io.qt.gui.nativeinterface"
@@ -20204,6 +18475,13 @@ TypeSystem{
         ppCondition: "QT_CONFIG(xcb)"
         isNativeInterface: true
         generate: "no-shell"
+        Rejection{
+            className: "TypeInfo"
+        }
+
+        EnumType{
+            name: "WindowType"
+        }
         ModifyFunction{
             signature: "QXcbWindow()"
             remove: RemoveFlag.All
@@ -20226,20 +18504,14 @@ TypeSystem{
         since: [6, 2]
     }
     
-    EnumType{
-        name: "QNativeInterface::Private::QXcbWindow::WindowType"
-        flags: "QNativeInterface::Private::QXcbWindow::WindowTypes"
-        since: [6, 2]
-    }
-    
-    Rejection{
-        className: "QNativeInterface::QAndroidOffscreenSurface::TypeInfo"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::QAndroidOffscreenSurface"
         ppCondition: "defined(Q_OS_ANDROID)"
         generate: "no-shell"
+
+        Rejection{
+            className: "TypeInfo"
+        }
         ModifyFunction{
             signature: "QAndroidOffscreenSurface()"
             remove: RemoveFlag.All
@@ -20247,10 +18519,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QNativeInterface::Private::QXcbScreen::TypeInfo"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::Private::QXcbScreen"
         packageName: "io.qt.gui.nativeinterface"
@@ -20258,6 +18526,10 @@ TypeSystem{
         ppCondition: "QT_CONFIG(xcb)"
         isNativeInterface: true
         generate: "no-shell"
+
+        Rejection{
+            className: "TypeInfo"
+        }
         ModifyFunction{
             signature: "QXcbScreen()"
             remove: RemoveFlag.All
@@ -20271,15 +18543,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QNativeInterface::Private::QVsp2Screen::TypeInfo"
-    }
-    
-    Rejection{
-        className: "QNativeInterface::Private::QVsp2Screen"
-        functionName: "addBlendListener"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::Private::QVsp2Screen"
         packageName: "io.qt.gui.nativeinterface"
@@ -20287,6 +18550,13 @@ TypeSystem{
         ppCondition: "QT_CONFIG(vsp2)"
         isNativeInterface: true
         generate: false
+        Rejection{
+            className: "TypeInfo"
+        }
+
+        Rejection{
+            functionName: "addBlendListener"
+        }
         ModifyFunction{
             signature: "QVsp2Screen()"
             remove: RemoveFlag.All
@@ -20300,15 +18570,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QNativeInterface::Private::QWebOSScreen::TypeInfo"
-    }
-    
-    Rejection{
-        className: "QNativeInterface::Private::QWebOSScreen"
-        functionName: "addFlipListener"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::Private::QWebOSScreen"
         packageName: "io.qt.gui.nativeinterface"
@@ -20316,6 +18577,13 @@ TypeSystem{
         ppCondition: "defined(Q_OS_WEBOS)"
         isNativeInterface: true
         generate: false
+        Rejection{
+            className: "TypeInfo"
+        }
+
+        Rejection{
+            functionName: "addFlipListener"
+        }
         ModifyFunction{
             signature: "QWebOSScreen()"
             remove: RemoveFlag.All
@@ -20329,8 +18597,52 @@ TypeSystem{
         since: [6, 2]
     }
 
-    Rejection{
-        className: "QNativeInterface::QWaylandApplication::TypeInfo"
+    PrimitiveType{
+        name: "wl_seat"
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
+        since: [6, 2]
+    }
+
+    PrimitiveType{
+        name: "wl_keyboard"
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
+        since: [6, 2]
+    }
+
+    PrimitiveType{
+        name: "wl_display"
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
+        since: [6, 2]
+    }
+
+    PrimitiveType{
+        name: "wl_pointer"
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
+        since: [6, 2]
+    }
+
+    PrimitiveType{
+        name: "wl_compositor"
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
+        since: [6, 2]
+    }
+
+    PrimitiveType{
+        name: "wl_touch"
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
+        since: [6, 2]
     }
 
     InterfaceType{
@@ -20340,6 +18652,10 @@ TypeSystem{
         ppCondition: "defined(Q_OS_UNIX)"
         isNativeInterface: true
         generate: false
+        Rejection{
+            className: "TypeInfo"
+        }
+
         ModifyFunction{
             signature: "QWaylandApplication()"
             remove: RemoveFlag.All
@@ -20603,7 +18919,7 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: class 'VkImage' inherits from unknown base class 'quint64'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: unsupported default value of argument in function 'doAction', class 'QAccessibleInterface'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: object type 'QAccessible' extended by interface type 'QAbstractAccessibleFactory'. The resulting API will be less expressive than the original."}
-    SuppressedWarning{text: "WARNING(CppImplGenerator) :: class 'QAccessibleEvent' has polymorphic id but does not inherit a polymorphic class"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: class 'QAccessibleEvent' has polymorphic id but does not inherit a polymorphic class"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAccessibleTableCellInterface'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: class 'Display' inherits from unknown base class '_XDisplay'"}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtHelp.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtHelp.qml
index fc2f1dc0..9368f6a7 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtHelp.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtHelp.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.help"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtHelp"
     module: "qtjambi.help"
     description: "Classes for integrating documentation into applications, similar to Qt Assistant."
@@ -42,17 +42,26 @@ TypeSystem{
         platforms: ["linux", "macos"]
     }
     
-    Rejection{
-        className: "QHelpSearchEngine::SearchHit"
-    }
-    
-    
-    EnumType{
-        name: "QHelpSearchQuery::FieldName"
-    }
-    
     ObjectType{
         name: "QHelpContentItem"
+        ModifyFunction{
+            signature: "child(int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "parent()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     
@@ -65,25 +74,28 @@ TypeSystem{
         InjectCode{
             target: CodeClass.Native
             position: Position.Beginning
-            Text{content: "#if QT_VERSION < QT_VERSION_CHECK(6,0,0)\n"+
-                          "hash_type qHash(const QMap<QString, QUrl> &value){\n"+
-                          "    hash_type hashCode = qHash(int(value.size()));\n"+
-                          "    for(const QString& key : value.keys()){\n"+
-                          "        hashCode = hashCode * 31 + qHash(key);\n"+
-                          "        hashCode = hashCode * 31 + qHash(value.value(key));\n"+
-                          "    }\n"+
-                          "    return hashCode;\n"+
-                          "}\n"+
-                          "#else\n"+
-                          "hash_type qHash(const QMultiMap<QString, QUrl> &value){\n"+
-                          "    hash_type hashCode = qHash(int(value.keys().size()));\n"+
-                          "    for(const QString& key : value.keys()){\n"+
-                          "        hashCode = hashCode * 31 + qHash(key);\n"+
-                          "        hashCode = hashCode * 31 + qHash(value.values(key));\n"+
-                          "    }\n"+
-                          "    return hashCode;\n"+
-                          "}\n"+
-                          "#endif"}
+            Text{
+                until: 5
+                content: String.raw`inline hash_type qHash(const QMap<QString, QUrl> &value, hash_type seed = 0){
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.size());
+    for(const QString& key : value.keys()){
+        seed = hash(seed, key);
+        seed = hash(seed, value.value(key));
+    }
+    return seed;
+}`}
+            Text{
+                since: 6
+                content: String.raw`inline hash_type qHash(const QMultiMap<QString, QUrl> &value, hash_type seed = 0){
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.keys().size());
+    for(const QString& key : value.keys()){
+        seed = hash(seed, key);
+        seed = hash(seed, value.values(key));
+    }
+    return seed;
+}`}
         }
     }
     
@@ -93,6 +105,15 @@ TypeSystem{
     
     ObjectType{
         name: "QHelpContentModel"
+        ModifyFunction{
+            signature: "contentItemAt(QModelIndex)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -127,6 +148,10 @@ TypeSystem{
     
     ObjectType{
         name: "QHelpSearchEngine"
+
+        Rejection{
+            className: "SearchHit"
+        }
         ModifyFunction{
             signature: "QHelpSearchEngine ( QHelpEngineCore *, QObject *)"
             InjectCode{
@@ -142,14 +167,13 @@ TypeSystem{
     
     ValueType{
         name: "QHelpSearchQuery"
+        EnumType{
+            name: "FieldName"
+        }
     }
     
     ValueType{
         name: "QHelpSearchResult"
-        ModifyFunction{
-            signature: "operator=(const QHelpSearchResult &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -206,19 +230,11 @@ TypeSystem{
     
     ValueType{
         name: "QCompressedHelpInfo"
-        ModifyFunction{
-            signature: "operator=(const QCompressedHelpInfo &)"
-            remove: RemoveFlag.All
-        }
         since: [5, 13]
     }
     
     ValueType{
         name: "QHelpFilterData"
-        ModifyFunction{
-            signature: "operator=(const QHelpFilterData &)"
-            remove: RemoveFlag.All
-        }
         since: [5, 13]
     }
     
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtHttpServer.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtHttpServer.qml
index 5b7e2ae9..4fed334f 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtHttpServer.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtHttpServer.qml
@@ -31,14 +31,10 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.httpserver"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtHttpServer"
     module: "qtjambi.httpserver"
     description: "Qt HTTP Server supports building an HTTP server into an application."
-
-    Rejection{
-        className: "QHttpServer::AfterRequestHandler"
-    }
     
     Rejection{
         className: "QHttpServerAfterRequestViewTraits"
@@ -48,11 +44,6 @@ TypeSystem{
         className: "QHttpServerRouterViewTraits"
     }
     
-    Rejection{
-        className: "QHttpServerRouter"
-        functionName: "bind_front"
-    }
-    
     ObjectType{
         name: "QAbstractHttpServer"
         ModifyFunction{
@@ -76,7 +67,7 @@ TypeSystem{
             ppCondition: "defined(QT_WEBSOCKETS_LIB)"
         }
         ModifyFunction{
-            signature: "listen(QHostAddress,unsigned short)"
+            signature: "listen(QHostAddress,quint16)"
             ModifyArgument{
                 index: 1
                 ReplaceDefaultExpression{
@@ -108,7 +99,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.core.QList<java.lang.Integer>"
+                    modifiedType: "io.qt.core.@NonNull QList<java.lang.@QtPrimitiveType@NonNull Integer>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -176,25 +167,32 @@ TypeSystem{
             }
             since: [6,5]
         }
-        ModifyFunction{
-            signature: "makeResponder(QHttpServerRequest,QTcpSocket*)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.httpserver.QHttpServerResponder"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, new QHttpServerResponder(std::move(%in)));\n"+
-                                  "QtJambiAPI::setJavaOwnership(%env, %out);"}
-                }
-            }
-            until: [6,4]
-        }
     }
     
     ObjectType{
         name: "QHttpServer"
+        Rejection{
+            className: "AfterRequestHandler"
+        }
+        ModifyFunction{
+            signature: "route<Rule,Args...>(Args&&)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "afterRequest<ViewHandler>(ViewHandler&&)"
+            remove: RemoveFlag.All
+        }
+        FunctionalType{
+            name: "MissingHandler"
+            ModifyArgument{
+                index: 1
+                invalidateAfterUse: true
+            }
+            ModifyArgument{
+                index: 2
+                invalidateAfterUse: true
+            }
+        }
         ExtraIncludes{
             Include{
                 fileName: "QtJambi/JavaAPI"
@@ -240,17 +238,17 @@ TypeSystem{
     
     ObjectType{
         name: "QHttpServerResponder"
-        ModifyFunction{
-            signature: "writeBody(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+
+        EnumType{
+            name: "StatusCode"
+        }
+
+        ValueType{
+            name: "HeaderList"
+            generate: false
         }
         ModifyFunction{
-            signature: "writeBody(const char*, long long)"
+            signature: "writeBody(const char*, qint64)"
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -264,7 +262,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.core.QPair<io.qt.core.QByteArray,io.qt.core.QByteArray>..."
+                    modifiedType: "io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray,io.qt.core.@NonNull QByteArray>@NonNull..."
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -277,7 +275,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.core.QPair<io.qt.core.QByteArray,io.qt.core.QByteArray>[]"
+                    modifiedType: "io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray,io.qt.core.@NonNull QByteArray>@NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -295,7 +293,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "io.qt.core.QPair<io.qt.core.QByteArray,io.qt.core.QByteArray>[]"
+                    modifiedType: "io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray,io.qt.core.@NonNull QByteArray>@NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -313,7 +311,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "io.qt.core.QPair<io.qt.core.QByteArray,io.qt.core.QByteArray>[]"
+                    modifiedType: "io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray,io.qt.core.@NonNull QByteArray>@NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -331,7 +329,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "io.qt.core.QPair<io.qt.core.QByteArray,io.qt.core.QByteArray>[]"
+                    modifiedType: "io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray,io.qt.core.@NonNull QByteArray>@NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -354,24 +352,37 @@ TypeSystem{
         }
     }
     
-    FunctionalType{
-        name: "QHttpServer::MissingHandler"
-        ModifyArgument{
-            index: 1
-            invalidateAfterUse: true
-        }
-        ModifyArgument{
-            index: 2
-            invalidateAfterUse: true
-        }
-    }
-    
-    EnumType{
-        name: "QHttpServerResponder::StatusCode"
-    }
-    
     ObjectType{
         name: "QHttpServerRequest"
+
+        EnumType{
+            name: "Method"
+            RejectEnumValue{
+                name: "GET"
+            }
+            RejectEnumValue{
+                name: "PUT"
+            }
+            RejectEnumValue{
+                name: "DELETE"
+            }
+            RejectEnumValue{
+                name: "POST"
+            }
+            RejectEnumValue{
+                name: "HEAD"
+            }
+            RejectEnumValue{
+                name: "OPTIONS"
+            }
+            RejectEnumValue{
+                name: "PATCH"
+            }
+            RejectEnumValue{
+                name: "CONNECT"
+            }
+        }
+
         InjectCode{
             target: CodeClass.Java
             ImportFile{
@@ -382,40 +393,6 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QHttpServerRequest::Method"
-        flags: "QHttpServerRequest::Methods"
-        RejectEnumValue{
-            name: "GET"
-        }
-        RejectEnumValue{
-            name: "PUT"
-        }
-        RejectEnumValue{
-            name: "DELETE"
-        }
-        RejectEnumValue{
-            name: "POST"
-        }
-        RejectEnumValue{
-            name: "HEAD"
-        }
-        RejectEnumValue{
-            name: "OPTIONS"
-        }
-        RejectEnumValue{
-            name: "PATCH"
-        }
-        RejectEnumValue{
-            name: "CONNECT"
-        }
-    }
-    
-    ValueType{
-        name: "QHttpServerResponder::HeaderList"
-        generate: false
-    }
-    
     
     ObjectType{
         name: "QHttpServerResponse"
@@ -423,12 +400,16 @@ TypeSystem{
             signature: "QHttpServerResponse(const char*,QHttpServerResponder::StatusCode)"
             remove: RemoveFlag.All
         }
+        ModifyFunction{
+            signature: "addHeaders<Container>(Container)"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "addHeaders(QHttpServerResponder::HeaderList)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.core.QPair<io.qt.core.QByteArray,io.qt.core.QByteArray>..."
+                    modifiedType: "io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray,io.qt.core.@NonNull QByteArray>@NonNull..."
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -441,7 +422,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.core.QPair<io.qt.core.QByteArray,io.qt.core.QByteArray>..."
+                    modifiedType: "io.qt.core.@NonNull QPair<io.qt.core.@NonNull QByteArray,io.qt.core.@NonNull QByteArray>@NonNull..."
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -494,20 +475,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "fromFile(QString)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.httpserver.QHttpServerResponse"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, new QHttpServerResponse(std::move(%in)));\n"+
-                                  "QtJambiAPI::setJavaOwnership(%env, %out);"}
-                }
-            }
-        }
         InjectCode{
             target: CodeClass.Java
             ImportFile{
@@ -520,6 +487,8 @@ TypeSystem{
     
     ObjectType{
         name: "QHttpServerRouter"
+
+        Rejection{functionName: "bind_front"}
         ModifyFunction{
             signature: "addConverter<Type>(QAnyStringView)"
             remove: RemoveFlag.All
@@ -540,6 +509,25 @@ TypeSystem{
     
     ObjectType{
         name: "QHttpServerRouterRule"
+        FunctionalType{
+            name: "RouterHandler"
+            ExtraIncludes{
+                Include{
+                    fileName: "QtCore/QRegularExpressionMatch"
+                    location: Include.Global
+                }
+                Include{
+                    fileName: "QtNetwork/QTcpSocket"
+                    location: Include.Global
+                    until: [6,4]
+                }
+                Include{
+                    fileName: "QtHttpServer/QHttpServerResponder"
+                    location: Include.Global
+                    since: [6,5]
+                }
+            }
+        }
         ExtraIncludes{
             Include{
                 fileName: "QtCore/QRegularExpressionMatch"
@@ -559,44 +547,12 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.core.QRegularExpressionMatch"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QRegularExpressionMatch* %out = qtjambi_cast<QRegularExpressionMatch*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
-    }
-    
-    FunctionalType{
-        name: "QHttpServerRouterRule::RouterHandler"
-        ExtraIncludes{
-            Include{
-                fileName: "QtCore/QRegularExpressionMatch"
-                location: Include.Global
-            }
-            Include{
-                fileName: "QtNetwork/QTcpSocket"
-                location: Include.Global
-                until: [6,4]
-            }
-            Include{
-                fileName: "QtHttpServer/QHttpServerResponder"
-                location: Include.Global
-                since: [6,5]
             }
         }
     }
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'ViewTraits::BindableType'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'QHttpServer::AfterRequestHandler'"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type std::function<QHttpServerResponse(QHttpServerResponse&&,const QHttpServerRequest&)> (is_busted)"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: unsupported default value 'qMakePair(1u, 1u)' of argument in function 'writeStatusLine', class 'QHttpServerResponder'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Cannot find enum constant for value 'StatusCode::Ok' in '*' or any of its super classes"}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtLocation.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtLocation.qml
index 1dcf6e71..43596b9e 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtLocation.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtLocation.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.location"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtLocation"
     module: "qtjambi.location"
     description: "Displays map, navigation, and place content in a QML application."
@@ -73,7 +73,6 @@ TypeSystem{
     
     EnumType{
         name: "QLocation::Visibility"
-        flags: "QLocation::VisibilityScope"
     }
     
     EnumType{
@@ -98,27 +97,22 @@ TypeSystem{
     
     EnumType{
         name: "QGeoServiceProvider::GeocodingFeature"
-        flags: "QGeoServiceProvider::GeocodingFeatures"
     }
     
     EnumType{
         name: "QGeoServiceProvider::MappingFeature"
-        flags: "QGeoServiceProvider::MappingFeatures"
     }
     
     EnumType{
         name: "QGeoServiceProvider::NavigationFeature"
-        flags: "QGeoServiceProvider::NavigationFeatures"
     }
     
     EnumType{
         name: "QGeoServiceProvider::PlacesFeature"
-        flags: "QGeoServiceProvider::PlacesFeatures"
     }
     
     EnumType{
         name: "QGeoServiceProvider::RoutingFeature"
-        flags: "QGeoServiceProvider::RoutingFeatures"
     }
     
     ObjectType{
@@ -220,13 +214,14 @@ TypeSystem{
                     action: ReferenceCount.Set
                 }
             }
+            since: 6
         }
         ModifyFunction{
             signature: "createGeocodingManagerEngine(const QMap<QString,QVariant> &,QGeoServiceProvider::Error *,QString *) const"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.location.QGeoServiceProviderFactory$Result<QGeoCodingManagerEngine>"
+                    modifiedType: "io.qt.location.QGeoServiceProviderFactory$@NonNull Result<@Nullable QGeoCodingManagerEngine>"
                 }
                 DefineOwnership{
                     codeClass: CodeClass.Native
@@ -298,7 +293,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.location.QGeoServiceProviderFactory.Result<QGeoRoutingManagerEngine>"
+                    modifiedType: "io.qt.location.QGeoServiceProviderFactory$@NonNull Result<@Nullable QGeoRoutingManagerEngine>"
                 }
                 DefineOwnership{
                     codeClass: CodeClass.Native
@@ -370,7 +365,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.location.QGeoServiceProviderFactory.Result<QPlaceManagerEngine>"
+                    modifiedType: "io.qt.location.QGeoServiceProviderFactory$@NonNull Result<@Nullable QPlaceManagerEngine>"
                 }
                 DefineOwnership{
                     codeClass: CodeClass.Native
@@ -479,35 +474,18 @@ TypeSystem{
     
     ValueType{
         name: "QGeoRoute"
-        ModifyFunction{
-            signature: "operator=(const QGeoRoute &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QGeoRouteLeg"
-        ModifyFunction{
-            signature: "operator=(const QGeoRouteLeg &)"
-            remove: RemoveFlag.All
-            since: [5, 15]
-        }
     }
     
     ValueType{
         name: "QPlace"
-        ModifyFunction{
-            signature: "operator=(const QPlace &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QPlaceIcon"
-        ModifyFunction{
-            signature: "operator=(const QPlaceIcon &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "setManager(QPlaceManager *)"
             ModifyArgument{
@@ -526,42 +504,22 @@ TypeSystem{
     
     ValueType{
         name: "QGeoManeuver"
-        ModifyFunction{
-            signature: "operator=(const QGeoManeuver &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QPlaceAttribute"
-        ModifyFunction{
-            signature: "operator=(const QPlaceAttribute &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QPlaceCategory"
-        ModifyFunction{
-            signature: "operator=(const QPlaceCategory &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QPlaceContactDetail"
-        ModifyFunction{
-            signature: "operator=(const QPlaceContactDetail &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QPlaceMatchRequest"
-        ModifyFunction{
-            signature: "operator=(const QPlaceMatchRequest &)"
-            remove: RemoveFlag.All
-        }
     }
     
     EnumType{
@@ -570,10 +528,6 @@ TypeSystem{
     
     ValueType{
         name: "QPlaceSearchResult"
-        ModifyFunction{
-            signature: "operator=(const QPlaceSearchResult &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -591,10 +545,6 @@ TypeSystem{
     
     ValueType{
         name: "QPlaceContent"
-        ModifyFunction{
-            signature: "operator=(const QPlaceContent &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -611,10 +561,6 @@ TypeSystem{
     
     ValueType{
         name: "QPlaceContentRequest"
-        ModifyFunction{
-            signature: "operator=(const QPlaceContentRequest &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -623,10 +569,6 @@ TypeSystem{
     
     ValueType{
         name: "QPlaceRatings"
-        ModifyFunction{
-            signature: "operator=(const QPlaceRatings &)"
-            remove: RemoveFlag.All
-        }
     }
     
     EnumType{
@@ -635,72 +577,46 @@ TypeSystem{
     
     ValueType{
         name: "QPlaceSearchRequest"
-        ModifyFunction{
-            signature: "operator=(const QPlaceSearchRequest &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QPlaceSupplier"
-        ModifyFunction{
-            signature: "operator=(const QPlaceSupplier &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QPlaceUser"
-        ModifyFunction{
-            signature: "operator=(const QPlaceUser &)"
-            remove: RemoveFlag.All
-        }
-    }
-    
-    EnumType{
-        name: "QGeoRouteRequest::FeatureType"
-        flags: "QGeoRouteRequest::FeatureTypes"
-    }
-    
-    EnumType{
-        name: "QGeoRouteRequest::FeatureWeight"
-        flags: "QGeoRouteRequest::FeatureWeights"
-    }
-    
-    EnumType{
-        name: "QGeoRouteRequest::ManeuverDetail"
-        flags: "QGeoRouteRequest::ManeuverDetails"
-    }
-    
-    EnumType{
-        name: "QGeoRouteRequest::RouteOptimization"
-        flags: "QGeoRouteRequest::RouteOptimizations"
-    }
-    
-    EnumType{
-        name: "QGeoRouteRequest::SegmentDetail"
-        flags: "QGeoRouteRequest::SegmentDetails"
-    }
-    
-    EnumType{
-        name: "QGeoRouteRequest::TravelMode"
-        flags: "QGeoRouteRequest::TravelModes"
     }
     
     ValueType{
         name: "QGeoRouteRequest"
-        ModifyFunction{
-            signature: "operator=(const QGeoRouteRequest &)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "FeatureType"
+        }
+
+        EnumType{
+            name: "FeatureWeight"
+        }
+
+        EnumType{
+            name: "ManeuverDetail"
+        }
+
+        EnumType{
+            name: "RouteOptimization"
+        }
+
+        EnumType{
+            name: "SegmentDetail"
+        }
+
+        EnumType{
+            name: "TravelMode"
         }
     }
     
     ValueType{
         name: "QGeoRouteSegment"
-        ModifyFunction{
-            signature: "operator=(const QGeoRouteSegment &)"
-            remove: RemoveFlag.All
-        }
     }
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QGeoRoute::d', unmatched return type '*QExplicitlySharedDataPointer*'"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtMacExtras.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtMacExtras.qml
index 42f9870b..3b1f5a47 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtMacExtras.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtMacExtras.qml
@@ -31,13 +31,13 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.macextras"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtMacExtras"
     module: "qtjambi.macextras"
     description: "Provides platform-specific APIs for macOS."
 
     InjectCode{
-        Text{content: "io.qt.QtUtilities.initializePackage(\"io.qt.widgets\");"}
+        Text{content: "QtUtilities.initializePackage(\"io.qt.widgets\");"}
     }
     
     Rejection{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtMultimedia.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtMultimedia.qml
index a82bb6cc..8420fbf4 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtMultimedia.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtMultimedia.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.multimedia"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtMultimedia"
     module: "qtjambi.multimedia"
     description: "Classes for audio, video, radio and camera functionality."
@@ -83,14 +83,6 @@ TypeSystem{
         className: "QAudioFrame"
     }
     
-    Rejection{
-        className: "QAudioBuffer::StereoFrame"
-    }
-    
-    Rejection{
-        className: "QAudioBuffer::StereoFrameDefault"
-    }
-    
     Rejection{
         className: "QAudioDevicePrivate"
     }
@@ -198,18 +190,6 @@ TypeSystem{
         until: 5
     }
     
-    EnumType{
-        name: "QAudioFormat::Endian"
-    }
-    
-    EnumType{
-        name: "QAudioFormat::SampleType"
-    }
-    
-    EnumType{
-        name: "QAudioFormat::SampleFormat"
-    }
-    
     EnumType{
         name: "QVideoSurfaceFormat::Direction"
         until: 5
@@ -230,7 +210,6 @@ TypeSystem{
     
     EnumType{
         name: "QCamera::CaptureMode"
-        flags: "QCamera::CaptureModes"
     }
     
     EnumType{
@@ -247,7 +226,6 @@ TypeSystem{
     
     EnumType{
         name: "QCamera::LockType"
-        flags: "QCamera::LockTypes"
     }
     
     EnumType{
@@ -268,7 +246,6 @@ TypeSystem{
     
     EnumType{
         name: "QCamera::Feature"
-        flags: "QCamera::Features"
     }
     
     EnumType{
@@ -294,7 +271,6 @@ TypeSystem{
     
     EnumType{
         name: "QCameraExposure::FlashMode"
-        flags: "QCameraExposure::FlashModes"
         until: 5
     }
     
@@ -315,7 +291,6 @@ TypeSystem{
     
     EnumType{
         name: "QCameraFocus::FocusMode"
-        flags: "QCameraFocus::FocusModes"
         until: 5
     }
     
@@ -331,7 +306,6 @@ TypeSystem{
     
     EnumType{
         name: "QCameraImageCapture::CaptureDestination"
-        flags: "QCameraImageCapture::CaptureDestinations"
         until: 5
     }
     
@@ -371,7 +345,6 @@ TypeSystem{
     
     EnumType{
         name: "QMediaPlayer::Flag"
-        flags: "QMediaPlayer::Flags"
     }
     
     EnumType{
@@ -490,26 +463,8 @@ TypeSystem{
         until: 5
     }
     
-    EnumType{
-        name: "QMediaServiceProviderHint::Feature"
-        flags: "QMediaServiceProviderHint::Features"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QMediaServiceProviderHint::Type"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QVideoFilterRunnable::RunFlag"
-        flags: "QVideoFilterRunnable::RunFlags"
-        until: 5
-    }
-    
     EnumType{
         name: "QVideoFrame::PaintOptions::PaintFlag"
-        flags: "QVideoFrame::PaintOptions::PaintFlags"
         since: [6, 2]
     }
     
@@ -522,12 +477,9 @@ TypeSystem{
         name: "QVideoFrame"
         ModifyFunction{
             signature: "operator=(const QVideoFrame &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyFunction{
@@ -552,6 +504,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "byte[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewByteArray(__qt_this->mappedBytes(%1));\n"+
@@ -566,7 +519,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@NonNull ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -582,6 +535,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "byte[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewByteArray(__qt_this->mappedBytes());\n"+
@@ -594,16 +548,34 @@ TypeSystem{
     
     ValueType{
         name: "QAudioBuffer"
-        ModifyFunction{
-            signature: "operator=(const QAudioBuffer &)"
-            remove: RemoveFlag.All
-        }
         ExtraIncludes{
             Include{
                 fileName: "utils_p.h"
                 location: Include.Local
             }
         }
+
+        Rejection{
+            className: "StereoFrame"
+        }
+        Rejection{
+            className: "StereoFrameDefault"
+        }
+        ModifyFunction{
+            signature: "constData<T>()const"
+            remove: RemoveFlag.All
+            since: 6
+        }
+        ModifyFunction{
+            signature: "data<T>()const"
+            remove: RemoveFlag.All
+            since: 6
+        }
+        ModifyFunction{
+            signature: "data<T>()"
+            remove: RemoveFlag.All
+            since: 6
+        }
         ModifyFunction{
             signature: "data() const"
             rename: "toByteArray"
@@ -612,6 +584,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "byte[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = %env->NewByteArray(__qt_this->byteCount());\n"+
@@ -624,7 +597,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@NonNull ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -638,7 +611,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.ByteBuffer"
+                    modifiedType: "java.nio.@NonNull ByteBuffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -695,6 +668,7 @@ TypeSystem{
             }
             ModifyArgument{
                 index: 0
+                NoNullPointer{}
                 ReplaceType{
                     modifiedType: "io.qt.multimedia.QAbstractVideoBuffer$MapResult"
                 }
@@ -779,7 +753,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QAbstractVideoBuffer$MapResult[]"
+                    modifiedType: "io.qt.multimedia.QAbstractVideoBuffer$@NonNull MapResult @NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -867,7 +841,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QAbstractVideoBuffer$MapResult[]"
+                    modifiedType: "io.qt.multimedia.QAbstractVideoBuffer$@NonNull MapResult @NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -943,48 +917,35 @@ TypeSystem{
     
     ValueType{
         name: "QAudioDeviceInfo"
-        ModifyFunction{
-            signature: "operator=(const QAudioDeviceInfo &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator!=(const QAudioDeviceInfo &)const"
-            remove: RemoveFlag.All
-        }
         until: 5
     }
     
-    EnumType{
-        name: "QAudioFormat::AudioChannelPosition"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QAudioFormat::ChannelConfig"
-        extensible: true
-        since: [6, 2]
-    }
-    
     ValueType{
         name: "QAudioFormat"
-        ModifyFunction{
-            signature: "operator=(const QAudioFormat &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator==(const QAudioFormat &)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "AudioChannelPosition"
             since: [6, 2]
         }
-        ModifyFunction{
-            signature: "operator!=(const QAudioFormat &)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "ChannelConfig"
+            extensible: true
             since: [6, 2]
         }
+        EnumType{
+            name: "Endian"
+        }
+        EnumType{
+            name: "SampleType"
+        }
+        EnumType{
+            name: "SampleFormat"
+        }
         ModifyFunction{
-            signature: "operator!=(const QAudioFormat &)const"
+            signature: "channelConfig<Args...>(Args)"
             remove: RemoveFlag.All
-            until: 5
+            since: 6
         }
         InjectCode{
             ImportFile{
@@ -1009,14 +970,6 @@ TypeSystem{
     
     ValueType{
         name: "QVideoSurfaceFormat"
-        ModifyFunction{
-            signature: "operator=(const QVideoSurfaceFormat &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator!=(const QVideoSurfaceFormat &)const"
-            remove: RemoveFlag.All
-        }
         ExtraIncludes{
             Include{
                 fileName: "QtCore/QScopedPointer"
@@ -1027,185 +980,68 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator=(const QVideoSurfaceFormat)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator==(const QVideoSurfaceFormat)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator!=(const QVideoSurfaceFormat)const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "property(const char*) const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setProperty(const char *, const QVariant &)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         until: 5
     }
     
     ValueType{
         name: "QAudioEncoderSettings"
-        ModifyFunction{
-            signature: "operator=(const QAudioEncoderSettings &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator!=(const QAudioEncoderSettings &)const"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QCameraFocusZone"
-        ModifyFunction{
-            signature: "operator=(const QCameraFocusZone &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator!=(const QCameraFocusZone &)const"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QImageEncoderSettings"
-        ModifyFunction{
-            signature: "operator=(const QImageEncoderSettings &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator!=(const QImageEncoderSettings &)const"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QMediaContent"
-        ModifyFunction{
-            signature: "operator=(const QMediaContent &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator!=(const QMediaContent &)const"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QMediaResource"
-        ModifyFunction{
-            signature: "operator=(const QMediaResource &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator!=(const QMediaResource &)const"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QMediaTimeInterval"
-        ModifyFunction{
-            signature: "operator=(const QMediaTimeInterval &)"
-            remove: RemoveFlag.All
-            since: [5, 14]
-        }
     }
     
     ValueType{
         name: "QMediaTimeRange"
-        ModifyFunction{
-            signature: "operator=(const QMediaTimeRange::Interval&)"
-            remove: RemoveFlag.All
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "operator=(const QMediaTimeInterval&)"
-            remove: RemoveFlag.All
-            until: 5
-        }
-        ModifyFunction{
-            signature: "operator=(const QMediaTimeRange &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator+=(const QMediaTimeRange::Interval&)"
-            remove: RemoveFlag.All
+        ValueType{
+            name: "Interval"
             since: [6, 2]
         }
-        ModifyFunction{
-            signature: "operator+=(const QMediaTimeInterval&)"
-            remove: RemoveFlag.All
-            until: 5
-        }
         ModifyFunction{
             signature: "operator+=(const QMediaTimeRange &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator-=(const QMediaTimeRange::Interval&)"
-            remove: RemoveFlag.All
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "operator-=(const QMediaTimeInterval&)"
-            remove: RemoveFlag.All
-            until: 5
+            rename: "add"
         }
         ModifyFunction{
             signature: "operator-=(const QMediaTimeRange &)"
-            remove: RemoveFlag.All
+            rename: "subtract"
         }
     }
     
     ValueType{
         name: "QVideoEncoderSettings"
-        ModifyFunction{
-            signature: "operator=(const QVideoEncoderSettings &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator!=(const QVideoEncoderSettings &)const"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QMediaServiceProviderHint"
-        ModifyFunction{
-            signature: "operator=(const QMediaServiceProviderHint &)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "Feature"
         }
-        ModifyFunction{
-            signature: "operator!=(const QMediaServiceProviderHint &)const"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "Type"
         }
         until: 5
     }
     
     ValueType{
         name: "QCameraViewfinderSettings"
-        ModifyFunction{
-            signature: "operator=(const QCameraViewfinderSettings &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -1285,7 +1121,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<Integer>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<@QtPrimitiveType@NonNull Integer>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1296,12 +1132,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<int> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<int>>(%env, __tmp_%in);\n"+
-                                  "if(%2){\n"+
-                                  "*%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<int>>(%env, __tmp_%in);\n"+
+                                  "    if(%2){\n"+
+                                  "        *%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -1440,10 +1276,6 @@ TypeSystem{
     
     ValueType{
         name: "QCameraInfo"
-        ModifyFunction{
-            signature: "operator=(const QCameraInfo&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -1476,7 +1308,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<Object>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<Object>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1487,12 +1319,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<QVariant> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<QVariant>>(%env, __tmp_%in);\n"+
-                                  "if(%2){\n"+
-                                  "*%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<QVariant>>(%env, __tmp_%in);\n"+
+                                  "    if(%2){\n"+
+                                  "        *%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -1532,7 +1364,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<Double>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<@QtPrimitiveType@NonNull Double>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1543,12 +1375,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<double> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<double>>(%env, __tmp_%in);\n"+
-                                  "if(%1){\n"+
-                                  "*%1 = %env->GetObjectField(%in, Java::QtMultimedia::QMediaService$Result(%env).continuous);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<double>>(%env, __tmp_%in);\n"+
+                                  "    if(%1){\n"+
+                                  "        *%1 = %env->GetObjectField(%in, Java::QtMultimedia::QMediaService$Result(%env).continuous);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -1568,7 +1400,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<Integer>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<@QtPrimitiveType@NonNull Integer>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1579,12 +1411,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<int> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<int>>(%env, __tmp_%in);\n"+
-                                  "if(%1){\n"+
-                                  "*%1 = %env->GetObjectField(%in, Java::QtMultimedia::QMediaService$Result(%env).continuous);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<int>>(%env, __tmp_%in);\n"+
+                                  "    if(%1){\n"+
+                                  "        *%1 = %env->GetObjectField(%in, Java::QtMultimedia::QMediaService$Result(%env).continuous);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -1604,7 +1436,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<Double>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<@QtPrimitiveType@NonNull Double>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1615,12 +1447,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<double> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<double>>(%env, __tmp_%in);\n"+
-                                  "if(%1){\n"+
-                                  "*%1 = %env->GetObjectField(%in, Java::QtMultimedia::QMediaService$Result(%env).continuous);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<double>>(%env, __tmp_%in);\n"+
+                                  "    if(%1){\n"+
+                                  "        *%1 = %env->GetObjectField(%in, Java::QtMultimedia::QMediaService$Result(%env).continuous);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -1670,7 +1502,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<io.qt.core.QSize>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<io.qt.core.@NonNull QSize>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1681,12 +1513,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<QSize> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<QSize>>(%env, __tmp_%in);\n"+
-                                  "if(%2){\n"+
-                                  "*%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<QSize>>(%env, __tmp_%in);\n"+
+                                  "    if(%2){\n"+
+                                  "        *%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -1749,7 +1581,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<io.qt.core.QSize>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<io.qt.core.@NonNull QSize>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1760,12 +1592,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<QSize> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<QSize>>(%env, __tmp_%in);\n"+
-                                  "if(%2){\n"+
-                                  "*%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<QSize>>(%env, __tmp_%in);\n"+
+                                  "    if(%2){\n"+
+                                  "        *%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -1932,7 +1764,7 @@ TypeSystem{
                     action: ReferenceCount.Set
                 }
                 ReplaceType{
-                    modifiedType: "io.qt.core.QObject"
+                    modifiedType: "io.qt.core.@Nullable QObject"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1986,51 +1818,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "load(const QNetworkRequest &, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "load(const QUrl &, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "save(const QUrl &, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "save(QIODevice*, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "load(QIODevice*, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         until: 5
     }
     
@@ -2057,7 +1844,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<Integer>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<@QtPrimitiveType@NonNull Integer>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -2068,12 +1855,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<int> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<int>>(%env, __tmp_%in);\n"+
-                                  "if(%2){\n"+
-                                  "*%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<int>>(%env, __tmp_%in);\n"+
+                                  "    if(%2){\n"+
+                                  "        *%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -2094,7 +1881,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<Double>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<@QtPrimitiveType@NonNull Double>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -2105,12 +1892,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<double> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<double>>(%env, __tmp_%in);\n"+
-                                  "if(%2){\n"+
-                                  "*%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<double>>(%env, __tmp_%in);\n"+
+                                  "    if(%2){\n"+
+                                  "        *%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -2131,7 +1918,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<io.qt.core.QSize>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<io.qt.core.@NonNull QSize>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -2142,12 +1929,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<QSize> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<QSize>>(%env, __tmp_%in);\n"+
-                                  "if(%2){\n"+
-                                  "*%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<QSize>>(%env, __tmp_%in);\n"+
+                                  "    if(%2){\n"+
+                                  "        *%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -2188,6 +1975,10 @@ TypeSystem{
                 location: Include.Global
             }
         }
+        ModifyFunction{
+            signature: "requestControl<T>()"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "requestControl(const char *)"
             AddTypeParameter{
@@ -2296,7 +2087,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<java.lang.Double>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<@QtPrimitiveType@NonNull Double>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -2307,12 +2098,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<double> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<double>>(%env, __tmp_%in);\n"+
-                                  "if(%2){\n"+
-                                  "*%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<double>>(%env, __tmp_%in);\n"+
+                                  "    if(%2){\n"+
+                                  "        *%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -2332,7 +2123,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.multimedia.QMediaService$ListResult<io.qt.core.QSize>"
+                    modifiedType: "io.qt.multimedia.QMediaService$@StrictNonNull ListResult<io.qt.core.@NonNull QSize>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -2343,12 +2134,12 @@ TypeSystem{
                     codeClass: CodeClass.Shell
                     Text{content: "QList<QSize> %out;\n"+
                                   "if(%in){\n"+
-                                  "jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
-                                  "if(__tmp_%in)\n"+
-                                  "%out = qtjambi_cast<QList<QSize>>(%env, __tmp_%in);\n"+
-                                  "if(%2){\n"+
-                                  "*%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
-                                  "}\n"+
+                                  "    jobject __tmp_%in = Java::QtMultimedia::QMediaService$Result::result(%env, %in);\n"+
+                                  "    if(__tmp_%in)\n"+
+                                  "        %out = qtjambi_cast<QList<QSize>>(%env, __tmp_%in);\n"+
+                                  "    if(%2){\n"+
+                                  "        *%2 = Java::QtMultimedia::QMediaService$Result::continuous(%env, %in);\n"+
+                                  "    }\n"+
                                   "}"}
                 }
             }
@@ -2514,6 +2305,10 @@ TypeSystem{
     
     ObjectType{
         name: "QVideoFilterRunnable"
+
+        EnumType{
+            name: "RunFlag"
+        }
         ExtraIncludes{
             Include{
                 fileName: "utils_p.h"
@@ -2521,22 +2316,12 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "run(QVideoFrame *, const QVideoSurfaceFormat &, QFlags<QVideoFilterRunnable::RunFlag>)"
+            signature: "run(QVideoFrame *, const QVideoSurfaceFormat &, QVideoFilterRunnable::RunFlags)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.multimedia.QVideoFrame"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QVideoFrame* %out = &qtjambi_cast<QVideoFrame&>(%env, %scope, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
+                invalidateAfterUse: true
             }
         }
         until: 5
@@ -2658,10 +2443,6 @@ TypeSystem{
     
     ValueType{
         name: "QCameraFormat"
-        ModifyFunction{
-            signature: "operator=(const QCameraFormat &)"
-            remove: RemoveFlag.All
-        }
         since: [6, 2]
     }
     
@@ -2672,19 +2453,11 @@ TypeSystem{
     
     ValueType{
         name: "QCameraDevice"
-        ModifyFunction{
-            signature: "operator=(const QCameraDevice &)"
-            remove: RemoveFlag.All
-        }
         since: [6, 2]
     }
     
     ValueType{
         name: "QAudioDevice"
-        ModifyFunction{
-            signature: "operator=(const QAudioDevice &)"
-            remove: RemoveFlag.All
-        }
         since: [6, 2]
     }
     
@@ -2705,10 +2478,6 @@ TypeSystem{
             read: false
             write: false
         }
-        ModifyFunction{
-            signature: "operator=(const QMediaFormat &)"
-            remove: RemoveFlag.All
-        }
         since: [6, 2]
     }
     
@@ -2791,16 +2560,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "setWindow(QWindow*)"
-            ModifyArgument{
-                index: 1
-                ReferenceCount{
-                    variableName: "__rcWindow"
-                    action: ReferenceCount.Set
-                }
-            }
-        }
         since: [6, 5]
     }
 
@@ -2932,45 +2691,16 @@ TypeSystem{
         since: [6, 2]
     }
     
-    ValueType{
-        name: "QMediaTimeRange::Interval"
-        since: [6, 2]
-    }
-    
     ValueType{
         name: "QMediaMetaData"
-        ModifyFunction{
-            signature: "operator[](QMediaMetaData::Key)"
-            remove: RemoveFlag.All
+        EnumType{
+            name: "Key"
         }
         since: [6, 2]
     }
     
     ValueType{
         name: "QVideoFrameFormat"
-        ModifyFunction{
-            signature: "operator=(const QVideoFrameFormat &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "updateUniformData(QByteArray *, const QVideoFrame &, const QMatrix4x4 &, float) const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.core.QByteArray"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray* %out = qtjambi_cast<QByteArray*>(%env, %in);"}
-                }
-            }
-            since: 6
-        }
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QMediaMetaData::Key"
         since: [6, 2]
     }
     
@@ -3006,10 +2736,7 @@ TypeSystem{
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QAudioBuffer::QAudioBuffer', unmatched parameter type 'QAbstractAudioBuffer*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QMediaService::requestControl', unmatched return type 'T'"}
-    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QWebEngine*."}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QAudioBuffer."}
-    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QCameraViewfinderSettings."}
-    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QVideoSurfaceFormat."}
     SuppressedWarning{
         text: "WARNING(MetaJavaBuilder) :: skipping function 'QVideoFrame::QVideoFrame', unmatched parameter type 'QAbstractVideoBuffer*'"
         since: [6, 2]
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtMultimediaWidgets.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtMultimediaWidgets.qml
index 16858a18..9c2d9148 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtMultimediaWidgets.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtMultimediaWidgets.qml
@@ -31,15 +31,15 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.multimedia.widgets"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtMultimediaWidgets"
     module: "qtjambi.multimediawidgets"
     description: "Widget classes for audio, video, radio and camera functionality."
     InjectCode{
         position: Position.Position4
         until: 5
-        Text{content: "if(io.qt.QtUtilities.isAvailableQtLibrary(\"OpenGL\"))\n"+
-                      "io.qt.QtUtilities.loadQtLibrary(\"OpenGL\");"}
+        Text{content: "if(QtUtilities.isAvailableQtLibrary(\"OpenGL\"))\n"+
+                      "QtUtilities.loadQtLibrary(\"OpenGL\");"}
     }
     
     RequiredLibrary{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtNetwork.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtNetwork.qml
index 608760b1..ff06a699 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtNetwork.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtNetwork.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.network"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtNetwork"
     module: "qtjambi.network"
     description: "Classes to make network programming easier and more portable."
@@ -40,7 +40,7 @@ TypeSystem{
         Text{content: "public final int read(byte data[]) {\n"+
                       "    if (data.length == 0) return 0;\n"+
                       "    \n"+
-                      "    io.qt.QNativePointer np = new io.qt.QNativePointer(io.qt.QNativePointer.Type.Byte, data.length);\n"+
+                      "    QNativePointer np = new QNativePointer(QNativePointer.Type.Byte, data.length);\n"+
                       "    int len = (int) read(np, data.length);\n"+
                       "    for (int i=0; i<len; ++i) data[i] = np.byteAt(i);\n"+
                       "    \n"+
@@ -85,7 +85,6 @@ TypeSystem{
     
     EnumType{
         name: "QSsl::SslOption"
-        flags: "QSsl::SslOptions"
     }
     
     EnumType{
@@ -100,7 +99,6 @@ TypeSystem{
     
     EnumType{
         name: "QNetworkProxy::Capability"
-        flags: "QNetworkProxy::Capabilities"
     }
     
     EnumType{
@@ -125,12 +123,10 @@ TypeSystem{
     
     EnumType{
         name: "QAbstractSocket::BindFlag"
-        flags: "QAbstractSocket::BindMode"
     }
     
     EnumType{
         name: "QAbstractSocket::PauseMode"
-        flags: "QAbstractSocket::PauseModes"
     }
     
     EnumType{
@@ -150,7 +146,6 @@ TypeSystem{
     
     EnumType{
         name: "QNetworkInterface::InterfaceFlag"
-        flags: "QNetworkInterface::InterfaceFlags"
     }
     
     EnumType{
@@ -200,13 +195,11 @@ TypeSystem{
     
     EnumType{
         name: "QLocalSocket::SocketOption"
-        flags: "QLocalSocket::SocketOptions"
         since: [6, 2]
     }
     
     EnumType{
         name: "QLocalServer::SocketOption"
-        flags: "QLocalServer::SocketOptions"
     }
     
     EnumType{
@@ -281,7 +274,6 @@ TypeSystem{
     
     EnumType{
         name: "QNetworkConfiguration::StateFlag"
-        flags: "QNetworkConfiguration::StateFlags"
         until: 5
     }
     
@@ -292,7 +284,6 @@ TypeSystem{
     
     EnumType{
         name: "QNetworkConfigurationManager::Capability"
-        flags: "QNetworkConfigurationManager::Capabilities"
         until: 5
     }
     
@@ -308,7 +299,6 @@ TypeSystem{
     
     EnumType{
         name: "QNetworkSession::UsagePolicy"
-        flags: "QNetworkSession::UsagePolicies"
         until: 5
     }
     
@@ -333,7 +323,6 @@ TypeSystem{
     
     EnumType{
         name: "QHostAddress::ConversionModeFlag"
-        flags: "QHostAddress::ConversionMode"
         since: [5, 8]
     }
     
@@ -368,7 +357,6 @@ TypeSystem{
     
     EnumType{
         name: "QHstsPolicy::PolicyFlag"
-        flags: "QHstsPolicy::PolicyFlags"
         since: [5, 9]
     }
     
@@ -398,7 +386,6 @@ TypeSystem{
     
     EnumType{
         name: "QNetworkInformation::Feature"
-        flags: "QNetworkInformation::Features"
         since: [6, 1]
     }
     
@@ -435,10 +422,6 @@ TypeSystem{
     
     ValueType{
         name: "QNetworkCacheMetaData"
-        ModifyFunction{
-            signature: "operator=(QNetworkCacheMetaData)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -457,10 +440,6 @@ TypeSystem{
     
     ValueType{
         name: "QNetworkProxyQuery"
-        ModifyFunction{
-            signature: "operator=(QNetworkProxyQuery)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -480,17 +459,6 @@ TypeSystem{
                 invalidateAfterUse: true
                 NoNullPointer{
                 }
-                ReplaceType{
-                    modifiedType: "io.qt.network.QAuthenticator"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QAuthenticator* %out  = qtjambi_cast<QAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -512,7 +480,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setLocalPort(unsigned short)"
+            signature: "setLocalPort(quint16)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
@@ -521,7 +489,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setPeerPort(unsigned short)"
+            signature: "setPeerPort(quint16)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
@@ -530,7 +498,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "connectToHost(QString, unsigned short, QFlags<QIODevice::OpenModeFlag>,QAbstractSocket::NetworkLayerProtocol)"
+            signature: "connectToHost(QString, quint16, QIODevice::OpenMode,QAbstractSocket::NetworkLayerProtocol)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -540,7 +508,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "connectToHost(QString, unsigned short, QFlags<QIODeviceBase::OpenModeFlag>,QAbstractSocket::NetworkLayerProtocol)"
+            signature: "connectToHost(QString, quint16, QIODeviceBase::OpenMode,QAbstractSocket::NetworkLayerProtocol)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -550,7 +518,7 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "connectToHost(QHostAddress, unsigned short, QFlags<QIODevice::OpenModeFlag>)"
+            signature: "connectToHost(QHostAddress, quint16, QIODevice::OpenMode)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -560,7 +528,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "connectToHost(QHostAddress, unsigned short, QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "connectToHost(QHostAddress, quint16, QIODeviceBase::OpenMode)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -578,16 +546,16 @@ TypeSystem{
             access: Modification.NonFinal
         }
         ModifyFunction{
-            signature: "setReadBufferSize(long long)"
+            signature: "setReadBufferSize(qint64)"
             access: Modification.NonFinal
         }
         ModifyFunction{
-            signature: "setSocketDescriptor(qintptr,QAbstractSocket::SocketState,QFlags<QIODevice::OpenModeFlag>)"
+            signature: "setSocketDescriptor(qintptr,QAbstractSocket::SocketState,QIODevice::OpenMode)"
             access: Modification.NonFinal
             until: 5
         }
         ModifyFunction{
-            signature: "setSocketDescriptor(qintptr,QAbstractSocket::SocketState,QFlags<QIODeviceBase::OpenModeFlag>)"
+            signature: "setSocketDescriptor(qintptr,QAbstractSocket::SocketState,QIODeviceBase::OpenMode)"
             access: Modification.NonFinal
             since: 6
         }
@@ -600,7 +568,7 @@ TypeSystem{
             access: Modification.NonFinal
         }
         ModifyFunction{
-            signature: "bind(QHostAddress, unsigned short, QFlags<QAbstractSocket::BindFlag>)"
+            signature: "bind(QHostAddress, quint16, QAbstractSocket::BindMode)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -609,7 +577,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "bind(unsigned short, QFlags<QAbstractSocket::BindFlag>)"
+            signature: "bind(quint16, QAbstractSocket::BindMode)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
@@ -640,7 +608,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "listen(QHostAddress,unsigned short)"
+            signature: "listen(QHostAddress,quint16)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -699,19 +667,8 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslPreSharedKeyAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslPreSharedKeyAuthenticator* %out  = qtjambi_cast<QSslPreSharedKeyAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         since: [6, 4]
@@ -733,7 +690,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "readDatagram(char*,long long,QHostAddress*,unsigned short*)"
+            signature: "readDatagram(char*,qint64,QHostAddress*,quint16*)"
             ModifyArgument{
                 index: 0
                 ConversionRule{
@@ -773,13 +730,13 @@ TypeSystem{
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "unsigned short port(0);\n"+
-                                  "unsigned short* %out = %2 ? &port : nullptr;"}
+                    Text{content: "ushort port(0);\n"+
+                                  "ushort* %out = %2 ? &port : nullptr;"}
                 }
             }
         }
         ModifyFunction{
-            signature: "writeDatagram(const char*,long long,QHostAddress,unsigned short)"
+            signature: "writeDatagram(const char*,qint64,QHostAddress,quint16)"
             ModifyArgument{
                 index: 1
                 ArrayType{
@@ -794,16 +751,9 @@ TypeSystem{
         name: "QHttpPart"
         ModifyFunction{
             signature: "operator=(const QHttpPart &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                replaceValue: "this"
-            }
-            ModifyArgument{
-                index: 1
-                ReferenceCount{
-                    action: ReferenceCount.Ignore
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyFunction{
@@ -889,7 +839,7 @@ TypeSystem{
             ppCondition: "!defined(QT_NO_SSL)"
         }
         ModifyFunction{
-            signature: "connectToHostEncrypted(const QString &, unsigned short, const QSslConfiguration &)"
+            signature: "connectToHostEncrypted(const QString &, quint16, const QSslConfiguration &)"
             ppCondition: "!defined(QT_NO_SSL)"
         }
         ModifyFunction{
@@ -940,19 +890,8 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.network.QAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QAuthenticator* %out  = qtjambi_cast<QAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -960,19 +899,8 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslPreSharedKeyAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslPreSharedKeyAuthenticator* %out  = qtjambi_cast<QSslPreSharedKeyAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -980,18 +908,16 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.network.QAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QAuthenticator* %out  = qtjambi_cast<QAuthenticator*>(%env, %scope, %in);"}
+            }
+        }
+        ModifyFunction{
+            signature: "proxyFactory()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
             }
         }
@@ -1025,19 +951,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslConfiguration"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslConfiguration& %out  = qtjambi_cast<QSslConfiguration&>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -1045,19 +958,8 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslPreSharedKeyAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslPreSharedKeyAuthenticator* %out  = qtjambi_cast<QSslPreSharedKeyAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
     }
@@ -1065,38 +967,21 @@ TypeSystem{
     ValueType{
         name: "QHostAddress"
         ModifyFunction{
-            signature: "QHostAddress(unsigned char*)"
-            remove: RemoveFlag.All
-            until: 5
-        }
-        ModifyFunction{
-            signature: "QHostAddress(const unsigned char*)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setAddress(unsigned char*)"
+            signature: "QHostAddress(quint8*)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "setAddress(const unsigned char*)"
+            signature: "QHostAddress(const quint8*)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator=(QString)"
+            signature: "setAddress(quint8*)"
             remove: RemoveFlag.All
             until: 5
         }
         ModifyFunction{
-            signature: "operator=(QHostAddress)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(const QHostAddress &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(QHostAddress::SpecialAddress)"
+            signature: "setAddress(const quint8*)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -1113,10 +998,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator=(QHostInfo)"
-            remove: RemoveFlag.All
-        }
         InjectCode{
             target: CodeClass.Java
             ImportFile{
@@ -1127,12 +1008,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "lookupHost(QString, QObject*, const char*)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -1161,28 +1036,16 @@ TypeSystem{
     
     ValueType{
         name: "QNetworkAddressEntry"
-        ModifyFunction{
-            signature: "operator=(QNetworkAddressEntry)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QNetworkInterface"
-        ModifyFunction{
-            signature: "operator=(QNetworkInterface)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QNetworkProxy"
         ModifyFunction{
-            signature: "operator=(QNetworkProxy)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "QNetworkProxy(QNetworkProxy::ProxyType,QString,unsigned short,QString,QString)"
+            signature: "QNetworkProxy(QNetworkProxy::ProxyType,QString,quint16,QString,QString)"
             access: Modification.Private
             ModifyArgument{
                 index: 3
@@ -1192,7 +1055,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setPort(unsigned short)"
+            signature: "setPort(quint16)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
@@ -1216,46 +1079,56 @@ TypeSystem{
         name: "QIPv6Address"
         ModifyFunction{
             signature: "operator[](int)const"
-            Remove{
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>15)\n"+
+                              "    throw new ArrayIndexOutOfBoundsException(index);"}
             }
         }
         ModifyFunction{
             signature: "operator[](int)"
-            Remove{
+            InjectCode{
+                target: CodeClass.Java
+                position: Position.Beginning
+                ArgumentMap{
+                    index: 1
+                    metaName: "index"
+                }
+                Text{content: "if(index<0 || index>15)\n"+
+                              "    throw new ArrayIndexOutOfBoundsException(index);"}
             }
         }
+        InjectCode{
+            target: CodeClass.Java
+            Text{content: "public QIPv6Address(byte[] c){\n"+
+                          "    this();\n"+
+                          "    setC(c);\n"+
+                          "}"}
+        }
     }
     
     ValueType{
         name: "QAuthenticator"
         ModifyFunction{
             signature: "operator=(QAuthenticator)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
     
     ValueType{
         name: "QNetworkCookie"
-        ModifyFunction{
-            signature: "operator=(QNetworkCookie)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QNetworkRequest"
-        ModifyFunction{
-            signature: "operator=(QNetworkRequest)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "setOriginatingObject(QObject*)"
             ModifyArgument{
@@ -1298,10 +1171,6 @@ TypeSystem{
     ValueType{
         name: "QSslCipher"
         ppCondition: "!defined(QT_NO_SSL)"
-        ModifyFunction{
-            signature: "operator=(QSslCipher)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -1309,14 +1178,9 @@ TypeSystem{
         ppCondition: "!defined(QT_NO_SSL)"
         ModifyFunction{
             signature: "operator=(QSslPreSharedKeyAuthenticator)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -1330,19 +1194,11 @@ TypeSystem{
     ValueType{
         name: "QSslError"
         ppCondition: "!defined(QT_NO_SSL)"
-        ModifyFunction{
-            signature: "operator=(QSslError)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QSslKey"
         ppCondition: "!defined(QT_NO_SSL)"
-        ModifyFunction{
-            signature: "operator=(QSslKey)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "QSslKey(Qt::HANDLE, QSsl::KeyType)"
             ModifyArgument{
@@ -1358,43 +1214,12 @@ TypeSystem{
     ValueType{
         name: "QSslCertificate"
         ppCondition: "!defined(QT_NO_SSL)"
-        ModifyFunction{
-            signature: "operator=(QSslCertificate)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "importPkcs12(QIODevice *, QSslKey *, QSslCertificate *, QList<QSslCertificate > *, const QByteArray &)"
             ModifyArgument{
                 index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslKey"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslKey* %out  = qtjambi_cast<QSslKey*>(%env, %scope, %in);"}
-                }
-            }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslCertificate"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslCertificate* %out  = qtjambi_cast<QSslCertificate*>(%env, %scope, %in);"}
-                }
             }
         }
     }
@@ -1402,10 +1227,6 @@ TypeSystem{
     ValueType{
         name: "QSslCertificateExtension"
         ppCondition: "!defined(QT_NO_SSL)"
-        ModifyFunction{
-            signature: "operator=(QSslCertificateExtension)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -1427,36 +1248,23 @@ TypeSystem{
             signature: "setDefaultDtlsConfiguration(const QSslConfiguration &)"
             ppCondition: "QT_CONFIG(dtls)"
         }
-        ModifyFunction{
-            signature: "operator=(QSslConfiguration)"
-            remove: RemoveFlag.All
-        }
         ModifyField{
             name: "ALPNProtocolHTTP2"
             read: true
             write: false
             access: Modification.Private
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
         }
         ModifyField{
             name: "NextProtocolHttp1_1"
             read: true
             write: false
             access: Modification.Private
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
         }
         ModifyField{
             name: "NextProtocolSpdy3_0"
             read: true
             write: false
             access: Modification.Private
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
             until: 5
         }
         InjectCode{
@@ -1500,10 +1308,6 @@ TypeSystem{
     ValueType{
         name: "QSslDiffieHellmanParameters"
         ppCondition: "!defined(QT_NO_SSL)"
-        ModifyFunction{
-            signature: "operator=(QSslDiffieHellmanParameters)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -1514,29 +1318,14 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslPreSharedKeyAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslPreSharedKeyAuthenticator* %out  = qtjambi_cast<QSslPreSharedKeyAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
     }
     
     ValueType{
         name: "QNetworkConfiguration"
-        ModifyFunction{
-            signature: "operator=(QNetworkConfiguration)"
-            remove: RemoveFlag.All
-        }
         until: 5
     }
     
@@ -1568,67 +1357,35 @@ TypeSystem{
     
     ValueType{
         name: "QDnsDomainNameRecord"
-        ModifyFunction{
-            signature: "operator=(const QDnsDomainNameRecord&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QDnsHostAddressRecord"
-        ModifyFunction{
-            signature: "operator=(const QDnsHostAddressRecord&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QDnsMailExchangeRecord"
-        ModifyFunction{
-            signature: "operator=(const QDnsMailExchangeRecord&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QDnsServiceRecord"
-        ModifyFunction{
-            signature: "operator=(const QDnsServiceRecord&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QDnsTextRecord"
-        ModifyFunction{
-            signature: "operator=(const QDnsTextRecord&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QNetworkDatagram"
-        ModifyFunction{
-            signature: "operator=(const QNetworkDatagram&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QHstsPolicy"
-        ModifyFunction{
-            signature: "operator=(const QHstsPolicy&)"
-            remove: RemoveFlag.All
-        }
         since: [5, 9]
     }
     
     ValueType{
         name: "QOcspResponse"
-        ModifyFunction{
-            signature: "operator=(const QOcspResponse&)"
-            remove: RemoveFlag.All
-        }
         since: [5, 13]
     }
     
@@ -1704,19 +1461,8 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslPreSharedKeyAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslPreSharedKeyAuthenticator* %out  = qtjambi_cast<QSslPreSharedKeyAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         since: [5, 12]
@@ -1737,7 +1483,7 @@ TypeSystem{
     ObjectType{
         name: "QDtlsClientVerifier"
         ModifyFunction{
-            signature: "verifyClient(QUdpSocket *, const QByteArray &, const QHostAddress &, unsigned short)"
+            signature: "verifyClient(QUdpSocket *, const QByteArray &, const QHostAddress &, quint16)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
@@ -1750,19 +1496,11 @@ TypeSystem{
     
     ValueType{
         name: "QHttp2Configuration"
-        ModifyFunction{
-            signature: "operator=(const QHttp2Configuration &)"
-            remove: RemoveFlag.All
-        }
         since: [5, 14]
     }
 
     ValueType{
         name: "QHttp1Configuration"
-        ModifyFunction{
-            signature: "operator=(const QHttp1Configuration &)"
-            remove: RemoveFlag.All
-        }
         since: [6, 5]
     }
     
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtNetworkAuth.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtNetworkAuth.qml
index 87345da9..0312edb4 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtNetworkAuth.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtNetworkAuth.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.network.auth"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtNetworkAuth"
     module: "qtjambi.networkauth"
     description: "Provides support for OAuth-based authorization to online services."
@@ -61,10 +61,6 @@ TypeSystem{
     
     ValueType{
         name: "QOAuth1Signature"
-        ModifyFunction{
-            signature: "operator=(const QOAuth1Signature &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -90,21 +86,12 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "prepareRequest(QNetworkRequest *, const QByteArray &, const QByteArray &)"
+            signature: "prepareRequest(QNetworkRequest*,QByteArray,QByteArray)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.network.QNetworkRequest"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QNetworkRequest *%out = qtjambi_cast<QNetworkRequest *>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
+                invalidateAfterUse: true
             }
+            since: 6
         }
     }
     
@@ -118,40 +105,6 @@ TypeSystem{
     
     ObjectType{
         name: "QOAuth1"
-        ModifyFunction{
-            signature: "setup(QNetworkRequest *, const QMap<QString, QVariant> &, QNetworkAccessManager::Operation)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.network.QNetworkRequest"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QNetworkRequest *%out = qtjambi_cast<QNetworkRequest *>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setup(QNetworkRequest *, const QMap<QString, QVariant> &, const QByteArray &)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.network.QNetworkRequest"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QNetworkRequest *%out = qtjambi_cast<QNetworkRequest *>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -161,7 +114,7 @@ TypeSystem{
     ObjectType{
         name: "QOAuthHttpServerReplyHandler"
         ModifyFunction{
-            signature: "listen(const QHostAddress &, unsigned short)"
+            signature: "listen(const QHostAddress &, quint16)"
             ModifyArgument{
                 index: 1
                 ReplaceDefaultExpression{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtNfc.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtNfc.qml
index e1e37e44..941ce0ca 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtNfc.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtNfc.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.nfc"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtNfc"
     module: "qtjambi.nfc"
     description: "Provides access to Near-Field communication (NFC) hardware."
@@ -51,19 +51,16 @@ TypeSystem{
         className: "RequestIdPrivate"
     }
     
-    EnumType{
-        name: "QNearFieldShareManager::ShareError"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QNearFieldShareManager::ShareMode"
-        flags: "QNearFieldShareManager::ShareModes"
-        until: 5
-    }
-    
     ObjectType{
         name: "QNearFieldShareManager"
+
+        EnumType{
+            name: "ShareError"
+        }
+
+        EnumType{
+            name: "ShareMode"
+        }
         until: 5
     }
     
@@ -71,21 +68,24 @@ TypeSystem{
         name: "QNearFieldShareTarget"
     }
     
-    EnumType{
-        name: "QNearFieldTarget::AccessMethod"
-        flags: "QNearFieldTarget::AccessMethods"
-    }
-    
-    EnumType{
-        name: "QNearFieldTarget::Error"
-    }
-    
-    EnumType{
-        name: "QNearFieldTarget::Type"
-    }
-    
     ObjectType{
         name: "QNearFieldTarget"
+
+        EnumType{
+            name: "AccessMethod"
+        }
+
+        EnumType{
+            name: "Error"
+        }
+
+        EnumType{
+            name: "Type"
+        }
+
+        ValueType{
+            name: "RequestId"
+        }
         ModifyFunction{
             signature: "disconnect()"
             rename: "disconnectFromTarget"
@@ -104,79 +104,40 @@ TypeSystem{
         }
     }
     
-    ValueType{
-        name: "QNearFieldTarget::RequestId"
-        ModifyFunction{
-            signature: "operator=(const QNearFieldTarget::RequestId &)"
-            remove: RemoveFlag.All
-        }
-    }
-    
-    EnumType{
-        name: "QNearFieldManager::AdapterState"
-    }
-    
-    EnumType{
-        name: "QNearFieldManager::TargetAccessMode"
-        flags: "QNearFieldManager::TargetAccessModes"
-    }
-    
     ObjectType{
         name: "QNearFieldManager"
-        ModifyFunction{
-            signature: "registerNdefMessageHandler(QObject *, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "registerNdefMessageHandler(QNdefRecord::TypeNameFormat, const QByteArray &, QObject *, const char *)"
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            until: 5
+
+        EnumType{
+            name: "AdapterState"
         }
-        ModifyFunction{
-            signature: "registerNdefMessageHandler(const QNdefFilter &, QObject *, const char *)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            until: 5
+
+        EnumType{
+            name: "TargetAccessMode"
         }
     }
     
     ValueType{
         name: "QNdefFilter"
-        ModifyFunction{
-            signature: "operator=(const QNdefFilter &)"
-            remove: RemoveFlag.All
+
+        ValueType{
+            name: "Record"
         }
         ModifyFunction{
             signature: "appendRecord<T>(unsigned int, unsigned int)"
             remove: RemoveFlag.All
         }
         InjectCode{
-            Text{content: "@io.qt.QtUninvokable\n"+
+            Text{content: "@QtUninvokable\n"+
                           "public final void appendRecord(Class<? extends QNdefRecord> type) {\n"+
                           "    appendRecord(type, 1, 1);\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public final void appendRecord(Class<? extends QNdefRecord> type, int min) {\n"+
                           "    appendRecord(type, min, 1);\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public final void appendRecord(Class<? extends QNdefRecord> type, int min, int max) {\n"+
                           "    if(type==QNdefRecord.class) {\n"+
                           "        QNdefRecord record = new QNdefRecord();\n"+
@@ -208,17 +169,8 @@ TypeSystem{
         }
     }
     
-    ValueType{
-        name: "QNdefFilter::Record"
-    }
-    
     ValueType{
         name: "QNdefMessage"
-        ModifyFunction{
-            signature: "operator=(const QNdefMessage &)"
-            remove: RemoveFlag.All
-            since: [6, 2]
-        }
         InjectCode{
             target: CodeClass.Native
             position: Position.Beginning
@@ -233,31 +185,22 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QNdefNfcSmartPosterRecord::Action"
-    }
-    
     ValueType{
         name: "QNdefNfcSmartPosterRecord"
-        polymorphicIdExpression: "%1->isRecordType<QNdefNfcSmartPosterRecord>()"
-        ModifyFunction{
-            signature: "operator=(const QNdefNfcSmartPosterRecord &)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "Action"
         }
-    }
-    
-    EnumType{
-        name: "QNdefNfcTextRecord::Encoding"
+        polymorphicIdExpression: "%1->isRecordType<QNdefNfcSmartPosterRecord>()"
     }
     
     ValueType{
         name: "QNdefNfcTextRecord"
-        polymorphicIdExpression: "%1->isRecordType<QNdefNfcTextRecord>()"
-        ModifyFunction{
-            signature: "operator=(const QNdefNfcTextRecord &)"
-            remove: RemoveFlag.All
-            until: 5
+
+        EnumType{
+            name: "Encoding"
         }
+        polymorphicIdExpression: "%1->isRecordType<QNdefNfcTextRecord>()"
     }
     
     ValueType{
@@ -270,18 +213,14 @@ TypeSystem{
         polymorphicIdExpression: "%1->isRecordType<QNdefNfcIconRecord>()"
     }
     
-    EnumType{
-        name: "QNdefRecord::TypeNameFormat"
-    }
-    
     ValueType{
         name: "QNdefRecord"
+
+        EnumType{
+            name: "TypeNameFormat"
+        }
         isPolymorphicBase: true
         polymorphicIdExpression: "%1->isRecordType%lt;QNdefRecord>()"
-        ModifyFunction{
-            signature: "operator=(const QNdefRecord &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "isRecordType<T>() const"
             remove: RemoveFlag.All
@@ -292,13 +231,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QQmlNdefRecord::TypeNameFormat"
-        until: 5
-    }
-    
     ObjectType{
         name: "QQmlNdefRecord"
+
+        EnumType{
+            name: "TypeNameFormat"
+        }
         until: 5
     }
     
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtOpenGL.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtOpenGL.qml
index a3e22c83..6a924eef 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtOpenGL.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtOpenGL.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.opengl"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtOpenGL"
     module: "qtjambi.opengl"
     description: "Classes that make it easy to use OpenGL in Qt applications."
@@ -2394,7 +2394,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -3485,7 +3485,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLBuffer::RangeAccessFlag"
-        flags: "QOpenGLBuffer::RangeAccessFlags"
     }
     
     EnumType{
@@ -3498,7 +3497,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLDebugMessage::Severity"
-        flags: "QOpenGLDebugMessage::Severities"
         RejectEnumValue{
             name: "LastSeverity"
         }
@@ -3506,7 +3504,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLDebugMessage::Source"
-        flags: "QOpenGLDebugMessage::Sources"
         RejectEnumValue{
             name: "LastSource"
         }
@@ -3514,7 +3511,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLDebugMessage::Type"
-        flags: "QOpenGLDebugMessage::Types"
         RejectEnumValue{
             name: "LastType"
         }
@@ -3530,7 +3526,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLShader::ShaderTypeBit"
-        flags: "QOpenGLShader::ShaderType"
     }
     
     EnumType{
@@ -3547,7 +3542,6 @@ TypeSystem{
     
     EnumType{
         name: "QOpenGLTexture::Feature"
-        flags: "QOpenGLTexture::Features"
     }
     
     EnumType{
@@ -3616,10 +3610,6 @@ TypeSystem{
     
     ValueType{
         name: "QOpenGLBuffer"
-        ModifyFunction{
-            signature: "operator=(const QOpenGLBuffer &)"
-            remove: RemoveFlag.All
-        }
         ExtraIncludes{
             Include{
                 fileName: "QtJambi/JavaAPI"
@@ -3667,7 +3657,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "mapRange(int, int, QFlags<QOpenGLBuffer::RangeAccessFlag>)"
+            signature: "mapRange(int, int, QOpenGLBuffer::RangeAccessFlags)"
             ModifyArgument{
                 index: 0
                 ReplaceType{
@@ -3687,26 +3677,10 @@ TypeSystem{
     
     ValueType{
         name: "QOpenGLDebugMessage"
-        ModifyFunction{
-            signature: "operator=(const QOpenGLDebugMessage&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QOpenGLFramebufferObjectFormat"
-        ModifyFunction{
-            signature: "operator!=(const QOpenGLFramebufferObjectFormat &) const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator=(const QOpenGLFramebufferObjectFormat &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator==(const QOpenGLFramebufferObjectFormat &) const"
-            access: Modification.Private
-        }
     }
     
     ObjectType{
@@ -3780,7 +3754,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_1_0"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_1_0>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_1_0_template_full"
@@ -3789,7 +3763,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_1_1"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_1_1>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_1_0_template_full"
@@ -3801,7 +3775,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_1_2"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_1_2>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_1_0_template_full"
@@ -3813,7 +3787,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_1_3"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_1_3>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_1_0_template_full"
@@ -3825,7 +3799,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_1_4"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_1_4>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_1_4A"
@@ -3840,7 +3814,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_1_5"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_1_5>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_1_4A"
@@ -3861,7 +3835,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_2_0"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_2_0>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -3876,7 +3850,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_2_1"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_2_1>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -3891,7 +3865,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_3_0"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_3_0>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -3909,7 +3883,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_3_1"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_3_1>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -3927,7 +3901,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_3_2_Compatibility"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_3_2_Compatibility>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -3948,7 +3922,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_3_2_Core"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_3_2_Core>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -3969,7 +3943,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_3_3_Compatibility"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_3_3_Compatibility>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -3990,7 +3964,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_3_3_Core"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_3_3_Core>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -4011,7 +3985,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_0_Compatibility"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_0_Compatibility>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -4032,7 +4006,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_0_Core"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_0_Core>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -4053,7 +4027,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_1_Compatibility"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_1_Compatibility>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -4074,7 +4048,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_1_Core"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_1_Core>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -4095,7 +4069,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_2_Compatibility"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_2_Compatibility>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -4116,7 +4090,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_2_Core"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_2_Core>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -4137,7 +4111,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_3_Compatibility"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_3_Compatibility>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -4158,7 +4132,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_3_Core"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_3_Core>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0A"
@@ -4179,7 +4153,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_4_Compatibility"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_4_Compatibility>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0B"
@@ -4200,7 +4174,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_4_Core"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_0_Core>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0B"
@@ -4221,7 +4195,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_5_Compatibility"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_5_Compatibility>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0B"
@@ -4242,7 +4216,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_4_5_Core"
-        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)"
+        ppCondition: "!defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_4_5_Core>)"
         targetType: "final class"
         Import{
             template: "QOpenGLFunctions_2_0B"
@@ -4263,7 +4237,7 @@ TypeSystem{
     
     ObjectType{
         name: "QOpenGLFunctions_ES2"
-        ppCondition: "QT_CONFIG(opengles2)"
+        ppCondition: "QT_CONFIG(opengles2) && __has_include(<QtOpenGL/QOpenGLFunctions_ES2>)"
         targetType: "final class"
         ModifyFunction{
             signature: "glBindAttribLocation(GLuint,GLuint,const GLchar*)"
@@ -4560,7 +4534,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addCacheableShaderFromSourceCode(QFlags<QOpenGLShader::ShaderTypeBit>, const char *)"
+            signature: "addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType, const char *)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -4592,7 +4566,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "addShaderFromSourceCode(QFlags<QOpenGLShader::ShaderTypeBit>, const char *)"
+            signature: "addShaderFromSourceCode(QOpenGLShader::ShaderType, const char *)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -4641,12 +4615,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setAttributeArray(const char *, const GLfloat *, int, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -4683,12 +4651,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setAttributeArray(const char *, const QVector2D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -4698,12 +4660,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setAttributeArray(const char *, const QVector3D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -4713,12 +4669,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setAttributeArray(const char *, const QVector4D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -4741,12 +4691,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setAttributeArray(const char *, GLenum, const void *, int, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 3
                 ReplaceType{
@@ -4768,618 +4712,240 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setAttributeBuffer ( const char *, GLenum, int, int, int)"
+            signature: "setAttributeValue ( const char * , const GLfloat * , int , int )"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    asBuffer: true
                 }
             }
         }
         ModifyFunction{
-            signature: "disableAttributeArray ( const char * )"
+            signature: "setUniformValueArray(int, const GLuint *, int)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "setUniformValueArray(int, const GLint *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    asBuffer: true
                 }
             }
         }
         ModifyFunction{
-            signature: "enableAttributeArray ( const char * )"
+            signature: "setUniformValueArray(int, const GLfloat *, int, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    asBuffer: true
                 }
             }
         }
         ModifyFunction{
-            signature: "setAttributeValue(const char *, GLfloat)"
+            signature: "setUniformValueArray(int, const QVector2D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setAttributeValue ( const char * , GLfloat , GLfloat )"
+            signature: "setUniformValueArray(int, const QVector3D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setAttributeValue ( const char *, GLfloat, GLfloat, GLfloat )"
+            signature: "setUniformValueArray(int, const QVector4D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setAttributeValue ( const char * , GLfloat , GLfloat , GLfloat , GLfloat )"
+            signature: "setUniformValueArray(int, const QMatrix4x4 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setAttributeValue ( const char * , const QVector2D )"
+            signature: "setUniformValueArray(int, const QMatrix2x2 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setAttributeValue ( const char * , const QVector3D )"
+            signature: "setUniformValueArray(int, const QMatrix3x2 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setAttributeValue ( const char * , const QVector4D )"
+            signature: "setUniformValueArray(int, const QMatrix4x2 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setAttributeValue ( const char *, const QColor )"
+            signature: "setUniformValueArray(int, const QMatrix2x3 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setAttributeValue ( const char * , const GLfloat * , int , int )"
+            signature: "setUniformValueArray(int, const QMatrix3x3 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
+        }
+        ModifyFunction{
+            signature: "setUniformValueArray(int, const QMatrix4x3 *, int)"
             ModifyArgument{
                 index: 2
                 ArrayType{
-                    asBuffer: true
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QPointF )"
+            signature: "setUniformValueArray(int, const QMatrix2x4 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QSize )"
+            signature: "setUniformValueArray(int, const QMatrix3x4 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QSizeF )"
+            signature: "setUniformValueArray(const char*, const GLuint *, int)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "setUniformValueArray(const char*, const GLint *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    asBuffer: true
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix2x2 )"
+            signature: "setUniformValueArray(const char*, const GLfloat *, int, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    asBuffer: true
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix2x3 )"
+            signature: "setUniformValueArray(const char*, const QVector2D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix2x4 )"
+            signature: "setUniformValueArray(const char*, const QVector3D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix3x2 )"
+            signature: "setUniformValueArray(const char*, const QVector4D *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix3x3 )"
+            signature: "setUniformValueArray(const char*, const QMatrix4x4 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix3x4 )"
+            signature: "setUniformValueArray(const char*, const QMatrix2x2 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix4x2 )"
+            signature: "setUniformValueArray(const char*, const QMatrix3x2 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix4x3 )"
+            signature: "setUniformValueArray(const char*, const QMatrix4x2 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QMatrix4x4 )"
+            signature: "setUniformValueArray(const char*, const QMatrix2x3 *, int)"
             ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                index: 2
+                ArrayType{
+                    lengthParameter: 3
                 }
             }
         }
         ModifyFunction{
-            signature: "setUniformValue(const char *, const QTransform )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, GLfloat)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, GLint)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, GLfloat, GLfloat)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, GLfloat, GLfloat, GLfloat)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, GLfloat, GLfloat, GLfloat, GLfloat)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, QVector2D )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, QVector3D )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, QVector4D )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, QPoint )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValue ( const char *, QColor )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const GLuint *, int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const GLint *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    asBuffer: true
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const GLfloat *, int, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    asBuffer: true
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QVector2D *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QVector3D *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QVector4D *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QMatrix4x4 *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QMatrix2x2 *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QMatrix3x2 *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QMatrix4x2 *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QMatrix2x3 *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QMatrix3x3 *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QMatrix4x3 *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QMatrix2x4 *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(int, const QMatrix3x4 *, int)"
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const GLuint *, int)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const GLint *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    asBuffer: true
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const GLfloat *, int, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    asBuffer: true
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const QVector2D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const QVector3D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const QVector4D *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const QMatrix4x4 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const QMatrix2x2 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const QMatrix3x2 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const QMatrix4x2 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const QMatrix2x3 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ArrayType{
-                    lengthParameter: 3
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setUniformValueArray(const char*, const QMatrix3x3 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            signature: "setUniformValueArray(const char*, const QMatrix3x3 *, int)"
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -5389,12 +4955,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix4x3 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -5404,12 +4964,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix2x4 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -5419,12 +4973,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "setUniformValueArray(const char*, const QMatrix3x4 *, int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -5441,10 +4989,6 @@ TypeSystem{
     
     ValueType{
         name: "QOpenGLVersionProfile"
-        ModifyFunction{
-            signature: "operator=(const QOpenGLVersionProfile &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -5457,7 +5001,7 @@ TypeSystem{
         InjectCode{
             target: CodeClass.Java
             Text{content: "@Override\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public final void close(){\n"+
                           "    dispose();\n"+
                           "}"}
@@ -5526,20 +5070,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 14
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
             since: [5, 14]
         }
         ModifyFunction{
@@ -5550,20 +5080,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 13
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
             since: [5, 14]
         }
         ModifyFunction{
@@ -5574,20 +5090,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 12
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
             since: [5, 14]
         }
         ModifyFunction{
@@ -5598,20 +5100,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 11
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
             since: [5, 14]
         }
         ModifyFunction{
@@ -5622,20 +5110,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 10
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
             since: [5, 14]
         }
         ModifyFunction{
@@ -5646,20 +5120,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setData(int, int, int, QOpenGLTexture::CubeMapFace, QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions * const)"
@@ -5669,20 +5129,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 8
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setData(int, int, QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions * const)"
@@ -5692,20 +5138,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 6
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setData(int, QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions * const)"
@@ -5715,20 +5147,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setData(QOpenGLTexture::PixelFormat, QOpenGLTexture::PixelType, const void *, const QOpenGLPixelTransferOptions * const)"
@@ -5738,16 +5156,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, int, int, QOpenGLTexture::CubeMapFace, int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -5757,16 +5165,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, int, QOpenGLTexture::CubeMapFace, int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -5776,16 +5174,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 6
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, int, int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -5795,16 +5183,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -5814,16 +5192,6 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
         ModifyFunction{
             signature: "setCompressedData(int, const void *,const QOpenGLPixelTransferOptions * const)"
@@ -5833,25 +5201,11 @@ TypeSystem{
                     asBuffer: true
                 }
             }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "io.qt.opengl.QOpenGLPixelTransferOptions"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QOpenGLPixelTransferOptions *%out = qtjambi_cast<QOpenGLPixelTransferOptions *>(%env, %in);"}
-                }
-            }
         }
     }
     
     ValueType{
         name: "QOpenGLPixelTransferOptions"
-        ModifyFunction{
-            signature: "operator=(const QOpenGLPixelTransferOptions&)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtOpenGLWidgets.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtOpenGLWidgets.qml
index 392b96b3..529a0fab 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtOpenGLWidgets.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtOpenGLWidgets.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.opengl.widgets"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtOpenGLWidgets"
     module: "qtjambi.openglwidgets"
     description: "This library provides a widget for rendering OpenGL graphics."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtPdf.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtPdf.qml
index 72af85b1..609577e8 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtPdf.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtPdf.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.pdf"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtPdf"
     module: "qtjambi.pdf"
     description: "Classes and functions for rendering PDF documents."
@@ -39,44 +39,21 @@ TypeSystem{
         name: "QtNetwork"
     }
     
-    EnumType{
-        name: "QPdfSearchModel::Role"
-    }
-    
-    EnumType{
-        name: "QPdfDocument::DocumentError"
-        until: [6, 3]
-    }
-    
-    EnumType{
-        name: "QPdfDocument::Error"
-        since: [6, 4]
-    }
-    
-    EnumType{
-        name: "QPdfDocument::PageModelRole"
-        since: [6, 4]
-    }
-    
-    EnumType{
-        name: "QPdfBookmarkModel::StructureMode"
-    }
-    
-    EnumType{
-        name: "QPdfBookmarkModel::Role"
-    }
-    
     ValueType{
         name: "QPdfLink"
-        ModifyFunction{
-            signature: "operator=(QPdfLink)"
-            remove: RemoveFlag.All
-        }
         since: [6, 4]
     }
     
     ObjectType{
         name: "QPdfBookmarkModel"
+
+        EnumType{
+            name: "StructureMode"
+        }
+
+        EnumType{
+            name: "Role"
+        }
         ModifyFunction{
             signature: "setDocument(QPdfDocument *)"
             ModifyArgument{
@@ -98,10 +75,6 @@ TypeSystem{
         name: "QPdfDestination"
         noMetaType: true
         generate: "no-shell"
-        ModifyFunction{
-            signature: "operator=(QPdfDestination)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "QPdfDestination()"
             remove: RemoveFlag.All
@@ -116,20 +89,45 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QPdfDocument::MetaDataField"
-    }
-    
-    EnumType{
-        name: "QPdfDocument::Status"
-    }
-    
     ObjectType{
         name: "QPdfDocument"
+
+        EnumType{
+            name: "DocumentError"
+            until: [6, 3]
+        }
+
+        EnumType{
+            name: "Error"
+            since: [6, 4]
+        }
+
+        EnumType{
+            name: "PageModelRole"
+            since: [6, 4]
+        }
+
+        EnumType{
+            name: "MetaDataField"
+        }
+
+        EnumType{
+            name: "Status"
+        }
     }
     
     ValueType{
         name: "QPdfDocumentRenderOptions"
+
+        EnumType{
+            name: "RenderFlag"
+            since: [6, 4]
+        }
+
+        EnumType{
+            name: "Rotation"
+            since: [6, 4]
+        }
     }
     
     ObjectType{
@@ -166,6 +164,10 @@ TypeSystem{
     
     ObjectType{
         name: "QPdfSearchModel"
+
+        EnumType{
+            name: "Role"
+        }
         ModifyFunction{
             signature: "setDocument(QPdfDocument *)"
             ModifyArgument{
@@ -203,39 +205,23 @@ TypeSystem{
             signature: "QPdfSelection(QPdfSelection)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QPdfSelection)"
-            remove: RemoveFlag.All
-        }
     }
     
     NamespaceType{
         name: "QPdf"
+
+        EnumType{
+            name: "RenderFlag"
+            until: [6, 3]
+        }
+
+        EnumType{
+            name: "Rotation"
+            until: [6, 3]
+        }
         until: [6, 3]
     }
     
-    EnumType{
-        name: "QPdf::RenderFlag"
-        flags: "QPdf::RenderFlags"
-        until: [6, 3]
-    }
-    
-    EnumType{
-        name: "QPdf::Rotation"
-        until: [6, 3]
-    }
-    
-    EnumType{
-        name: "QPdfDocumentRenderOptions::RenderFlag"
-        flags: "QPdfDocumentRenderOptions::RenderFlags"
-        since: [6, 4]
-    }
-    
-    EnumType{
-        name: "QPdfDocumentRenderOptions::Rotation"
-        since: [6, 4]
-    }
-    
     SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QPdfDestination' is missing a default constructor.*"}
     SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QPdfSelection' is missing a default constructor.*"}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtPdfWidgets.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtPdfWidgets.qml
index aee1401f..f81b3e85 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtPdfWidgets.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtPdfWidgets.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.pdf.widgets"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtPdfWidgets"
     module: "qtjambi.pdfwidgets"
     description: "Classes and functions for rendering PDF documents in a widget."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtPositioning.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtPositioning.qml
index cb1585e6..0c63689e 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtPositioning.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtPositioning.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.positioning"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtPositioning"
     module: "qtjambi.positioning"
     description: "Provides access to position, satellite and area monitoring classes."
@@ -49,18 +49,10 @@ TypeSystem{
     
     ValueType{
         name: "QGeoAreaMonitorInfo"
-        ModifyFunction{
-            signature: "operator=(const QGeoAreaMonitorInfo &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QGeoAddress"
-        ModifyFunction{
-            signature: "operator=(const QGeoAddress &)"
-            remove: RemoveFlag.All
-        }
     }
     
     EnumType{
@@ -84,10 +76,6 @@ TypeSystem{
             signature: "toString()const"
             access: Modification.NonFinal
         }
-        ModifyFunction{
-            signature: "operator=(const QGeoShape &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -97,28 +85,16 @@ TypeSystem{
             signature: "center()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(const QGeoCircle &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QGeoPath"
         polymorphicIdExpression: "%1->type() == QGeoShape::PathType"
-        ModifyFunction{
-            signature: "operator=(const QGeoPath &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QGeoPolygon"
         polymorphicIdExpression: "%1->type() == QGeoShape::PolygonType"
-        ModifyFunction{
-            signature: "operator=(const QGeoPolygon &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -128,10 +104,6 @@ TypeSystem{
             signature: "center()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(const QGeoRectangle &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "operator|=(const QGeoRectangle &)"
             remove: RemoveFlag.All
@@ -152,18 +124,10 @@ TypeSystem{
     
     ValueType{
         name: "QGeoCoordinate"
-        ModifyFunction{
-            signature: "operator=(const QGeoCoordinate &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QGeoLocation"
-        ModifyFunction{
-            signature: "operator=(const QGeoLocation &)"
-            remove: RemoveFlag.All
-        }
     }
     
     EnumType{
@@ -176,10 +140,6 @@ TypeSystem{
     
     ValueType{
         name: "QGeoSatelliteInfo"
-        ModifyFunction{
-            signature: "operator=(const QGeoSatelliteInfo &)"
-            remove: RemoveFlag.All
-        }
     }
     
     EnumType{
@@ -188,10 +148,6 @@ TypeSystem{
     
     ValueType{
         name: "QGeoPositionInfo"
-        ModifyFunction{
-            signature: "operator=(const QGeoPositionInfo &)"
-            remove: RemoveFlag.All
-        }
     }
     
     EnumType{
@@ -200,7 +156,6 @@ TypeSystem{
     
     EnumType{
         name: "QGeoAreaMonitorSource::AreaMonitorFeature"
-        flags: "QGeoAreaMonitorSource::AreaMonitorFeatures"
     }
     
     ObjectType{
@@ -259,6 +214,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.core.QMetaObject$AbstractSignal"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "QByteArray %out;\n"+
@@ -304,7 +260,6 @@ TypeSystem{
     
     EnumType{
         name: "QGeoPositionInfoSource::PositioningMethod"
-        flags: "QGeoPositionInfoSource::PositioningMethods"
     }
     
     ObjectType{
@@ -416,7 +371,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.positioning.QNmeaPositionInfoSource$Result"
+                    modifiedType: "io.qt.positioning.QNmeaPositionInfoSource$@Nullable Result"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -483,7 +438,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.positioning.QNmeaPositionInfoSource$Result"
+                    modifiedType: "io.qt.positioning.QNmeaPositionInfoSource$@Nullable Result"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -557,6 +512,14 @@ TypeSystem{
     
     ObjectType{
         name: "QNmeaSatelliteInfoSource"
+
+        EnumType{
+            name: "SatelliteInfoParseStatus"
+        }
+
+        EnumType{
+            name: "UpdateMode"
+        }
         ModifyFunction{
             signature: "setDevice(QIODevice*)"
             ModifyArgument{
@@ -577,6 +540,10 @@ TypeSystem{
                     lengthParameter: 2
                 }
             }
+            ModifyArgument{
+                index: 3
+                invalidateAfterUse: true
+            }
             ModifyArgument{
                 index: 4
                 NoNullPointer{
@@ -588,6 +555,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "parseSatelliteInfoFromNmea(QByteArrayView, QList<QGeoSatelliteInfo> &, QGeoSatelliteInfo::SatelliteSystem &)"
+            ModifyArgument{
+                index: 2
+                invalidateAfterUse: true
+            }
             ModifyArgument{
                 index: 3
                 NoNullPointer{
@@ -608,20 +579,14 @@ TypeSystem{
                     lengthParameter: 2
                 }
             }
+            ModifyArgument{
+                index: 3
+                invalidateAfterUse: true
+            }
         }
         since: [6, 2]
     }
     
-    EnumType{
-        name: "QNmeaSatelliteInfoSource::SatelliteInfoParseStatus"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QNmeaSatelliteInfoSource::UpdateMode"
-        since: [6, 2]
-    }
-    
     InterfaceType{
         name: "QGeoPositionInfoSourceFactory"
     }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtPrintSupport.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtPrintSupport.qml
index 47c087d6..b0d4ac59 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtPrintSupport.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtPrintSupport.qml
@@ -31,113 +31,35 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.printsupport"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtPrintSupport"
     module: "qtjambi.printsupport"
     description: "Classes to make printing easier and more portable."
-
-    Rejection{
-        className: "QPrinter"
-        functionName: "printerSelectionOption"
-    }
-    
-    Rejection{
-        className: "QPrinter"
-        functionName: "setPrinterSelectionOption"
-    }
-    
-    EnumType{
-        name: "QAbstractPrintDialog::PrintDialogOption"
-        flags: "QAbstractPrintDialog::PrintDialogOptions"
-    }
-    
-    EnumType{
-        name: "QAbstractPrintDialog::PrintRange"
-    }
-    
-    EnumType{
-        name: "QPrintPreviewWidget::ViewMode"
-    }
-    
-    EnumType{
-        name: "QPrintPreviewWidget::ZoomMode"
-    }
-    
-    EnumType{
-        name: "QPrintEngine::PrintEnginePropertyKey"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-        RejectEnumValue{
-            name: "PPK_PaperSize"
-        }
-    }
-    
-    EnumType{
-        name: "QPrinter::ColorMode"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-    }
-    
-    EnumType{
-        name: "QPrinter::Orientation"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-    }
-    
-    EnumType{
-        name: "QPrinter::OutputFormat"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-    }
-    
-    EnumType{
-        name: "QPrinter::PageOrder"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-    }
-    
-    EnumType{
-        name: "QPrinter::PaperSource"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-        RejectEnumValue{
-            name: "Upper"
-        }
-        RejectEnumValue{
-            name: "LastPaperSource"
-        }
-    }
-    
-    EnumType{
-        name: "QPrinter::PrintRange"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-    }
-    
-    EnumType{
-        name: "QPrinter::PrinterMode"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-    }
-    
-    EnumType{
-        name: "QPrinter::PrinterState"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-    }
-    
-    EnumType{
-        name: "QPrinter::Unit"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-    }
-    
-    EnumType{
-        name: "QPrinter::DuplexMode"
-        ppCondition: "!defined(QT_NO_PRINTER)"
-    }
     
     ValueType{
         name: "QPrinterInfo"
         ppCondition: "!defined(QT_NO_PRINTER)"
-        ModifyFunction{
-            signature: "operator=(const QPrinterInfo &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
         name: "QAbstractPrintDialog"
+
+        EnumType{
+            name: "PrintDialogOption"
+        }
+
+        EnumType{
+            name: "PrintRange"
+        }
+        ModifyFunction{
+            signature: "printer()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -170,11 +92,57 @@ TypeSystem{
     ObjectType{
         name: "QPrintEngine"
         ppCondition: "!defined(QT_NO_PRINTER)"
+        EnumType{
+            name: "PrintEnginePropertyKey"
+            RejectEnumValue{
+                name: "PPK_PaperSize"
+            }
+        }
     }
     
     ObjectType{
         name: "QPrinter"
         ppCondition: "!defined(QT_NO_PRINTER)"
+        EnumType{
+            name: "ColorMode"
+        }
+        EnumType{
+            name: "Orientation"
+        }
+        EnumType{
+            name: "OutputFormat"
+        }
+        EnumType{
+            name: "PageOrder"
+        }
+        EnumType{
+            name: "PaperSource"
+            RejectEnumValue{
+                name: "Upper"
+            }
+            RejectEnumValue{
+                name: "LastPaperSource"
+            }
+        }
+        EnumType{
+            name: "PrintRange"
+        }
+
+        EnumType{
+            name: "PrinterMode"
+        }
+
+        EnumType{
+            name: "PrinterState"
+        }
+
+        EnumType{
+            name: "Unit"
+        }
+
+        EnumType{
+            name: "DuplexMode"
+        }
         ModifyFunction{
             signature: "devType() const"
             remove: RemoveFlag.All
@@ -212,6 +180,15 @@ TypeSystem{
                               "    throw new IllegalStateException(\"Cannot create QPrinter before initializing QCoreApplication.\");"}
             }
         }
+        ModifyFunction{
+            signature: "printEngine()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const"
             ModifyArgument{
@@ -257,7 +234,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.core.QMarginsF"
+                    modifiedType: "io.qt.core.@NonNull QMarginsF"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -274,10 +251,27 @@ TypeSystem{
             signature: "open(QObject*,const char*)"
             remove: RemoveFlag.All
         }
+        ModifyFunction{
+            signature: "printer()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
         name: "QPrintPreviewWidget"
+        EnumType{
+            name: "ViewMode"
+        }
+
+        EnumType{
+            name: "ZoomMode"
+        }
+
         ModifyFunction{
             signature: "setVisible(bool)"
             threadAffinity: true
@@ -291,6 +285,15 @@ TypeSystem{
             signature: "open(QObject*,const char*)"
             remove: RemoveFlag.All
         }
+        ModifyFunction{
+            signature: "printer()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Shadowing: QDialog::accepted() and QPrintDialog::accepted(); Java code will not compile"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtPurchasing.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtPurchasing.qml
index 68db4a5d..4c0a99bb 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtPurchasing.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtPurchasing.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.purchasing"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtPurchasing"
     module: "qtjambi.purchasing"
     description: "Enables in-app purchase of products in Qt applications."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtQml.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtQml.qml
index bca61b2d..0a4665b1 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtQml.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtQml.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.qml"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtQml"
     module: "qtjambi.qml"
     description: "Classes for QML and JavaScript languages."
@@ -61,14 +61,6 @@ TypeSystem{
         className: "QQmlTriviallyDestructibleDebuggingEnabler"
     }
     
-    Rejection{
-        className: "QJSEngine::FunctionWithArgSignature"
-    }
-    
-    Rejection{
-        className: "QJSEngine::FunctionSignature"
-    }
-    
     Rejection{
         className: ""
         functionName: "qmlCreateCustomParser"
@@ -79,42 +71,12 @@ TypeSystem{
         functionName: "qjsvalue_cast_helper"
     }
     
-    Rejection{
-        className: "QJSEngine"
-        functionName: "fromScriptValue"
-    }
-    
-    Rejection{
-        className: "QJSEngine"
-        functionName: "toScriptValue"
-    }
-    
-    Rejection{
-        className: "QJSEngine"
-        functionName: "registerCustomType"
-    }
-    
-    Rejection{
-        className: "QJSEngine"
-        functionName: "scriptValueFromQMetaObject"
-    }
-    
-    Rejection{
-        className: "QJSEngine"
-        functionName: "newFunction"
-    }
-    
     
     Rejection{
         className: "QQmlInfo"
         functionName: "operator<<"
     }
     
-    Rejection{
-        className: "QJSEngine"
-        functionName: "objectById"
-    }
-    
     Rejection{
         className: ""
         functionName: "qjsvalue_cast"
@@ -178,31 +140,11 @@ TypeSystem{
         className: "QQmlComponentAttached"
     }
     
-    EnumType{
-        name: "QJSEngine::ObjectOwnership"
-        since: 6
-    }
-    
-    EnumType{
-        name: "QJSManagedValue::Type"
-        since: [6, 1]
-    }
-    
-    EnumType{
-        name: "QJSPrimitiveValue::Type"
-        since: [6, 1]
-    }
-    
     EnumType{
         name: "QJSValue::ObjectConversionBehavior"
         since: [6, 1]
     }
     
-    EnumType{
-        name: "QJSEngine::Extension"
-        flags: "QJSEngine::Extensions"
-    }
-    
     EnumType{
         name: "QQmlIncubator::IncubationMode"
     }
@@ -269,32 +211,6 @@ TypeSystem{
             signature: "data() const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "connectDownloadProgress(QObject *, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "connectFinished(QObject *, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "J2CStringBuffer %out(%env, %in);"}
-                }
-            }
-        }
     }
     
     ValueType{
@@ -345,16 +261,12 @@ TypeSystem{
     
     ValueType{
         name: "QQmlScriptString"
-        ModifyFunction{
-            signature: "operator= ( const QQmlScriptString & )"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "numberLiteral( bool * ) const"
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Double"
+                    modifiedType: "java.lang.@Nullable Double"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -377,7 +289,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Boolean"
+                    modifiedType: "java.lang.@Nullable Boolean"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -399,47 +311,9 @@ TypeSystem{
     
     ObjectType{
         name: "QJSManagedValue"
-        ModifyFunction{
-            signature: "jsMetaInstantiate(QList<QJSValue>)const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.qml.QJSManagedValue"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, new QJSManagedValue(std::move(%in)));\n"+
-                                  "QtJambiAPI::setJavaOwnership(%env, %out);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "jsMetaType()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.qml.QJSManagedValue"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, new QJSManagedValue(std::move(%in)));\n"+
-                                  "QtJambiAPI::setJavaOwnership(%env, %out);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "prototype()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.qml.QJSManagedValue"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, new QJSManagedValue(std::move(%in)));\n"+
-                                  "QtJambiAPI::setJavaOwnership(%env, %out);"}
-                }
-            }
+        EnumType{
+            name: "Type"
+            since: [6, 1]
         }
         since: [6, 1]
     }
@@ -452,6 +326,10 @@ TypeSystem{
                 location: Include.Global
             }
         }
+        EnumType{
+            name: "Type"
+            since: [6, 1]
+        }
         ModifyFunction{
             signature: "QJSPrimitiveValue(QJSPrimitiveNull)"
             remove: RemoveFlag.All
@@ -466,62 +344,34 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator+()"
-            rename: "unaryPlus"
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "operator++()"
-            rename: "inc"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
+            signature: "operator--(int)"
+            remove: RemoveFlag.All
             since: [6, 2]
         }
         ModifyFunction{
-            signature: "operator-()"
-            rename: "unaryMinus"
+            signature: "operator++(int)"
+            remove: RemoveFlag.All
             since: [6, 2]
         }
         ModifyFunction{
-            signature: "operator--()"
-            rename: "dec"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-            }
-            since: [6, 2]
+            signature: "operator*(QJSPrimitiveValue)"
+            Delegate{name: "multiplied"; deprecated: true}
         }
         ModifyFunction{
             signature: "operator%(QJSPrimitiveValue)"
-            rename: "mod"
-        }
-        ModifyFunction{
-            signature: "operator/(QJSPrimitiveValue)"
-            rename: "div"
-        }
-        ModifyFunction{
-            signature: "operator*(QJSPrimitiveValue)"
-            rename: "times"
+            Delegate{name: "modulo"; deprecated: true}
         }
         ModifyFunction{
             signature: "operator+(QJSPrimitiveValue)"
-            rename: "plus"
+            Delegate{name: "added"; deprecated: true}
         }
         ModifyFunction{
             signature: "operator-(QJSPrimitiveValue)"
-            rename: "minus"
-        }
-        ModifyFunction{
-            signature: "operator--(int)"
-            remove: RemoveFlag.All
-            since: [6, 2]
+            Delegate{name: "substracted"; deprecated: true}
         }
         ModifyFunction{
-            signature: "operator++(int)"
-            remove: RemoveFlag.All
-            since: [6, 2]
+            signature: "operator/(QJSPrimitiveValue)"
+            Delegate{name: "divided"; deprecated: true}
         }
         ModifyFunction{
             signature: "operate<Operators>(QJSPrimitiveValue,QJSPrimitiveValue)"
@@ -531,13 +381,6 @@ TypeSystem{
             signature: "operateOnIntegers<Operators,Lhs,Rhs>(QJSPrimitiveValue,QJSPrimitiveValue)"
             remove: RemoveFlag.All
         }
-        InjectCode{
-            ImportFile{
-                name: ":/io/qtjambi/generator/typesystem/QtJambiQml.java"
-                quoteAfterLine: "class QJSPrimitiveValue__"
-                quoteBeforeLine: "}// class"
-            }
-        }
         since: [6, 1]
     }
     
@@ -572,10 +415,6 @@ TypeSystem{
             signature: "QJSValue(const char * )"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator= ( const QJSValue & )"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "toUInt() const"
             remove: RemoveFlag.All
@@ -611,9 +450,6 @@ TypeSystem{
             signature: "call(const QList<QJSValue> &)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "java.util.Collection<QJSValue>"
-                }
                 ReplaceDefaultExpression{
                     expression: "java.util.Collections.emptyList()"
                 }
@@ -624,9 +460,6 @@ TypeSystem{
             signature: "callWithInstance(const QJSValue &, const QList<QJSValue> &)"
             ModifyArgument{
                 index: 2
-                ReplaceType{
-                    modifiedType: "java.util.Collection<QJSValue>"
-                }
                 ReplaceDefaultExpression{
                     expression: "java.util.Collections.emptyList()"
                 }
@@ -637,9 +470,6 @@ TypeSystem{
             signature: "callAsConstructor(const QList<QJSValue> &)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "java.util.Collection<QJSValue>"
-                }
                 ReplaceDefaultExpression{
                     expression: "java.util.Collections.emptyList()"
                 }
@@ -650,9 +480,6 @@ TypeSystem{
             signature: "call(const QList<QJSValue> &)const"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "java.util.Collection<QJSValue>"
-                }
                 ReplaceDefaultExpression{
                     expression: "java.util.Collections.emptyList()"
                 }
@@ -663,9 +490,6 @@ TypeSystem{
             signature: "callWithInstance(const QJSValue &, const QList<QJSValue> &)const"
             ModifyArgument{
                 index: 2
-                ReplaceType{
-                    modifiedType: "java.util.Collection<QJSValue>"
-                }
                 ReplaceDefaultExpression{
                     expression: "java.util.Collections.emptyList()"
                 }
@@ -676,9 +500,6 @@ TypeSystem{
             signature: "callAsConstructor(const QList<QJSValue> &)const"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "java.util.Collection<QJSValue>"
-                }
                 ReplaceDefaultExpression{
                     expression: "java.util.Collections.emptyList()"
                 }
@@ -700,14 +521,15 @@ TypeSystem{
             type: CustomConstructor.Default
             Text{content: "new(placement) QQmlInfo(qmlDebug(nullptr));"}
         }
+        ModifyFunction{
+            signature: "operator<<(QQmlInfo,const QWindow*)"
+            rename: "append"
+            since: 6
+        }
     }
     
     ValueType{
         name: "QQmlError"
-        ModifyFunction{
-            signature: "operator=(const QQmlError &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "setObject(QObject*)"
             ModifyArgument{
@@ -807,10 +629,175 @@ TypeSystem{
     
     ObjectType{
         name: "QJSEngine"
+        ExtraIncludes{
+            Include{
+                fileName: "utils_p.h"
+                location: Include.Local
+            }
+        }
+        Rejection{className: "FunctionWithArgSignature"}
+        Rejection{className: "FunctionSignature"}
+        Rejection{functionName: "registerCustomType"}
+        Rejection{functionName: "scriptValueFromQMetaObject"}
+        Rejection{functionName: "newFunction"}
+        Rejection{functionName: "objectById"}
+        EnumType{
+            name: "ObjectOwnership"
+            since: 6
+        }
+        EnumType{
+            name: "Extension"
+        }
+
         ModifyFunction{
             signature: "newQMetaObject<T>()"
             remove: RemoveFlag.All
         }
+        ModifyFunction{
+            signature: "toManagedValue<T>(T)"
+            Instantiation{
+                proxyCall: "qtjambi_toManagedValue"
+                Argument{
+                    type: "QVariant"
+                }
+                AddTypeParameter{
+                    name: "T"
+                }
+                ModifyArgument{
+                    index: 1
+                    ReplaceType{
+                        modifiedType: "T"
+                    }
+                }
+            }
+            since: [6, 1]
+        }
+        ModifyFunction{
+            signature: "fromManagedValue<T>(QJSManagedValue)"
+            Instantiation{
+                proxyCall: "qtjambi_fromManagedValue"
+                Argument{
+                    type: "QVariant"
+                }
+                AddTypeParameter{
+                    name: "T"
+                }
+                AddArgument{
+                    name: "type"
+                    type: "io.qt.core.QMetaType"
+                }
+                ModifyArgument{
+                    index: 0
+                    replaceType: "T"
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "%out = %in;"}
+                    }
+                }
+            }
+            since: [6, 1]
+        }
+        ModifyFunction{
+            signature: "toScriptValue<T>(T)"
+            Instantiation{
+                proxyCall: "qtjambi_toScriptValue"
+                Argument{
+                    type: "QVariant"
+                }
+                AddTypeParameter{
+                    name: "T"
+                }
+                ModifyArgument{
+                    index: 1
+                    ReplaceType{
+                        modifiedType: "T"
+                    }
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "fromScriptValue<T>(QJSValue)"
+            Instantiation{
+                proxyCall: "qtjambi_fromScriptValue"
+                Argument{
+                    type: "QVariant"
+                }
+                AddTypeParameter{
+                    name: "T"
+                }
+                AddArgument{
+                    name: "type"
+                    type: "io.qt.core.QMetaType"
+                }
+                ModifyArgument{
+                    index: 0
+                    replaceType: "T"
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "%out = %in;"}
+                    }
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "toPrimitiveValue<T>(T)"
+            Instantiation{
+                Argument{
+                    type: "int"
+                }
+            }
+            Instantiation{
+                Argument{
+                    type: "bool"
+                }
+            }
+            Instantiation{
+                Argument{
+                    type: "double"
+                }
+            }
+            Instantiation{
+                Argument{
+                    type: "QString"
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "fromPrimitiveValue<T>(QJSPrimitiveValue)"
+            remove: RemoveFlag.All
+            since: 6.5
+        }
+        ModifyFunction{
+            signature: "fromVariant<T>(QVariant)"
+            Instantiation{
+                proxyCall: "qtjambi_fromVariant"
+                Argument{
+                    type: "QVariant"
+                }
+                AddTypeParameter{
+                    name: "T"
+                }
+                AddArgument{
+                    name: "type"
+                    type: "io.qt.core.QMetaType"
+                }
+                ModifyArgument{
+                    index: 0
+                    replaceType: "T"
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "%out = %in;"}
+                    }
+                }
+            }
+            since: [6, 3]
+        }
+        ModifyFunction{
+            signature: "coerceValue<From,To>(From)"
+            remove: RemoveFlag.All
+            since: 6.5
+        }
+
         ModifyFunction{
             signature: "setObjectOwnership(QObject*,QJSEngine::ObjectOwnership)"
             ModifyArgument{
@@ -1001,12 +988,46 @@ TypeSystem{
             }
             since: 6
         }
+        ModifyFunction{
+            signature: "singletonInstance(int)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "singletonInstance<T>(int)"
+            Instantiation{
+                Argument{
+                    type: "QJSValue"
+                    isImplicit: false
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "singletonInstance(QAnyStringView,QAnyStringView)"
+            remove: RemoveFlag.All
+            since: [6,5]
+        }
+        ModifyFunction{
+            signature: "singletonInstance<T>(QAnyStringView,QAnyStringView)"
+            Instantiation{
+                Argument{
+                    type: "QJSValue"
+                    isImplicit: false
+                }
+            }
+            since: [6,5]
+        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiQml.java"
                 quoteAfterLine: "class QQmlEngine__"
                 quoteBeforeLine: "}// class"
             }
+            ImportFile{
+                name: ":/io/qtjambi/generator/typesystem/QtJambiQml.java"
+                quoteAfterLine: "class QQmlEngine_65_"
+                quoteBeforeLine: "}// class"
+                since: [6,5]
+            }
         }
     }
     
@@ -1042,24 +1063,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "initializeEngine ( QQmlEngine * , const char * )"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "registerTypes ( const char * )"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -1180,7 +1183,6 @@ TypeSystem{
     
     EnumType{
         name: "QQmlImageProviderBase::Flag"
-        flags: "QQmlImageProviderBase::Flags"
     }
     
     EnumType{
@@ -1199,10 +1201,6 @@ TypeSystem{
     
     InterfaceType{
         name: "QQmlIncubationController"
-        ModifyFunction{
-            signature: "operator=(const QQmlIncubationController &)"
-            remove: RemoveFlag.All
-        }
         ExtraIncludes{
             Include{
                 fileName: "utils_p.h"
@@ -1275,10 +1273,6 @@ TypeSystem{
     
     ObjectType{
         name: "QQmlIncubator"
-        ModifyFunction{
-            signature: "operator=(const QQmlIncubator &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "setInitialState(QObject*)"
             ModifyArgument{
@@ -1307,10 +1301,6 @@ TypeSystem{
     
     ValueType{
         name: "QQmlListReference"
-        ModifyFunction{
-            signature: "operator=(const QQmlListReference &)"
-            remove: RemoveFlag.All
-        }
         ExtraIncludes{
             Include{
                 fileName: "QtCore/QScopedPointer"
@@ -1321,31 +1311,12 @@ TypeSystem{
                 location: Include.Global
             }
         }
+    }
+    
+    InterfaceType{
+        name: "QQmlNetworkAccessManagerFactory"
         ModifyFunction{
-            signature: "QQmlListReference ( QObject *, const char *, QQmlEngine * )"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "QQmlListReference ( QObject *, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            since: [6, 4]
-        }
-    }
-    
-    InterfaceType{
-        name: "QQmlNetworkAccessManagerFactory"
-        ModifyFunction{
-            signature: "create(QObject *)"
+            signature: "create(QObject *)"
             ModifyArgument{
                 index: 0
                 DefineOwnership{
@@ -1376,37 +1347,10 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "registerTypes(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
     }
     
     InterfaceType{
         name: "QQmlExtensionInterface"
-        ModifyFunction{
-            signature: "registerTypes(const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "initializeEngine(QQmlEngine *, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
     }
     
     InterfaceType{
@@ -1425,22 +1369,12 @@ TypeSystem{
                     action: ReferenceCount.Ignore
                 }
             }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
         }
         since: [5, 15]
     }
     
     ValueType{
         name: "QQmlProperty"
-        ModifyFunction{
-            signature: "operator=(const QQmlProperty &)"
-            remove: RemoveFlag.All
-        }
         ExtraIncludes{
             Include{
                 fileName: "QtCore/QScopedPointer"
@@ -1478,21 +1412,6 @@ TypeSystem{
                               "    }\n"+
                               "}"}
             }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "propertyTypeName() const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
         }
         InjectCode{
             ImportFile{
@@ -1506,11 +1425,7 @@ TypeSystem{
     ObjectType{
         name: "QQmlPropertyMap"
         ModifyFunction{
-            signature: "operator[](const QString &) const"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator[](const QString &)"
+            signature: "QQmlPropertyMap<DerivedType>(DerivedType *, QObject *)"
             remove: RemoveFlag.All
         }
     }
@@ -1642,175 +1557,61 @@ TypeSystem{
     GlobalFunction{
         signature: "qmlProtectModule(const char*, int)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 1
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlRegisterModule(const char*, int, int)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 1
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlRegisterModuleImport(const char*, int, const char*, int, int)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 1
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 3
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlRegisterNamespaceAndRevisions(const QMetaObject*, const char*, int)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 2
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlRegisterNamespaceAndRevisions(const QMetaObject*, const char*, int, QList<int>*, const QMetaObject*)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 2
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlRegisterNamespaceAndRevisions(const QMetaObject*, const char*, int, QList<int>*, const QMetaObject*, const QMetaObject*)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 2
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlRegisterSingletonType(QUrl, const char*, int, int, const char*)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 2
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 5
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlRegisterType(QUrl, const char*, int, int, const char*)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 2
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 5
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlRegisterTypeNotAvailable(const char*, int, int, const char*, QString)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 1
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 4
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlRegisterUncreatableMetaObject(const QMetaObject&, const char*, int, int, const char*, QString)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 2
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 5
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlTypeId(const char*, int, int, const char*)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 1
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 4
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qmlUnregisterModuleImport(const char*, int, const char*, int, int)"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 1
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 3
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
@@ -1837,12 +1638,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "containerType"
@@ -1859,12 +1654,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -1877,12 +1666,6 @@ TypeSystem{
             Argument{
                 type: "QString"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -1904,12 +1687,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -1930,12 +1707,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -1958,12 +1729,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -1980,16 +1745,10 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
-                type: "java.lang.Class<? extends io.qt.QtObjectInterface>"
+                type: "java.lang.Class<? extends QtObjectInterface>"
             }
         }
     }
@@ -2002,16 +1761,10 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
-                type: "java.lang.Class<? extends io.qt.QtObjectInterface>"
+                type: "java.lang.Class<? extends QtObjectInterface>"
             }
         }
         until: [5, 15]
@@ -2028,12 +1781,6 @@ TypeSystem{
             Argument{
                 type: "int"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2058,12 +1805,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2088,18 +1829,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2124,18 +1853,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2155,18 +1872,6 @@ TypeSystem{
             Argument{
                 type: "QString"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2186,35 +1891,23 @@ TypeSystem{
     }
     
     GlobalFunction{
-        signature: "qmlRegisterSingletonType<T>(const char*, int, int, const char*, QObject*)"
+        signature: "qmlRegisterSingletonType<T>(const char*,int,int,const char*,QObject*(*)(QQmlEngine*,QJSEngine*))"
         targetType: "QtQml"
+        ModifyArgument{
+            index: 5
+            ReplaceType{
+                modifiedType: "io.qt.qml.QtQml$@Nullable ObjectCallback"
+            }
+            ConversionRule{
+                codeClass: CodeClass.Native
+                Text{content: "QtQml::ObjectCallback %out = qtjambi_cast<QtQml::ObjectCallback>(%env, %in);"}
+            }
+        }
         Instantiation{
             proxyCall: "qtjambi_qmlRegisterSingletonType"
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "io.qt.qml.QtQml$ObjectCallback"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QtQml::ObjectCallback %out = qtjambi_cast<QtQml::ObjectCallback>(%env, %in);"}
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2224,25 +1917,13 @@ TypeSystem{
     }
     
     GlobalFunction{
-        signature: "qmlRegisterSingletonType(const char*, int, int, const char*, QJSValue)"
+        signature: "qmlRegisterSingletonType(const char*,int,int,const char*,QJSValue(*)(QQmlEngine*,QJSEngine*))"
         proxyCall: "qtjambi_qmlRegisterSingletonType"
         targetType: "QtQml"
-        ModifyArgument{
-            index: 1
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 4
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
         ModifyArgument{
             index: 5
             ReplaceType{
-                modifiedType: "io.qt.qml.QtQml$ValueCallback"
+                modifiedType: "io.qt.qml.QtQml$@Nullable ValueCallback"
             }
             ConversionRule{
                 codeClass: CodeClass.Native
@@ -2262,18 +1943,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2288,18 +1957,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2324,18 +1981,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2350,18 +1995,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 index: 1
                 name: "type"
@@ -2389,18 +2022,17 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 name: "types"
                 type: "java.lang.Class<?>..."
             }
         }
     }
+
+    GlobalFunction{
+        signature: "qmlRegisterTypesAndRevisions<>(const char *, int, QList<int> *)"
+        remove: RemoveFlag.All
+    }
     
     GlobalFunction{
         signature: "qmlRegisterTypesAndRevisions<T,Args...>(const char*, int, QList<int> *)"
@@ -2416,12 +2048,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 name: "types"
                 type: "java.lang.Class<?>..."
@@ -2440,12 +2066,6 @@ TypeSystem{
             Argument{
                 type: "QObject"
             }
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             AddArgument{
                 name: "types"
                 type: "java.lang.Class<?>..."
@@ -2479,9 +2099,6 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: enum 'QQmlModuleImportSpecialVersions' does not have a type entry or is not an enum"}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QJSValue."}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QQmlContext::PropertyPair."}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type std::function<QObject *(QQmlEngine *, QJSEngine *)> (is_busted)"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type QObject *(*)(QQmlEngine *, QJSEngine *) (is_busted)"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type QJSValue (*)(QQmlEngine *, QJSEngine *) (is_busted)"}
     SuppressedWarning{text: "WARNING(CppImplGenerator) :: protected function '*' in final class '*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuick.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuick.qml
index 0638fa68..18b12ac1 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuick.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuick.qml
@@ -31,15 +31,15 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.quick"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtQuick"
     module: "qtjambi.quick"
     description: "A declarative framework for building highly dynamic applications with custom user interfaces."
 
     InjectCode{
         position: Position.Position4
-        Text{content: "if(io.qt.QtUtilities.isAvailableQtLibrary(\"QmlWorkerScript\"))\n"+
-                      "    io.qt.QtUtilities.loadQtLibrary(\"QmlWorkerScript\");"}
+        Text{content: "if(QtUtilities.isAvailableQtLibrary(\"QmlWorkerScript\"))\n"+
+                      "    QtUtilities.loadQtLibrary(\"QmlWorkerScript\");"}
     }
     
     InjectCode{
@@ -70,7 +70,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -166,7 +166,7 @@ TypeSystem{
                 index: 1
                 invalidateAfterUse: true
                 DefineOwnership{
-                    codeClass: CodeClass.Java
+                    codeClass: CodeClass.Native
                     ownership: Ownership.Invalidate
                 }
             }
@@ -194,123 +194,10 @@ TypeSystem{
         since: 6
     }
     
-    Rejection{
-        className: "QSGTexturePrivate"
-    }
-    
-    Rejection{
-        className: "QSGOpaqueTextureMaterial"
-        fieldName: "m_texture"
-    }
-    
-    Rejection{
-        className: "QSGOpaqueTextureMaterial"
-        fieldName: "m_mipmap_filtering"
-    }
-    
-    Rejection{
-        className: "QSGOpaqueTextureMaterial"
-        fieldName: "m_filtering"
-    }
-    
-    Rejection{
-        className: "QSGOpaqueTextureMaterial"
-        fieldName: "m_horizontal_wrap"
-    }
-    
-    Rejection{
-        className: "QSGOpaqueTextureMaterial"
-        fieldName: "m_vertical_wrap"
-    }
-    
-    Rejection{
-        className: "QSGOpaqueTextureMaterial"
-        fieldName: "m_anisotropy_level"
-    }
-    
-    Rejection{
-        className: "QSGOpaqueTextureMaterial"
-        fieldName: "m_reserved"
-    }
-    
-    Rejection{
-        className: "QQuickWindow"
-        enumName: "NativeObjectType"
-    }
-    
-    Rejection{
-        className: "QQuickWindow"
-        functionName: "createTextureFromNativeObject"
-    }
-    
-    Rejection{
-        className: "QSGMaterialRhiShader::RenderState"
-        functionName: "rhi"
-    }
-    
-    Rejection{
-        className: "QSGMaterialRhiShader::RenderState"
-        functionName: "resourceUpdateBatch"
-    }
-    
-    Rejection{
-        className: "QSGMaterialRhiShader"
-        functionName: "setShader"
-    }
-    
-    Rejection{
-        className: "QSGMaterialShader::RenderState"
-        functionName: "rhi"
-    }
-    
-    Rejection{
-        className: "QSGMaterialShader::RenderState"
-        functionName: "resourceUpdateBatch"
-    }
-    
-    Rejection{
-        className: "QSGMaterialShader"
-        functionName: "setShader"
-    }
-    
-    Rejection{
-        className: "QSGTexture"
-        functionName: "updateRhiTexture"
-    }
-    
-    Rejection{
-        className: "QSGTexture"
-        functionName: "setWorkResourceUpdateBatch"
-    }
-    
-    Rejection{
-        className: "QSGTexture"
-        functionName: "rhiTexture"
-    }
-    
-    Rejection{
-        className: "QSGTexture"
-        functionName: "removedFromAtlas"
-    }
-    
-    Rejection{
-        className: "QSGTexture"
-        functionName: "commitTextureOperations"
-    }
-    
     Rejection{
         className: "PtrShaderCreateFunc"
     }
     
-    Rejection{
-        className: "QSGTexture::NativeTexture"
-    }
-    
-    Rejection{
-        className: "QSGTexture"
-        functionName: "nativeTexture"
-    }
-    
     Rejection{
         className: "QQuickWheelEvent"
     }
@@ -323,193 +210,57 @@ TypeSystem{
         className: "QQuickKeyEvent"
     }
     
-    Rejection{
-        className: "QQuickGraphicsDevice"
-        functionName: "fromDeviceObjects"
-    }
-    
-    Rejection{
-        className: "QQuickGraphicsDevice"
-        functionName: "fromPhysicalDevice"
-    }
-    
-    Rejection{
-        className: "QQuickGraphicsDevice"
-        functionName: "fromDeviceAndContext"
-    }
-    
-    Rejection{
-        className: "QQuickGraphicsDevice"
-        functionName: "fromDeviceAndCommandQueue"
-    }
-    
-    EnumType{
-        name: "QQuickItem::Flag"
-        flags: "QQuickItem::Flags"
-    }
-    
-    EnumType{
-        name: "QQuickItem::ItemChange"
-    }
-    
-    EnumType{
-        name: "QQuickItem::TransformOrigin"
-    }
-    
-    EnumType{
-        name: "QQuickPaintedItem::PerformanceHint"
-        flags: "QQuickPaintedItem::PerformanceHints"
-    }
-    
-    EnumType{
-        name: "QQuickPaintedItem::RenderTarget"
-    }
-    
-    EnumType{
-        name: "QQuickView::ResizeMode"
-    }
-    
-    EnumType{
-        name: "QQuickView::Status"
-    }
-    
-    EnumType{
-        name: "QQuickWindow::CreateTextureOption"
-        flags: "QQuickWindow::CreateTextureOptions"
-    }
-    
-    EnumType{
-        name: "QSGNode::DirtyStateBit"
-        flags: "QSGNode::DirtyState"
-    }
-    
-    EnumType{
-        name: "QSGNode::Flag"
-        flags: "QSGNode::Flags"
-    }
-    
-    EnumType{
-        name: "QSGNode::NodeType"
-        generate: false
-    }
-    
-    EnumType{
-        name: "QSGGeometry::DataPattern"
-    }
-    
-    EnumType{
-        name: "QSGGeometry::Type"
-    }
-    
-    EnumType{
-        name: "QSGGeometry::DrawingMode"
-    }
-    
-    EnumType{
-        name: "QSGGeometry::AttributeType"
-    }
-    
-    EnumType{
-        name: "QSGMaterial::Flag"
-        flags: "QSGMaterial::Flags"
-        RejectEnumValue{
-            name: "CustomCompileStep"
-            since: [6, 3]
+    InterfaceType{
+        name: "QSGRendererInterface"
+        EnumType{
+            name: "GraphicsApi"
+            RejectEnumValue{
+                name: "OpenGLRhi"
+                since: 6
+            }
+            RejectEnumValue{
+                name: "Direct3D11Rhi"
+                since: 6
+            }
+            RejectEnumValue{
+                name: "VulkanRhi"
+                since: 6
+            }
+            RejectEnumValue{
+                name: "MetalRhi"
+                since: 6
+            }
+            RejectEnumValue{
+                name: "NullRhi"
+                since: 6
+            }
+            since: [5, 8]
         }
-    }
-    
-    EnumType{
-        name: "QSGTexture::Filtering"
-    }
-    
-    EnumType{
-        name: "QSGTexture::WrapMode"
-    }
-    
-    EnumType{
-        name: "QSGTexture::AnisotropyLevel"
-        since: [5, 9]
-    }
-    
-    EnumType{
-        name: "QSGMaterialShader::RenderState::DirtyState"
-        flags: "QSGMaterialShader::RenderState::DirtyStates"
-    }
-    
-    EnumType{
-        name: "QSGSimpleTextureNode::TextureCoordinatesTransformFlag"
-        flags: "QSGSimpleTextureNode::TextureCoordinatesTransformMode"
-    }
-    
-    EnumType{
-        name: "QQuickWindow::SceneGraphError"
-    }
-    
-    EnumType{
-        name: "QQuickWindow::RenderStage"
-    }
-    
-    EnumType{
-        name: "QQuickWindow::TextRenderType"
-        since: [5, 10]
-    }
-    
-    
-    
-    EnumType{
-        name: "QSGRendererInterface::GraphicsApi"
-        RejectEnumValue{
-            name: "OpenGLRhi"
-            since: 6
+
+        EnumType{
+            name: "Resource"
+            since: [5, 8]
         }
-        RejectEnumValue{
-            name: "Direct3D11Rhi"
-            since: 6
+
+        EnumType{
+            name: "ShaderType"
+            since: [5, 8]
         }
-        RejectEnumValue{
-            name: "VulkanRhi"
+
+        EnumType{
+            name: "RenderMode"
             since: 6
         }
-        RejectEnumValue{
-            name: "MetalRhi"
-            since: 6
+
+        EnumType{
+            name: "ShaderCompilationType"
+            since: [5, 8]
         }
-        RejectEnumValue{
-            name: "NullRhi"
-            since: 6
+
+        EnumType{
+            name: "ShaderSourceType"
+            since: [5, 8]
         }
-        since: [5, 8]
-    }
-    
-    EnumType{
-        name: "QSGRendererInterface::Resource"
-        since: [5, 8]
-    }
-    
-    EnumType{
-        name: "QSGRendererInterface::ShaderType"
-        since: [5, 8]
-    }
-    
-    EnumType{
-        name: "QSGRendererInterface::RenderMode"
-        since: 6
-    }
-    
-    EnumType{
-        name: "QSGRendererInterface::ShaderCompilationType"
-        flags: "QSGRendererInterface::ShaderCompilationTypes"
-        since: [5, 8]
-    }
-    
-    EnumType{
-        name: "QSGRendererInterface::ShaderSourceType"
-        flags: "QSGRendererInterface::ShaderSourceTypes"
-        since: [5, 8]
-    }
-    
-    InterfaceType{
-        name: "QSGRendererInterface"
         ExtraIncludes{
             Include{
                 fileName: "QtCore/QTextCodec"
@@ -524,21 +275,6 @@ TypeSystem{
         ModifyFunction{
             signature: "getResource(QQuickWindow *, const char *) const"
             remove: RemoveFlag.JavaAndNative
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jstring %out = qtjambi_cast<jstring>(%env, QLatin1String(%in));"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QByteArray b1 = qtjambi_cast<QByteArray>(%env, %in);\n"+
-                                  "const char* %out = b1.data();"}
-                }
-            }
         }
         since: [5, 8]
     }
@@ -555,17 +291,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPoint* %out = qtjambi_cast<QPoint*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -573,17 +298,6 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPoint* %out = qtjambi_cast<QPoint*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
         }
     }
@@ -611,6 +325,16 @@ TypeSystem{
                 location: Include.Global
             }
         }
+        EnumType{
+            name: "Flag"
+        }
+        EnumType{
+            name: "ItemChange"
+        }
+        EnumType{
+            name: "TransformOrigin"
+        }
+
         ModifyFunction{
             signature: "childMouseEventFilter(QQuickItem*,QEvent*)"
             ModifyArgument{
@@ -813,6 +537,14 @@ TypeSystem{
     
     ObjectType{
         name: "QQuickPaintedItem"
+
+        EnumType{
+            name: "PerformanceHint"
+        }
+
+        EnumType{
+            name: "RenderTarget"
+        }
         ModifyFunction{
             signature: "antialiasing()const"
             rename: "paintAntialiasing"
@@ -864,7 +596,7 @@ TypeSystem{
                 index: 1
                 invalidateAfterUse: true
                 DefineOwnership{
-                    codeClass: CodeClass.Java
+                    codeClass: CodeClass.Native
                     ownership: Ownership.Invalidate
                 }
             }
@@ -933,6 +665,13 @@ TypeSystem{
     
     ObjectType{
         name: "QQuickView"
+
+        EnumType{
+            name: "ResizeMode"
+        }
+        EnumType{
+            name: "Status"
+        }
         ModifyFunction{
             signature: "QQuickView(const QUrl &, QWindow *)"
             blockExceptions: true
@@ -965,6 +704,35 @@ TypeSystem{
     
     ObjectType{
         name: "QQuickWindow"
+        Rejection{
+            enumName: "NativeObjectType"
+        }
+
+        Rejection{
+            functionName: "createTextureFromNativeObject"
+        }
+
+        EnumType{
+            name: "CreateTextureOption"
+        }
+
+        EnumType{
+            name: "SceneGraphError"
+        }
+
+        EnumType{
+            name: "RenderStage"
+        }
+
+        EnumType{
+            name: "TextRenderType"
+            since: [5, 10]
+        }
+
+        ValueType{
+            name: "GraphicsStateInfo"
+            since: [5, 14]
+        }
         ModifyFunction{
             signature: "setRenderTarget(QOpenGLFramebufferObject*)"
             threadAffinity: false
@@ -1030,7 +798,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "createTextureFromImage(QImage,QFlags<QQuickWindow::CreateTextureOption>)const"
+            signature: "createTextureFromImage(QImage,QQuickWindow::CreateTextureOptions)const"
             threadAffinity: false
             ModifyArgument{
                 index: 0
@@ -1041,7 +809,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "createTextureFromId(uint,QSize,QFlags<QQuickWindow::CreateTextureOption>)const"
+            signature: "createTextureFromId(uint,QSize,QQuickWindow::CreateTextureOptions)const"
             threadAffinity: false
             ModifyArgument{
                 index: 0
@@ -1061,20 +829,28 @@ TypeSystem{
             }
         }
         InjectCode{
-            Text{content: "@io.qt.QtUninvokable\n"+
+            Text{content: "@QtUninvokable\n"+
                           "public final void scheduleRenderJob(Runnable job, io.qt.quick.QQuickWindow.RenderStage schedule){\n"+
                           "    scheduleRenderJob(io.qt.core.QRunnable.of(job), schedule);\n"+
                           "}"}
         }
     }
     
-    ValueType{
-        name: "QQuickWindow::GraphicsStateInfo"
-        since: [5, 14]
-    }
-    
     ObjectType{
         name: "QSGNode"
+
+        EnumType{
+            name: "DirtyStateBit"
+        }
+
+        EnumType{
+            name: "Flag"
+        }
+
+        EnumType{
+            name: "NodeType"
+            generate: false
+        }
         ModifyFunction{
             signature: "QSGNode(QSGNode::NodeType)"
             remove: RemoveFlag.All
@@ -1257,34 +1033,14 @@ TypeSystem{
             signature: "geometry() const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "matrix() const"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x4"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "setRendererMatrix(const QMatrix4x4 *)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x4"
-                }
                 ReferenceCount{
                     variableName: "__rcRendererMatrix"
                     action: ReferenceCount.Set
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QMatrix4x4* %out = qtjambi_cast<QMatrix4x4*>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -1389,7 +1145,6 @@ TypeSystem{
     
     EnumType{
         name: "QSGImageNode::TextureCoordinatesTransformFlag"
-        flags: "QSGImageNode::TextureCoordinatesTransformMode"
         since: [5, 8]
     }
     
@@ -1404,6 +1159,9 @@ TypeSystem{
     
     ObjectType{
         name: "QSGSimpleTextureNode"
+        EnumType{
+            name: "TextureCoordinatesTransformFlag"
+        }
         ModifyFunction{
             signature: "setTexture(QSGTexture*)"
             ModifyArgument{
@@ -1441,120 +1199,35 @@ TypeSystem{
     }
     
     ObjectType{
-        name: "QSGRenderNode"
-        ModifyFunction{
-            signature: "flags() const"
-            rename: "renderingFlags"
-        }
-        ModifyFunction{
-            signature: "matrix() const"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x4"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "QMatrix4x4* %out = qtjambi_cast<QMatrix4x4*>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "projectionMatrix() const"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x4"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "QMatrix4x4* %out = qtjambi_cast<QMatrix4x4*>(%env, %in);"}
-                }
-            }
-            since: [6,5]
-        }
-        ModifyFunction{
-            signature: "render(const QSGRenderNode::RenderState*)"
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-            }
-        }
-    }
-    
-    ObjectType{
-        name: "QSGRenderNode::RenderState"
-        ModifyFunction{
-            signature: "projectionMatrix() const"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x4"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "QMatrix4x4* %out = qtjambi_cast<QMatrix4x4*>(%env, %in);"}
-                }
-            }
+        name: "QSGRenderNode"
+        ModifyFunction{
+            signature: "flags() const"
+            rename: "renderingFlags"
         }
         ModifyFunction{
-            signature: "clipRegion() const"
+            signature: "render(const QSGRenderNode::RenderState*)"
             ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QRegion"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "QRegion* %out = qtjambi_cast<QRegion*>(%env, %in);"}
-                }
+                index: 1
+                invalidateAfterUse: true
             }
         }
+    }
+    
+    ObjectType{
+        name: "QSGRenderNode::RenderState"
         ModifyFunction{
             signature: "get(const char *) const"
             remove: RemoveFlag.JavaAndNative
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "const char* %out = qtjambi_cast<const char*>(%env, %scope, %in);"}
-                }
-            }
         }
     }
     
     EnumType{
         name: "QSGRenderNode::StateFlag"
-        flags: "QSGRenderNode::StateFlags"
         since: [5, 8]
     }
     
     EnumType{
         name: "QSGRenderNode::RenderingFlag"
-        flags: "QSGRenderNode::RenderingFlags"
         since: [5, 8]
     }
     
@@ -1612,6 +1285,133 @@ TypeSystem{
     
     ObjectType{
         name: "QSGGeometry"
+
+        EnumType{
+            name: "DataPattern"
+        }
+
+        EnumType{
+            name: "Type"
+        }
+
+        EnumType{
+            name: "DrawingMode"
+        }
+
+        EnumType{
+            name: "AttributeType"
+        }
+
+        ValueType{
+            name: "Point2D"
+        }
+
+        ValueType{
+            name: "TexturedPoint2D"
+        }
+
+        ValueType{
+            name: "Attribute"
+            ModifyFunction{
+                signature: "Attribute()"
+                remove: RemoveFlag.All
+            }
+            ModifyField{
+                name: "position"
+                read: true
+                write: false
+            }
+            ModifyField{
+                name: "tupleSize"
+                read: true
+                write: false
+            }
+            ModifyField{
+                name: "type"
+                read: true
+                write: false
+            }
+            ModifyField{
+                name: "attributeType"
+                read: true
+                write: false
+            }
+            ModifyField{
+                name: "isVertexCoordinate"
+                read: true
+                write: false
+                ReplaceType{
+                    modifiedType: "boolean"
+                }
+            }
+            ModifyField{
+                name: "reserved"
+                read: false
+                write: false
+            }
+        }
+
+        ObjectType{
+            name: "AttributeSet"
+            InjectCode{
+                target: CodeClass.DestructorFunction
+                Text{content: "delete[] %this->attributes;"}
+            }
+            ModifyFunction{
+                signature: "AttributeSet()"
+                AddArgument{
+                    name: "attributes"
+                    type: "io.qt.quick.QSGGeometry$Attribute[]"
+                }
+                AddArgument{
+                    name: "stride"
+                    type: "int"
+                }
+                InjectCode{
+                    target: CodeClass.Native
+                    position: Position.End
+                    Text{content: "__qt_this->stride = stride;\n"+
+                                  "__qt_this->count = %env->GetArrayLength(attributes);\n"+
+                                  "QSGGeometry::Attribute* _attributes = new QSGGeometry::Attribute[size_t(__qt_this->count)];\n"+
+                                  "__qt_this->attributes = _attributes;\n"+
+                                  "for(jsize i=0; i<jsize(__qt_this->count); ++i){\n"+
+                                  "    jobject element = %env->GetObjectArrayElement(attributes, i);\n"+
+                                  "    _attributes[i] = qtjambi_cast<const QSGGeometry::Attribute&>(%env, element);\n"+
+                                  "}"}
+                }
+            }
+            ModifyField{
+                name: "attributes"
+                write: false
+                ReplaceType{
+                    modifiedType: "io.qt.quick.QSGGeometry$@Nullable Attribute @NonNull[]"
+                }
+                ConversionRule{
+                    codeClass: CodeClass.NativeGetter
+                    Text{content: "%out = qtjambi_array_cast<jobjectArray>(%env, %scope, %in, __qt_this->count);"}
+                }
+            }
+            ModifyField{
+                name: "count"
+                write: false
+            }
+            ModifyField{
+                name: "stride"
+                write: false
+            }
+            InjectCode{
+                target: CodeClass.Java
+                ImportFile{
+                    name: ":/io/qtjambi/generator/typesystem/QtJambiQuick.java"
+                    quoteAfterLine: "class QSGGeometry.AttributeSet__"
+                    quoteBeforeLine: "}// class"
+                }
+            }
+        }
+
+        ValueType{
+            name: "ColoredPoint2D"
+        }
         ModifyFunction{
             signature: "indexData() const"
             remove: RemoveFlag.All
@@ -1671,7 +1471,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.nio.Buffer"
+                    modifiedType: "java.nio.@Nullable Buffer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1709,14 +1509,11 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.quick.QSGGeometry$Attribute[]"
+                    modifiedType: "io.qt.quick.QSGGeometry$@NonNull Attribute @NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "%out = QtJambiAPI::toJObjectArray<QSGGeometry::Attribute>(%env, %in, __qt_this->attributeCount(),\n"+
-                                  "                                                        [](JNIEnv * env, const QSGGeometry::Attribute& item)->jobject{\n"+
-                                  "                                                            return qtjambi_cast<jobject>(env, item);\n"+
-                                  "                                                       });"}
+                    Text{content: "%out = qtjambi_array_cast<jobjectArray>(%env, %scope, %in, __qt_this->attributeCount());"}
                 }
             }
         }
@@ -1726,7 +1523,7 @@ TypeSystem{
                 index: 0
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObject<QSGGeometry::AttributeSet>(%env, &%in, false);"}
+                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, &%in);"}
                 }
             }
         }
@@ -1736,7 +1533,7 @@ TypeSystem{
                 index: 0
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObject<QSGGeometry::AttributeSet>(%env, &%in, false);"}
+                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, &%in);"}
                 }
             }
         }
@@ -1746,7 +1543,7 @@ TypeSystem{
                 index: 0
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObject<QSGGeometry::AttributeSet>(%env, &%in, false);"}
+                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, &%in);"}
                 }
             }
         }
@@ -1778,6 +1575,14 @@ TypeSystem{
     
     ObjectType{
         name: "QSGMaterial"
+
+        EnumType{
+            name: "Flag"
+            RejectEnumValue{
+                name: "CustomCompileStep"
+                since: [6, 3]
+            }
+        }
         ModifyFunction{
             signature: "compare(const QSGMaterial*)const"
             ModifyArgument{
@@ -1825,6 +1630,53 @@ TypeSystem{
     
     ObjectType{
         name: "QSGMaterialShader"
+        Rejection{
+            functionName: "rhi"
+        }
+        Rejection{
+            functionName: "resourceUpdateBatch"
+        }
+        Rejection{
+            functionName: "setShader"
+        }
+        EnumType{
+            name: "Flag"
+            since: 6
+        }
+
+        EnumType{
+            name: "Stage"
+            since: 6
+        }
+
+        ValueType{
+            name: "RenderState"
+            EnumType{
+                name: "DirtyState"
+            }
+            ModifyFunction{
+                signature: "uniformData()"
+                remove: RemoveFlag.All
+                since: 6
+            }
+        }
+
+        ValueType{
+            name: "GraphicsPipelineState"
+            EnumType{
+                name: "BlendFactor"
+            }
+            EnumType{
+                name: "PolygonMode"
+            }
+            EnumType{
+                name: "ColorMaskComponent"
+            }
+            EnumType{
+                name: "CullMode"
+            }
+            since: 6
+        }
         ModifyFunction{
             signature: "updateState(QSGMaterialShader::RenderState,QSGMaterial*,QSGMaterial*)"
             ModifyArgument{
@@ -1874,7 +1726,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.String[]"
+                    modifiedType: "java.lang.@Nullable String @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -1974,34 +1826,10 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.quick.QSGMaterialShader$RenderState"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSGMaterialShader::RenderState& %out = qtjambi_cast<QSGMaterialShader::RenderState&>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.quick.QSGMaterialShader$GraphicsPipelineState"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSGMaterialShader::GraphicsPipelineState* %out = qtjambi_cast<QSGMaterialShader::GraphicsPipelineState*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
             ModifyArgument{
                 index: 3
@@ -2018,19 +1846,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.quick.QSGMaterialShader$RenderState"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSGMaterialShader::RenderState& %out = qtjambi_cast<QSGMaterialShader::RenderState&>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
             ModifyArgument{
                 index: 2
@@ -2047,19 +1862,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.quick.QSGMaterialShader$RenderState"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSGMaterialShader::RenderState& %out = qtjambi_cast<QSGMaterialShader::RenderState&>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
             ModifyArgument{
                 index: 3
@@ -2082,6 +1884,27 @@ TypeSystem{
     
     ObjectType{
         name: "QSGOpaqueTextureMaterial"
+        Rejection{
+            fieldName: "m_texture"
+        }
+        Rejection{
+            fieldName: "m_mipmap_filtering"
+        }
+        Rejection{
+            fieldName: "m_filtering"
+        }
+        Rejection{
+            fieldName: "m_horizontal_wrap"
+        }
+        Rejection{
+            fieldName: "m_vertical_wrap"
+        }
+        Rejection{
+            fieldName: "m_anisotropy_level"
+        }
+        Rejection{
+            fieldName: "m_reserved"
+        }
         ModifyFunction{
             signature: "createShader() const"
             noExcept: true
@@ -2128,9 +1951,11 @@ TypeSystem{
             }
         }
     }
-    
-    
-    
+
+    Rejection{
+        className: "QSGTexturePrivate"
+    }
+
     ObjectType{
         name: "QSGTexture"
         ExtraIncludes{
@@ -2139,6 +1964,38 @@ TypeSystem{
                 location: Include.Global
             }
         }
+
+        Rejection{
+            functionName: "updateRhiTexture"
+        }
+        Rejection{
+            functionName: "setWorkResourceUpdateBatch"
+        }
+        Rejection{
+            functionName: "rhiTexture"
+        }
+        Rejection{
+            functionName: "removedFromAtlas"
+        }
+        Rejection{
+            functionName: "commitTextureOperations"
+        }
+        Rejection{
+            className: "NativeTexture"
+        }
+        Rejection{
+            functionName: "nativeTexture"
+        }
+        EnumType{
+            name: "Filtering"
+        }
+        EnumType{
+            name: "WrapMode"
+        }
+        EnumType{
+            name: "AnisotropyLevel"
+            since: [5, 9]
+        }
         ModifyFunction{
             signature: "resolveInterface(const char *, int)const"
             rename: "nativeInterface"
@@ -2146,12 +2003,15 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "<QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface"
+                    modifiedType: "<QNativeInterface extends io.qt.@Nullable QtObjectInterface> QNativeInterface"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObject(%env, %in, %1, false, false);\n"+
-                                  "CoreAPI::registerDependency(%env, %out, __this_nativeId);"}
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, %in, %1);"}
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
                 }
             }
             ModifyArgument{
@@ -2235,152 +2095,38 @@ TypeSystem{
                     codeClass: CodeClass.Native
                     ownership: Ownership.Java
                 }
-            }
-            until: 5
-        }
-        ModifyFunction{
-            signature: "createShader(QSGRendererInterface::RenderMode) const"
-            noExcept: true
-            ModifyArgument{
-                index: 0
-                NoNullPointer{
-                }
-                DefineOwnership{
-                    codeClass: CodeClass.Shell
-                    ownership: Ownership.Cpp
-                }
-                DefineOwnership{
-                    codeClass: CodeClass.Native
-                    ownership: Ownership.Java
-                }
-            }
-            since: 6
-        }
-    }
-    
-    ObjectType{
-        name: "QQuickTransform"
-        ModifyFunction{
-            signature: "applyTo(QMatrix4x4 *)const"
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x4"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QMatrix4x4* %out = qtjambi_cast<QMatrix4x4*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
-    }
-    
-    ValueType{
-        name: "QSGGeometry::Attribute"
-        ModifyFunction{
-            signature: "Attribute()"
-            remove: RemoveFlag.All
-        }
-        ModifyField{
-            name: "position"
-            read: true
-            write: false
-        }
-        ModifyField{
-            name: "tupleSize"
-            read: true
-            write: false
-        }
-        ModifyField{
-            name: "type"
-            read: true
-            write: false
-        }
-        ModifyField{
-            name: "attributeType"
-            read: true
-            write: false
-        }
-        ModifyField{
-            name: "isVertexCoordinate"
-            read: true
-            write: false
-            ReplaceType{
-                modifiedType: "boolean"
-            }
-        }
-        ModifyField{
-            name: "reserved"
-            read: false
-            write: false
-        }
-    }
-    
-    ObjectType{
-        name: "QSGGeometry::AttributeSet"
-        InjectCode{
-            target: CodeClass.DestructorFunction
-            Text{content: "delete[] %this->attributes;"}
-        }
-        ModifyFunction{
-            signature: "AttributeSet()"
-            AddArgument{
-                name: "attributes"
-                type: "io.qt.quick.QSGGeometry$Attribute[]"
-            }
-            AddArgument{
-                name: "stride"
-                type: "int"
-            }
-            InjectCode{
-                target: CodeClass.Native
-                position: Position.End
-                Text{content: "__qt_this->stride = stride;\n"+
-                              "__qt_this->count = %env->GetArrayLength(attributes);\n"+
-                              "QSGGeometry::Attribute* _attributes = new QSGGeometry::Attribute[size_t(__qt_this->count)];\n"+
-                              "__qt_this->attributes = _attributes;\n"+
-                              "for(jsize i=0; i<jsize(__qt_this->count); ++i){\n"+
-                              "    jobject element = %env->GetObjectArrayElement(attributes, i);\n"+
-                              "    _attributes[i] = qtjambi_cast<const QSGGeometry::Attribute&>(%env, element);\n"+
-                              "}"}
-            }
-        }
-        ModifyField{
-            name: "attributes"
-            write: false
-            ReplaceType{
-                modifiedType: "io.qt.quick.QSGGeometry$Attribute[]"
-            }
-            ConversionRule{
-                codeClass: CodeClass.NativeGetter
-                Text{content: "%out = qtjambi_array_cast<jobjectArray>(%env, %scope, %in, __qt_this->count);"}
-            }
-        }
-        ModifyField{
-            name: "count"
-            write: false
-        }
-        ModifyField{
-            name: "stride"
-            write: false
+            }
+            until: 5
         }
-        InjectCode{
-            target: CodeClass.Java
-            ImportFile{
-                name: ":/io/qtjambi/generator/typesystem/QtJambiQuick.java"
-                quoteAfterLine: "class QSGGeometry.AttributeSet__"
-                quoteBeforeLine: "}// class"
+        ModifyFunction{
+            signature: "createShader(QSGRendererInterface::RenderMode) const"
+            noExcept: true
+            ModifyArgument{
+                index: 0
+                NoNullPointer{
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Shell
+                    ownership: Ownership.Cpp
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Java
+                }
             }
+            since: 6
         }
     }
     
-    ValueType{
-        name: "QSGGeometry::ColoredPoint2D"
+    ObjectType{
+        name: "QQuickTransform"
+        ModifyFunction{
+            signature: "applyTo(QMatrix4x4 *)const"
+            ModifyArgument{
+                index: 1
+                invalidateAfterUse: true
+            }
+        }
     }
     
     ValueType{
@@ -2416,10 +2162,6 @@ TypeSystem{
         }
     }
     
-    ValueType{
-        name: "QSGGeometry::Point2D"
-    }
-    
     ObjectType{
         name: "QQuickImageProvider"
         ModifyFunction{
@@ -2427,17 +2169,6 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSize"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSize* %out = qtjambi_cast<QSize*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -2445,17 +2176,6 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSize"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSize* %out = qtjambi_cast<QSize*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -2463,17 +2183,6 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.core.QSize"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSize* %out = qtjambi_cast<QSize*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
         }
     }
@@ -2508,10 +2217,6 @@ TypeSystem{
         name: "QSGMaterialType"
     }
     
-    ValueType{
-        name: "QSGGeometry::TexturedPoint2D"
-    }
-    
     ObjectType{
         name: "QQuickItemGrabResult"
         ModifyFunction{
@@ -2525,7 +2230,7 @@ TypeSystem{
     ObjectType{
         name: "QSGAbstractRenderer"
         ModifyFunction{
-            signature: "nodeChanged(QSGNode*,QFlags<QSGNode::DirtyStateBit>)"
+            signature: "nodeChanged(QSGNode*,QSGNode::DirtyState)"
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
@@ -2546,13 +2251,11 @@ TypeSystem{
     
     EnumType{
         name: "QSGAbstractRenderer::ClearModeBit"
-        flags: "QSGAbstractRenderer::ClearMode"
         until: 5
     }
     
     EnumType{
         name: "QSGAbstractRenderer::MatrixTransformFlag"
-        flags: "QSGAbstractRenderer::MatrixTransformFlags"
         since: [5, 14]
         until: 5
     }
@@ -2600,7 +2303,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "createTextureFromImage(QImage,QFlags<QSGEngine::CreateTextureOption>)const"
+            signature: "createTextureFromImage(QImage,QSGEngine::CreateTextureOptions)const"
             ModifyArgument{
                 index: 0
                 DefineOwnership{
@@ -2610,7 +2313,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "createTextureFromId(uint,QSize,QFlags<QSGEngine::CreateTextureOption>)const"
+            signature: "createTextureFromId(uint,QSize,QSGEngine::CreateTextureOptions)const"
             ModifyArgument{
                 index: 0
                 DefineOwnership{
@@ -2624,7 +2327,6 @@ TypeSystem{
     
     EnumType{
         name: "QSGEngine::CreateTextureOption"
-        flags: "QSGEngine::CreateTextureOptions"
         until: 5
     }
     
@@ -2720,23 +2422,39 @@ TypeSystem{
     
     ValueType{
         name: "QQuickGraphicsDevice"
-        ModifyFunction{
-            signature: "operator=(QQuickGraphicsDevice)"
-            remove: RemoveFlag.All
+        Rejection{
+            functionName: "fromDeviceObjects"
+        }
+        Rejection{
+            functionName: "fromPhysicalDevice"
+        }
+        Rejection{
+            functionName: "fromDeviceAndContext"
+        }
+        Rejection{
+            functionName: "fromDeviceAndCommandQueue"
         }
         ModifyFunction{
-            signature: "fromAdapter(unsigned int, int, int)"
+            signature: "fromAdapter(quint32, qint32, int)"
             ppCondition: "defined(Q_OS_WIN)"
         }
         since: 6
     }
+
+    ObjectType{
+        name: "VkImage"
+        generate: false
+        since: [6, 2]
+    }
+
+    ObjectType{
+        name: "VkImageLayout"
+        generate: false
+        since: [6, 2]
+    }
     
     ValueType{
         name: "QQuickRenderTarget"
-        ModifyFunction{
-            signature: "operator=(QQuickRenderTarget)"
-            remove: RemoveFlag.All
-        }
         InjectCode{
             target: CodeClass.Native
             position: Position.Beginning
@@ -2865,39 +2583,53 @@ TypeSystem{
                           "    mutable QByteArray __qt_attributeNameByteArrays;\n"+
                           "    mutable QVector<const char *> __qt_attributeNames;"}
         }
+        Rejection{
+            functionName: "setShader"
+        }
+
+        EnumType{
+            name: "Flag"
+        }
+
+        EnumType{
+            name: "Stage"
+        }
+
+        ValueType{
+            name: "RenderState"
+            ModifyFunction{
+                signature: "uniformData()"
+                remove: RemoveFlag.All
+            }
+            Rejection{
+                functionName: "resourceUpdateBatch"
+            }
+            Rejection{
+                functionName: "rhi"
+            }
+        }
+
+        ValueType{
+            name: "GraphicsPipelineState"
+            EnumType{
+                name: "BlendFactor"
+            }
+            EnumType{
+                name: "ColorMaskComponent"
+            }
+            EnumType{
+                name: "CullMode"
+            }
+        }
         ModifyFunction{
             signature: "updateGraphicsPipelineState(QSGMaterialRhiShader::RenderState &, QSGMaterialRhiShader::GraphicsPipelineState *, QSGMaterial *, QSGMaterial *)"
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.quick.QSGMaterialRhiShader$RenderState"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSGMaterialRhiShader::RenderState& %out = qtjambi_cast<QSGMaterialRhiShader::RenderState&>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.quick.QSGMaterialRhiShader$GraphicsPipelineState"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSGMaterialRhiShader::GraphicsPipelineState* %out = qtjambi_cast<QSGMaterialRhiShader::GraphicsPipelineState*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
             ModifyArgument{
                 index: 3
@@ -2913,19 +2645,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.quick.QSGMaterialRhiShader$RenderState"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSGMaterialRhiShader::RenderState& %out = qtjambi_cast<QSGMaterialRhiShader::RenderState&>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
             ModifyArgument{
                 index: 4
@@ -2950,19 +2669,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.quick.QSGMaterialRhiShader$RenderState"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSGMaterialRhiShader::RenderState& %out = qtjambi_cast<QSGMaterialRhiShader::RenderState&>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
             ModifyArgument{
                 index: 2
@@ -2977,113 +2683,11 @@ TypeSystem{
         until: 5
     }
     
-    EnumType{
-        name: "QSGMaterialRhiShader::Flag"
-        flags: "QSGMaterialRhiShader::Flags"
-        since: [5, 14]
-        until: 5
-    }
-    
-    EnumType{
-        name: "QSGMaterialRhiShader::Stage"
-        since: [5, 14]
-        until: 5
-    }
-    
-    ValueType{
-        name: "QSGMaterialRhiShader::RenderState"
-        ModifyFunction{
-            signature: "uniformData()"
-            remove: RemoveFlag.All
-        }
-        since: [5, 14]
-        until: 5
-    }
-    
-    ValueType{
-        name: "QSGMaterialRhiShader::GraphicsPipelineState"
-        since: [5, 14]
-        until: 5
-    }
-    
-    EnumType{
-        name: "QSGMaterialRhiShader::GraphicsPipelineState::BlendFactor"
-        since: [5, 14]
-        until: 5
-    }
-    
-    EnumType{
-        name: "QSGMaterialRhiShader::GraphicsPipelineState::ColorMaskComponent"
-        flags: "QSGMaterialRhiShader::GraphicsPipelineState::ColorMask"
-        since: [5, 14]
-        until: 5
-    }
-    
-    EnumType{
-        name: "QSGMaterialRhiShader::GraphicsPipelineState::CullMode"
-        since: [5, 14]
-        until: 5
-    }
-    
-    EnumType{
-        name: "QSGMaterialShader::Flag"
-        flags: "QSGMaterialShader::Flags"
-        since: 6
-    }
-    
-    EnumType{
-        name: "QSGMaterialShader::Stage"
-        since: 6
-    }
-    
-    ValueType{
-        name: "QSGMaterialShader::RenderState"
-        ModifyFunction{
-            signature: "uniformData()"
-            remove: RemoveFlag.All
-            since: 6
-        }
-    }
-    
-    ValueType{
-        name: "QSGMaterialShader::GraphicsPipelineState"
-        since: 6
-    }
-    
     ValueType{
         name: "QQuickGraphicsConfiguration"
-        ModifyFunction{
-            signature: "operator=(QQuickGraphicsConfiguration)"
-            remove: RemoveFlag.All
-        }
-        since: 6
-    }
-    
-    EnumType{
-        name: "QSGMaterialShader::GraphicsPipelineState::BlendFactor"
-        since: 6
-    }
-    
-    EnumType{
-        name: "QSGMaterialShader::GraphicsPipelineState::PolygonMode"
-        since: [6, 4]
-    }
-    
-    EnumType{
-        name: "QSGMaterialShader::GraphicsPipelineState::ColorMaskComponent"
-        flags: "QSGMaterialShader::GraphicsPipelineState::ColorMask"
         since: 6
     }
-    
-    EnumType{
-        name: "QSGMaterialShader::GraphicsPipelineState::CullMode"
-        since: 6
-    }
-    
-    Rejection{
-        className: "QNativeInterface::QSGOpenGLTexture::TypeInfo"
-    }
-    
+        
     InterfaceType{
         name: "QNativeInterface::QSGOpenGLTexture"
         packageName: "io.qt.quick.nativeinterface"
@@ -3091,6 +2695,9 @@ TypeSystem{
         ppCondition: "QT_CONFIG(opengl)"
         isNativeInterface: true
         generate: "no-shell"
+        Rejection{
+            className: "TypeInfo"
+        }
         ModifyFunction{
             signature: "QSGOpenGLTexture()"
             remove: RemoveFlag.All
@@ -3098,10 +2705,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QNativeInterface::QSGD3D11Texture::TypeInfo"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::QSGD3D11Texture"
         packageName: "io.qt.quick.nativeinterface"
@@ -3109,6 +2712,9 @@ TypeSystem{
         ppCondition: "defined(Q_OS_WIN)"
         isNativeInterface: true
         generate: "no-shell"
+        Rejection{
+            className: "TypeInfo"
+        }
         ModifyFunction{
             signature: "QSGD3D11Texture()"
             remove: RemoveFlag.All
@@ -3116,39 +2722,35 @@ TypeSystem{
         since: [6, 2]
     }
     
-    ValueType{
-        name: "VkImage"
-        generate: false
-        since: [6, 2]
-    }
-    
-    ValueType{
-        name: "VkImageLayout"
-        generate: false
-        since: [6, 2]
-    }
-    
-    ValueType{
+    PrimitiveType{
         name: "VkFormat"
-        generate: false
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
         since: [6, 4]
     }
     
-    ValueType{
+    PrimitiveType{
         name: "MTLTexture"
-        generate: false
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
         since: [6, 2]
     }
     
-    ValueType{
+    PrimitiveType{
         name: "MTLDevice"
-        generate: false
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
         since: [6, 2]
     }
     
-    ValueType{
+    PrimitiveType{
         name: "MTLCommandQueue"
-        generate: false
+        javaName: "io.qt.QNativePointer"
+        jniName: "jobject"
+        preferredConversion: false
         since: [6, 2]
     }
     
@@ -3167,10 +2769,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QNativeInterface::QSGMetalTexture::TypeInfo"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::QSGMetalTexture"
         packageName: "io.qt.quick.nativeinterface"
@@ -3178,6 +2776,9 @@ TypeSystem{
         ppCondition: "defined(Q_OS_MACOS)"
         isNativeInterface: true
         generate: "no-shell"
+        Rejection{
+            className: "TypeInfo"
+        }
         ModifyFunction{
             signature: "QSGMetalTexture()"
             remove: RemoveFlag.All
@@ -3199,12 +2800,21 @@ TypeSystem{
         ModifyFunction{
             signature: "nativeTexture() const"
             proxyCall: "qtjambi_QSGMetalTexture_nativeTexture"
+            ModifyArgument{
+                index: 0
+                replaceType: "io.qt.@Nullable QNativePointer"
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToQNativePointer(%env, %in, QNativePointer::Type::Pointer, 1);"}
+                }
+            }
         }
         ModifyFunction{
-            signature: "fromNative(id<MTLTexture>, QQuickWindow *, QSize, QFlags<QQuickWindow::CreateTextureOption>)"
+            signature: "fromNative(id<MTLTexture>, QQuickWindow *, QSize, QQuickWindow::CreateTextureOptions)"
             proxyCall: "qtjambi_QSGMetalTexture_fromNative"
             ModifyArgument{
                 index: 1
+                replaceType: "io.qt.@Nullable QNativePointer"
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "void* %out = QtJambiAPI::convertQNativePointerToNative(%env, %in, 0);"}
@@ -3214,10 +2824,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    Rejection{
-        className: "QNativeInterface::QSGVulkanTexture::TypeInfo"
-    }
-    
     InterfaceType{
         name: "QNativeInterface::QSGVulkanTexture"
         packageName: "io.qt.quick.nativeinterface"
@@ -3225,6 +2831,10 @@ TypeSystem{
         ppCondition: "QT_CONFIG(vulkan)"
         isNativeInterface: true
         generate: "no-shell"
+        Rejection{
+            className: "TypeInfo"
+        }
+
         ModifyFunction{
             signature: "QSGVulkanTexture()"
             remove: RemoveFlag.All
@@ -3235,7 +2845,7 @@ TypeSystem{
             Text{content: "QSGTexture * qtjambi_QSGVulkanTexture_fromNative(JNIEnv *env, jlong image, jint layout, QQuickWindow* window, const QSize& size, QQuickWindow::CreateTextureOptions options);"}
         }
         ModifyFunction{
-            signature: "fromNative(VkImage, VkImageLayout, QQuickWindow *, QSize, QFlags<QQuickWindow::CreateTextureOption>)"
+            signature: "fromNative(VkImage, VkImageLayout, QQuickWindow *, QSize, QQuickWindow::CreateTextureOptions)"
             proxyCall: "qtjambi_QSGVulkanTexture_fromNative"
             ModifyArgument{
                 index: 1
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuick3D.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuick3D.qml
index ca41620b..169da01a 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuick3D.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuick3D.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.quick3d"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtQuick3D"
     module: "qtjambi.quick3d"
     description: "Provides a high-level API for creating 3D content or UIs based on Qt Quick."
@@ -60,10 +60,6 @@ TypeSystem{
         until: [6, 2]
     }
     
-    Rejection{
-        className: "QSSGRenderGraphObject"
-    }
-    
     Rejection{
         className: ""
         functionName: "qml_register_types_QtQuick3D"
@@ -78,34 +74,28 @@ TypeSystem{
         }
     }
     
-    
-    ObjectType{
-        name: "QQuick3DObject::ItemChangeData"
-        generate: false
-    }
-    
-    EnumType{
-        name: "QQuick3DGeometry::PrimitiveType"
-    }
-    
-    EnumType{
-        name: "QQuick3DGeometry::Attribute::Semantic"
-        RejectEnumValue{
-            name: "TexCoord0Semantic"
-            since: 6
-        }
-    }
-    
-    EnumType{
-        name: "QQuick3DGeometry::Attribute::ComponentType"
-    }
-    
-    ValueType{
-        name: "QQuick3DGeometry::Attribute"
-    }
-    
     ObjectType{
         name: "QQuick3DGeometry"
+
+        EnumType{
+            name: "PrimitiveType"
+        }
+
+        ValueType{
+            name: "Attribute"
+
+            EnumType{
+                name: "Semantic"
+                RejectEnumValue{
+                    name: "TexCoord0Semantic"
+                    since: 6
+                }
+            }
+
+            EnumType{
+                name: "ComponentType"
+            }
+        }
     }
     
     ObjectType{
@@ -128,30 +118,32 @@ TypeSystem{
                 }
             }
         }
+
+        ValueType{
+            name: "InstanceTableEntry"
+        }
         since: [6, 1]
     }
     
-    ValueType{
-        name: "QQuick3DInstancing::InstanceTableEntry"
-        since: [6, 1]
-    }
-    
-    EnumType{
-        name: "QQuick3DTextureData::Format"
-        since: 6
-    }
-    
     ObjectType{
         name: "QQuick3DTextureData"
+        EnumType{
+            name: "Format"
+        }
         since: 6
     }
-    
-    EnumType{
-        name: "QQuick3DObject::ItemChange"
-    }
+
+    Rejection{className: "QSSGRenderGraphObject"}
     
     ObjectType{
         name: "QQuick3DObject"
+        EnumType{
+            name: "ItemChange"
+        }
+        ObjectType{
+            name: "ItemChangeData"
+            generate: false
+        }
         ExtraIncludes{
             Include{
                 fileName: "utils_p.h"
@@ -174,7 +166,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.Object"
+                    modifiedType: "java.lang.@Nullable Object"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -269,4 +261,5 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping*, unmatched *type 'QSSGRenderGraphObject*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping*unmatched*type '*QQuick3DSceneManager*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'QQuick3D()' for function modification in 'QQuick3D' not found. Possible candidates:"}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Unimplementable pure virtual function: QQuick3DObject::updateSpatialNode*"}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickControls2.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickControls2.qml
index 0cdb9fff..4250d3ab 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickControls2.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickControls2.qml
@@ -31,14 +31,14 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.quick.controls"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtQuickControls2"
     module: "qtjambi.quickcontrols"
     description: "Provides lightweight QML types for creating performant user interfaces for desktop, embedded, and mobile devices. These types employ a simple styling architecture and are very efficient."
 
     InjectCode{
         position: Position.Position3
-        Text{content: "io.qt.QtUtilities.loadQtLibrary(\"QuickTemplates2\");"}
+        Text{content: "QtUtilities.loadQtLibrary(\"QuickTemplates2\");"}
     }
     
     NamespaceType{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickTest.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickTest.qml
index 4d332f58..dae7184e 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickTest.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickTest.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.quick.test"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtQuickTest"
     module: "qtjambi.quicktest"
     description: "A unit test framework for QML applications, where the test cases are written as JavaScript functions."
@@ -77,7 +77,7 @@ TypeSystem{
         ModifyArgument{
             index: 2
             ReplaceType{
-                modifiedType: "java.lang.String[]"
+                modifiedType: "java.lang.@Nullable String @Nullable[]"
             }
             ConversionRule{
                 codeClass: CodeClass.Native
@@ -86,18 +86,6 @@ TypeSystem{
                               "int %1 = applicationData->size();"}
             }
         }
-        ModifyArgument{
-            index: 3
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 4
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
@@ -111,7 +99,7 @@ TypeSystem{
         ModifyArgument{
             index: 2
             ReplaceType{
-                modifiedType: "java.lang.String[]"
+                modifiedType: "java.lang.@Nullable String @Nullable[]"
             }
             ConversionRule{
                 codeClass: CodeClass.Native
@@ -120,17 +108,5 @@ TypeSystem{
                               "int %1 = applicationData->size();"}
             }
         }
-        ModifyArgument{
-            index: 3
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
-        ModifyArgument{
-            index: 4
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickWidgets.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickWidgets.qml
index f94ce6aa..aa8ed935 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickWidgets.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtQuickWidgets.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.quick.widgets"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtQuickWidgets"
     module: "qtjambi.quickwidgets"
     description: "Provides a C++ widget class for displaying a Qt Quick user interface."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtRemoteObjects.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtRemoteObjects.qml
index bb62efd7..2dc345b3 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtRemoteObjects.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtRemoteObjects.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.remoteobjects"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtRemoteObjects"
     module: "qtjambi.remoteobjects"
     description: "Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices."
@@ -96,7 +96,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "operator<<(QDataStream &, QFlags<QItemSelectionModel::SelectionFlag>)"
+            signature: "operator<<(QDataStream &, QItemSelectionModel::SelectionFlags)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -104,7 +104,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator>>(QDataStream &, QFlags<QItemSelectionModel::SelectionFlag> &)"
+            signature: "operator>>(QDataStream &, QItemSelectionModel::SelectionFlags &)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -225,18 +225,6 @@ TypeSystem{
         name: "QRemoteObjectHostBase::AllowedSchemas"
     }
     
-    EnumType{
-        name: "QRemoteObjectNode::ErrorCode"
-    }
-    
-    EnumType{
-        name: "QRemoteObjectReplica::State"
-    }
-    
-    EnumType{
-        name: "QRemoteObjectReplica::ConstructorType"
-    }
-    
     EnumType{
         name: "QRemoteObjectPendingCall::Error"
     }
@@ -297,6 +285,9 @@ TypeSystem{
     
     ObjectType{
         name: "QRemoteObjectNode"
+        EnumType{
+            name: "ErrorCode"
+        }
         ModifyFunction{
             signature: "setPersistedStore(QRemoteObjectAbstractPersistedStore*)"
             ModifyArgument{
@@ -317,6 +308,10 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "acquire<ObjectType>(QString)"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "instances<T>() const"
             remove: RemoveFlag.All
@@ -353,6 +348,14 @@ TypeSystem{
     
     ObjectType{
         name: "QRemoteObjectReplica"
+        Rejection{fieldName: "d_impl"}
+        EnumType{
+            name: "State"
+        }
+
+        EnumType{
+            name: "ConstructorType"
+        }
         ModifyFunction{
             signature: "setNode(QRemoteObjectNode*)"
             ModifyArgument{
@@ -426,7 +429,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.remoteobjects.IoDeviceBase$ReadResult"
+                    modifiedType: "io.qt.remoteobjects.IoDeviceBase$@Nullable ReadResult"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -436,6 +439,16 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "stream()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiRemoteObjects.java"
@@ -484,7 +497,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.remoteobjects.QtROIoDeviceBase$ReadResult"
+                    modifiedType: "io.qt.remoteobjects.QtROIoDeviceBase$@Nullable ReadResult"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -542,7 +555,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.remoteobjects.ServerIoDevice$ReadResult"
+                    modifiedType: "io.qt.remoteobjects.ServerIoDevice$@Nullable ReadResult"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -618,7 +631,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.remoteobjects.ClientIoDevice$ReadResult"
+                    modifiedType: "io.qt.remoteobjects.ClientIoDevice$@Nullable ReadResult"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -653,19 +666,11 @@ TypeSystem{
     
     ValueType{
         name: "QRemoteObjectSourceLocationInfo"
-        ModifyFunction{
-            signature: "operator=(const QRemoteObjectSourceLocationInfo &)"
-            remove: RemoveFlag.All
-        }
     }
     
     InterfaceType{
         name: "QRemoteObjectPendingCall"
         isValue: true
-        ModifyFunction{
-            signature: "operator=(const QRemoteObjectPendingCall &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "waitForFinished(int)"
             ModifyArgument{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtScript.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtScript.qml
index 35a6a6ac..aa0c81d7 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtScript.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtScript.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.script"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtScript"
     module: "qtjambi.script"
     description: "Classes for making Qt applications scriptable. Deprecated in favor of the QJS* classes in the Qt QML module."
@@ -98,7 +98,6 @@ TypeSystem{
     
     EnumType{
         name: "QScriptClass::QueryFlag"
-        flags: "QScriptClass::QueryFlags"
     }
     
     EnumType{
@@ -115,7 +114,6 @@ TypeSystem{
     
     EnumType{
         name: "QScriptEngine::QObjectWrapOption"
-        flags: "QScriptEngine::QObjectWrapOptions"
     }
     
     EnumType{
@@ -128,12 +126,10 @@ TypeSystem{
     
     EnumType{
         name: "QScriptValue::PropertyFlag"
-        flags: "QScriptValue::PropertyFlags"
     }
     
     EnumType{
         name: "QScriptValue::ResolveFlag"
-        flags: "QScriptValue::ResolveFlags"
     }
     
     EnumType{
@@ -151,7 +147,7 @@ TypeSystem{
             ModifyArgument{
                 index: "return"
                 ReplaceType{
-                    modifiedType: "io.qt.script.QScriptClassPropertyIterator"
+                    modifiedType: "io.qt.script.@NonNull QScriptClassPropertyIterator"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -160,11 +156,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "queryProperty(const QScriptValue &, const QScriptString &, QFlags<QScriptClass::QueryFlag>, uint *)"
+            signature: "queryProperty(const QScriptValue &, const QScriptString &, QScriptClass::QueryFlags, uint *)"
             ModifyArgument{
                 index: 4
                 ReplaceType{
-                    modifiedType: "java.lang.Integer"
+                    modifiedType: "java.lang.@Nullable Integer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -177,23 +173,12 @@ TypeSystem{
                 }
             }
         }
+
         ModifyFunction{
-            signature: "setProperty(QScriptValue &, const QScriptString &, unsigned int, const QScriptValue &)"
+            signature: "setProperty(QScriptValue&,QScriptString,uint,QScriptValue)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.script.QScriptValue"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QScriptValue& %out = qtjambi_cast<QScriptValue&>(%env, %scope, %in);"}
-                }
+                invalidateAfterUse: true
             }
         }
     }
@@ -212,10 +197,6 @@ TypeSystem{
     
     ValueType{
         name: "QScriptContextInfo"
-        ModifyFunction{
-            signature: "operator=(const QScriptContextInfo &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ObjectType{
@@ -224,10 +205,6 @@ TypeSystem{
     
     ValueType{
         name: "QScriptString"
-        ModifyFunction{
-            signature: "operator= ( const QScriptString & )"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "operator QString() const"
             remove: RemoveFlag.All
@@ -259,10 +236,6 @@ TypeSystem{
     
     ValueType{
         name: "QScriptProgram"
-        ModifyFunction{
-            signature: "operator= ( const QScriptProgram & )"
-            remove: RemoveFlag.All
-        }
     }
     
     InterfaceType{
@@ -271,10 +244,6 @@ TypeSystem{
     
     ValueType{
         name: "QScriptSyntaxCheckResult"
-        ModifyFunction{
-            signature: "operator= ( const QScriptSyntaxCheckResult & )"
-            remove: RemoveFlag.All
-        }
         CustomConstructor{
             Text{content: "if(copy)\n"+
                           "    return new(placement) QScriptSyntaxCheckResult(*copy);\n"+
@@ -305,10 +274,6 @@ TypeSystem{
             signature: "QScriptValue(const char * )"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator= ( const QScriptValue & )"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "toBoolean () const"
             remove: RemoveFlag.All
@@ -368,7 +333,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.util.Collection<QScriptValue>"
+                    modifiedType: "java.util.@Nullable Collection<@NonNull QScriptValue>"
                 }
                 ReplaceDefaultExpression{
                     expression: "new java.util.ArrayList<>()"
@@ -380,7 +345,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.Collection<QScriptValue>"
+                    modifiedType: "java.util.@Nullable Collection<@NonNull QScriptValue>"
                 }
                 ReplaceDefaultExpression{
                     expression: "new java.util.ArrayList<>()"
@@ -388,7 +353,7 @@ TypeSystem{
             }
         }
         InjectCode{
-            Text{content: "@io.qt.QtUninvokable\n"+
+            Text{content: "@QtUninvokable\n"+
                           "public final Integer toInteger() {\n"+
                           "    if(Double.isNaN(private_toInteger())){\n"+
                           "        return null;\n"+
@@ -469,7 +434,7 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QScriptEngine::registerCustomType', unmatched parameter type 'QScriptEngine::MarshalFunction'"}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QScriptSyntaxCheckResult."}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QScriptValue."}
-    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QScriptSyntaxCheckResult' is missing a default constructor. The resulting C++ code will not compile.*"}
+    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QScriptSyntaxCheckResult' is missing a default constructor.*"}
     SuppressedWarning{text: "WARNING(CppImplGenerator) :: protected function '*' in final class '*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtScriptTools.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtScriptTools.qml
index d4aef9f5..a9446051 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtScriptTools.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtScriptTools.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.script.tools"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtScriptTools"
     module: "qtjambi.scripttools"
     description: "Additional components for applications that use Qt Script."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtScxml.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtScxml.qml
index f9f8a62f..ab11e108 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtScxml.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtScxml.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.scxml"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtScxml"
     module: "qtjambi.scxml"
     description: "Provides classes and tools for creating state machines from SCXML files and embedding them in applications."
@@ -74,18 +74,33 @@ TypeSystem{
         Text{content: "initialize_meta_info_ForeachLoopBody();"}
     }
     
-    Rejection{
-        className: "QScxmlStateMachine"
-        functionName: "onExit"
-    }
-    
-    Rejection{
-        className: "QScxmlStateMachine"
-        functionName: "onEntry"
-    }
-    
     NamespaceType{
         name: "QScxmlExecutableContent"
+
+        ValueType{
+            name: "AssignmentInfo"
+        }
+
+        ValueType{
+            name: "EvaluatorInfo"
+        }
+
+        ValueType{
+            name: "ForeachInfo"
+        }
+
+        ValueType{
+            name: "InvokeInfo"
+            ModifyField{
+                name: "finalize"
+                rename: "finalizeId"
+            }
+        }
+
+        ValueType{
+            name: "ParameterInfo"
+        }
+
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiScxml.java"
@@ -95,40 +110,8 @@ TypeSystem{
         }
     }
     
-    ValueType{
-        name: "QScxmlExecutableContent::AssignmentInfo"
-    }
-    
-    ValueType{
-        name: "QScxmlExecutableContent::EvaluatorInfo"
-    }
-    
-    ValueType{
-        name: "QScxmlExecutableContent::ForeachInfo"
-    }
-    
-    ValueType{
-        name: "QScxmlExecutableContent::InvokeInfo"
-        ModifyField{
-            name: "finalize"
-            rename: "finalizeId"
-        }
-    }
-    
-    ValueType{
-        name: "QScxmlExecutableContent::ParameterInfo"
-    }
-    
     ValueType{
         name: "QScxmlError"
-        ModifyFunction{
-            signature: "operator=( const QScxmlError & )"
-            remove: RemoveFlag.All
-        }
-    }
-    
-    InterfaceType{
-        name: "QScxmlCompiler::Loader"
     }
     
     InterfaceType{
@@ -146,6 +129,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.IntBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "int* %out = reinterpret_cast<int*>(%env->GetDirectBufferAddress(%in));"}
@@ -165,6 +149,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.IntBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "int* %out = reinterpret_cast<int*>(%env->GetDirectBufferAddress(%in));"}
@@ -184,6 +169,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "java.nio.IntBuffer"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "int* %out = reinterpret_cast<int*>(%env->GetDirectBufferAddress(%in));\n"+
@@ -214,6 +200,10 @@ TypeSystem{
     
     ObjectType{
         name: "QScxmlCompiler"
+
+        InterfaceType{
+            name: "Loader"
+        }
         ModifyFunction{
             signature: "setLoader(QScxmlCompiler::Loader*)"
             ModifyArgument{
@@ -235,6 +225,70 @@ TypeSystem{
     
     ObjectType{
         name: "QScxmlDataModel"
+
+        ObjectType{
+            name: "ForeachLoopBody"
+            forceAbstract: true
+            generate: false
+            ModifyFunction{
+                signature: "ForeachLoopBody()"
+                remove: RemoveFlag.All
+            }
+            ModifyFunction{
+                signature: "run(bool*)"
+                ModifyArgument{
+                    index: 1
+                    ReplaceType{
+                        modifiedType: "boolean @Nullable[]"
+                    }
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "JBooleanArrayPointer %out(%env, %in);"}
+                    }
+                }
+            }
+            until: [5, 11]
+        }
+
+        InterfaceType{
+            name: "ForeachLoopBody"
+            ExtraIncludes{
+                Include{
+                    fileName: "QtJambi/JavaAPI"
+                    location: Include.Global
+                }
+            }
+            ModifyFunction{
+                signature: "run(bool*)"
+                ModifyArgument{
+                    index: 0
+                    ReplaceType{
+                        modifiedType: "boolean"
+                    }
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "jboolean %out = %1;"}
+                    }
+                    ConversionRule{
+                        codeClass: CodeClass.Shell
+                        Text{content: "if(%1){\n"+
+                                      "    *%1 = %in;\n"+
+                                      "}"}
+                    }
+                }
+                ModifyArgument{
+                    index: 1
+                    RemoveArgument{
+                    }
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "bool %in = false;\n"+
+                                      "bool* %out = &%in;"}
+                    }
+                }
+            }
+            since: [5, 12]
+        }
         ModifyFunction{
             signature: "setStateMachine(QScxmlStateMachine*)"
             ModifyArgument{
@@ -257,11 +311,11 @@ TypeSystem{
             since: [6, 1]
         }
         ModifyFunction{
-            signature: "evaluateToString(int, bool *)"
+            signature: "evaluateToString(qint32, bool *)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "boolean[]"
+                    modifiedType: "boolean @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -275,11 +329,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "evaluateToBool(int, bool *)"
+            signature: "evaluateToBool(qint32, bool *)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "boolean[]"
+                    modifiedType: "boolean @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -293,11 +347,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "evaluateToVariant(int, bool *)"
+            signature: "evaluateToVariant(qint32, bool *)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "boolean[]"
+                    modifiedType: "boolean @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -311,11 +365,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "evaluateToVoid(int, bool *)"
+            signature: "evaluateToVoid(qint32, bool *)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "boolean[]"
+                    modifiedType: "boolean @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -329,11 +383,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "evaluateAssignment(int, bool *)"
+            signature: "evaluateAssignment(qint32, bool *)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "boolean[]"
+                    modifiedType: "boolean @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -347,11 +401,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "evaluateInitialization(int, bool *)"
+            signature: "evaluateInitialization(qint32, bool *)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "boolean[]"
+                    modifiedType: "boolean @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -365,11 +419,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "evaluateForeach(int,bool*,QScxmlDataModel::ForeachLoopBody*)"
+            signature: "evaluateForeach(qint32,bool*,QScxmlDataModel::ForeachLoopBody*)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "boolean[]"
+                    modifiedType: "boolean @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -398,9 +452,9 @@ TypeSystem{
     
     ValueType{
         name: "QScxmlEvent"
-        ModifyFunction{
-            signature: "operator=( const QScxmlEvent & )"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "EventType"
         }
     }
     
@@ -411,7 +465,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.scxml.QScxmlEvent"
+                    modifiedType: "io.qt.scxml.@Nullable QScxmlEvent"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
@@ -435,6 +489,8 @@ TypeSystem{
     
     ObjectType{
         name: "QScxmlStateMachine"
+        Rejection{functionName: "onExit"}
+        Rejection{functionName: "onEntry"}
         ModifyFunction{
             signature: "setDataModel(QScxmlDataModel*)"
             ModifyArgument{
@@ -468,12 +524,6 @@ TypeSystem{
         ModifyFunction{
             signature: "connectToEvent(QString,const QObject*,const char*,Qt::ConnectionType)"
             access: Modification.Private
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 4
                 ReplaceType{
@@ -486,12 +536,6 @@ TypeSystem{
         ModifyFunction{
             signature: "connectToState(QString,const QObject*,const char*,Qt::ConnectionType)"
             access: Modification.Private
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 4
                 ReplaceType{
@@ -501,23 +545,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "submitEvent(QScxmlEvent *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.scxml.QScxmlEvent"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QScxmlEvent *%out = qtjambi_cast<QScxmlEvent *>(%env, %in);"}
-                }
-            }
-        }
         InjectCode{
             target: CodeClass.Java
             ImportFile{
@@ -532,73 +559,5 @@ TypeSystem{
         name: "QScxmlStaticScxmlServiceFactory"
     }
     
-    ObjectType{
-        name: "QScxmlDataModel::ForeachLoopBody"
-        forceAbstract: true
-        generate: false
-        ModifyFunction{
-            signature: "ForeachLoopBody()"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "run(bool*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "boolean[]"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "JBooleanArrayPointer %out(%env, %in);"}
-                }
-            }
-        }
-        until: [5, 11]
-    }
-    
-    InterfaceType{
-        name: "QScxmlDataModel::ForeachLoopBody"
-        ExtraIncludes{
-            Include{
-                fileName: "QtJambi/JavaAPI"
-                location: Include.Global
-            }
-        }
-        ModifyFunction{
-            signature: "run(bool*)"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "boolean"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jboolean %out = %1;"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "if(%1){\n"+
-                                  "    *%1 = %in;\n"+
-                                  "}"}
-                }
-            }
-            ModifyArgument{
-                index: 1
-                RemoveArgument{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "bool %in = false;\n"+
-                                  "bool* %out = &%in;"}
-                }
-            }
-        }
-        since: [5, 12]
-    }
-    
-    EnumType{
-        name: "QScxmlEvent::EventType"
-    }
-    
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QScxml*."}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtSensors.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtSensors.qml
index 3ec6d02a..af0c4b83 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtSensors.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtSensors.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.sensors"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtSensors"
     module: "qtjambi.sensors"
     description: "Provides access to sensor hardware and motion gesture recognition."
@@ -103,10 +103,6 @@ TypeSystem{
         until: 5
     }
     
-    EnumType{
-        name: "QAccelerometer::AccelerationMode"
-    }
-    
     ObjectType{
         name: "QAccelerometer"
         ModifyField{
@@ -117,6 +113,10 @@ TypeSystem{
             name: "sensorType"
             read: false
         }
+
+        EnumType{
+            name: "AccelerationMode"
+        }
     }
     
     ObjectType{
@@ -139,12 +139,12 @@ TypeSystem{
         name: "QAltimeterReading"
     }
     
-    EnumType{
-        name: "QAmbientLightReading::LightLevel"
-    }
-    
     ObjectType{
         name: "QAmbientLightReading"
+
+        EnumType{
+            name: "LightLevel"
+        }
     }
     
     ObjectType{
@@ -317,10 +317,10 @@ TypeSystem{
     
     ObjectType{
         name: "QOrientationReading"
-    }
-    
-    EnumType{
-        name: "QOrientationReading::Orientation"
+
+        EnumType{
+            name: "Orientation"
+        }
     }
     
     ObjectType{
@@ -371,12 +371,12 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QTapReading::TapDirection"
-    }
-    
     ObjectType{
         name: "QTapReading"
+
+        EnumType{
+            name: "TapDirection"
+        }
     }
     
     ObjectType{
@@ -407,16 +407,16 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QSensor::AxesOrientationMode"
-    }
-    
-    EnumType{
-        name: "QSensor::Feature"
-    }
-    
     ObjectType{
         name: "QSensor"
+
+        EnumType{
+            name: "AxesOrientationMode"
+        }
+
+        EnumType{
+            name: "Feature"
+        }
         ModifyFunction{
             signature: "addFilter(QSensorFilter*)"
             ModifyArgument{
@@ -445,6 +445,21 @@ TypeSystem{
     
     ObjectType{
         name: "QSensorReading"
+        ModifyFunction{
+            signature: "QSensorReading(QObject *, QSensorReadingPrivate *)"
+            InjectCode{
+                target: CodeClass.Native
+                ArgumentMap{
+                    index: 2
+                    metaName: "%2"
+                }
+                Text{content: "QSensorReadingPrivate * __qt_%2 = nullptr;"}
+            }
+            ModifyArgument{
+                index: 2
+                RemoveArgument{}
+            }
+        }
     }
     
     ObjectType{
@@ -472,6 +487,12 @@ TypeSystem{
     
     ObjectType{
         name: "QSensorBackend"
+        ExtraIncludes{
+            Include{
+                fileName: "utils_p.h"
+                location: Include.Local
+            }
+        }
         ModifyFunction{
             signature: "setDataRates(const QSensor*)"
             ModifyArgument{
@@ -481,6 +502,74 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "setReading<T>(T*)"
+            Instantiation{
+                proxyCall: "qtjambi_setReading"
+                Argument{
+                    type: "QSensorReading"
+                }
+                ModifyArgument{
+                    index: 0
+                    ReplaceType{
+                        modifiedType: "T"
+                        modifiedJniType: "jobject"
+                    }
+                    NoNullPointer{}
+                }
+                ModifyArgument{
+                    index: 1
+                    ReferenceCount{
+                        action: ReferenceCount.Ignore
+                    }
+                    NoNullPointer{}
+                    ReplaceType{
+                        modifiedType: "T"
+                    }
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "jobject %out = %in;"}
+                    }
+                }
+                AddTypeParameter{
+                    name: "T"
+                    extending: "io.qt.sensors.QSensorReading"
+                }
+            }
+
+            Instantiation{
+                proxyCall: "qtjambi_setReading"
+                Argument{
+                    type: "QObject"
+                }
+                ModifyArgument{
+                    index: 0
+                    ReplaceType{
+                        modifiedType: "T"
+                        modifiedJniType: "jobject"
+                    }
+                    NoNullPointer{}
+                }
+                ModifyArgument{
+                    index: 1
+                    NoNullPointer{}
+                    ReferenceCount{
+                        action: ReferenceCount.Ignore
+                    }
+                    ReplaceType{
+                        modifiedType: "java.lang.Class<T>"
+                    }
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "jclass %out = %in;"}
+                    }
+                }
+                AddTypeParameter{
+                    name: "T"
+                    extending: "io.qt.sensors.QSensorReading"
+                }
+            }
+        }
     }
     
     ObjectType{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtSerialBus.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtSerialBus.qml
index baf6df65..123d9eb7 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtSerialBus.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtSerialBus.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.serialbus"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtSerialBus"
     module: "qtjambi.serialbus"
     description: "Provides access to serial industrial bus interface. Currently the module supports the CAN bus and Modbus protocols."
@@ -43,33 +43,22 @@ TypeSystem{
     RequiredLibrary{
         name: "QtSerialPort"
     }
-    
-    Rejection{
-        className: "QModbusPdu::IsType"
-    }
 
     NamespaceType{
         name: "QtCanBus"
-        since: [6,5]
-    }
-
-    EnumType{
-        name: "QtCanBus::DataSource"
-        since: [6,5]
-    }
-
-    EnumType{
-        name: "QtCanBus::DataFormat"
-        since: [6,5]
-    }
-
-    EnumType{
-        name: "QtCanBus::DataEndian"
-        since: [6,5]
-    }
 
-    EnumType{
-        name: "QtCanBus::MultiplexState"
+        EnumType{
+            name: "DataSource"
+        }
+        EnumType{
+            name: "DataFormat"
+        }
+        EnumType{
+            name: "DataEndian"
+        }
+        EnumType{
+            name: "MultiplexState"
+        }
         since: [6,5]
     }
     
@@ -80,17 +69,6 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.serialbus.QModbusDataUnit"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QModbusDataUnit* %out = qtjambi_cast<QModbusDataUnit*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -98,17 +76,6 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.serialbus.QModbusDataUnit"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QModbusDataUnit* %out = qtjambi_cast<QModbusDataUnit*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
         }
     }
@@ -234,29 +201,36 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QCanBusDevice::CanBusDeviceState"
-    }
-    
-    EnumType{
-        name: "QCanBusDevice::CanBusError"
-    }
-    
-    EnumType{
-        name: "QCanBusDevice::CanBusStatus"
-    }
-    
-    EnumType{
-        name: "QCanBusDevice::ConfigurationKey"
-    }
-    
-    EnumType{
-        name: "QCanBusDevice::Direction"
-        flags: "QCanBusDevice::Directions"
-    }
-    
     ObjectType{
         name: "QCanBusDevice"
+
+        ValueType{
+            name: "Filter"
+
+            EnumType{
+                name: "FormatFilter"
+            }
+        }
+
+        EnumType{
+            name: "CanBusDeviceState"
+        }
+
+        EnumType{
+            name: "CanBusError"
+        }
+
+        EnumType{
+            name: "CanBusStatus"
+        }
+
+        EnumType{
+            name: "ConfigurationKey"
+        }
+
+        EnumType{
+            name: "Direction"
+        }
         ExtraIncludes{
             Include{
                 fileName: "QtJambi/JObjectWrapper"
@@ -268,7 +242,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "clear(QFlags<QCanBusDevice::Direction>)"
+            signature: "clear(QCanBusDevice::Directions)"
             ModifyArgument{
                 index: 1
                 ReplaceDefaultExpression{
@@ -276,12 +250,18 @@ TypeSystem{
                 }
             }
         }
+
+        FunctionalType{
+            name: "ResetControllerFunction"
+            generate: false
+            using: "std::function<void()>"
+        }
         ModifyFunction{
             signature: "setResetControllerFunction(std::function<void()>)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.lang.Runnable"
+                    modifiedType: "java.lang.@Nullable Runnable"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -292,12 +272,18 @@ TypeSystem{
             }
             until: 5
         }
+
+        FunctionalType{
+            name: "CanBusStatusGetter"
+            generate: false
+            using: "std::function<QCanBusDevice::CanBusStatus()>"
+        }
         ModifyFunction{
             signature: "setCanBusStatusGetter(std::function<QCanBusDevice::CanBusStatus()>)"
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.function.Supplier<CanBusStatus>"
+                    modifiedType: "java.util.function.@Nullable Supplier<@NonNull CanBusStatus>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -314,15 +300,6 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QCanBusDevice::Filter::FormatFilter"
-        flags: "QCanBusDevice::Filter::FormatFilters"
-    }
-    
-    ValueType{
-        name: "QCanBusDevice::Filter"
-    }
-    
     ValueType{
         name: "QCanBusDeviceInfo"
         ExtraIncludes{
@@ -352,10 +329,6 @@ TypeSystem{
                           "};\n"+
                           "new(placement) QCanBusDeviceInfo(CanBusDevice::createDeviceInfo());"}
         }
-        ModifyFunction{
-            signature: "operator=(const QCanBusDeviceInfo &)"
-            remove: RemoveFlag.All
-        }
     }
     
     InterfaceType{
@@ -602,50 +575,49 @@ TypeSystem{
         until: 5
     }
     
-    EnumType{
-        name: "QCanBusFrame::FrameError"
-        flags: "QCanBusFrame::FrameErrors"
-    }
-    
-    EnumType{
-        name: "QCanBusFrame::FrameType"
-    }
-    
     ValueType{
         name: "QCanBusFrame"
+
+        EnumType{
+            name: "FrameError"
+        }
+
+        EnumType{
+            name: "FrameType"
+        }
     }
     
     ValueType{
         name: "QCanBusFrame::TimeStamp"
     }
     
-    EnumType{
-        name: "QModbusDataUnit::RegisterType"
-    }
-    
     ValueType{
         name: "QModbusDataUnit"
-    }
-    
-    EnumType{
-        name: "QModbusDevice::IntermediateError"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QModbusDevice::ConnectionParameter"
-    }
-    
-    EnumType{
-        name: "QModbusDevice::Error"
-    }
-    
-    EnumType{
-        name: "QModbusDevice::State"
+
+        EnumType{
+            name: "RegisterType"
+        }
     }
     
     ObjectType{
         name: "QModbusDevice"
+
+        EnumType{
+            name: "IntermediateError"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "ConnectionParameter"
+        }
+
+        EnumType{
+            name: "Error"
+        }
+
+        EnumType{
+            name: "State"
+        }
     }
     
     EnumType{
@@ -664,16 +636,20 @@ TypeSystem{
         name: "QModbusDeviceIdentification"
     }
     
-    EnumType{
-        name: "QModbusPdu::ExceptionCode"
-    }
-    
-    EnumType{
-        name: "QModbusPdu::FunctionCode"
-    }
-    
     ValueType{
         name: "QModbusPdu"
+
+        Rejection{
+            className: "IsType"
+        }
+
+        EnumType{
+            name: "ExceptionCode"
+        }
+
+        EnumType{
+            name: "FunctionCode"
+        }
         CustomConstructor{
             Text{content: "void* create_QModbusPdu(void* placement, const void * copy);\n"+
                           "return create_QModbusPdu(placement, copy);"}
@@ -684,15 +660,23 @@ TypeSystem{
                           "create_QModbusPdu(placement, copy);"}
         }
         ModifyFunction{
-            signature: "operator=(const QModbusPdu &)"
+            signature: "operator<<(QDataStream &,QModbusPdu)"
+            access: Modification.NonFinal
+        }
+        ModifyFunction{
+            signature: "encodeData<Args...>(Args)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator<<(QDataStream &,QModbusPdu)"
-            access: Modification.NonFinal
+            signature: "decodeData<Args...>(Args&&)const"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "QModbusPdu<Args...>(QModbusPdu::FunctionCode,Args)"
+            remove: RemoveFlag.All
         }
         InjectCode{
-            Text{content: "@io.qt.QtUninvokable\n"+
+            Text{content: "@QtUninvokable\n"+
                           "public void encodeData(Number...data) {\n"+
                           "    io.qt.core.QByteArray byteArray = new io.qt.core.QByteArray(data());\n"+
                           "    io.qt.core.QDataStream stream = new io.qt.core.QDataStream(byteArray, io.qt.core.QIODevice.OpenModeFlag.WriteOnly);\n"+
@@ -709,7 +693,7 @@ TypeSystem{
                           "    setData(byteArray);\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public void encodeData(short...data) {\n"+
                           "    io.qt.core.QByteArray byteArray = new io.qt.core.QByteArray(data());\n"+
                           "    io.qt.core.QDataStream stream = new io.qt.core.QDataStream(byteArray, io.qt.core.QIODevice.OpenModeFlag.WriteOnly);\n"+
@@ -720,7 +704,7 @@ TypeSystem{
                           "    setData(byteArray);\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public void encodeData(byte...data) {\n"+
                           "    io.qt.core.QByteArray byteArray = new io.qt.core.QByteArray(data());\n"+
                           "    io.qt.core.QDataStream stream = new io.qt.core.QDataStream(byteArray, io.qt.core.QIODevice.OpenModeFlag.WriteOnly);\n"+
@@ -731,7 +715,7 @@ TypeSystem{
                           "    setData(byteArray);\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public void decodeData(byte[] data) {\n"+
                           "    io.qt.core.QDataStream stream = new io.qt.core.QDataStream(data(), io.qt.core.QIODevice.OpenModeFlag.ReadOnly);\n"+
                           "    for (int i = 0; i < data.length; ++i) {\n"+
@@ -740,7 +724,7 @@ TypeSystem{
                           "    stream.dispose();\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public void decodeData(short[] data) {\n"+
                           "    io.qt.core.QDataStream stream = new io.qt.core.QDataStream(data(), io.qt.core.QIODevice.OpenModeFlag.ReadOnly);\n"+
                           "    for (int i = 0; i < data.length; ++i) {\n"+
@@ -749,7 +733,7 @@ TypeSystem{
                           "    stream.dispose();\n"+
                           "}\n"+
                           "\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtUninvokable\n"+
                           "public void decodeData(Number[][] data) {\n"+
                           "    io.qt.core.QDataStream stream = new io.qt.core.QDataStream(data(), io.qt.core.QIODevice.OpenModeFlag.ReadOnly);\n"+
                           "    for (int i = 0; i < data.length; ++i) {\n"+
@@ -767,67 +751,41 @@ TypeSystem{
         }
     }
     
-    FunctionalType{
-        name: "QModbusRequestCalculatorFunction"
-        ExtraIncludes{
-            Include{
-                fileName: "hashes.h"
-                location: Include.Local
-            }
-        }
-    }
-    
-    FunctionalType{
-        name: "QModbusResponseCalculatorFunction"
-        ExtraIncludes{
-            Include{
-                fileName: "hashes.h"
-                location: Include.Local
-            }
-        }
-    }
-    
-    FunctionalType{
-        name: "QModbusRequest::CalcFuncPtr"
-        generate: false
-    }
-    
-    FunctionalType{
-        name: "QModbusResponse::CalcFuncPtr"
-        generate: false
-    }
-    
     ValueType{
         name: "QModbusRequest"
+
+        FunctionalType{
+            name: "CalcFunction"
+            using: "int(*)(const QModbusRequest &)"
+        }
+
+        FunctionalType{
+            name: "CalcFuncPtr"
+            javaName: "CalcFunction"
+            generate: false
+        }
         ModifyFunction{
-            signature: "registerDataSizeCalculator(QModbusPdu::FunctionCode, QModbusRequest::CalcFuncPtr)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.serialbus.QModbusRequestCalculatorFunction"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QModbusRequest::CalcFuncPtr %out = qtjambi_cast<QModbusRequest::CalcFuncPtr>(%env, %in);"}
-                }
-            }
+            signature: "QModbusRequest<Args...>(QModbusPdu::FunctionCode,Args)"
+            remove: RemoveFlag.All
         }
     }
     
     ValueType{
         name: "QModbusResponse"
+
+        FunctionalType{
+            name: "CalcFunction"
+            using: "int(*)(const QModbusResponse &)"
+        }
+
+        FunctionalType{
+            name: "CalcFuncPtr"
+            javaName: "CalcFunction"
+            generate: false
+        }
         ModifyFunction{
-            signature: "registerDataSizeCalculator(QModbusPdu::FunctionCode, QModbusResponse::CalcFuncPtr)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.serialbus.QModbusResponseCalculatorFunction"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QModbusResponse::CalcFuncPtr %out = qtjambi_cast<QModbusResponse::CalcFuncPtr>(%env, %in);"}
-                }
-            }
+            signature: "QModbusResponse<Args...>(QModbusPdu::FunctionCode,Args)"
+            remove: RemoveFlag.All
         }
     }
     
@@ -835,12 +793,12 @@ TypeSystem{
         name: "QModbusExceptionResponse"
     }
     
-    EnumType{
-        name: "QModbusReply::ReplyType"
-    }
-    
     ObjectType{
         name: "QModbusReply"
+
+        EnumType{
+            name: "ReplyType"
+        }
     }
     
     ObjectType{
@@ -863,24 +821,17 @@ TypeSystem{
         since: [6, 2]
     }
     
-    EnumType{
-        name: "QModbusServer::Option"
-    }
-    
     ObjectType{
         name: "QModbusServer"
+
+        EnumType{
+            name: "Option"
+        }
         ModifyFunction{
             signature: "data(QModbusDataUnit *) const"
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.serialbus.QModbusDataUnit"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QModbusDataUnit* %out = qtjambi_cast<QModbusDataUnit*>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -888,21 +839,10 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.serialbus.QModbusDataUnit"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QModbusDataUnit* %out = qtjambi_cast<QModbusDataUnit*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
-            signature: "data(QModbusDataUnit::RegisterType,unsigned short,unsigned short*)const"
+            signature: "data(QModbusDataUnit::RegisterType,quint16,quint16*)const"
             ModifyArgument{
                 index: 3
                 ArrayType{
@@ -954,7 +894,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.network.QTcpSocket"
+                    modifiedType: "io.qt.network.@Nullable QTcpSocket"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -962,7 +902,7 @@ TypeSystem{
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
-                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObject(%env, reinterpret_cast<void*>(%in), \"io/qt/network/QTcpSocket\", false, false);"}
+                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, reinterpret_cast<void*>(%in), Java::QtNetwork::QTcpSocket::getClass(%env));"}
                 }
             }
         }
@@ -986,7 +926,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "io.qt.network.QTcpSocket"
+                    modifiedType: "io.qt.network.@Nullable QTcpSocket"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -994,87 +934,56 @@ TypeSystem{
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObject(%env, reinterpret_cast<void*>(%in), \"io/qt/network/QTcpSocket\", false, false);"}
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, reinterpret_cast<void*>(%in), Java::QtNetwork::QTcpSocket::getClass(%env));"}
                 }
             }
         }
     }
-    
-    FunctionalType{
-        name: "QCanBusDevice::ResetControllerFunction"
-        generate: false
-        using: "std::function<void()>"
-    }
-    
-    FunctionalType{
-        name: "QCanBusDevice::CanBusStatusGetter"
-        generate: false
-        using: "std::function<QCanBusDevice::CanBusStatus()>"
-    }
 
     ObjectType{
         name: "QCanDbcFileParser"
-        since: [6,5]
-    }
 
-    EnumType{
-        name: "QCanDbcFileParser::Error"
+        EnumType{
+            name: "Error"
+        }
         since: [6,5]
     }
 
-    ValueType{
+    ObjectType{
         name: "QCanFrameProcessor"
-        ModifyFunction{
-            signature: "operator=(const QCanFrameProcessor &)"
-            remove: RemoveFlag.All
-        }
-        since: [6,5]
-    }
 
-    EnumType{
-        name: "QCanFrameProcessor::Error"
-        since: [6,5]
-    }
+        EnumType{
+            name: "Error"
+        }
 
-    ValueType{
-        name: "QCanFrameProcessor::ParseResult"
+        ValueType{
+            name: "ParseResult"
+        }
         since: [6,5]
     }
 
     ValueType{
         name: "QCanMessageDescription"
-        ModifyFunction{
-            signature: "operator=(const QCanMessageDescription &)"
-            remove: RemoveFlag.All
-        }
         since: [6,5]
     }
 
     ValueType{
         name: "QCanSignalDescription"
-        ModifyFunction{
-            signature: "operator=(const QCanSignalDescription &)"
-            remove: RemoveFlag.All
+        ValueType{
+            name: "MultiplexValueRange"
+            /*ModifyFunction{
+                signature: "operator<<(QDebug, const QCanSignalDescription::MultiplexValueRange &)"
+                remove: RemoveFlag.All
+            }*/
         }
         since: [6,5]
     }
 
     ValueType{
         name: "QCanUniqueIdDescription"
-        ModifyFunction{
-            signature: "operator=(const QCanUniqueIdDescription &)"
-            remove: RemoveFlag.All
-        }
         since: [6,5]
     }
     
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: function '*::CalcFuncPtr' is specified in typesystem, but not declared"}
-    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QModbusDataUnit."}
-    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QModbusDeviceIdentification."}
-    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QModbusPdu."}
-    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QCanBus*."}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QModbusPdu::encode*', unmatched parameter type 'const QList*'"}
-    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QCanBusDeviceInfo' is missing a default constructor. The resulting C++ code will not compile.*"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Class function '*::CalcFuncPtr' is specified in typesystem, but not declared"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QModbusPdu::encode', unmatched parameter type '*'"}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtSerialPort.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtSerialPort.qml
index fd0589e3..d79985db 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtSerialPort.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtSerialPort.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.serialport"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtSerialPort"
     module: "qtjambi.serialport"
     description: "Provides access to hardware and virtual serial ports."
@@ -49,7 +49,6 @@ TypeSystem{
     
     EnumType{
         name: "QSerialPort::Direction"
-        flags: "QSerialPort::Directions"
     }
     
     EnumType{
@@ -62,7 +61,6 @@ TypeSystem{
     
     EnumType{
         name: "QSerialPort::PinoutSignal"
-        flags: "QSerialPort::PinoutSignals"
     }
     
     EnumType{
@@ -88,10 +86,6 @@ TypeSystem{
     
     ValueType{
         name: "QSerialPortInfo"
-        ModifyFunction{
-            signature: "operator=(const QSerialPortInfo&)"
-            remove: RemoveFlag.All
-        }
     }
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping *unmatched *type 'QSerialPort::DataErrorPolicy'"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtSpatialAudio.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtSpatialAudio.qml
index dc7cf52c..be250056 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtSpatialAudio.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtSpatialAudio.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.spatialaudio"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtSpatialAudio"
     module: "qtjambi.spatialaudio"
     description: "Qt Spatial Audio is an add-on module that provides a rich set of QML types and C++ classes to implement sound fields in 3D space."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtSql.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtSql.qml
index 3d6eea23..68c4554b 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtSql.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtSql.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.sql"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtSql"
     module: "qtjambi.sql"
     description: "Classes for database integration using SQL."
@@ -130,10 +130,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator=(QSqlDatabase)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "registerSqlDriver(QString, QSqlDriverCreatorBase *)"
             ModifyArgument{
@@ -190,12 +186,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyField{
-            name: "defaultConnection"
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     ValueType{
@@ -218,10 +208,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "operator=(QSqlQuery)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -236,26 +222,14 @@ TypeSystem{
             signature: "append(QSqlField)"
             access: Modification.NonFinal
         }
-        ModifyFunction{
-            signature: "operator=(QSqlRecord)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QSqlError"
-        ModifyFunction{
-            signature: "operator=(QSqlError)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QSqlIndex"
-        ModifyFunction{
-            signature: "operator=(QSqlIndex)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -264,10 +238,6 @@ TypeSystem{
     
     ValueType{
         name: "QSqlField"
-        ModifyFunction{
-            signature: "operator=(QSqlField)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "QSqlField(QString,QVariant::Type)"
             ModifyArgument{
@@ -330,6 +300,18 @@ TypeSystem{
             signature: "record()const"
             access: Modification.NonFinal
         }
+        ModifyFunction{
+            signature: "query(Qt::Disambiguated_t)const"
+            ModifyArgument{
+                index: 1
+                RemoveArgument{}
+                ConversionRule{
+                    codeClass: CodeClass.Native
+                    Text{content: "constexpr Qt::Disambiguated_t %out = Qt::Disambiguated;"}
+                }
+            }
+            since: [6,5]
+        }
         ModifyFunction{
             signature: "record(int)const"
             access: Modification.NonFinal
@@ -401,6 +383,17 @@ TypeSystem{
             Remove{
             }
         }
+
+        ModifyFunction{
+            signature: "boundValues()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -429,19 +422,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.sql.QSqlRecord"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, &%in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSqlRecord &%out = qtjambi_cast<QSqlRecord &>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -449,19 +429,6 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.sql.QSqlRecord"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, &%in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSqlRecord &%out = qtjambi_cast<QSqlRecord &>(%env, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -469,19 +436,6 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 invalidateAfterUse: true
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.sql.QSqlRecord"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, &%in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSqlRecord &%out = qtjambi_cast<QSqlRecord &>(%env, %in);"}
-                }
             }
         }
     }
@@ -516,7 +470,6 @@ TypeSystem{
     
     EnumType{
         name: "QSql::ParamTypeFlag"
-        flags: "QSql::ParamType"
     }
     
     EnumType{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtStateMachine.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtStateMachine.qml
index 11a6d314..5ac50616 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtStateMachine.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtStateMachine.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.statemachine"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtStateMachine"
     module: "qtjambi.statemachine"
     description: "Provides classes and tools for creating state machines from SCXML files and embedding them in applications."
@@ -208,12 +208,6 @@ TypeSystem{
                     action: ReferenceCount.Ignore
                 }
             }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 3
                 NoNullPointer{
@@ -280,15 +274,6 @@ TypeSystem{
                 Text{content: "QtJambi_LibraryUtilities.internal.addReferenceCount(%0, QAbstractTransition.class, \"__rcTargetStates\", false, false, %1);"}
             }
         }
-        ModifyFunction{
-            signature: "assignProperty(QObject *, const char *, const QVariant &)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         InjectCode{
             target: CodeClass.Java
         }
@@ -430,12 +415,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "QSignalTransition(const QObject *, const char *, QState *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtSvg.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtSvg.qml
index 4ca47782..5dd00053 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtSvg.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtSvg.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.svg"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtSvg"
     module: "qtjambi.svg"
     description: "Classes for displaying the contents of SVG files. Supports a subset of the SVG 1.2 Tiny standard."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtSvgWidgets.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtSvgWidgets.qml
index 44d8d46f..3e43ce4c 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtSvgWidgets.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtSvgWidgets.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.widgets.svg"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtSvgWidgets"
     module: "qtjambi.svgwidgets"
     description: "Classes for displaying the contents of SVG files. Supports a subset of the SVG 1.2 Tiny standard."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtTest.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtTest.qml
index 03917841..f76b0e8b 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtTest.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtTest.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.test"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtTest"
     module: "qtjambi.test"
     description: "Classes for unit testing Qt applications and libraries."
@@ -59,11 +59,6 @@ TypeSystem{
         name: "QtWidgets"
     }
     
-    Rejection{
-        className: "QTest"
-        functionName: "compare_ptr_helper"
-    }
-    
     
     Rejection{
         className: "QTestData"
@@ -80,40 +75,6 @@ TypeSystem{
         functionName: "qt_metacall"
     }
     
-    
-    EnumType{
-        name: "QTest::ComparisonOperation"
-        since: [6, 4]
-    }
-    
-    EnumType{
-        name: "QTest::AttributeIndex"
-    }
-    
-    EnumType{
-        name: "QTest::KeyAction"
-    }
-    
-    EnumType{
-        name: "QTest::LogElementType"
-    }
-    
-    EnumType{
-        name: "QTest::MouseAction"
-    }
-    
-    EnumType{
-        name: "QTest::QBenchmarkMetric"
-    }
-    
-    EnumType{
-        name: "QTest::SkipMode"
-    }
-    
-    EnumType{
-        name: "QTest::TestFailMode"
-    }
-    
     NamespaceType{
         name: "QTest"
         ExtraIncludes{
@@ -138,6 +99,47 @@ TypeSystem{
                 location: Include.Local
             }
         }
+
+
+        Rejection{functionName: "compare_ptr_helper"}
+
+        EnumType{
+            name: "ComparisonOperation"
+            since: [6, 4]
+        }
+
+        EnumType{
+            name: "AttributeIndex"
+        }
+
+        EnumType{
+            name: "KeyAction"
+        }
+
+        EnumType{
+            name: "LogElementType"
+        }
+
+        EnumType{
+            name: "MouseAction"
+        }
+
+        EnumType{
+            name: "QBenchmarkMetric"
+        }
+
+        EnumType{
+            name: "SkipMode"
+        }
+
+        EnumType{
+            name: "TestFailMode"
+        }
+        ModifyFunction{
+            signature: "qTest<T>(T,const char*,const char*,const char*,const char*,int)"
+            remove: RemoveFlag.All
+        }
+
         ModifyFunction{
             signature: "qRun()"
             noExcept: true
@@ -190,68 +192,23 @@ TypeSystem{
             remove: RemoveFlag.All
             since: [6, 4]
         }
+
+        Rejection{functionName: "toString"}
+        Rejection{functionName: "_q_compareSequence"}
         ModifyFunction{
-            signature: "toString(const char*)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "toString(const void*)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "toString(const QObject*)"
-            remove: RemoveFlag.All
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "toString(QSizePolicy)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "toString(QGeoAreaMonitorInfo)"
-            remove: RemoveFlag.All
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "toString(QGeoPositionInfo)"
-            remove: RemoveFlag.All
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "toString(QGeoSatelliteInfo)"
-            remove: RemoveFlag.All
-            since: [6, 2]
-        }
-        ModifyFunction{
-            signature: "toString(QSizePolicy::ControlType)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "toString(QSizePolicy::Policy)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "toString(QNetworkReply::NetworkError)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "toString(QFlags<QSizePolicy::ControlType>)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "toString(QList<QNetworkCookie>)"
+            signature: "qCompare(quint64,quint32,const char*,const char*,const char*,int)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "toString(QNetworkCookie)"
+            signature: "qCompare(qint64,quint32,const char*,const char*,const char*,int)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "toString(std::nullptr_t)"
+            signature: "qCompare(quint32,quint64,const char*,const char*,const char*,int)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "toString<T1,T2>(const QPair<T1, T2> &)"
+            signature: "qCompare(quint32,qint64,const char*,const char*,const char*,int)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -352,39 +309,42 @@ TypeSystem{
             since: 6
         }
         ModifyFunction{
-            signature: "failOnWarning(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            since: [6, 3]
+            signature: "qCompare<T,N>(QList<T>,T,const char*,const char*,const char*,int)"
+            remove: RemoveFlag.All
+            since: 6
         }
         ModifyFunction{
-            signature: "qCaught(const char*,const char*,const char*,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            since: [6, 3]
+            signature: "qCompare<T1,T2>(T1*,T2*,const char*,const char*,const char*,int)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "qCompare<T>(std::nullptr_t,T*,const char*,const char*,const char*,int)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "qCompare<T>(T*,std::nullptr_t,const char*,const char*,const char*,int)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "qCompare<T>(T*,T*,const char*,const char*,const char*,int)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "qCompare<T>(T,T,const char*,const char*,const char*,int)"
+            remove: RemoveFlag.All
+            until: 5
+        }
+        ModifyFunction{
+            signature: "qCompare<T>(const T*,const T*,const char*,const char*,const char*,int)"
+            remove: RemoveFlag.All
+            since: 6
+        }
+        ModifyFunction{
+            signature: "qCompare<T1,T2>(T1,T2,const char*,const char*,const char*,int)"
+            remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "createTouchDevice(QInputDevice::DeviceType,QFlags<QInputDevice::Capability>)"
+            signature: "createTouchDevice(QInputDevice::DeviceType,QInputDevice::Capabilities)"
             ModifyArgument{
                 index: "return"
                 DefineOwnership{
@@ -458,379 +418,48 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "qFail(const char *,const char *,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "currentTestFunction()"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "ignoreMessage(QtMsgType,const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "setMainSourcePath(const char *, const char *)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qFindTestData(const QString&, const char*, int, const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+            signature: "qWaitFor<Functor>(Functor,int)"
+            Instantiation{
+                Argument{
+                    type: "QVariant"
+                    isImplicit: true
                 }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                ModifyArgument{
+                    index: 1
+                    ReplaceType{
+                        modifiedType: "java.util.function.BooleanSupplier"
+                    }
+                    NoNullPointer{}
+                    ConversionRule{
+                        codeClass: CodeClass.Native
+                        Text{content: "JObjectWrapper functor(%env, %in);\n"+
+                                      "auto %out = [functor]() -> bool {\n"+
+                                      "                    if(JniEnvironment env{200}){\n"+
+                                      "                        return Java::Runtime::BooleanSupplier::getAsBoolean(env, functor.object());\n"+
+                                      "                    }\n"+
+                                      "                    else return false;\n"+
+                                      "                };"}
+                    }
                 }
             }
-            until: 5
         }
         ModifyFunction{
-            signature: "qFindTestData(const QString&, const char*, int, const char*, const char*)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+            signature: "addColumn<T>(const char *, T *)"
+            Instantiation{
+                Argument{
+                    type: "int"
+                    isImplicit: true
                 }
-            }
-            since: 6
-        }
-        ModifyFunction{
-            signature: "qVerify(bool,const char *,const char *,const char *,int)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                AddTypeParameter{
+                    name: "T"
                 }
-            }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+                AddArgument{
+                    name: "type"
+                    type: "java.lang.Class<T>"
                 }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qSkip(const char*,const char*,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qWarn(const char *,const char *,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qCompare(int, int, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qCompare(double, double, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qCompare(float, double, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qCompare(float, float, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qCompare(double, float, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qCompare(QPixmap, QPixmap, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qCompare(QIcon, QIcon, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qCompare(QImage, QImage, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qCompare(QStringView, QStringView, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qWaitFor<Functor>(Functor,int)"
-            Instantiation{
-                Argument{
-                    type: "QVariant"
-                    isImplicit: true
-                }
-                ModifyArgument{
-                    index: 1
-                    ReplaceType{
-                        modifiedType: "java.util.function.BooleanSupplier"
-                    }
-                    ConversionRule{
-                        codeClass: CodeClass.Native
-                        Text{content: "JObjectWrapper functor(%env, %in);\n"+
-                                      "auto %out = [functor]() -> bool {\n"+
-                                      "                    if(JniEnvironment env{200}){\n"+
-                                      "                        return Java::Runtime::BooleanSupplier::getAsBoolean(env, functor.object());\n"+
-                                      "                    }\n"+
-                                      "                    else return false;\n"+
-                                      "                };"}
-                    }
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "addColumn<T>(const char *, T *)"
-            Instantiation{
-                Argument{
-                    type: "int"
-                    isImplicit: true
-                }
-                AddTypeParameter{
-                    name: "T"
-                }
-                AddArgument{
-                    name: "type"
-                    type: "java.lang.Class<T>"
-                }
-                AddArgument{
-                    name: "instantiations"
-                    type: "io.qt.core.QMetaType..."
-                }
-                ModifyArgument{
-                    index: 1
-                    ReplaceType{
-                        modifiedType: "java.lang.String"
-                    }
+                AddArgument{
+                    name: "instantiations"
+                    type: "io.qt.core.QMetaType..."
                 }
                 ModifyArgument{
                     index: 2
@@ -842,132 +471,40 @@ TypeSystem{
                     }
                 }
             }
-        }
-        ModifyFunction{
-            signature: "qCompare<T>(const QList<T> &, const QList<T> &, const char *, const char *, const char *, int)"
-            Instantiation{
-                Argument{
-                    type: "QString"
-                    isImplicit: true
-                }
-                ModifyArgument{
-                    index: 3
-                    ReplaceType{
-                        modifiedType: "java.lang.String"
-                    }
-                }
-                ModifyArgument{
-                    index: 4
-                    ReplaceType{
-                        modifiedType: "java.lang.String"
-                    }
-                }
-                ModifyArgument{
-                    index: 5
-                    ReplaceType{
-                        modifiedType: "java.lang.String"
-                    }
-                }
-            }
-            Instantiation{
-                Argument{
-                    type: "QVariant"
-                    isImplicit: true
-                }
-                AddTypeParameter{
-                    name: "T"
-                }
-                ModifyArgument{
-                    index: 1
-                    ReplaceType{
-                        modifiedType: "io.qt.core.QList<T>"
-                    }
-                }
-                ModifyArgument{
-                    index: 2
-                    ReplaceType{
-                        modifiedType: "io.qt.core.QList<T>"
-                    }
-                }
-                ModifyArgument{
-                    index: 3
-                    ReplaceType{
-                        modifiedType: "java.lang.String"
-                    }
-                }
-                ModifyArgument{
-                    index: 4
-                    ReplaceType{
-                        modifiedType: "java.lang.String"
-                    }
-                }
-                ModifyArgument{
-                    index: 5
-                    ReplaceType{
-                        modifiedType: "java.lang.String"
-                    }
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "compare_helper(bool,const char *,char *,char *,const char *,const char *,const char *,int)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jsize %in_length = %env->GetStringUTFLength(%in);\n"+
-                                  "char* %out = new char[size_t(%in_length)];\n"+
-                                  "%env->GetStringUTFRegion(%in, 0, %in_length, %out);"}
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jsize %in_length = %env->GetStringUTFLength(%in);\n"+
-                                  "char* %out = new char[size_t(%in_length)];\n"+
-                                  "%env->GetStringUTFRegion(%in, 0, %in_length, %out);"}
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 6
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+        }
+        ModifyFunction{
+            signature: "qCompare<T>(const QList<T> &, const QList<T> &, const char *, const char *, const char *, int)"
+            Instantiation{
+                Argument{
+                    type: "QString"
+                    isImplicit: true
                 }
+                since: 6
             }
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "java.lang.String"
+            Instantiation{
+                Argument{
+                    type: "QVariant"
+                    isImplicit: true
+                }
+                AddTypeParameter{
+                    name: "T"
+                }
+                ModifyArgument{
+                    index: 1
+                    ReplaceType{
+                        modifiedType: "io.qt.core.@NonNull QList<T>"
+                    }
+                }
+                ModifyArgument{
+                    index: 2
+                    ReplaceType{
+                        modifiedType: "io.qt.core.@NonNull QList<T>"
+                    }
                 }
             }
         }
         ModifyFunction{
-            signature: "compare_helper(bool, const char *, const char *, const char *, const char *, int)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
+            signature: "compare_helper(bool,const char *,char *,char *,const char *,const char *,const char *,int)"
             ModifyArgument{
                 index: 3
                 ReplaceType{
@@ -992,69 +529,9 @@ TypeSystem{
                                   "%env->GetStringUTFRegion(%in, 0, %in_length, %out);"}
                 }
             }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "qExpectFail(const char *,const char *,QTest::TestFailMode,const char *,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "currentAppName()"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "currentDataTag()"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "currentTestFunction()"
-            ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
         }
         ModifyFunction{
             signature: "qData(const char *,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: "return"
                 ReplaceType{
@@ -1082,12 +559,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "qElementData(const char *,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: "return"
                 ReplaceType{
@@ -1115,12 +586,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "qGlobalData(const char *,int)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: "return"
                 ReplaceType{
@@ -1146,15 +611,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "addColumnInternal(int,const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "asciiToKey(char)"
             ModifyArgument{
@@ -1171,7 +627,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "keyClick(QWindow *, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "keyClick(QWindow *, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -1186,7 +642,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "keyClick(QWidget *, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "keyClick(QWidget *, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -1201,7 +657,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "keyPress(QWindow *, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "keyPress(QWindow *, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -1216,7 +672,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "keyPress(QWidget *, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "keyPress(QWidget *, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -1231,7 +687,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "keyRelease(QWindow *, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "keyRelease(QWindow *, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -1246,7 +702,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "keyRelease(QWidget *, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "keyRelease(QWidget *, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 2
                 ReplaceType{
@@ -1261,7 +717,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "keyEvent(QTest::KeyAction, QWindow *, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "keyEvent(QTest::KeyAction, QWindow *, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 3
                 ReplaceType{
@@ -1276,7 +732,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "keyEvent(QTest::KeyAction, QWidget *, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "keyEvent(QTest::KeyAction, QWidget *, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 3
                 ReplaceType{
@@ -1291,7 +747,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "sendKeyEvent(QTest::KeyAction, QWidget *, Qt::Key, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "sendKeyEvent(QTest::KeyAction, QWidget *, Qt::Key, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 4
                 ReplaceType{
@@ -1306,7 +762,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "sendKeyEvent(QTest::KeyAction, QWindow *, Qt::Key, char, QFlags<Qt::KeyboardModifier>, int)"
+            signature: "sendKeyEvent(QTest::KeyAction, QWindow *, Qt::Key, char, Qt::KeyboardModifiers, int)"
             ModifyArgument{
                 index: 4
                 ReplaceType{
@@ -1322,16 +778,10 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "compare_helper(bool,const char*,qxp::function_ref<const char*()>,qxp::function_ref<const char*()>,const char*,const char*,const char*,int)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             ModifyArgument{
                 index: 3
                 ReplaceType{
-                    modifiedType: "java.util.function.Supplier<String>"
+                    modifiedType: "java.util.function.@Nullable Supplier<@NonNull String>"
                 }
                 NoNullPointer{
                 }
@@ -1345,7 +795,7 @@ TypeSystem{
             ModifyArgument{
                 index: 4
                 ReplaceType{
-                    modifiedType: "java.util.function.Supplier<String>"
+                    modifiedType: "java.util.function.@Nullable Supplier<@NonNull String>"
                 }
                 NoNullPointer{
                 }
@@ -1356,24 +806,6 @@ TypeSystem{
                     }
                 }
             }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 6
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             since: [6, 4]
         }
         ModifyFunction{
@@ -1381,7 +813,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.util.function.Supplier<String>"
+                    modifiedType: "java.util.function.@Nullable Supplier<@NonNull String>"
                 }
                 NoNullPointer{
                 }
@@ -1395,7 +827,7 @@ TypeSystem{
             ModifyArgument{
                 index: 3
                 ReplaceType{
-                    modifiedType: "java.util.function.Supplier<String>"
+                    modifiedType: "java.util.function.@Nullable Supplier<@NonNull String>"
                 }
                 NoNullPointer{
                 }
@@ -1406,24 +838,6 @@ TypeSystem{
                     }
                 }
             }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 5
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 7
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             since: [6, 4]
         }
         InjectCode{
@@ -1498,91 +912,28 @@ TypeSystem{
             access: Modification.Friendly
             since: 6
         }
-        ModifyFunction{
-            signature: "stationary(int)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventSequence"
-                }
-            }
-        }
         ModifyFunction{
             signature: "point(int)"
             ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QEventPoint"
-                    since: 6
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QTouchEvent$TouchPoint"
-                    until: 5
-                }
-                ConversionRule{
+                index: 0
+                DefineOwnership{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, &%in);"}
+                    ownership: Ownership.Dependent
                 }
             }
         }
         ModifyFunction{
             signature: "pointOrPreviousPoint(int)"
             ModifyArgument{
-                index: "return"
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QEventPoint"
-                    since: 6
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QTouchEvent$TouchPoint"
-                    until: 5
-                }
-                ConversionRule{
+                index: 0
+                DefineOwnership{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, &%in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "move(int, QPoint, QWindow *)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventSequence"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "press(int, QPoint, QWindow *)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventSequence"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "release(int, QPoint, QWindow *)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventSequence"
+                    ownership: Ownership.Dependent
                 }
             }
         }
         ModifyFunction{
             signature: "move(int, QPoint, QWidget *)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventSequence"
-                }
-            }
             ModifyArgument{
                 index: 3
                 RemoveDefaultExpression{
@@ -1592,13 +943,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "press(int, QPoint, QWidget *)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventSequence"
-                }
-            }
             ModifyArgument{
                 index: 3
                 RemoveDefaultExpression{
@@ -1608,13 +952,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "release(int, QPoint, QWidget *)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventSequence"
-                }
-            }
             ModifyArgument{
                 index: 3
                 RemoveDefaultExpression{
@@ -1646,25 +983,8 @@ TypeSystem{
                 location: Include.Local
             }
         }
-        ModifyFunction{
-            signature: "stationary(int)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventWidgetSequence"
-                }
-            }
-        }
         ModifyFunction{
             signature: "move(int, QPoint, QWidget *)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventWidgetSequence"
-                }
-            }
             ModifyArgument{
                 index: 3
                 RemoveDefaultExpression{
@@ -1673,13 +993,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "press(int, QPoint, QWidget *)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventWidgetSequence"
-                }
-            }
             ModifyArgument{
                 index: 3
                 RemoveDefaultExpression{
@@ -1688,13 +1001,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "release(int, QPoint, QWidget *)"
-            ModifyArgument{
-                index: "return"
-                replaceValue: "this"
-                ReplaceType{
-                    modifiedType: "io.qt.test.QTest$QTouchEventWidgetSequence"
-                }
-            }
             ModifyArgument{
                 index: 3
                 RemoveDefaultExpression{
@@ -1707,7 +1013,7 @@ TypeSystem{
     
     ObjectType{
         name: "QSignalSpy"
-        implementing: "List<java.util.List<java.lang.Object>>"
+        implementing: "List<@NonNull List<@Nullable Object>>"
         DelegateBaseClass{
             baseClass: "QList<QList<QVariant>>"
             delegate: "list"
@@ -1726,15 +1032,6 @@ TypeSystem{
             signature: "wait(int)"
             rename: "waitForTimeout"
         }
-        ModifyFunction{
-            signature: "QSignalSpy(const QObject *, const char *)"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ExtraIncludes{
             Include{
                 fileName: "java.util.*"
@@ -1776,6 +1073,16 @@ TypeSystem{
     
     ObjectType{
         name: "QTestEventLoop"
+        ModifyFunction{
+            signature: "instance()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Cpp
+                }
+            }
+        }
     }
     
     EnumType{
@@ -1958,13 +1265,6 @@ TypeSystem{
         targetType: "QTest"
     }
     
-    FunctionalType{
-        name: "QTest::Supplier"
-        generate: false
-        using: "qxp::function_ref<const char*()>"
-        since: [6, 4]
-    }
-    
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'qWaitForWindowShown(QWidget*)' for function modification in 'QTest' not found. Possible candidates:"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'qWarn(const char*)' for function modification in 'QTest' not found. Possible candidates: qWarn(const char*,const char*,int) in QTest"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QTest::newRow', unmatched return type '*QTestData*'"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtTextToSpeech.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtTextToSpeech.qml
index 296f29d5..e65dbafd 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtTextToSpeech.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtTextToSpeech.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.texttospeech"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtTextToSpeech"
     module: "qtjambi.texttospeech"
     description: "Provides support for accessibility features such as text-to-speech."
@@ -161,9 +161,5 @@ TypeSystem{
     
     ValueType{
         name: "QVoice"
-        ModifyFunction{
-            signature: "operator=(const QVoice &)"
-            remove: RemoveFlag.All
-        }
     }
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtUiTools.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtUiTools.qml
index 6ae2bf2b..951c8df5 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtUiTools.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtUiTools.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.widgets.tools"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtUiTools"
     module: "qtjambi.uitools"
     description: "Classes for loading QWidget based forms created in Qt Designer dynamically, at runtime."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtVirtualKeyboard.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtVirtualKeyboard.qml
index 383c875e..d222a85f 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtVirtualKeyboard.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtVirtualKeyboard.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.keyboard"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtVirtualKeyboard"
     module: "qtjambi.virtualkeyboard"
     description: "A framework for implementing different input methods as well as a QML virtual keyboard. Supports localized keyboard layouts and custom visual themes."
@@ -45,15 +45,6 @@ TypeSystem{
     
     ObjectType{
         name: "QVirtualKeyboardExtensionPlugin"
-        ModifyFunction{
-            signature: "registerTypes(const char *) const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -76,7 +67,6 @@ TypeSystem{
     
     EnumType{
         name: "QVirtualKeyboardInputEngine::ReselectFlag"
-        flags: "QVirtualKeyboardInputEngine::ReselectFlags"
     }
     
     EnumType{
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebChannel.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebChannel.qml
index 52238f58..edb03b07 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebChannel.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebChannel.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.webchannel"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtWebChannel"
     module: "qtjambi.webchannel"
     description: "Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients."
@@ -65,7 +65,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.SortedMap<java.lang.String, java.lang.Object>"
+                    modifiedType: "java.util.@Nullable SortedMap<java.lang.@NonNull String, java.lang.@Nullable Object>"
                 }
             }
         }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngine.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngine.qml
index 319a4656..72a42d9f 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngine.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngine.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.webengine"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtWebEngine"
     module: "qtjambi.webengine"
     description: "Classes and functions for embedding web content in applications using the Chromium browser project."
@@ -112,7 +112,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "? extends io.qt.core.QObject"
+                    modifiedType: "? extends io.qt.core.@Nullable QObject"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -132,7 +132,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "? extends io.qt.core.QObject"
+                    modifiedType: "? extends io.qt.core.@Nullable QObject"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -163,5 +163,4 @@ TypeSystem{
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QQuickWebEngineProfile::*', unmatched parameter type 'QQuickWebEngineDownloadItem*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QQuickWebEngineProfile::*', unmatched parameter type 'QQuickWebEngineDownloadItem*'"}
-    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QXml*."}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineCore.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineCore.qml
index 5bf99911..1f611b21 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineCore.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineCore.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.webengine.core"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtWebEngineCore"
     module: "qtjambi.webenginecore"
     Description{
@@ -77,12 +77,12 @@ TypeSystem{
         mode: RequiredLibrary.Optional
     }
     
-    Rejection{
-        className: "QtWebEngineCore::WebContentsAdapter"
-    }
-    
     NamespaceType{
         name: "QtWebEngineCore"
+
+        Rejection{
+            className: "WebContentsAdapter"
+        }
         ExtraIncludes{
             Include{
                 fileName: "qwebenginecontextmenurequest.h"
@@ -90,39 +90,29 @@ TypeSystem{
             }
             since: [6, 2]
         }
+
+        EnumType{
+            name: "ReferrerPolicy"
+            RejectEnumValue{
+                name: "Last"
+            }
+            since: [6, 2]
+        }
     }
     
     GlobalFunction{
         signature: "qWebEngineChromiumSecurityPatchVersion()"
         targetType: "QtWebEngineCore"
-        ModifyArgument{
-            index: 0
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qWebEngineChromiumVersion()"
         targetType: "QtWebEngineCore"
-        ModifyArgument{
-            index: 0
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     GlobalFunction{
         signature: "qWebEngineVersion()"
         targetType: "QtWebEngineCore"
-        ModifyArgument{
-            index: 0
-            ReplaceType{
-                modifiedType: "java.lang.String"
-            }
-        }
     }
     
     Rejection{
@@ -140,43 +130,20 @@ TypeSystem{
         enumName: "NavigationRequestAction"
     }
     
-    Rejection{
-        className: "QWebEngineUrlScheme"
-        enumName: "SpecialPort"
-    }
-    
-    EnumType{
-        name: "QtWebEngineCore::ReferrerPolicy"
-        RejectEnumValue{
-            name: "Last"
-        }
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEngineUrlRequestInfo::NavigationType"
-    }
-    
-    EnumType{
-        name: "QWebEngineUrlRequestInfo::ResourceType"
-        RejectEnumValue{
-            name: "ResourceTypeLast"
-            since: [5, 14]
-        }
-    }
-    
-    EnumType{
-        name: "QWebEngineUrlScheme::Flag"
-        flags: "QWebEngineUrlScheme::Flags"
-    }
-    
-    
-    EnumType{
-        name: "QWebEngineUrlScheme::Syntax"
-    }
-    
     ObjectType{
         name: "QWebEngineUrlRequestInfo"
+
+        EnumType{
+            name: "NavigationType"
+        }
+
+        EnumType{
+            name: "ResourceType"
+            RejectEnumValue{
+                name: "ResourceTypeLast"
+                since: [5, 14]
+            }
+        }
     }
     
     ValueType{
@@ -185,26 +152,32 @@ TypeSystem{
     
     ValueType{
         name: "QWebEngineFileSystemAccessRequest"
-        ModifyFunction{
-            signature: "operator=(QWebEngineFileSystemAccessRequest)"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "HandleType"
+        }
+
+        EnumType{
+            name: "AccessFlag"
         }
-        since: [6, 4]
-    }
-    
-    EnumType{
-        name: "QWebEngineFileSystemAccessRequest::HandleType"
-        since: [6, 4]
-    }
-    
-    EnumType{
-        name: "QWebEngineFileSystemAccessRequest::AccessFlag"
-        flags: "QWebEngineFileSystemAccessRequest::AccessFlags"
         since: [6, 4]
     }
     
     ObjectType{
         name: "QWebEngineCookieStore"
+        ValueType{
+            name: "FilterRequest"
+            Rejection{
+                className: "FilterRequest"
+                fieldName: "_reservedFlag"
+            }
+
+            Rejection{
+                className: "FilterRequest"
+                fieldName: "_reservedType"
+            }
+        }
+
         ExtraIncludes{
             Include{
                 fileName: "QtJambi/JavaAPI"
@@ -220,7 +193,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.function.Predicate<FilterRequest>"
+                    modifiedType: "java.util.function.@Nullable Predicate<@NonNull FilterRequest>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -240,26 +213,6 @@ TypeSystem{
         }
     }
     
-    FunctionalType{
-        name: "QWebEngineCookieStore::CookieFilter"
-        generate: false
-        using: "std::function<bool(const FilterRequest&)>"
-    }
-    
-    Rejection{
-        className: "QWebEngineCookieStore::FilterRequest"
-        fieldName: "_reservedFlag"
-    }
-    
-    Rejection{
-        className: "QWebEngineCookieStore::FilterRequest"
-        fieldName: "_reservedType"
-    }
-    
-    ValueType{
-        name: "QWebEngineCookieStore::FilterRequest"
-    }
-    
     ObjectType{
         name: "QWebEngineUrlRequestInterceptor"
         ModifyFunction{
@@ -271,24 +224,29 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QWebEngineUrlRequestJob::Error"
-    }
-    
     ObjectType{
         name: "QWebEngineUrlRequestJob"
+
+        EnumType{
+            name: "Error"
+        }
     }
     
     ValueType{
         name: "QWebEngineUrlScheme"
+
+        Rejection{enumName: "SpecialPort"}
+        EnumType{
+            name: "Flag"
+        }
+        EnumType{
+            name: "Syntax"
+        }
         ModifyFunction{
             signature: "operator=(QWebEngineUrlScheme)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -301,12 +259,9 @@ TypeSystem{
         name: "QWebEngineHttpRequest"
         ModifyFunction{
             signature: "operator=(QWebEngineHttpRequest)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -333,92 +288,6 @@ TypeSystem{
         name: "QWebEngineNotification"
     }
     
-    EnumType{
-        name: "QWebEnginePage::Feature"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::FileSelectionMode"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::FindFlag"
-        flags: "QWebEnginePage::FindFlags"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::JavaScriptConsoleMessageLevel"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::NavigationType"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::PermissionPolicy"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::RenderProcessTerminationStatus"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::WebAction"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::WebWindowType"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::LifecycleState"
-        since: [6, 2]
-    }
-    
-    FunctionalType{
-        name: "QWebEnginePage::ScriptConsumer"
-        generate: false
-        using: "std::function<void(const QVariant&)>"
-        since: [6, 2]
-    }
-    
-    
-    FunctionalType{
-        name: "QWebEnginePage::StringConsumer"
-        generate: false
-        using: "std::function<void(const QString&)>"
-        since: [6, 2]
-    }
-    
-    FunctionalType{
-        name: "QWebEnginePage::ByteArrayConsumer"
-        generate: false
-        using: "std::function<void(const QByteArray&)>"
-        since: [6, 2]
-    }
-    
-    FunctionalType{
-        name: "QWebEnginePage::ResultConsumer"
-        generate: false
-        using: "std::function<void(const QWebEngineFindTextResult&)>"
-        ExtraIncludes{
-            Include{
-                fileName: "QtWebEngineCore/QWebEngineFindTextResult"
-                location: Include.Global
-            }
-        }
-        since: [6, 2]
-    }
-    
     ObjectType{
         name: "QWebEnginePage"
         ExtraIncludes{
@@ -436,6 +305,66 @@ TypeSystem{
                 location: Include.Global
             }
         }
+
+        EnumType{
+            name: "Feature"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "FileSelectionMode"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "FindFlag"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "JavaScriptConsoleMessageLevel"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "NavigationType"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "PermissionPolicy"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "RenderProcessTerminationStatus"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "WebAction"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "WebWindowType"
+            since: [6, 2]
+        }
+
+        EnumType{
+            name: "LifecycleState"
+            since: [6, 2]
+        }
+        ModifyFunction{
+            signature: "scripts()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
         ModifyFunction{
             signature: "createWindow(QWebEnginePage::WebWindowType)"
             ModifyArgument{
@@ -464,14 +393,14 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "findText(QString, QFlags<QWebEnginePage::FindFlag>, std::function<void(const QWebEngineFindTextResult &)>)"
+            signature: "findText(QString,QWebEnginePage::FindFlags,std::function<void(const QWebEngineFindTextResult &)>)"
             ModifyArgument{
                 index: 3
                 ReplaceDefaultExpression{
                     expression: "null"
                 }
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<Boolean>"
+                    modifiedType: "java.util.function.@Nullable Consumer<@NonNull QWebEngineFindTextResult>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -490,7 +419,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<String>"
+                    modifiedType: "java.util.function.@Nullable Consumer<@NonNull String>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -509,7 +438,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<String>"
+                    modifiedType: "java.util.function.@Nullable Consumer<@NonNull String>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -528,7 +457,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<Object>"
+                    modifiedType: "java.util.function.@Nullable Consumer<@Nullable Object>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -543,11 +472,11 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "runJavaScript(QString, unsigned int, const std::function<void(const QVariant &)> &)"
+            signature: "runJavaScript(QString, quint32, const std::function<void(const QVariant &)> &)"
             ModifyArgument{
                 index: 3
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<Object>"
+                    modifiedType: "java.util.function.@Nullable Consumer<@Nullable Object>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -592,7 +521,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setWebChannel(QWebChannel*,uint)"
+            signature: "setWebChannel(QWebChannel*,quint32)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
@@ -605,38 +534,16 @@ TypeSystem{
             signature: "authenticationRequired(const QUrl&,QAuthenticator*)"
             ModifyArgument{
                 index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.network.QAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QAuthenticator* %out  = qtjambi_cast<QAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
             signature: "proxyAuthenticationRequired(const QUrl&,QAuthenticator*, const QString&)"
             ModifyArgument{
                 index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.network.QAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QAuthenticator* %out  = qtjambi_cast<QAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -644,7 +551,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "java.lang.@Nullable String"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -689,7 +596,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<io.qt.core.QByteArray>"
+                    modifiedType: "java.util.function.@Nullable Consumer<io.qt.core.@NonNull QByteArray>"
                 }
                 NoNullPointer{
                 }
@@ -775,7 +682,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<QWebEngineNotification>"
+                    modifiedType: "java.util.function.@Nullable Consumer<@NonNull QWebEngineNotification>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -796,19 +703,6 @@ TypeSystem{
         since: [6, 2]
     }
     
-    FunctionalType{
-        name: "QWebEngineProfile::NotificationPresenter"
-        generate: false
-        using: "std::function<void(std::unique_ptr<QWebEngineNotification>)>"
-        ExtraIncludes{
-            Include{
-                fileName: "QtWebEngineCore/QWebEngineNotification"
-                location: Include.Global
-            }
-        }
-        since: [6, 2]
-    }
-    
     FunctionalType{
         name: "QWebEngineProfile::IconAvailableCallback3"
         using: "std::function<void(const QIcon&,const QUrl&,const QUrl&)>"
@@ -852,10 +746,6 @@ TypeSystem{
                           "    return nullptr;\n"+
                           "}"}
         }
-        ModifyFunction{
-            signature: "operator=(const QWebEngineCertificateError &)"
-            remove: RemoveFlag.All
-        }
         since: [6, 2]
     }
     
@@ -873,12 +763,9 @@ TypeSystem{
         name: "QWebEngineScript"
         ModifyFunction{
             signature: "operator=(QWebEngineScript)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         since: [6, 2]
@@ -918,12 +805,9 @@ TypeSystem{
         name: "QWebEngineFullScreenRequest"
         ModifyFunction{
             signature: "operator=(QWebEngineFullScreenRequest)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         since: [6, 2]
@@ -931,21 +815,11 @@ TypeSystem{
     
     ValueType{
         name: "QWebEngineClientCertificateSelection"
-        CustomConstructor{
-            Text{content: "if(copy){\n"+
-                          "    return new(placement) QWebEngineClientCertificateSelection(*copy);\n"+
-                          "}else{\n"+
-                          "    return nullptr;\n"+
-                          "}"}
-        }
         ModifyFunction{
             signature: "operator=(QWebEngineClientCertificateSelection)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         since: [6, 2]
@@ -977,12 +851,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(QWebEngineHistoryItem)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         since: [6, 2]
@@ -995,13 +866,11 @@ TypeSystem{
     
     EnumType{
         name: "QWebEngineContextMenuRequest::MediaFlag"
-        flags: "QWebEngineContextMenuRequest::MediaFlags"
         since: [6, 2]
     }
     
     EnumType{
         name: "QWebEngineContextMenuRequest::EditFlag"
-        flags: "QWebEngineContextMenuRequest::EditFlags"
         since: [6, 2]
     }
     
@@ -1045,13 +914,12 @@ TypeSystem{
         since: [6, 2]
     }
     
-    EnumType{
-        name: "QWebEngineNewWindowRequest::DestinationType"
-        since: [6, 2]
-    }
-    
     ObjectType{
         name: "QWebEngineNewWindowRequest"
+
+        EnumType{
+            name: "DestinationType"
+        }
         since: [6, 2]
     }
     
@@ -1059,37 +927,29 @@ TypeSystem{
         name: "QWebEngineFindTextResult"
         ModifyFunction{
             signature: "operator=(QWebEngineFindTextResult)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         since: [5, 14]
     }
     
-    EnumType{
-        name: "QWebEngineLoadingInfo::LoadStatus"
-        since: [6, 2]
-    }
-    
-    EnumType{
-        name: "QWebEngineLoadingInfo::ErrorDomain"
-        since: [6, 2]
-    }
-    
     ObjectType{
         name: "QWebEngineLoadingInfo"
+
+        EnumType{
+            name: "LoadStatus"
+        }
+
+        EnumType{
+            name: "ErrorDomain"
+        }
         ModifyFunction{
             signature: "operator=(QWebEngineLoadingInfo)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         since: [6, 2]
@@ -1104,11 +964,7 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*QtWebEngineCore::WebContentsAdapter*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type '*QtWebEngineCore::CertificateErrorController*'"}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QWebEngineClientCertificateSelection."}
-    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QWebEngineCertificateError' is missing a default constructor. The resulting C++ code will not compile. If possible, use <custom-constructor> tag to provide the constructors."}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type *std::function<bool (const FilterRequest &)>* (is_busted)"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type *std::function<void (const QVariant &)>* (is_busted)"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type *std::function<void (const QByteArray &)>* (is_busted)"}
-    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QWebEngineFullScreenRequest' is missing a default constructor. The resulting C++ code will not compile.*"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QWebEngineFileSystemAccessRequest::QWebEngineFileSystemAccessRequest', unmatched parameter type 'QSharedPointer*'"}
-    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QWebEngineFileSystemAccessRequest' is missing a default constructor. The resulting C++ code will not compile. If possible, use * tag to provide the constructors."}
+    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QWebEngineFullScreenRequest' is missing a default constructor. If possible, use CustomConstructor{} element to specify default construction."}
+    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QWebEngineFileSystemAccessRequest' is missing a default constructor. If possible, use CustomConstructor{} element to specify default construction."}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineQuick.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineQuick.qml
index 2dd3143b..7516004a 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineQuick.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineQuick.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.webengine.quick"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtWebEngineQuick"
     module: "qtjambi.webenginequick"
     description: "Classes and functions for embedding web content in applications using the Chromium browser project."
@@ -102,7 +102,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "? extends io.qt.webengine.core.QWebEngineDownloadRequest"
+                    modifiedType: "? extends io.qt.webengine.core.@Nullable QWebEngineDownloadRequest"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -122,7 +122,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "? extends io.qt.webengine.core.QWebEngineDownloadRequest"
+                    modifiedType: "? extends io.qt.webengine.core.@Nullable QWebEngineDownloadRequest"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -156,5 +156,4 @@ TypeSystem{
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'QQuickWebEngineDownloadItem*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function '*', unmatched *type 'QQuickWebEngineDownloadRequest*'"}
-    SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QXml*."}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineWidgets.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineWidgets.qml
index 7f3e78b1..861196c9 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineWidgets.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebEngineWidgets.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.webengine.widgets"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtWebEngineWidgets"
     module: "qtjambi.webenginewidgets"
     description: "Provides C++ classes for rendering web content in a QWidget based application."
@@ -97,58 +97,6 @@ TypeSystem{
         until: 5
     }
     
-    EnumType{
-        name: "QWebEnginePage::Feature"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::FileSelectionMode"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::FindFlag"
-        flags: "QWebEnginePage::FindFlags"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::JavaScriptConsoleMessageLevel"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::NavigationType"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::PermissionPolicy"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::RenderProcessTerminationStatus"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::WebAction"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::WebWindowType"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QWebEnginePage::LifecycleState"
-        since: [5, 14]
-        until: 5
-    }
-    
     EnumType{
         name: "QWebEngineProfile::HttpCacheType"
         until: 5
@@ -196,22 +144,16 @@ TypeSystem{
     
     EnumType{
         name: "QWebEngineContextMenuData::MediaFlag"
-        flags: "QWebEngineContextMenuData::MediaFlags"
         until: 5
     }
     
     EnumType{
         name: "QWebEngineContextMenuData::EditFlag"
-        flags: "QWebEngineContextMenuData::EditFlags"
         until: 5
     }
     
     ValueType{
         name: "QWebEngineCertificateError"
-        ModifyFunction{
-            signature: "operator=(const QWebEngineCertificateError &)"
-            remove: RemoveFlag.All
-        }
         CustomConstructor{
             Text{content: "if(copy){\n"+
                           "    return new(placement) QWebEngineCertificateError(*copy);\n"+
@@ -252,12 +194,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(QWebEngineHistoryItem)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         until: 5
@@ -267,12 +206,9 @@ TypeSystem{
         name: "QWebEngineScript"
         ModifyFunction{
             signature: "operator=(QWebEngineScript)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         until: 5
@@ -282,12 +218,9 @@ TypeSystem{
         name: "QWebEngineContextMenuData"
         ModifyFunction{
             signature: "operator=(QWebEngineContextMenuData)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         until: 5
@@ -304,12 +237,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(QWebEngineClientCertificateSelection)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         until: 5
@@ -327,6 +257,48 @@ TypeSystem{
                 location: Include.Global
             }
         }
+
+        EnumType{
+            name: "Feature"
+        }
+        EnumType{
+            name: "FileSelectionMode"
+        }
+        EnumType{
+            name: "FindFlag"
+        }
+        EnumType{
+            name: "JavaScriptConsoleMessageLevel"
+        }
+        EnumType{
+            name: "NavigationType"
+        }
+        EnumType{
+            name: "PermissionPolicy"
+        }
+        EnumType{
+            name: "RenderProcessTerminationStatus"
+        }
+        EnumType{
+            name: "WebAction"
+        }
+        EnumType{
+            name: "WebWindowType"
+        }
+        EnumType{
+            name: "LifecycleState"
+            since: [5, 14]
+        }
+        ModifyFunction{
+            signature: "scripts()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
+                }
+            }
+        }
         ModifyFunction{
             signature: "setView(QWidget*)"
             ModifyArgument{
@@ -398,6 +370,25 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+                    signature: "fullScreenRequested(QWebEngineFullScreenRequest)"
+                    ModifyArgument{
+                        index: 1
+                        ReplaceType{
+                            modifiedType: "io.qt.webengine.widgets.QWebEngineFullScreenRequest"
+                        }
+                        NoNullPointer{
+                        }
+                        ConversionRule{
+                            codeClass: CodeClass.Shell
+                            Text{content: "%out = qtjambi_cast<jobject>(%env, &%in);"}
+                        }
+                        ConversionRule{
+                            codeClass: CodeClass.Native
+                            Text{content: "QWebEngineFullScreenRequest& %out  = *qtjambi_cast<QWebEngineFullScreenRequest*>(%env, %in);"}
+                        }
+                    }
+                }
         ModifyFunction{
             signature: "setUrlRequestInterceptor(QWebEngineUrlRequestInterceptor*)"
             ModifyArgument{
@@ -428,61 +419,20 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "fullScreenRequested(QWebEngineFullScreenRequest)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "QWebEngineFullScreenRequest"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, &%in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QWebEngineFullScreenRequest& %out  = *qtjambi_cast<QWebEngineFullScreenRequest*>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "authenticationRequired(const QUrl&,QAuthenticator*)"
             ModifyArgument{
                 index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.network.QAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QAuthenticator* %out  = qtjambi_cast<QAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
             signature: "proxyAuthenticationRequired(const QUrl&,QAuthenticator*, const QString&)"
             ModifyArgument{
                 index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.network.QAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QAuthenticator* %out  = qtjambi_cast<QAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
@@ -490,7 +440,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "java.lang.@Nullable String"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -558,7 +508,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "findText(const QString &, QFlags<QWebEnginePage::FindFlag>, QWebEngineCallback)"
+            signature: "findText(const QString &, QWebEnginePage::FindFlags, QWebEngineCallback)"
             ModifyArgument{
                 index: 3
                 ReplaceDefaultExpression{
@@ -643,7 +593,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "runJavaScript(const QString&,uint,QWebEngineCallback)"
+            signature: "runJavaScript(const QString&,quint32,QWebEngineCallback)"
             ModifyArgument{
                 index: 3
                 NoNullPointer{
@@ -754,7 +704,7 @@ TypeSystem{
                     expression: "null"
                 }
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<io.qt.webengine.core.QWebEngineNotification>"
+                    modifiedType: "java.util.function.@Nullable Consumer<io.qt.webengine.core.@NonNull QWebEngineNotification>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -901,14 +851,14 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "findText(QString, QFlags<QWebEnginePage::FindFlag>, std::function<void(const QWebEngineFindTextResult&)>)"
+            signature: "findText(QString, QWebEnginePage::FindFlags, std::function<void(const QWebEngineFindTextResult&)>)"
             ModifyArgument{
                 index: 3
                 ReplaceDefaultExpression{
                     expression: "null"
                 }
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<io.qt.webengine.core.QWebEngineFindTextResult>"
+                    modifiedType: "java.util.function.@Nullable Consumer<io.qt.webengine.core.@NonNull QWebEngineFindTextResult>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -924,7 +874,7 @@ TypeSystem{
             since: [6, 2]
         }
         ModifyFunction{
-            signature: "findText(const QString &, QFlags<QWebEnginePage::FindFlag>, QWebEngineCallback)"
+            signature: "findText(const QString &, QWebEnginePage::FindFlags, QWebEngineCallback)"
             ModifyArgument{
                 index: 3
                 ReplaceDefaultExpression{
@@ -961,7 +911,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.function.Consumer<io.qt.core.QByteArray>"
+                    modifiedType: "java.util.function.@Nullable Consumer<io.qt.core.@NonNull QByteArray>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -988,7 +938,5 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QWebEngineContextMenuData::operator=', unmatched parameter type '*QWebEngineContextMenuData::QWebEngineContextDataPrivate*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QWebEngineClientCertificateSelection::QWebEngineClientCertificateSelection', unmatched parameter type '*QSharedPointer*'"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: skipping function 'QWebEngineCertificateError::QWebEngineCertificateError', unmatched parameter type '*QSharedPointer<CertificateErrorController>*'"}
-    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QWebEngineClientCertificateSelection' is missing a default constructor. The resulting C++ code will not compile.*"}
-    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QWebEngineHistoryItem' is missing a default constructor. The resulting C++ code will not compile.*"}
-    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: Type parser doesn't recognize the type *std::function<void(bool)>* (is_busted)"; since: [6, 2]}
+    SuppressedWarning{text: "WARNING(CppImplGenerator) :: Value type 'QWebEngineClientCertificateSelection' is missing a default constructor.*"}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebSockets.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebSockets.qml
index b202e554..8195a175 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebSockets.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebSockets.qml
@@ -31,27 +31,24 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.websockets"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtWebSockets"
     module: "qtjambi.websockets"
     description: "Provides WebSocket communication compliant with RFC 6455."
+
     NamespaceType{
         name: "QWebSocketProtocol"
-    }
-    
-    EnumType{
-        name: "QWebSocketServer::SslMode"
-    }
-    
-    EnumType{
-        name: "QWebSocketProtocol::Version"
-        RejectEnumValue{
-            name: "VersionLatest"
+
+        EnumType{
+            name: "Version"
+            RejectEnumValue{
+                name: "VersionLatest"
+            }
+        }
+
+        EnumType{
+            name: "CloseCode"
         }
-    }
-    
-    EnumType{
-        name: "QWebSocketProtocol::CloseCode"
     }
     
     ObjectType{
@@ -78,46 +75,27 @@ TypeSystem{
             signature: "proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)"
             ModifyArgument{
                 index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.network.QAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QAuthenticator* %out  = qtjambi_cast<QAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
             signature: "preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslPreSharedKeyAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslPreSharedKeyAuthenticator* %out  = qtjambi_cast<QSslPreSharedKeyAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
     }
     
     ObjectType{
         name: "QWebSocketServer"
+
+        EnumType{name: "SslMode"}
+
         ModifyFunction{
-            signature: "listen(const QHostAddress &, unsigned short)"
+            signature: "listen(const QHostAddress &, quint16)"
             ModifyArgument{
                 index: 1
                 ReplaceDefaultExpression{
@@ -129,38 +107,16 @@ TypeSystem{
             signature: "originAuthenticationRequired(QWebSocketCorsAuthenticator *)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.websockets.QWebSocketCorsAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QWebSocketCorsAuthenticator* %out  = qtjambi_cast<QWebSocketCorsAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
         ModifyFunction{
             signature: "preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *)"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.network.QSslPreSharedKeyAuthenticator"
-                }
                 NoNullPointer{
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QSslPreSharedKeyAuthenticator* %out  = qtjambi_cast<QSslPreSharedKeyAuthenticator*>(%env, %scope, %in);"}
-                }
             }
         }
     }
@@ -180,14 +136,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(QWebSocketCorsAuthenticator)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -196,14 +147,9 @@ TypeSystem{
         name: "QWebSocketHandshakeOptions"
         ModifyFunction{
             signature: "operator=(QWebSocketHandshakeOptions)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                NoNullPointer{
-                }
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         since: [6, 4]
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebView.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebView.qml
index eada8e21..830b29a2 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtWebView.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtWebView.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.webview"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtWebView"
     module: "qtjambi.webview"
     description: "Displays web content in a QML application by using APIs native to the platform, without the need to include a full web browser stack."
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtWidgets.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtWidgets.qml
index e828eacc..0dd28d24 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtWidgets.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtWidgets.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.widgets"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtWidgets"
     module: "qtjambi"
     Template{
@@ -207,12 +207,6 @@ TypeSystem{
         functionName: "qstyleoption_cast"
     }
     
-    Rejection{
-        className: "QApplication"
-        functionName: "nativeInterface"
-        since: [6, 2]
-    }
-    
     Rejection{
         className: "QFileDialogArgs"
     }
@@ -289,51 +283,6 @@ TypeSystem{
         className: "QWidgetItemV2"
     }
     
-    Rejection{
-        className: "QTreeWidgetItem"
-        functionName: "treeModel"
-    }
-    
-    Rejection{
-        className: "QAbstractItemDelegate"
-        functionName: "operator="
-    }
-    
-    Rejection{
-        className: "QApplication"
-        functionName: "compressEvent"
-    }
-    
-    Rejection{
-        className: "QWidget"
-        functionName: "create"
-    }
-    
-    Rejection{
-        className: "QWidget"
-        functionName: "destroy"
-    }
-    
-    Rejection{
-        className: "QWidget"
-        functionName: "find"
-    }
-    
-    Rejection{
-        className: "QWidget"
-        functionName: "handle"
-    }
-    
-    Rejection{
-        className: "QWidget"
-        functionName: "styleChange"
-    }
-    
-    Rejection{
-        className: "QWidget"
-        functionName: "internalWinId"
-    }
-    
     Rejection{
         className: "QActionGroup"
         functionName: "selected"
@@ -364,11 +313,6 @@ TypeSystem{
         className: "QStandardItemEditorCreator"
     }
     
-    Rejection{
-        className: "QGraphicsItem"
-        enumName: "enum_1"
-    }
-    
     Rejection{
         className: "QGraphicsItemGroup"
         enumName: "enum_1"
@@ -743,36 +687,16 @@ TypeSystem{
         enumName: "ItemType"
     }
     
-    Rejection{
-        className: "QTreeWidgetItem"
-        enumName: "ItemType"
-    }
-    
-    EnumType{
-        name: "QTabBar::SelectionBehavior"
-    }
-    
-    EnumType{
-        name: "QTabBar::ButtonPosition"
-    }
-    
     EnumType{
         name: "QInputDialog::InputMode"
     }
     
     EnumType{
         name: "QInputDialog::InputDialogOption"
-        flags: "QInputDialog::InputDialogOptions"
-    }
-    
-    EnumType{
-        name: "QFontDialog::FontDialogOption"
-        flags: "QFontDialog::FontDialogOptions"
     }
     
     EnumType{
         name: "QColorDialog::ColorDialogOption"
-        flags: "QColorDialog::ColorDialogOptions"
     }
     
     EnumType{
@@ -793,7 +717,6 @@ TypeSystem{
     
     EnumType{
         name: "QAbstractItemView::EditTrigger"
-        flags: "QAbstractItemView::EditTriggers"
     }
     
     EnumType{
@@ -824,23 +747,6 @@ TypeSystem{
         name: "QAbstractSlider::SliderChange"
     }
     
-    EnumType{
-        name: "QAbstractSpinBox::ButtonSymbols"
-    }
-    
-    EnumType{
-        name: "QAbstractSpinBox::CorrectionMode"
-    }
-    
-    EnumType{
-        name: "QAbstractSpinBox::StepType"
-    }
-    
-    EnumType{
-        name: "QAbstractSpinBox::StepEnabledFlag"
-        flags: "QAbstractSpinBox::StepEnabled"
-    }
-    
     EnumType{
         name: "QDirModel::Roles"
         until: 5
@@ -852,7 +758,6 @@ TypeSystem{
     
     EnumType{
         name: "QMdiArea::AreaOption"
-        flags: "QMdiArea::AreaOptions"
     }
     
     EnumType{
@@ -863,25 +768,12 @@ TypeSystem{
         name: "QMdiArea::ViewMode"
     }
     
-    EnumType{
-        name: "QFormLayout::FieldGrowthPolicy"
-    }
-    
-    EnumType{
-        name: "QFormLayout::ItemRole"
-    }
-    
-    EnumType{
-        name: "QFormLayout::RowWrapPolicy"
-    }
-    
     EnumType{
         name: "QPlainTextEdit::LineWrapMode"
     }
     
     EnumType{
         name: "QMdiSubWindow::SubWindowOption"
-        flags: "QMdiSubWindow::SubWindowOptions"
     }
     
     EnumType{
@@ -899,12 +791,6 @@ TypeSystem{
         until: 5
     }
     
-    
-    EnumType{
-        name: "QApplication::ColorSpec"
-    }
-    
-    
     EnumType{
         name: "QCalendarWidget::HorizontalHeaderFormat"
     }
@@ -939,7 +825,6 @@ TypeSystem{
     
     EnumType{
         name: "QDateTimeEdit::Section"
-        flags: "QDateTimeEdit::Sections"
     }
     
     EnumType{
@@ -968,7 +853,6 @@ TypeSystem{
     
     EnumType{
         name: "QFileDialog::Option"
-        flags: "QFileDialog::Options"
     }
     
     EnumType{
@@ -981,12 +865,10 @@ TypeSystem{
     
     EnumType{
         name: "QFileIconProvider::Option"
-        flags: "QFileIconProvider::Options"
     }
     
     EnumType{
         name: "QFontComboBox::FontFilter"
-        flags: "QFontComboBox::FontFilters"
     }
     
     EnumType{
@@ -1013,7 +895,6 @@ TypeSystem{
     
     EnumType{
         name: "QGraphicsItem::GraphicsItemFlag"
-        flags: "QGraphicsItem::GraphicsItemFlags"
     }
     
     EnumType{
@@ -1030,7 +911,6 @@ TypeSystem{
     
     EnumType{
         name: "QGraphicsView::CacheModeFlag"
-        flags: "QGraphicsView::CacheMode"
     }
     
     EnumType{
@@ -1039,7 +919,6 @@ TypeSystem{
     
     EnumType{
         name: "QGraphicsView::OptimizationFlag"
-        flags: "QGraphicsView::OptimizationFlags"
     }
     
     EnumType{
@@ -1088,7 +967,6 @@ TypeSystem{
     
     EnumType{
         name: "QMainWindow::DockOption"
-        flags: "QMainWindow::DockOptions"
     }
     
     EnumType{
@@ -1117,12 +995,10 @@ TypeSystem{
     
     EnumType{
         name: "QSizePolicy::ControlType"
-        flags: "QSizePolicy::ControlTypes"
     }
     
     EnumType{
         name: "QStyle::SubControl"
-        flags: "QStyle::SubControls"
         extensible: true
         RejectEnumValue{
             name: "SC_SpinBoxUp"
@@ -1267,7 +1143,6 @@ TypeSystem{
     
     EnumType{
         name: "QStyle::StateFlag"
-        flags: "QStyle::State"
     }
     
     EnumType{
@@ -1288,7 +1163,6 @@ TypeSystem{
     
     EnumType{
         name: "QStyleOptionButton::ButtonFeature"
-        flags: "QStyleOptionButton::ButtonFeatures"
     }
     
     EnumType{
@@ -1313,7 +1187,6 @@ TypeSystem{
     
     EnumType{
         name: "QStyleOptionTab::CornerWidget"
-        flags: "QStyleOptionTab::CornerWidgets"
     }
     
     EnumType{
@@ -1326,7 +1199,6 @@ TypeSystem{
     
     EnumType{
         name: "QStyleOptionToolBar::ToolBarFeature"
-        flags: "QStyleOptionToolBar::ToolBarFeatures"
     }
     
     EnumType{
@@ -1335,7 +1207,6 @@ TypeSystem{
     
     EnumType{
         name: "QStyleOptionToolButton::ToolButtonFeature"
-        flags: "QStyleOptionToolButton::ToolButtonFeatures"
         RejectEnumValue{
             name: "MenuButtonPopup"
         }
@@ -1353,10 +1224,6 @@ TypeSystem{
         name: "QSystemTrayIcon::MessageIcon"
     }
     
-    EnumType{
-        name: "QTabBar::Shape"
-    }
-    
     EnumType{
         name: "QTabWidget::TabPosition"
     }
@@ -1369,28 +1236,12 @@ TypeSystem{
         name: "QToolButton::ToolButtonPopupMode"
     }
     
-    EnumType{
-        name: "QTreeWidgetItemIterator::IteratorFlag"
-        flags: "QTreeWidgetItemIterator::IteratorFlags"
-    }
-    
-    EnumType{
-        name: "QWidget::RenderFlag"
-        flags: "QWidget::RenderFlags"
-    }
-    
     EnumType{
         name: "QGraphicsScene::SceneLayer"
-        flags: "QGraphicsScene::SceneLayers"
-    }
-    
-    EnumType{
-        name: "QTreeWidgetItem::ChildIndicatorPolicy"
     }
     
     EnumType{
         name: "QWizard::WizardOption"
-        flags: "QWizard::WizardOptions"
     }
     
     EnumType{
@@ -1407,7 +1258,6 @@ TypeSystem{
     
     EnumType{
         name: "QGraphicsBlurEffect::BlurHint"
-        flags: "QGraphicsBlurEffect::BlurHints"
     }
     
     EnumType{
@@ -1420,12 +1270,10 @@ TypeSystem{
     
     EnumType{
         name: "QPinchGesture::ChangeFlag"
-        flags: "QPinchGesture::ChangeFlags"
     }
     
     EnumType{
         name: "QGestureRecognizer::ResultFlag"
-        flags: "QGestureRecognizer::Result"
     }
     
     EnumType{
@@ -1450,7 +1298,6 @@ TypeSystem{
     
     EnumType{
         name: "QDialogButtonBox::StandardButton"
-        flags: "QDialogButtonBox::StandardButtons"
         RejectEnumValue{
             name: "FirstButton"
         }
@@ -1479,19 +1326,10 @@ TypeSystem{
     
     EnumType{
         name: "QDockWidget::DockWidgetFeature"
-        flags: "QDockWidget::DockWidgetFeatures"
-    }
-    
-    EnumType{
-        name: "QHeaderView::ResizeMode"
-        RejectEnumValue{
-            name: "Custom"
-        }
     }
     
     EnumType{
         name: "QMessageBox::StandardButton"
-        flags: "QMessageBox::StandardButtons"
         RejectEnumValue{
             name: "FirstButton"
         }
@@ -1526,7 +1364,6 @@ TypeSystem{
     
     EnumType{
         name: "QTextEdit::AutoFormattingFlag"
-        flags: "QTextEdit::AutoFormatting"
     }
     
     EnumType{
@@ -1535,7 +1372,6 @@ TypeSystem{
     
     EnumType{
         name: "QGraphicsEffect::ChangeFlag"
-        flags: "QGraphicsEffect::ChangeFlags"
     }
     
     EnumType{
@@ -1552,7 +1388,6 @@ TypeSystem{
     
     EnumType{
         name: "QStyleOptionViewItem::ViewItemFeature"
-        flags: "QStyleOptionViewItem::ViewItemFeatures"
     }
     
     EnumType{
@@ -1569,7 +1404,6 @@ TypeSystem{
     
     EnumType{
         name: "QStyleOptionTab::TabFeature"
-        flags: "QStyleOptionTab::TabFeatures"
     }
     
     EnumType{
@@ -1578,7 +1412,6 @@ TypeSystem{
     
     EnumType{
         name: "QStyleOptionFrame::FrameFeature"
-        flags: "QStyleOptionFrame::FrameFeatures"
     }
     
     EnumType{
@@ -1631,12 +1464,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOption &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -1659,12 +1489,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionComplex &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1679,12 +1506,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionGraphicsItem &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1699,12 +1523,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionSizeGrip &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1719,12 +1540,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionButton &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1739,12 +1557,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionComboBox &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1759,12 +1574,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionDockWidget &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1779,12 +1591,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionFocusRect &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1799,12 +1608,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionFrame &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1819,12 +1625,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionGroupBox &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1839,12 +1642,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionHeader &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1855,12 +1655,9 @@ TypeSystem{
         polymorphicIdExpression: "%1->type == QStyleOptionHeaderV2::Type && %1->version == QStyleOptionHeaderV2::Version"
         ModifyFunction{
             signature: "operator=(const QStyleOptionHeaderV2 &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyField{
@@ -1880,12 +1677,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionMenuItem &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1900,12 +1694,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionProgressBar &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1920,12 +1711,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionRubberBand &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1940,12 +1728,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionSlider &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1960,12 +1745,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionSpinBox &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -1985,12 +1767,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionTab &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -2005,12 +1784,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionTabBarBase &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -2025,12 +1801,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionTabWidgetFrame &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -2045,12 +1818,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionTitleBar &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -2065,12 +1835,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionToolBar &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -2085,12 +1852,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionToolBox &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -2105,12 +1869,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionToolButton &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -2125,12 +1886,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QStyleOptionViewItem &)"
-            rename: "set"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "void"
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
             since: [5, 12]
         }
@@ -2154,12 +1912,6 @@ TypeSystem{
             remove: RemoveFlag.All
             until: 5
         }
-        ModifyFunction{
-            signature: "operator=(const QTableWidgetSelectionRange &)"
-            remove: RemoveFlag.All
-            since: [5, 14]
-            until: 5
-        }
         CustomConstructor{
             type: CustomConstructor.Copy
             Text{content: "new(placement) QTableWidgetSelectionRange(copy->topRow(), copy->leftColumn(), copy->bottomRow(), copy->rightColumn());"}
@@ -2172,10 +1924,6 @@ TypeSystem{
     
     ValueType{
         name: "QColormap"
-        ModifyFunction{
-            signature: "operator=(QColormap)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "initialize()"
             remove: RemoveFlag.All
@@ -2209,6 +1957,15 @@ TypeSystem{
             read: false
             write: false
         }
+        ModifyFunction{
+            signature: "spacerItem()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -2239,13 +1996,16 @@ TypeSystem{
         }
         InjectCode{
             position: Position.End
-            Text{content: "@io.qt.QtUninvokable\n"+
+            Text{content: "@QtUninvokable\n"+
                           "static native boolean hasWidgetItemV2(QWidget widget);"}
         }
     }
     
     InterfaceType{
         name: "QGraphicsItem"
+        Rejection{
+            enumName: "enum_1"
+        }
         threadAffinity: "getPointerOwner(%1)"
         ExtraIncludes{
             Include{
@@ -2502,23 +2262,6 @@ TypeSystem{
                               "    QtJambi_LibraryUtilities.internal.setCppOwnership(%this);"}
             }
         }
-        ModifyFunction{
-            signature: "paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)"
-            ModifyArgument{
-                index: 2
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "const QStyleOptionGraphicsItem *%out = qtjambi_cast<QStyleOptionGraphicsItem *>(%env, %in);"}
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionGraphicsItem"
-                }
-            }
-        }
         ModifyFunction{
             signature: "itemTransform(const QGraphicsItem*,bool*)const"
             ModifyArgument{
@@ -2610,50 +2353,168 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.widgets.QGraphicsItem$BlockedByModalPanelInfo"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtWidgets::QGraphicsItem$BlockedByModalPanelInfo::newInstance(%env, jboolean(%in), qtjambi_cast<jobject>(%env, modalPanel));"}
                 }
             }
         }
-    }
-    
-    ObjectType{
-        name: "QAbstractGraphicsShapeItem"
-        threadAffinity: "getPointerOwner(%1)"
-        ExtraIncludes{
-            Include{
-                fileName: "utils_p.h"
-                location: Include.Local
-            }
-        }
         ModifyFunction{
-            signature: "resetMatrix()"
-            remove: RemoveFlag.All
-            until: 5
+            signature: "commonAncestorItem(const QGraphicsItem*)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
         }
         ModifyFunction{
-            signature: "setFocusProxy(QGraphicsItem*)"
+            signature: "focusItem()const"
             ModifyArgument{
-                index: 1
-                ReferenceCount{
-                    action: ReferenceCount.Ignore
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
             }
         }
         ModifyFunction{
-            signature: "QAbstractGraphicsShapeItem(QGraphicsItem*)"
+            signature: "focusProxy()const"
             ModifyArgument{
-                index: 1
-                threadAffinity: true
-            }
-            InjectCode{
-                position: Position.End
-                ArgumentMap{
-                    index: 1
-                    metaName: "%1"
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
-                Text{content: "if (%1 != null) QtJambi_LibraryUtilities.internal.setCppOwnership(this);"}
+            }
+        }
+        ModifyFunction{
+            signature: "focusScopeItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "group()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "panel()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "parentItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "topLevelItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "focusProxy()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "focusScopeItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "group()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "panel()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "parentItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "topLevelItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+    }
+    
+    ObjectType{
+        name: "QAbstractGraphicsShapeItem"
+        threadAffinity: "getPointerOwner(%1)"
+        ExtraIncludes{
+            Include{
+                fileName: "utils_p.h"
+                location: Include.Local
+            }
+        }
+        ModifyFunction{
+            signature: "resetMatrix()"
+            remove: RemoveFlag.All
+            until: 5
+        }
+        ModifyFunction{
+            signature: "QAbstractGraphicsShapeItem(QGraphicsItem*)"
+            ModifyArgument{
+                index: 1
+                threadAffinity: true
+            }
+            InjectCode{
+                position: Position.End
+                ArgumentMap{
+                    index: 1
+                    metaName: "%1"
+                }
+                Text{content: "if (%1 != null) QtJambi_LibraryUtilities.internal.setCppOwnership(this);"}
             }
         }
     }
@@ -2712,24 +2573,6 @@ TypeSystem{
                 invalidateAfterUse: true
             }
         }
-        ModifyFunction{
-            signature: "initViewItemOption(QStyleOptionViewItem *) const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionViewItem"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionViewItem* %out = qtjambi_cast<QStyleOptionViewItem*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-            since: 6
-        }
         ModifyFunction{
             signature: "setIndexWidget(const QModelIndex &,QWidget *)"
             threadAffinity: true
@@ -2868,23 +2711,6 @@ TypeSystem{
     
     ObjectType{
         name: "QCheckBox"
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionButton*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionButton"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionButton* %out = qtjambi_cast<QStyleOptionButton*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     
@@ -3061,6 +2887,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "iconProvider()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         until: 5
     }
     
@@ -3137,18 +2972,6 @@ TypeSystem{
         ModifyFunction{
             signature: "registerField(const QString &, QWidget *, const char *, const char *)"
             threadAffinity: Affinity.UI
-            ModifyArgument{
-                index: 3
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -3182,23 +3005,6 @@ TypeSystem{
                 invalidateAfterUse: true
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOption*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption* %out = qtjambi_cast<QStyleOption*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -3207,6 +3013,10 @@ TypeSystem{
     
     ObjectType{
         name: "QFontDialog"
+        EnumType{
+            name: "FontDialogOption"
+        }
+
         ModifyFunction{
             signature: "eventFilter(QObject*,QEvent*)"
             ModifyArgument{
@@ -3224,12 +3034,6 @@ TypeSystem{
         ModifyFunction{
             signature: "open(QObject*,const char*)"
             threadAffinity: true
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -3237,7 +3041,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getFont(bool*,QFont,QWidget*,QString,QFlags<QFontDialog::FontDialogOption>)"
+            signature: "getFont(bool*,QFont,QWidget*,QString,QFontDialog::FontDialogOptions)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
@@ -3277,6 +3081,10 @@ TypeSystem{
                                   "bool* %out = &ok;"}
                 }
             }
+            ModifyArgument{
+                index: 2
+                RemoveDefaultExpression{}
+            }
         }
     }
     
@@ -3370,6 +3178,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "item()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -3804,10 +3621,24 @@ TypeSystem{
     
     ObjectType{
         name: "QHeaderView"
+        EnumType{
+            name: "ResizeMode"
+            RejectEnumValue{
+                name: "Custom"
+            }
+        }
         ModifyFunction{
             signature: "setVisible(bool)"
             threadAffinity: true
         }
+        ModifyFunction{
+            signature: "initStyleOptionForIndex(QStyleOptionHeader*,int)const"
+            ModifyArgument{
+                index: 1
+                invalidateAfterUse: true
+            }
+            since: 6
+        }
         ModifyFunction{
             signature: "paintSection(QPainter*,QRect,int)const"
             ModifyArgument{
@@ -3826,41 +3657,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionHeader*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionHeader"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionHeader* %out = qtjambi_cast<QStyleOptionHeader*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "initStyleOptionForIndex(QStyleOptionHeader *, int) const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionHeader"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionHeader* %out = qtjambi_cast<QStyleOptionHeader*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-            since: 6
-        }
     }
     
     ObjectType{
@@ -3879,6 +3675,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "itemEditorFactory()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const"
             Remove{
@@ -4009,6 +3814,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "defaultFactory()"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -4267,7 +4081,7 @@ TypeSystem{
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "addSubWindow(QWidget*,QFlags<Qt::WindowType>)"
+            signature: "addSubWindow(QWidget*,Qt::WindowFlags)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 1
@@ -4346,6 +4160,22 @@ TypeSystem{
     
     ObjectType{
         name: "QMenu"
+        ModifyFunction{
+            signature: "initStyleOption(QStyleOptionMenuItem*,const QAction*)const"
+            ModifyArgument{
+                index: 1
+                invalidateAfterUse: true
+            }
+            since: 6
+        }
+        ModifyFunction{
+            signature: "addAction<Func1>(QIcon,QString,Func1,QKeySequence)"
+            remove: RemoveFlag.All
+        }
+        ModifyFunction{
+            signature: "addAction<Func1>(QString,Func1,QKeySequence)"
+            remove: RemoveFlag.All
+        }
         ModifyFunction{
             signature: "setAsDockMenu()"
             remove: RemoveFlag.All
@@ -4587,27 +4417,23 @@ TypeSystem{
                               "    QtJambi_LibraryUtilities.internal.clearReferenceCount(this, QWidget.class, \"__rcActions\", false);"}
             }
         }
+    }
+    
+    ObjectType{
+        name: "QMenuBar"
         ModifyFunction{
             signature: "initStyleOption(QStyleOptionMenuItem*,const QAction*)const"
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionMenuItem"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionMenuItem* %out = qtjambi_cast<QStyleOptionMenuItem*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
+                invalidateAfterUse: true
             }
+            since: 6
+        }
+        ModifyFunction{
+            signature: "addAction<Func1>(QString,Func1)"
+            remove: RemoveFlag.All
+            until: 6.3
         }
-    }
-    
-    ObjectType{
-        name: "QMenuBar"
         ModifyFunction{
             signature: "clear()"
             threadAffinity: true
@@ -4771,23 +4597,6 @@ TypeSystem{
                               "    QtJambi_LibraryUtilities.internal.clearReferenceCount(this, QWidget.class, \"__rcActions\", false);"}
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionMenuItem*,const QAction*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionMenuItem"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionMenuItem* %out = qtjambi_cast<QStyleOptionMenuItem*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     
@@ -4804,23 +4613,6 @@ TypeSystem{
             signature: "invertedAppearance()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionProgressBar*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionProgressBar"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionProgressBar* %out = qtjambi_cast<QStyleOptionProgressBar*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -4836,23 +4628,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionButton*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionButton"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionButton* %out = qtjambi_cast<QStyleOptionButton*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -5214,23 +4989,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionToolButton*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionToolButton"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionToolButton* %out = qtjambi_cast<QStyleOptionToolButton*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -5566,10 +5324,9 @@ TypeSystem{
         name: "QGraphicsSceneContextMenuEvent"
         ModifyFunction{
             signature: "operator=(const QGraphicsSceneContextMenuEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -5598,10 +5355,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QGraphicsSceneDragDropEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -5620,10 +5376,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QGraphicsSceneEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -5632,10 +5387,9 @@ TypeSystem{
         name: "QGraphicsSceneMoveEvent"
         ModifyFunction{
             signature: "operator=(const QGraphicsSceneMoveEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -5644,10 +5398,9 @@ TypeSystem{
         name: "QGraphicsSceneResizeEvent"
         ModifyFunction{
             signature: "operator=(const QGraphicsSceneResizeEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -5656,10 +5409,9 @@ TypeSystem{
         name: "QGraphicsSceneHelpEvent"
         ModifyFunction{
             signature: "operator=(const QGraphicsSceneHelpEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -5668,10 +5420,9 @@ TypeSystem{
         name: "QGraphicsSceneHoverEvent"
         ModifyFunction{
             signature: "operator=(const QGraphicsSceneHoverEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -5680,10 +5431,9 @@ TypeSystem{
         name: "QGraphicsSceneMouseEvent"
         ModifyFunction{
             signature: "operator=(const QGraphicsSceneMouseEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -5692,10 +5442,9 @@ TypeSystem{
         name: "QGraphicsSceneWheelEvent"
         ModifyFunction{
             signature: "operator=(const QGraphicsSceneWheelEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
     }
@@ -5704,10 +5453,9 @@ TypeSystem{
         name: "QToolBarChangeEvent"
         ModifyFunction{
             signature: "operator=(const QToolBarChangeEvent &)"
-            rename: "set"
-            ModifyArgument{
-                index: "return"
-                replaceType: "void"
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyFunction{
@@ -5781,21 +5529,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "drawControl(QStyle::ControlElement, const QStyleOption *, QPainter *, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 3
                 invalidateAfterUse: true
@@ -5803,21 +5536,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "drawComplexControl(QStyle::ComplexControl, const QStyleOptionComplex *, QPainter *, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionComplex"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionComplex *%out = qtjambi_cast<QStyleOptionComplex *>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 3
                 invalidateAfterUse: true
@@ -5825,21 +5543,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "drawPrimitive(QStyle::PrimitiveElement, const QStyleOption *, QPainter *, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 3
                 invalidateAfterUse: true
@@ -5847,26 +5550,12 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "hitTestComplexControl(QStyle::ComplexControl, const QStyleOptionComplex *, const QPoint &, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionComplex"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionComplex *%out = qtjambi_cast<QStyleOptionComplex *>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 0
                 ReplaceType{
                     modifiedType: "io.qt.widgets.QStyle$SubControl"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     Text{content: "QStyle::SubControl %out = qtjambi_cast<QStyle::SubControl>(%env, %in);"}
@@ -5877,206 +5566,18 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "pixelMetric(QStyle::PixelMetric, const QStyleOption *, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "sizeFromContents(QStyle::ContentsType, const QStyleOption *, const QSize &, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "standardIcon(QStyle::StandardPixmap, const QStyleOption *, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "standardPixmap(QStyle::StandardPixmap, const QStyleOption *, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "styleHint(QStyle::StyleHint, const QStyleOption *, const QWidget *, QStyleHintReturn *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
             ModifyArgument{
                 index: 4
                 invalidateAfterUse: true
             }
         }
-        ModifyFunction{
-            signature: "subControlRect(QStyle::ComplexControl, const QStyleOptionComplex *, QStyle::SubControl, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionComplex"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionComplex *%out = qtjambi_cast<QStyleOptionComplex *>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "subElementRect(QStyle::SubElement, const QStyleOption *, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "generatedIconPixmap(QIcon::Mode,QPixmap,const QStyleOption*)const"
-            ModifyArgument{
-                index: 3
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
-        }
         ModifyFunction{
             signature: "polish(QPalette&)"
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QPalette"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %scope, &%in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPalette &%out = qtjambi_cast<QPalette&>(%env, %scope, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "combinedLayoutSpacing(QFlags<QSizePolicy::ControlType>,QFlags<QSizePolicy::ControlType>,Qt::Orientation,QStyleOption*,QWidget*)const"
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "layoutSpacing(QSizePolicy::ControlType,QSizePolicy::ControlType,Qt::Orientation,const QStyleOption*,const QWidget*)const"
-            ModifyArgument{
-                index: 4
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
             }
         }
     }
@@ -6095,7 +5596,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getColor(const QColor &, QWidget *, const QString &, QFlags<QColorDialog::ColorDialogOption>)"
+            signature: "getColor(const QColor &, QWidget *, const QString &, QColorDialog::ColorDialogOptions)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 1
@@ -6107,12 +5608,6 @@ TypeSystem{
         ModifyFunction{
             signature: "open(QObject*,const char*)"
             threadAffinity: true
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -6125,7 +5620,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Integer"
+                    modifiedType: "java.lang.@Nullable Integer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -6170,9 +5665,19 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "itemAt(int) const"
+            signature: "itemAt(int)const"
             ModifyArgument{
-                index: "return"
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Shell
+                    ownership: Ownership.Invalidate
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "replaceWidget(QWidget*,QWidget*,Qt::FindChildOptions)"
+            ModifyArgument{
+                index: 0
                 DefineOwnership{
                     codeClass: CodeClass.Shell
                     ownership: Ownership.Invalidate
@@ -6200,7 +5705,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setAlignment(QWidget*,QFlags<Qt::AlignmentFlag>)"
+            signature: "setAlignment(QWidget*,Qt::Alignment)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
@@ -6209,7 +5714,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setAlignment(QLayout*,QFlags<Qt::AlignmentFlag>)"
+            signature: "setAlignment(QLayout*,Qt::Alignment)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
@@ -6383,6 +5888,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "int[]"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "jsize %out_size = 4;\n"+
@@ -6514,7 +6020,7 @@ TypeSystem{
                 NoNullPointer{
                 }
                 DefineOwnership{
-                    codeClass: CodeClass.Java
+                    codeClass: CodeClass.Native
                     ownership: Ownership.Invalidate
                 }
             }
@@ -6532,7 +6038,7 @@ TypeSystem{
         }
         InjectCode{
             position: Position.End
-            Text{content: "@io.qt.QtUninvokable\n"+
+            Text{content: "@QtUninvokable\n"+
                           "void add_widget(QWidget widget){\n"+
                           "    stackWidget(widget);\n"+
                           "}"}
@@ -6687,7 +6193,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addWidget(QWidget *, int, QFlags<Qt::AlignmentFlag>)"
+            signature: "addWidget(QWidget *, int, Qt::Alignment)"
             threadAffinity: true
             ModifyArgument{
                 index: 1
@@ -6717,7 +6223,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "insertWidget(int,QWidget*,int,QFlags<Qt::AlignmentFlag>)"
+            signature: "insertWidget(int,QWidget*,int,Qt::Alignment)"
             threadAffinity: true
             ModifyArgument{
                 index: 2
@@ -6744,7 +6250,7 @@ TypeSystem{
     ObjectType{
         name: "QGridLayout"
         ModifyFunction{
-            signature: "addLayout(QLayout *, int, int, QFlags<Qt::AlignmentFlag>)"
+            signature: "addLayout(QLayout *, int, int, Qt::Alignment)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
@@ -6753,7 +6259,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addLayout(QLayout *, int, int, int, int, QFlags<Qt::AlignmentFlag>)"
+            signature: "addLayout(QLayout *, int, int, int, int, Qt::Alignment)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
@@ -6771,6 +6277,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "itemAtPosition(int,int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ExtraIncludes{
             Include{
                 fileName: "utils_p.h"
@@ -6802,7 +6317,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addWidget(QWidget*,int,int,QFlags<Qt::AlignmentFlag>)"
+            signature: "addWidget(QWidget*,int,int,Qt::Alignment)"
             threadAffinity: true
             ModifyArgument{
                 index: 1
@@ -6825,7 +6340,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addWidget(QWidget*,int,int,int,int,QFlags<Qt::AlignmentFlag>)"
+            signature: "addWidget(QWidget*,int,int,int,int,Qt::Alignment)"
             threadAffinity: true
             ModifyArgument{
                 index: 1
@@ -6878,7 +6393,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addItem(QLayoutItem *, int, int, int, int, QFlags<Qt::AlignmentFlag>)"
+            signature: "addItem(QLayoutItem *, int, int, int, int, Qt::Alignment)"
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
@@ -6953,6 +6468,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.widgets.QGridLayout$ItemInfo"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtWidgets::QGridLayout$ItemInfo::newInstance(%env, %2, %3, %4, %5);"}
@@ -6970,6 +6486,38 @@ TypeSystem{
     
     ObjectType{
         name: "QFormLayout"
+        ValueType{
+            name: "TakeRowResult"
+            ModifyField{
+                name: "labelItem"
+                read: true
+                write: false
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+            ModifyField{
+                name: "fieldItem"
+                read: true
+                write: false
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        EnumType{
+            name: "FieldGrowthPolicy"
+        }
+
+        EnumType{
+            name: "ItemRole"
+        }
+
+        EnumType{
+            name: "RowWrapPolicy"
+        }
         ModifyFunction{
             signature: "itemAt(int) const"
             ModifyArgument{
@@ -6980,6 +6528,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "itemAt(int,QFormLayout::ItemRole) const"
+            ModifyArgument{
+                index: "return"
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ExtraIncludes{
             Include{
                 fileName: "utils_p.h"
@@ -7050,6 +6607,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.widgets.QFormLayout$ItemInfo"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtWidgets::QFormLayout$ItemInfo::newInstance(%env, %2, qtjambi_cast<jobject>(%env, %3));"}
@@ -7083,6 +6641,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.widgets.QFormLayout$ItemInfo"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtWidgets::QFormLayout$ItemInfo::newInstance(%env, %2, qtjambi_cast<jobject>(%env, %3));"}
@@ -7116,6 +6675,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.widgets.QFormLayout$ItemInfo"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtWidgets::QFormLayout$ItemInfo::newInstance(%env, %2, qtjambi_cast<jobject>(%env, %3));"}
@@ -7660,6 +7220,24 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "itemAt(QPoint)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "itemAt(int,int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -7674,12 +7252,6 @@ TypeSystem{
         ModifyFunction{
             signature: "open(QObject*,const char*)"
             threadAffinity: true
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -7687,12 +7259,12 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getInt(QWidget*,const QString &,const QString &,int,int,int,int,bool*,QFlags<Qt::WindowType>)"
+            signature: "getInt(QWidget*,const QString &,const QString &,int,int,int,int,bool*,Qt::WindowFlags)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Integer"
+                    modifiedType: "java.lang.@Nullable Integer"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -7711,12 +7283,12 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, QFlags<Qt::WindowType>)"
+            signature: "getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, Qt::WindowFlags)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Double"
+                    modifiedType: "java.lang.@Nullable Double"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -7736,12 +7308,12 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, QFlags<Qt::WindowType>, double)"
+            signature: "getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, Qt::WindowFlags, double)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Double"
+                    modifiedType: "java.lang.@Nullable Double"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -7760,12 +7332,12 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getItem(QWidget*,QString,QString,QStringList,int,bool,bool*,QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)"
+            signature: "getItem(QWidget*,QString,QString,QStringList,int,bool,bool*,Qt::WindowFlags,Qt::InputMethodHints)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "java.lang.@Nullable String"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -7784,12 +7356,12 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getText(QWidget *, const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *, QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)"
+            signature: "getText(QWidget *, const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *, Qt::WindowFlags,Qt::InputMethodHints)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "java.lang.@Nullable String"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -7808,12 +7380,12 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getMultiLineText(QWidget *, const QString &, const QString &, const QString &, bool *, QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)"
+            signature: "getMultiLineText(QWidget *, const QString &, const QString &, const QString &, bool *, Qt::WindowFlags,Qt::InputMethodHints)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.String"
+                    modifiedType: "java.lang.@Nullable String"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -8052,11 +7624,56 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setActivePanel(QGraphicsItem*)"
+            signature: "setActivePanel(QGraphicsItem*)"
+            threadAffinity: true
+            ModifyArgument{
+                index: 1
+                threadAffinity: true
+                DefineOwnership{
+                    codeClass: CodeClass.Java
+                    ownership: Ownership.Cpp
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "addItem(QGraphicsItem *)"
+            threadAffinity: true
+            ModifyArgument{
+                index: 1
+                threadAffinity: true
+                DefineOwnership{
+                    codeClass: CodeClass.Java
+                    ownership: Ownership.Cpp
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "addEllipse(qreal,qreal,qreal,qreal, const QPen &, const QBrush &)"
+            threadAffinity: true
+            ModifyArgument{
+                index: "return"
+                DefineOwnership{
+                    codeClass: CodeClass.Java
+                    ownership: Ownership.Cpp
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "addEllipse(const QRectF &, const QPen &, const QBrush &)"
+            threadAffinity: true
+            ModifyArgument{
+                index: "return"
+                DefineOwnership{
+                    codeClass: CodeClass.Java
+                    ownership: Ownership.Cpp
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "addLine(qreal,qreal,qreal,qreal, const QPen &)"
             threadAffinity: true
             ModifyArgument{
-                index: 1
-                threadAffinity: true
+                index: "return"
                 DefineOwnership{
                     codeClass: CodeClass.Java
                     ownership: Ownership.Cpp
@@ -8064,11 +7681,10 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addItem(QGraphicsItem *)"
+            signature: "addLine(const QLineF &, const QPen &)"
             threadAffinity: true
             ModifyArgument{
-                index: 1
-                threadAffinity: true
+                index: "return"
                 DefineOwnership{
                     codeClass: CodeClass.Java
                     ownership: Ownership.Cpp
@@ -8076,7 +7692,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addEllipse(const QRectF &, const QPen &, const QBrush &)"
+            signature: "addPath(const QPainterPath &, const QPen &, const QBrush &)"
             threadAffinity: true
             ModifyArgument{
                 index: "return"
@@ -8087,7 +7703,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addLine(const QLineF &, const QPen &)"
+            signature: "addPixmap(const QPixmap &)"
             threadAffinity: true
             ModifyArgument{
                 index: "return"
@@ -8098,7 +7714,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addPath(const QPainterPath &, const QPen &, const QBrush &)"
+            signature: "addPolygon(const QPolygonF &, const QPen &, const QBrush &)"
             threadAffinity: true
             ModifyArgument{
                 index: "return"
@@ -8109,7 +7725,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addPixmap(const QPixmap &)"
+            signature: "addRect(qreal,qreal,qreal,qreal, const QPen &, const QBrush &)"
             threadAffinity: true
             ModifyArgument{
                 index: "return"
@@ -8120,7 +7736,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addPolygon(const QPolygonF &, const QPen &, const QBrush &)"
+            signature: "addRect(const QRectF &, const QPen &, const QBrush &)"
             threadAffinity: true
             ModifyArgument{
                 index: "return"
@@ -8131,7 +7747,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addRect(const QRectF &, const QPen &, const QBrush &)"
+            signature: "addSimpleText(const QString &, const QFont &)"
             threadAffinity: true
             ModifyArgument{
                 index: "return"
@@ -8153,7 +7769,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addWidget(QWidget*,QFlags<Qt::WindowType>)"
+            signature: "addWidget(QWidget*,Qt::WindowFlags)"
             threadAffinity: true
             ModifyArgument{
                 index: "return"
@@ -8170,6 +7786,51 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "activePanel()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "focusItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "mouseGrabberItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "itemAt(QPointF,QTransform)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "itemAt(qreal,qreal,QTransform)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "removeItem(QGraphicsItem*)"
             threadAffinity: true
@@ -8209,67 +7870,6 @@ TypeSystem{
                 }
             }
         }
-        ExtraIncludes{
-            Include{
-                fileName: "io.qt.core.*"
-                location: Include.Java
-            }
-            Include{
-                fileName: "io.qt.gui.*"
-                location: Include.Java
-            }
-        }
-        InjectCode{
-            ImportFile{
-                name: ":/io/qtjambi/generator/typesystem/QtJambiWidgets.java"
-                quoteAfterLine: "class QGraphicsScene___"
-                quoteBeforeLine: "}// class"
-            }
-        }
-        ModifyFunction{
-            signature: "addEllipse(const QRectF &, const QPen &, const QBrush &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addEllipse(qreal, qreal, qreal, qreal, const QPen &, const QBrush &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addLine(const QLineF &, const QPen &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addLine(qreal, qreal, qreal, qreal, const QPen &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addPath(const QPainterPath &, const QPen &, const QBrush &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addPixmap(const QPixmap &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addPolygon(const QPolygonF &, const QPen &, const QBrush &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addRect(const QRectF &, const QPen &, const QBrush &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addRect(qreal, qreal, qreal, qreal, const QPen &, const QBrush &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addSimpleText(const QString &, const QFont &)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "addText(const QString &, const QFont &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*,QWidget*)"
             ModifyArgument{
@@ -8433,7 +8033,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setCurrentItem(QTreeWidgetItem*,int,QFlags<QItemSelectionModel::SelectionFlag>)"
+            signature: "setCurrentItem(QTreeWidgetItem*,int,QItemSelectionModel::SelectionFlags)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
@@ -8624,10 +8224,6 @@ TypeSystem{
     ObjectType{
         name: "QTableWidgetItem"
         threadAffinity: "%1->tableWidget()"
-        ModifyFunction{
-            signature: "operator=(const QTableWidgetItem&)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "clone() const"
             ModifyArgument{
@@ -8737,34 +8333,6 @@ TypeSystem{
     ObjectType{
         name: "QListWidgetItem"
         threadAffinity: "%1->listWidget()"
-        ModifyFunction{
-            signature: "operator<(QListWidgetItem)const"
-            access: Modification.Private
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-            }
-        }
-        ModifyFunction{
-            signature: "read(QDataStream&)"
-            access: Modification.Protected
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-            }
-        }
-        ModifyFunction{
-            signature: "write(QDataStream&)const"
-            access: Modification.Protected
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-            }
-        }
-        ModifyFunction{
-            signature: "operator=(const QListWidgetItem&)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "QListWidgetItem(const QListWidgetItem &)"
             remove: RemoveFlag.All
@@ -8857,46 +8425,25 @@ TypeSystem{
         }
     }
     
-    ObjectType{
+    ValueType{
         name: "QTreeWidgetItem"
         implementing: "Iterable<io.qt.widgets.QTreeWidgetItem>"
         threadAffinity: "%1->treeWidget() ? %1->treeWidget()->model() : nullptr"
-        ModifyFunction{
-            signature: "operator<(QTreeWidgetItem)const"
-            access: Modification.Private
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-            }
-        }
-        ModifyFunction{
-            signature: "read(QDataStream&)"
-            access: Modification.Protected
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-            }
-        }
-        ModifyFunction{
-            signature: "write(QDataStream&)const"
-            access: Modification.Protected
-            ModifyArgument{
-                index: 1
-                invalidateAfterUse: true
-            }
+
+        Rejection{enumName: "ItemType"}
+        Rejection{functionName: "treeModel"}
+
+        EnumType{
+            name: "ChildIndicatorPolicy"
         }
         ModifyFunction{
-            signature: "operator=(const QTreeWidgetItem&)"
+            signature: "QTreeWidgetItem(const QTreeWidgetItem &)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
             signature: "type()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "QTreeWidgetItem(const QTreeWidgetItem &)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "QTreeWidgetItem(QTreeWidget *,int)"
             ModifyArgument{
@@ -9262,7 +8809,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setCurrentItem(QListWidgetItem*,QFlags<QItemSelectionModel::SelectionFlag>)"
+            signature: "setCurrentItem(QListWidgetItem*,QItemSelectionModel::SelectionFlags)"
             ModifyArgument{
                 index: 1
                 ReferenceCount{
@@ -9357,32 +8904,64 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "addItem(const QString &)"
-            remove: RemoveFlag.All
+            signature: "currentItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
         }
         ModifyFunction{
-            signature: "addItems(const QStringList &)"
-            remove: RemoveFlag.All
+            signature: "item(int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
         }
         ModifyFunction{
-            signature: "insertItem(int, const QString &)"
-            remove: RemoveFlag.All
+            signature: "itemAt(QPoint)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
         }
         ModifyFunction{
-            signature: "insertItems(int, const QStringList &)"
-            remove: RemoveFlag.All
+            signature: "itemAt(int,int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
         }
-        InjectCode{
-            ImportFile{
-                name: ":/io/qtjambi/generator/typesystem/QtJambiWidgets.java"
-                quoteAfterLine: "class QListWidget___"
-                quoteBeforeLine: "}// class"
+        ModifyFunction{
+            signature: "itemFromIndex(QModelIndex)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
             }
         }
     }
     
     ObjectType{
         name: "QWidget"
+
+        Rejection{functionName: "create"}
+        Rejection{functionName: "destroy"}
+        Rejection{functionName: "find"}
+        Rejection{functionName: "handle"}
+        Rejection{functionName: "styleChange"}
+        Rejection{functionName: "internalWinId"}
+        EnumType{
+            name: "RenderFlag"
+        }
         ExtraIncludes{
             Include{
                 fileName: "QIcon"
@@ -9693,7 +9272,7 @@ TypeSystem{
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "setParent(QWidget *, QFlags<Qt::WindowType>)"
+            signature: "setParent(QWidget *, Qt::WindowFlags)"
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
@@ -9837,19 +9416,19 @@ TypeSystem{
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "setWindowFlags(QFlags<Qt::WindowType>)"
+            signature: "setWindowFlags(Qt::WindowFlags)"
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "setWindowState(QFlags<Qt::WindowState>)"
+            signature: "setWindowState(Qt::WindowStates)"
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "overrideWindowState(QFlags<Qt::WindowState>)"
+            signature: "overrideWindowState(Qt::WindowStates)"
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "createWindowContainer(QWindow *, QWidget *, QFlags<Qt::WindowType>)"
+            signature: "createWindowContainer(QWindow *, QWidget *, Qt::WindowFlags)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
@@ -10107,7 +9686,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "render(QPaintDevice *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"
+            signature: "render(QPaintDevice *, const QPoint &, const QRegion &, QWidget::RenderFlags)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 4
@@ -10117,7 +9696,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "render(QPainter *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"
+            signature: "render(QPainter *, const QPoint &, const QRegion &, QWidget::RenderFlags)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 4
@@ -10168,7 +9747,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setParent(QWidget*,QFlags<Qt::WindowType>)"
+            signature: "setParent(QWidget*,Qt::WindowFlags)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 1
@@ -10281,6 +9860,26 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "addAction<Args...,>(QIcon,QString,QKeySequence,Args&&)"
+            remove: RemoveFlag.All
+            since: 6.3
+        }
+        ModifyFunction{
+            signature: "addAction<Args...,>(QString,QKeySequence,Args&&)"
+            remove: RemoveFlag.All
+            since: 6.3
+        }
+        ModifyFunction{
+            signature: "addAction<Args...,>(QIcon,QString,Args&&)"
+            remove: RemoveFlag.All
+            since: 6.3
+        }
+        ModifyFunction{
+            signature: "addAction<Args...,>(QString,Args&&)"
+            remove: RemoveFlag.All
+            since: 6.3
+        }
         ModifyFunction{
             signature: "addAction(QString)"
             threadAffinity: Affinity.UI
@@ -10395,7 +9994,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "grabGesture(Qt::GestureType, QFlags<Qt::GestureFlag>)"
+            signature: "grabGesture(Qt::GestureType, Qt::GestureFlags)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 2
@@ -10429,7 +10028,7 @@ TypeSystem{
                 index: 1
                 rename: "margins"
                 ReplaceType{
-                    modifiedType: "int[]"
+                    modifiedType: "int @NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -10536,7 +10135,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "QMessageBox(QString,QString,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)"
+            signature: "QMessageBox(QString,QString,QMessageBox::Icon,int,int,int,QWidget*,Qt::WindowFlags)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -10588,19 +10187,19 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "information(QWidget *, QString, QString, QFlags<QMessageBox::StandardButton>, QMessageBox::StandardButton)"
+            signature: "information(QWidget *, QString, QString, QMessageBox::StandardButtons, QMessageBox::StandardButton)"
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "question(QWidget *, QString, QString, QFlags<QMessageBox::StandardButton>, QMessageBox::StandardButton)"
+            signature: "question(QWidget *, QString, QString, QMessageBox::StandardButtons, QMessageBox::StandardButton)"
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "warning(QWidget *, QString, QString, QFlags<QMessageBox::StandardButton>, QMessageBox::StandardButton)"
+            signature: "warning(QWidget *, QString, QString, QMessageBox::StandardButtons, QMessageBox::StandardButton)"
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "critical(QWidget *, QString, QString, QFlags<QMessageBox::StandardButton>, QMessageBox::StandardButton)"
+            signature: "critical(QWidget *, QString, QString, QMessageBox::StandardButtons, QMessageBox::StandardButton)"
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
@@ -10621,81 +10220,39 @@ TypeSystem{
                 location: Include.Local
             }
         }
-        ModifyFunction{
-            signature: "setReadOnly(bool)"
-            threadAffinity: Affinity.UI
-        }
-        ModifyFunction{
-            signature: "setLineEdit(QLineEdit*)"
-            threadAffinity: Affinity.UI
-            ModifyArgument{
-                index: 1
-                ReferenceCount{
-                    action: ReferenceCount.Ignore
-                }
-                NoNullPointer{
-                }
-            }
+
+        EnumType{
+            name: "ButtonSymbols"
         }
-        InjectCode{
-            target: CodeClass.Java
-            position: Position.Beginning
-            Text{content: "@io.qt.QtUninvokable\n"+
-                          "protected final void initStyleOption(io.qt.widgets.QStyleOptionSpinBox option){\n"+
-                          "    if(this instanceof QDateTimeEdit){\n"+
-                          "        ((QDateTimeEdit)this)._initStyleOption(option);\n"+
-                          "        return;\n"+
-                          "    }\n"+
-                          "    _initStyleOption(option);\n"+
-                          "}"}
+
+        EnumType{
+            name: "CorrectionMode"
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionSpinBox*)const"
-            rename: "_initStyleOption"
-            access: Modification.Private
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionSpinBox"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionSpinBox* %out = qtjambi_cast<QStyleOptionSpinBox*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
+
+        EnumType{
+            name: "StepType"
+        }
+
+        EnumType{
+            name: "StepEnabledFlag"
+        }
+        ModifyFunction{
+            signature: "initStyleOption(QStyleOptionSpinBox*)const"
+            access: Modification.NonFinal
+        }
+        ModifyFunction{
+            signature: "setReadOnly(bool)"
+            threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "fixup(QString&)const"
+            signature: "setLineEdit(QLineEdit*)"
+            threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jstring %out = qtjambi_cast<jstring>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QString %out = qtjambi_cast<QString>(%env, %in);"}
-                }
-            }
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jstring %out = qtjambi_cast<jstring>(%env, __qt_%1);"}
+                ReferenceCount{
+                    action: ReferenceCount.Ignore
                 }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "%1 = qtjambi_cast<QString>(%env, %in);"}
+                NoNullPointer{
                 }
             }
         }
@@ -10706,6 +10263,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.gui.QValidator$QValidationData"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Shell
                     InsertTemplate{
@@ -10773,6 +10331,14 @@ TypeSystem{
                 }
             }
         }
+        InjectCode{
+            target: CodeClass.Java
+            ImportFile{
+                name: ":/io/qtjambi/generator/typesystem/QtJambiWidgets.java"
+                quoteAfterLine: "class QAbstractSpinBox___"
+                quoteBeforeLine: "}// class"
+            }
+        }
     }
     
     
@@ -10848,23 +10414,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionTabWidgetFrame*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionTabWidgetFrame"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionTabWidgetFrame* %out = qtjambi_cast<QStyleOptionTabWidgetFrame*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -10890,46 +10439,10 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionSpinBox*)const"
-            rename: "_initStyleOption"
-            access: Modification.Friendly
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionSpinBox"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionSpinBox* %out = qtjambi_cast<QStyleOptionSpinBox*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
         name: "QSlider"
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionSlider*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionSlider"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionSlider* %out = qtjambi_cast<QStyleOptionSlider*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -11015,34 +10528,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "picture()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QPicture"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-            until: [5, 14]
-        }
-        ModifyFunction{
-            signature: "pixmap()const"
-            ModifyArgument{
-                index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QPixmap"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-            until: [5, 14]
-        }
         ModifyFunction{
             signature: "picture()const"
             remove: RemoveFlag.All
@@ -11081,14 +10566,13 @@ TypeSystem{
         }
     }
     
-    FunctionalType{
-        name: "QFileDialog::FileContentHandler"
-        generate: false
-        using: "std::function<void(const QString&,const QByteArray&)>"
-    }
-    
     ObjectType{
         name: "QFileDialog"
+        FunctionalType{
+            name: "FileContentHandler"
+            generate: false
+            using: "std::function<void(const QString&,const QByteArray&)>"
+        }
         ExtraIncludes{
             Include{
                 fileName: "QUrl"
@@ -11129,12 +10613,6 @@ TypeSystem{
         ModifyFunction{
             signature: "open(QObject*,const char*)"
             threadAffinity: true
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
             InjectCode{
                 target: CodeClass.Java
                 position: Position.Beginning
@@ -11142,7 +10620,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getExistingDirectory(QWidget*,QString,QString,QFlags<QFileDialog::Option>)"
+            signature: "getExistingDirectory(QWidget*,QString,QString,QFileDialog::Options)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
@@ -11153,7 +10631,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getExistingDirectoryUrl(QWidget*,QString,QUrl,QFlags<QFileDialog::Option>,QStringList)"
+            signature: "getExistingDirectoryUrl(QWidget*,QString,QUrl,QFileDialog::Options,QStringList)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 0
@@ -11164,7 +10642,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getOpenFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"
+            signature: "getOpenFileName(QWidget*,QString,QString,QString,QString*,QFileDialog::Options)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 5
@@ -11179,7 +10657,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QFileDialog$Result<java.lang.String>"
+                    modifiedType: "io.qt.widgets.QFileDialog$@NonNull Result<java.lang.@NonNull String>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -11190,7 +10668,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getOpenFileNames(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"
+            signature: "getOpenFileNames(QWidget*,QString,QString,QString,QString*,QFileDialog::Options)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 5
@@ -11205,7 +10683,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QFileDialog$Result<java.util.List<java.lang.String>>"
+                    modifiedType: "io.qt.widgets.QFileDialog$@NonNull Result<io.qt.core.@NonNull QStringList>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -11216,7 +10694,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getSaveFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"
+            signature: "getSaveFileName(QWidget*,QString,QString,QString,QString*,QFileDialog::Options)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 5
@@ -11231,7 +10709,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QFileDialog$Result<java.lang.String>"
+                    modifiedType: "io.qt.widgets.QFileDialog$@NonNull Result<java.lang.@NonNull String>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -11242,7 +10720,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getOpenFileUrl(QWidget*,QString,QUrl,QString,QString*,QFlags<QFileDialog::Option>,QStringList)"
+            signature: "getOpenFileUrl(QWidget*,QString,QUrl,QString,QString*,QFileDialog::Options,QStringList)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 5
@@ -11257,7 +10735,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QFileDialog$Result<io.qt.core.QUrl>"
+                    modifiedType: "io.qt.widgets.QFileDialog$@NonNull Result<io.qt.core.@NonNull QUrl>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -11268,7 +10746,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getOpenFileUrls(QWidget*,QString,QUrl,QString,QString*,QFlags<QFileDialog::Option>,QStringList)"
+            signature: "getOpenFileUrls(QWidget*,QString,QUrl,QString,QString*,QFileDialog::Options,QStringList)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 5
@@ -11283,7 +10761,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QFileDialog$Result<java.util.List<io.qt.core.QUrl>>"
+                    modifiedType: "io.qt.widgets.QFileDialog$@NonNull Result<io.qt.core.@NonNull QList<io.qt.core.@NonNull QUrl>>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -11294,7 +10772,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "getSaveFileUrl(QWidget*,QString,QUrl,QString,QString*,QFlags<QFileDialog::Option>,QStringList)"
+            signature: "getSaveFileUrl(QWidget*,QString,QUrl,QString,QString*,QFileDialog::Options,QStringList)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 5
@@ -11309,7 +10787,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QFileDialog$Result<io.qt.core.QUrl>"
+                    modifiedType: "io.qt.widgets.QFileDialog$@NonNull Result<io.qt.core.@NonNull QUrl>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -11328,7 +10806,7 @@ TypeSystem{
                     expression: "null"
                 }
                 ReplaceType{
-                    modifiedType: "java.util.function.BiConsumer<String,io.qt.core.QByteArray>"
+                    modifiedType: "java.util.function.BiConsumer<@NonNull String,io.qt.core.@NonNull QByteArray>"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -11337,7 +10815,7 @@ TypeSystem{
                                   "    JObjectWrapper wrapper(%env, %in);\n"+
                                   "    %out = [wrapper](const QString& value1,const QByteArray& value2){\n"+
                                   "                        if(JniEnvironment env{200}){\n"+
-                                  "                            jobject _value1 = qtjambi_cast<jobject>(env, value1);\n"+
+                                  "                            jstring _value1 = qtjambi_cast<jstring>(env, value1);\n"+
                                   "                            jobject _value2 = qtjambi_cast<jobject>(env, value2);\n"+
                                   "                            Java::Runtime::BiConsumer::accept(env, wrapper.object(), _value1, _value2);\n"+
                                   "                        }\n"+
@@ -11378,6 +10856,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "iconProvider()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -11404,6 +10891,26 @@ TypeSystem{
                 location: Include.Global
             }
         }
+
+        EnumType{
+            name: "Shape"
+        }
+
+        EnumType{
+            name: "SelectionBehavior"
+        }
+
+        EnumType{
+            name: "ButtonPosition"
+        }
+        ModifyFunction{
+            signature: "initStyleOption(QStyleOptionTab*,int)const"
+            ModifyArgument{
+                index: 1
+                invalidateAfterUse: true
+            }
+            since: 6
+        }
         ModifyFunction{
             signature: "setTabButton(int,QTabBar::ButtonPosition,QWidget*)"
             threadAffinity: Affinity.UI
@@ -11414,65 +10921,14 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionTab*,int)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionTab"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionTab* %out = qtjambi_cast<QStyleOptionTab*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
         name: "QRadioButton"
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionButton*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionButton"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionButton* %out = qtjambi_cast<QStyleOptionButton*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
         name: "QScrollBar"
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionSlider*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionSlider"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionSlider* %out = qtjambi_cast<QStyleOptionSlider*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -11483,7 +10939,7 @@ TypeSystem{
             threadAffinity: Affinity.UI
         }
         ModifyFunction{
-            signature: "addScrollBarWidget(QWidget*,QFlags<Qt::AlignmentFlag>)"
+            signature: "addScrollBarWidget(QWidget*,Qt::Alignment)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 1
@@ -11621,23 +11077,6 @@ TypeSystem{
             rename: "setRubberBandGeometry"
             threadAffinity: Affinity.UI
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionRubberBand*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionRubberBand"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionRubberBand* %out = qtjambi_cast<QStyleOptionRubberBand*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -11759,7 +11198,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setCurrentItem(QTableWidgetItem*,QFlags<QItemSelectionModel::SelectionFlag>)"
+            signature: "setCurrentItem(QTableWidgetItem*,QItemSelectionModel::SelectionFlags)"
             threadAffinity: Affinity.UI
             ModifyArgument{
                 index: 1
@@ -11880,6 +11319,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.widgets.QSplitter$Range"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtWidgets::QSplitter$Range::newInstance(%env, %2, %3);"}
@@ -11890,23 +11330,6 @@ TypeSystem{
     
     ObjectType{
         name: "QGroupBox"
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionGroupBox*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionGroupBox"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionGroupBox* %out = qtjambi_cast<QStyleOptionGroupBox*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -11963,23 +11386,6 @@ TypeSystem{
     
     ObjectType{
         name: "QDial"
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionSlider*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionSlider"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionSlider* %out = qtjambi_cast<QStyleOptionSlider*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -12041,23 +11447,6 @@ TypeSystem{
                 location: Include.Global
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionFrame*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionFrame"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionFrame* %out = qtjambi_cast<QStyleOptionFrame*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -12144,23 +11533,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionDockWidget*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionDockWidget"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionDockWidget* %out = qtjambi_cast<QStyleOptionDockWidget*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -12169,23 +11541,6 @@ TypeSystem{
     
     ObjectType{
         name: "QFrame"
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionFrame*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionFrame"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionFrame* %out = qtjambi_cast<QStyleOptionFrame*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -12257,6 +11612,16 @@ TypeSystem{
     
     ObjectType{
         name: "QToolBar"
+        ModifyFunction{
+            signature: "addAction<Func1>(QString,Func1)"
+            remove: RemoveFlag.All
+            until: 6.3
+        }
+        ModifyFunction{
+            signature: "addAction<Func1>(QIcon,QString,Func1)"
+            remove: RemoveFlag.All
+            until: 6.3
+        }
         ModifyFunction{
             signature: "addAction(QAction *)"
             remove: RemoveFlag.All
@@ -12333,23 +11698,6 @@ TypeSystem{
             }
             until: [6, 2]
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionToolBar*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionToolBar"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionToolBar* %out = qtjambi_cast<QStyleOptionToolBar*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
         InjectCode{
             until: [6, 2]
             InsertTemplate{
@@ -12556,24 +11904,7 @@ TypeSystem{
             until: 5
         }
         ModifyFunction{
-            signature: "initStyleOption(QStyleOptionComboBox*)const"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionComboBox"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionComboBox* %out = qtjambi_cast<QStyleOptionComboBox*>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "findData(const QVariant&,int,QFlags<Qt::MatchFlag>)const"
+            signature: "findData(const QVariant&,int,Qt::MatchFlags)const"
             ModifyArgument{
                 index: 3
                 ReplaceDefaultExpression{
@@ -12582,7 +11913,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "findText(const QString&,QFlags<Qt::MatchFlag>)const"
+            signature: "findText(const QString&,Qt::MatchFlags)const"
             ModifyArgument{
                 index: 2
                 ReplaceDefaultExpression{
@@ -12730,6 +12061,15 @@ TypeSystem{
     
     ObjectType{
         name: "QApplication"
+        EnumType{
+            name: "ColorSpec"
+        }
+
+        Rejection{functionName: "compressEvent"}
+        Rejection{
+            functionName: "nativeInterface"
+            since: [6, 2]
+        }
         ExtraIncludes{
             Include{
                 fileName: "QBasicTimer"
@@ -12854,7 +12194,7 @@ TypeSystem{
             ModifyArgument{
                 index: 2
                 ReplaceType{
-                    modifiedType: "java.lang.String[]"
+                    modifiedType: "java.lang.@Nullable String @Nullable[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -12895,43 +12235,13 @@ TypeSystem{
                           "    return %FUNCTION_NAME(%PRE_CALL_ARGUMENTS %COMMA className == null ? null : className.data());\n"+
                           "}"}
         }
-        ModifyFunction{
-            signature: "font(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
         ModifyFunction{
             signature: "setFont(QFont,const char*)"
             threadAffinity: Affinity.UI
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
-        }
-        ModifyFunction{
-            signature: "palette(const char*)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
         }
         ModifyFunction{
             signature: "setPalette(QPalette,const char*)"
             threadAffinity: Affinity.UI
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "java.lang.String"
-                }
-            }
         }
         ModifyFunction{
             signature: "notify(QObject *, QEvent *)"
@@ -12950,12 +12260,15 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "<QNativeInterface extends io.qt.QtObjectInterface> QNativeInterface"
+                    modifiedType: "<QNativeInterface extends @Nullable QtObjectInterface> QNativeInterface"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
-                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObject(%env, %in, %1, false, false);\n"+
-                                  "CoreAPI::registerDependency(%env, %out, __this_nativeId);"}
+                    Text{content: "jobject %out = QtJambiAPI::convertNativeToJavaObjectAsWrapper(%env, %in, %1);"}
+                }
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Dependent
                 }
             }
             ModifyArgument{
@@ -12998,6 +12311,15 @@ TypeSystem{
     
     ObjectType{
         name: "QFileSystemModel"
+        EnumType{
+            name: "Roles"
+            until: 5
+        }
+        EnumType{
+            name: "Option"
+            since: [5, 14]
+            until: 5
+        }
         ModifyFunction{
             signature: "setIconProvider(QFileIconProvider*)"
             ModifyArgument{
@@ -13008,33 +12330,16 @@ TypeSystem{
                 }
             }
         }
-        until: 5
-    }
-    
-    EnumType{
-        name: "QFileSystemModel::Roles"
-        until: 5
-    }
-    
-    EnumType{
-        name: "QFileSystemModel::Option"
-        flags: "QFileSystemModel::Options"
-        since: [5, 14]
-        until: 5
-    }
-    
-    ValueType{
-        name: "QFormLayout::TakeRowResult"
-        ModifyField{
-            name: "labelItem"
-            read: true
-            write: false
-        }
-        ModifyField{
-            name: "fieldItem"
-            read: true
-            write: false
+        ModifyFunction{
+            signature: "iconProvider()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
         }
+        until: 5
     }
     
     ObjectType{
@@ -13047,7 +12352,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addItem(QGraphicsLayoutItem*,int,int,QFlags<Qt::AlignmentFlag>)"
+            signature: "addItem(QGraphicsLayoutItem*,int,int,Qt::Alignment)"
             threadAffinity: true
             ModifyArgument{
                 index: 1
@@ -13059,7 +12364,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addItem(QGraphicsLayoutItem*,int,int,int,int,QFlags<Qt::AlignmentFlag>)"
+            signature: "addItem(QGraphicsLayoutItem*,int,int,int,int,Qt::Alignment)"
             threadAffinity: true
             ModifyArgument{
                 index: 1
@@ -13071,7 +12376,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setAlignment(QGraphicsLayoutItem*,QFlags<Qt::AlignmentFlag>)"
+            signature: "setAlignment(QGraphicsLayoutItem*,Qt::Alignment)"
             threadAffinity: true
             ModifyArgument{
                 index: 1
@@ -13118,6 +12423,15 @@ TypeSystem{
                               "QtJambi_LibraryUtilities.internal.setCppOwnership(%this);"}
             }
         }
+        ModifyFunction{
+            signature: "itemAt(int,int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -13208,7 +12522,7 @@ TypeSystem{
                 index: 1
                 rename: "margins"
                 ReplaceType{
-                    modifiedType: "double[]"
+                    modifiedType: "double @NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -13267,6 +12581,15 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "itemAt(int)const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     InterfaceType{
@@ -13363,7 +12686,7 @@ TypeSystem{
                 index: 1
                 rename: "margins"
                 ReplaceType{
-                    modifiedType: "double[]"
+                    modifiedType: "double @NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -13464,13 +12787,31 @@ TypeSystem{
                               "}"}
             }
         }
+        ModifyFunction{
+            signature: "graphicsItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "parentLayoutItem()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         InjectCode{
             target: CodeClass.JavaInterface
             Text{content: "/**\n"+
                           " * @see #getContentsMargins(double[])\n"+
                           " */\n"+
-                          "@io.qt.QtDeclaredFinal\n"+
-                          "@io.qt.QtUninvokable\n"+
+                          "@QtDeclaredFinal\n"+
+                          "@QtUninvokable\n"+
                           "public default io.qt.core.QMarginsF contentsMargins(){\n"+
                           "    double[] mrg = {0.0, 0.0, 0.0, 0.0};\n"+
                           "    getContentsMargins(mrg);\n"+
@@ -13525,7 +12866,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "setAlignment(QGraphicsLayoutItem*,QFlags<Qt::AlignmentFlag>)"
+            signature: "setAlignment(QGraphicsLayoutItem*,Qt::Alignment)"
             threadAffinity: true
             ModifyArgument{
                 index: 1
@@ -13603,7 +12944,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "addAnchors(QGraphicsLayoutItem *, QGraphicsLayoutItem *, QFlags<Qt::Orientation>)"
+            signature: "addAnchors(QGraphicsLayoutItem *, QGraphicsLayoutItem *, Qt::Orientations)"
             threadAffinity: true
             ModifyArgument{
                 index: 1
@@ -13870,7 +13211,7 @@ TypeSystem{
             threadAffinity: true
         }
         ModifyFunction{
-            signature: "setWindowFlags(QFlags<Qt::WindowType>)"
+            signature: "setWindowFlags(Qt::WindowFlags)"
             threadAffinity: true
         }
         ModifyFunction{
@@ -14101,7 +13442,7 @@ TypeSystem{
                 index: 1
                 rename: "margins"
                 ReplaceType{
-                    modifiedType: "double[]"
+                    modifiedType: "double @NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -14193,7 +13534,7 @@ TypeSystem{
                 index: 1
                 rename: "margins"
                 ReplaceType{
-                    modifiedType: "double[]"
+                    modifiedType: "double @NonNull[]"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -14237,49 +13578,41 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "initStyleOption(QStyleOption*)const"
+            signature: "setLayout(QGraphicsLayout*)"
+            threadAffinity: true
             ModifyArgument{
                 index: 1
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
+                threadAffinity: true
+                DefineOwnership{
+                    codeClass: CodeClass.Java
+                    ownership: Ownership.Cpp
                 }
             }
         }
         ModifyFunction{
-            signature: "paintWindowFrame(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)"
+            signature: "graphicsItem()const"
             ModifyArgument{
-                index: 2
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "const QStyleOptionGraphicsItem *%out = qtjambi_cast<QStyleOptionGraphicsItem *>(%env, %in);"}
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionGraphicsItem"
+            }
+        }
+        ModifyFunction{
+            signature: "layout()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    ownership: Ownership.Ignore
                 }
             }
         }
         ModifyFunction{
-            signature: "setLayout(QGraphicsLayout*)"
-            threadAffinity: true
+            signature: "parentLayoutItem()const"
             ModifyArgument{
-                index: 1
-                threadAffinity: true
+                index: 0
                 DefineOwnership{
-                    codeClass: CodeClass.Java
-                    ownership: Ownership.Cpp
+                    ownership: Ownership.Ignore
                 }
             }
         }
@@ -14385,6 +13718,13 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "initStyleOption(QStyleOptionViewItem*,QModelIndex)const"
+            ModifyArgument{
+                index: 1
+                invalidateAfterUse: true
+            }
+        }
         ModifyFunction{
             signature: "setItemEditorFactory(QItemEditorFactory*)"
             ModifyArgument{
@@ -14428,23 +13768,6 @@ TypeSystem{
                 invalidateAfterUse: true
             }
         }
-        ModifyFunction{
-            signature: "initStyleOption(QStyleOptionViewItem*,QModelIndex)const"
-            ModifyArgument{
-                index: 1
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOptionViewItem *%out = qtjambi_cast<QStyleOptionViewItem *>(%env, %in);"}
-                }
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOptionViewItem"
-                }
-            }
-        }
     }
     
     
@@ -14457,17 +13780,6 @@ TypeSystem{
                 invalidateAfterUse: true
                 NoNullPointer{
                 }
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QPicture"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPicture *%out = qtjambi_cast<QPicture *>(%env, %in);"}
-                }
             }
         }
     }
@@ -14512,24 +13824,6 @@ TypeSystem{
                 invalidateAfterUse: true
             }
         }
-        ModifyFunction{
-            signature: "sourcePixmap(Qt::CoordinateSystem, QPoint *, QGraphicsEffect::PixmapPadMode) const"
-            ModifyArgument{
-                index: 2
-                invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.core.QPoint"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QPoint *%out = qtjambi_cast<QPoint *>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -14659,7 +13953,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "grabGesture(Qt::GestureType, QFlags<Qt::GestureFlag>)"
+            signature: "grabGesture(Qt::GestureType, Qt::GestureFlags)"
             ModifyArgument{
                 index: 2
                 ReplaceDefaultExpression{
@@ -14678,17 +13972,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x4"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QMatrix4x4 *%out = qtjambi_cast<QMatrix4x4 *>(%env, %in);"}
-                }
             }
         }
     }
@@ -14700,17 +13983,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x4"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QMatrix4x4 *%out = qtjambi_cast<QMatrix4x4 *>(%env, %in);"}
-                }
             }
         }
     }
@@ -14722,17 +13994,6 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 invalidateAfterUse: true
-                ReplaceType{
-                    modifiedType: "io.qt.gui.QMatrix4x4"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QMatrix4x4 *%out = qtjambi_cast<QMatrix4x4 *>(%env, %in);"}
-                }
             }
         }
     }
@@ -14764,23 +14025,6 @@ TypeSystem{
                 }
             }
         }
-        ModifyFunction{
-            signature: "standardPixmap(QStyle::StandardPixmap, const QStyleOption *, const QWidget *) const"
-            ModifyArgument{
-                index: 2
-                ReplaceType{
-                    modifiedType: "io.qt.widgets.QStyleOption"
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Shell
-                    Text{content: "jobject %out = qtjambi_cast<jobject>(%env, %in);"}
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QStyleOption *%out = qtjambi_cast<QStyleOption *>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ObjectType{
@@ -14871,6 +14115,10 @@ TypeSystem{
         name: "QTreeWidgetItemIterator"
         implementing: "Iterable<io.qt.widgets.QTreeWidgetItem>, java.util.Iterator<io.qt.widgets.QTreeWidgetItem>"
         threadAffinity: "getPointerOwner(%1)"
+
+        EnumType{
+            name: "IteratorFlag"
+        }
         ExtraIncludes{
             Include{
                 fileName: "utils_p.h"
@@ -14881,10 +14129,6 @@ TypeSystem{
             signature: "QTreeWidgetItemIterator(QTreeWidgetItemIterator)"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QTreeWidgetItemIterator)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "operator++(int)"
             remove: RemoveFlag.All
@@ -14915,7 +14159,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "QTreeWidgetItemIterator(QTreeWidget *,QFlags<QTreeWidgetItemIterator::IteratorFlag>)"
+            signature: "QTreeWidgetItemIterator(QTreeWidget *,QTreeWidgetItemIterator::IteratorFlags)"
             ModifyArgument{
                 index: 1
                 NoNullPointer{
@@ -14931,7 +14175,7 @@ TypeSystem{
             }
         }
         ModifyFunction{
-            signature: "QTreeWidgetItemIterator(QTreeWidgetItem *,QFlags<QTreeWidgetItemIterator::IteratorFlag>)"
+            signature: "QTreeWidgetItemIterator(QTreeWidgetItem *,QTreeWidgetItemIterator::IteratorFlags)"
             InjectCode{
                 position: Position.Beginning
                 ArgumentMap{
@@ -14963,7 +14207,7 @@ TypeSystem{
             ModifyArgument{
                 index: "return"
                 ReplaceType{
-                    modifiedType: "io.qt.widgets.QTreeWidgetItem"
+                    modifiedType: "io.qt.widgets.@Nullable QTreeWidgetItem"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Native
@@ -15014,18 +14258,6 @@ TypeSystem{
     
     ValueType{
         name: "QScrollerProperties"
-        ModifyFunction{
-            signature: "operator=(QScrollerProperties)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "operator==(const QScrollerProperties&)const"
-            access: Modification.Private
-        }
-        ModifyFunction{
-            signature: "operator!=(const QScrollerProperties&)const"
-            access: Modification.Private
-        }
     }
     
     EnumType{
@@ -15056,17 +14288,11 @@ TypeSystem{
     
     NamespaceType{
         name: "QDrawBorderPixmap"
-        generate: false
-    }
-    
-    NamespaceType{
-        name: "QtDrawUtil"
-    }
-    
-    EnumType{
-        name: "QDrawBorderPixmap::DrawingHint"
-        flags: "QDrawBorderPixmap::DrawingHints"
-        javaScope: "QtDrawUtil"
+        javaName: "QtDrawUtil"
+
+        EnumType{
+            name: "DrawingHint"
+        }
     }
     
     GlobalFunction{
@@ -15304,4 +14530,6 @@ TypeSystem{
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QTileRules."}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QTableWidgetSelectionRange."}
     SuppressedWarning{text: "WARNING(JavaGenerator) :: No ==/!= operator found for value type QStyleOption."}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'hasEditFocus()const' for function modification in 'QWidget' not found. Possible candidates: "}
+    SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: signature 'setEditFocus(bool)' for function modification in 'QWidget' not found. Possible candidates: "}
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtWinExtras.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtWinExtras.qml
index 684755a3..cc41007d 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtWinExtras.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtWinExtras.qml
@@ -31,7 +31,7 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.winextras"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtWinExtras"
     module: "qtjambi.winextras"
     description: "Provides platform-specific APIs for Windows."
@@ -62,6 +62,10 @@ TypeSystem{
     
     NamespaceType{
         name: "QtWin"
+
+        EnumType{name: "HBitmapFormat"}
+        EnumType{name: "WindowFlip3DPolicy"}
+
         ModifyFunction{
             signature: "setWindowFlip3DPolicy(QWidget*,QtWin::WindowFlip3DPolicy)"
             ModifyArgument{
@@ -139,6 +143,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.winextras.QtWin$ColorizationColorInfo"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtWinExtras::QtWin$ColorizationColorInfo::newInstance(%env, qtjambi_cast<jobject>(%env, %in), jboolean(ok));"}
@@ -154,22 +159,6 @@ TypeSystem{
         }
     }
     
-    EnumType{
-        name: "QtWin::HBitmapFormat"
-    }
-    
-    EnumType{
-        name: "QWinJumpListCategory::Type"
-    }
-    
-    EnumType{
-        name: "QWinJumpListItem::Type"
-    }
-    
-    EnumType{
-        name: "QtWin::WindowFlip3DPolicy"
-    }
-    
     ObjectType{
         name: "QWinJumpList"
         ModifyFunction{
@@ -218,6 +207,7 @@ TypeSystem{
     
     ObjectType{
         name: "QWinJumpListCategory"
+        EnumType{name: "Type"}
         ModifyFunction{
             signature: "addItem(QWinJumpListItem*)"
             ModifyArgument{
@@ -239,6 +229,8 @@ TypeSystem{
     
     ObjectType{
         name: "QWinJumpListItem"
+
+        EnumType{name: "Type"}
     }
     
     
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtX11Extras.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtX11Extras.qml
index 83e32276..d7edff39 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtX11Extras.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtX11Extras.qml
@@ -31,19 +31,20 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.x11extras"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtX11Extras"
     module: "qtjambi.x11extras"
     description: "Provides platform-specific APIs for X11."
-
-    EnumType{
-        name: "QX11Info::PeekOption"
-        flags: "QX11Info::PeekOptions"
-        since: [5, 10]
-    }
     
     ObjectType{
         name: "QX11Info"
+
+        Rejection{className: "PeekerCallback"}
+
+        EnumType{
+            name: "PeekOption"
+            since: [5, 10]
+        }
     }
     
     Rejection{
@@ -58,10 +59,6 @@ TypeSystem{
         className: "QWaylandWindowFunctions::SetWindowSync"
     }
     
-    Rejection{
-        className: "QX11Info::PeekerCallback"
-    }
-    
     Rejection{
         className: "QXcbIntegrationFunctions::XEmbedSystemTrayVisualHasAlphaChannel"
     }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtXml.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtXml.qml
index 8dbcf462..115ac61c 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtXml.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtXml.qml
@@ -31,37 +31,13 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.xml"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtXml"
     module: "qtjambi.xml"
     description: "C++ implementations of SAX and DOM."
-    Rejection{
-        className: "QXmlAttributes::Attribute"
-    }
-    
-    Rejection{
-        className: "QDomNode"
-        fieldName: "impl"
-    }
-    
-    EnumType{
-        name: "QDomNode::NodeType"
-    }
-    
-    EnumType{
-        name: "QDomNode::EncodingPolicy"
-    }
-    
-    EnumType{
-        name: "QDomImplementation::InvalidDataPolicy"
-    }
     
     ValueType{
         name: "QDomAttr"
-        ModifyFunction{
-            signature: "operator=(QDomAttr)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "nodeType()const"
             remove: RemoveFlag.All
@@ -70,10 +46,6 @@ TypeSystem{
     
     ValueType{
         name: "QDomCDATASection"
-        ModifyFunction{
-            signature: "operator=(QDomCDATASection)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "nodeType()const"
             remove: RemoveFlag.All
@@ -82,10 +54,6 @@ TypeSystem{
     
     ValueType{
         name: "QDomCharacterData"
-        ModifyFunction{
-            signature: "operator=(QDomCharacterData)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "nodeType()const"
             remove: RemoveFlag.All
@@ -94,39 +62,30 @@ TypeSystem{
     
     ValueType{
         name: "QDomComment"
-        ModifyFunction{
-            signature: "operator=(QDomComment)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "nodeType()const"
             remove: RemoveFlag.All
         }
     }
-
-    EnumType{
-        name: "QDomDocument::ParseOption"
-        flags: "QDomDocument::ParseOptions"
-        since: [6,5]
-    }
-
-    ValueType{
-        name: "QDomDocument::ParseResult"
-        ModifyFunction{
-            signature: "operator bool() const"
-            rename: "success"
-        }
-        since: [6,5]
-    }
     
     ValueType{
         name: "QDomDocument"
-        ModifyFunction{
-            signature: "nodeType()const"
-            remove: RemoveFlag.All
+
+        EnumType{
+            name: "ParseOption"
+            since: [6,5]
+        }
+
+        ValueType{
+            name: "ParseResult"
+            ModifyFunction{
+                signature: "operator bool() const"
+                rename: "success"
+            }
+            since: [6,5]
         }
         ModifyFunction{
-            signature: "operator=(QDomDocument)"
+            signature: "nodeType()const"
             remove: RemoveFlag.All
         }
         InjectCode{
@@ -142,6 +101,28 @@ TypeSystem{
                 location: Include.Local
             }
         }
+        ModifyFunction{
+            signature: "setContent(QIODevice*, QDomDocument::ParseOptions)"
+            ModifyArgument{
+                index: 1
+                ReferenceCount{
+                    variableName: "__rcContent"
+                    action: ReferenceCount.Set
+                }
+            }
+            since: 6.5
+        }
+        ModifyFunction{
+            signature: "setContent(QXmlStreamReader*, QDomDocument::ParseOptions)"
+            ModifyArgument{
+                index: 1
+                ReferenceCount{
+                    variableName: "__rcContent"
+                    action: ReferenceCount.Set
+                }
+            }
+            since: 6.5
+        }
         ModifyFunction{
             signature: "setContent(QIODevice*, bool, QString*, int*, int*)"
             ModifyArgument{
@@ -186,6 +167,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QDomDocument$Result"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QDomDocument$Result::newInstance(%env, jboolean(%in), qtjambi_cast<jstring>(%env, errorMsg), errorLine, errorColumn);"}
@@ -236,6 +218,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QDomDocument$Result"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QDomDocument$Result::newInstance(%env, jboolean(%in), qtjambi_cast<jstring>(%env, errorMsg), errorLine, errorColumn);"}
@@ -286,6 +269,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QDomDocument$Result"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QDomDocument$Result::newInstance(%env, jboolean(%in), qtjambi_cast<jstring>(%env, errorMsg), errorLine, errorColumn);"}
@@ -337,6 +321,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QDomDocument$Result"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QDomDocument$Result::newInstance(%env, jboolean(%in), qtjambi_cast<jstring>(%env, errorMsg), errorLine, errorColumn);"}
@@ -381,6 +366,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QDomDocument$Result"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QDomDocument$Result::newInstance(%env, jboolean(%in), qtjambi_cast<jstring>(%env, errorMsg), errorLine, errorColumn);"}
@@ -424,6 +410,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QDomDocument$Result"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QDomDocument$Result::newInstance(%env, jboolean(%in), qtjambi_cast<jstring>(%env, errorMsg), errorLine, errorColumn);"}
@@ -467,6 +454,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QDomDocument$Result"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QDomDocument$Result::newInstance(%env, jboolean(%in), qtjambi_cast<jstring>(%env, errorMsg), errorLine, errorColumn);"}
@@ -511,6 +499,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QDomDocument$Result"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QDomDocument$Result::newInstance(%env, jboolean(%in), qtjambi_cast<jstring>(%env, errorMsg), errorLine, errorColumn);"}
@@ -562,6 +551,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QDomDocument$Result"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QDomDocument$Result::newInstance(%env, jboolean(%in), qtjambi_cast<jstring>(%env, errorMsg), errorLine, errorColumn);"}
@@ -577,10 +567,6 @@ TypeSystem{
             signature: "nodeType()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QDomDocumentFragment)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -589,10 +575,6 @@ TypeSystem{
             signature: "nodeType()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QDomDocumentType)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -601,10 +583,6 @@ TypeSystem{
             signature: "nodeType()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QDomEntity)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -613,33 +591,30 @@ TypeSystem{
             signature: "nodeType()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QDomEntityReference)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QDomImplementation"
-        ModifyFunction{
-            signature: "operator=(QDomImplementation)"
-            remove: RemoveFlag.All
+        EnumType{
+            name: "InvalidDataPolicy"
         }
     }
     
     ValueType{
         name: "QDomNamedNodeMap"
-        ModifyFunction{
-            signature: "operator=(QDomNamedNodeMap)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QDomNode"
-        ModifyFunction{
-            signature: "operator=(QDomNode)"
-            remove: RemoveFlag.All
+
+        Rejection{fieldName: "impl"}
+
+        EnumType{
+            name: "NodeType"
+        }
+
+        EnumType{
+            name: "EncodingPolicy"
         }
         ModifyFunction{
             signature: "attributes()const"
@@ -649,10 +624,6 @@ TypeSystem{
     
     ValueType{
         name: "QDomNodeList"
-        ModifyFunction{
-            signature: "operator=(const QDomNodeList &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -661,10 +632,6 @@ TypeSystem{
             signature: "nodeType()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QDomNotation)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -673,10 +640,6 @@ TypeSystem{
             signature: "nodeType()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(QDomProcessingInstruction)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -685,10 +648,6 @@ TypeSystem{
             signature: "nodeType()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "operator=(const QDomText &)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
@@ -697,6 +656,9 @@ TypeSystem{
     
     ValueType{
         name: "QXmlAttributes"
+        Rejection{
+            className: "Attribute"
+        }
         ModifyFunction{
             signature: "index(const QLatin1String&) const"
             Remove{
@@ -707,26 +669,10 @@ TypeSystem{
             Remove{
             }
         }
-        ModifyFunction{
-            signature: "operator=(const QXmlAttributes &)"
-            remove: RemoveFlag.All
-            since: [5, 12]
-        }
     }
     
-    ValueType{
+    ObjectType{
         name: "QXmlNamespaceSupport"
-        CustomConstructor{
-            Text{content: "QXmlNamespaceSupport *clone = new(placement) QXmlNamespaceSupport;\n"+
-                          "if(copy){\n"+
-                          "    clone->setPrefix(\"\", copy->uri(\"\"));\n"+
-                          "\n"+
-                          "    QStringList prefixes = copy->prefixes();\n"+
-                          "    for (int i=0; i<prefixes.size(); ++i)\n"+
-                          "        clone->setPrefix(prefixes.at(i), copy->uri(prefixes.at(i)));\n"+
-                          "}\n"+
-                          "return clone;"}
-        }
         InjectCode{
             ImportFile{
                 name: ":/io/qtjambi/generator/typesystem/QtJambiXml.java"
@@ -765,6 +711,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QXmlNamespaceSupport$ProcessedName"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QXmlNamespaceSupport$ProcessedName::newInstance(%env, qtjambi_cast<jstring>(%env, __qt_%3), qtjambi_cast<jstring>(%env, __qt_%4));"}
@@ -796,6 +743,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QXmlNamespaceSupport$SplitName"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "%out = Java::QtXml::QXmlNamespaceSupport$SplitName::newInstance(%env, qtjambi_cast<jstring>(%env, __qt_%2), qtjambi_cast<jstring>(%env, __qt_%3));"}
@@ -811,26 +759,22 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "operator=(QDomElement)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "setAttribute(const QString &, unsigned int)"
+            signature: "setAttribute(const QString &, uint)"
             Remove{
             }
         }
         ModifyFunction{
-            signature: "setAttribute(const QString &, unsigned long long)"
+            signature: "setAttribute(const QString &, qulonglong)"
             Remove{
             }
         }
         ModifyFunction{
-            signature: "setAttributeNS(const QString, const QString &, unsigned int)"
+            signature: "setAttributeNS(const QString, const QString &, uint)"
             Remove{
             }
         }
         ModifyFunction{
-            signature: "setAttributeNS(const QString, const QString &, unsigned long long)"
+            signature: "setAttributeNS(const QString, const QString &, qulonglong)"
             Remove{
             }
         }
@@ -894,6 +838,7 @@ TypeSystem{
                 ReplaceType{
                     modifiedType: "io.qt.xml.QXmlEntityResolver$ResolvedEntity"
                 }
+                NoNullPointer{}
                 ConversionRule{
                     codeClass: CodeClass.Native
                     Text{content: "jobject java_inputSource = qtjambi_cast<jobject>(%env, __qt_%3);\n"+
@@ -1125,11 +1070,23 @@ TypeSystem{
             }
             InjectCode{
                 target: CodeClass.Shell
-                ImportFile{
-                    name: ":/io/qtjambi/generator/typesystem/QtJambiXml.java"
-                    quoteAfterLine: "class QXmlReader_parse___"
-                    quoteBeforeLine: "}// class"
-                }
+                Text{content: String.raw`
+JniEnvironment __jni_env{300};
+jmethodID method_id = __shell_javaMethod(10);
+if(__jni_env && method_id) {
+    bool  __qt_return_value = false;
+    if(jobject __java_this = __shell()->getJavaObjectLocalRef(__jni_env)){
+        jobject __java_input0 = qtjambi_cast<jobject>(__jni_env, &input0);
+        QTJAMBI_INVALIDATE_AFTER_USE(__jni_env, __java_input0);
+        jboolean __java_return_value = __jni_env->CallBooleanMethod(__java_this, method_id, __java_input0);
+        JavaException::check(__jni_env QTJAMBI_STACKTRACEINFO );
+        __qt_return_value = bool(__java_return_value);
+    } else {
+        __shell()->warnForMethod("QXmlReader::parse(const QXmlInputSource& input)");
+    }
+    return __qt_return_value;
+}
+`}
             }
         }
         ModifyFunction{
@@ -1169,7 +1126,7 @@ TypeSystem{
             ModifyArgument{
                 index: 0
                 ReplaceType{
-                    modifiedType: "java.lang.Boolean"
+                    modifiedType: "java.lang.@Nullable Boolean"
                 }
                 ConversionRule{
                     codeClass: CodeClass.Shell
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/QtXmlPatterns.qml b/src/cpp/QtJambiGenerator/typesystem/qml/QtXmlPatterns.qml
index e31be05f..7512b654 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/QtXmlPatterns.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/QtXmlPatterns.qml
@@ -31,31 +31,11 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.xmlpatterns"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     qtLibrary: "QtXmlPatterns"
     module: "qtjambi.xmlpatterns"
     description: "Support for XPath, XQuery, XSLT and XML schema validation."
     
-    EnumType{
-        name: "QXmlNodeModelIndex::NodeKind"
-    }
-    
-    EnumType{
-        name: "QXmlNodeModelIndex::DocumentOrder"
-    }
-    
-    EnumType{
-        name: "QAbstractXmlNodeModel::NodeCopySetting"
-    }
-    
-    EnumType{
-        name: "QAbstractXmlNodeModel::SimpleAxis"
-    }
-    
-    EnumType{
-        name: "QXmlQuery::QueryLanguage"
-    }
-    
     ObjectType{
         name: "QAbstractMessageHandler"
     }
@@ -64,55 +44,26 @@ TypeSystem{
         name: "QAbstractUriResolver"
     }
     
-    
-    Rejection{
-        className: "QPatternist::NodeIndexStorage"
-    }
-    
-    Rejection{
-        className: "QAbstractXmlNodeModel"
-        functionName: "mapToItem"
-    }
-    
-    Rejection{
-        className: "QAbstractXmlNodeModel"
-        functionName: "mapToSequence"
-    }
-    
-    Rejection{
-        className: "QAbstractXmlNodeModel"
-        functionName: "sequencedTypedValue"
-    }
-    
-    Rejection{
-        className: "QAbstractXmlNodeModel"
-        functionName: "sendNamespaces"
-    }
-    
-    Rejection{
-        className: "QAbstractXmlNodeModel"
-        functionName: "iterate"
-    }
-    
-    Rejection{
-        className: "QAbstractXmlNodeModel"
-        functionName: "copyNodeTo"
-    }
-    
-    Rejection{
-        className: "QAbstractXmlNodeModel"
-        functionName: "type"
-    }
-    
     ObjectType{
         name: "QAbstractXmlNodeModel"
-        implementing: "java.lang.Cloneable"
+
+        Rejection{functionName: "mapToItem"}
+        Rejection{functionName: "mapToSequence"}
+        Rejection{functionName: "sequencedTypedValue"}
+        Rejection{functionName: "sendNamespaces"}
+        Rejection{functionName: "iterate"}
+        Rejection{functionName: "copyNodeTo"}
+        Rejection{functionName: "type"}
+
+        EnumType{name: "NodeCopySetting"}
+        EnumType{name: "SimpleAxis"}
+
         ModifyFunction{
-            signature: "createIndex(void *, long long) const"
+            signature: "createIndex(void *, qint64) const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "namespaceForPrefix(QXmlNodeModelIndex,short) const"
+            signature: "namespaceForPrefix(QXmlNodeModelIndex,qint16) const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -121,39 +72,20 @@ TypeSystem{
         }
     }
     
-    Rejection{
-        className: "QAbstractXmlReceiver"
-        functionName: "item"
-    }
-    
-    Rejection{
-        className: "QAbstractXmlReceiver"
-        functionName: "sendAsNode"
-    }
-    
-    Rejection{
-        className: "QAbstractXmlReceiver"
-        fieldName: "d_ptr"
-    }
-    
     ObjectType{
         name: "QAbstractXmlReceiver"
+
+        Rejection{functionName: "item"}
+        Rejection{functionName: "sendAsNode"}
+        Rejection{fieldName: "d_ptr"}
     }
     
     ValueType{
         name: "QSourceLocation"
-        ModifyFunction{
-            signature: "operator=(QSourceLocation)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QXmlSchema"
-        ModifyFunction{
-            signature: "operator=(const QXmlSchema&)"
-            remove: RemoveFlag.All
-        }
         ModifyFunction{
             signature: "setMessageHandler(QAbstractMessageHandler*)"
             ModifyArgument{
@@ -229,20 +161,12 @@ TypeSystem{
     
     ValueType{
         name: "QXmlItem"
-        ModifyFunction{
-            signature: "operator=(QXmlItem)"
-            remove: RemoveFlag.All
-        }
     }
     
     ValueType{
         name: "QXmlName"
         ModifyFunction{
-            signature: "operator=(QXmlName)"
-            remove: RemoveFlag.All
-        }
-        ModifyFunction{
-            signature: "QXmlName(short,short,short)"
+            signature: "QXmlName(qint16,qint16,qint16)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -270,77 +194,38 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setPrefix(const short)"
+            signature: "setPrefix(qint16)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setNamespaceURI(const short)"
+            signature: "setNamespaceURI(qint16)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "setLocalName(const short)"
+            signature: "setLocalName(qint16)"
             remove: RemoveFlag.All
         }
         ModifyFunction{
             signature: "code()const"
             remove: RemoveFlag.All
         }
-        ModifyFunction{
-            signature: "QXmlName(QXmlNamePool&,QString,QString,QString)"
-            ModifyArgument{
-                index: 1
-                ReplaceType{
-                    modifiedType: "io.qt.xmlpatterns.QXmlNamePool"
-                }
-                NoNullPointer{
-                }
-                ConversionRule{
-                    codeClass: CodeClass.Native
-                    Text{content: "QXmlNamePool& %out = qtjambi_cast<QXmlNamePool&>(%env, %in);"}
-                }
-            }
-        }
     }
     
     ValueType{
         name: "QXmlNamePool"
-        ModifyFunction{
-            signature: "operator=(QXmlNamePool)"
-            remove: RemoveFlag.All
-        }
-    }
-    
-    Rejection{
-        className: "QXmlNodeModelIndex"
-        functionName: "sequencedTypedValue"
-    }
-    
-    Rejection{
-        className: "QXmlNodeModelIndex"
-        functionName: "sendNamespaces"
-    }
-    
-    Rejection{
-        className: "QXmlNodeModelIndex"
-        functionName: "iterate"
-    }
-    
-    Rejection{
-        className: "QXmlNodeModelIndex"
-        functionName: "type"
-    }
-    
-    Rejection{
-        className: "QXmlNodeModelIndex"
-        enumName: "Axis"
     }
     
     ValueType{
         name: "QXmlNodeModelIndex"
-        ModifyFunction{
-            signature: "operator=(const QXmlNodeModelIndex &)"
-            remove: RemoveFlag.All
-        }
+
+        Rejection{functionName: "sequencedTypedValue"}
+        Rejection{functionName: "sendNamespaces"}
+        Rejection{functionName: "iterate"}
+        Rejection{functionName: "type"}
+        Rejection{enumName: "Axis"}
+
+        EnumType{name: "NodeKind"}
+        EnumType{name: "DocumentOrder"}
         ModifyFunction{
             signature: "name() const"
             remove: RemoveFlag.All
@@ -374,7 +259,7 @@ TypeSystem{
             remove: RemoveFlag.All
         }
         ModifyFunction{
-            signature: "namespaceForPrefix(short) const"
+            signature: "namespaceForPrefix(qint16) const"
             remove: RemoveFlag.All
         }
         ModifyFunction{
@@ -401,6 +286,8 @@ TypeSystem{
     
     ObjectType{
         name: "QXmlQuery"
+        EnumType{name: "QueryLanguage"}
+
         ModifyFunction{
             signature: "setFocus(QIODevice*)"
             ModifyArgument{
@@ -452,12 +339,9 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "operator=(const QXmlQuery &)"
-            rename: "set"
-            ModifyArgument{
-                index: 1
-                ReferenceCount{
-                    action: ReferenceCount.Ignore
-                }
+            Delegate{
+                name: "set"
+                deprecated: true
             }
         }
         ModifyFunction{
@@ -501,7 +385,7 @@ TypeSystem{
             ModifyArgument{
                 index: 1
                 ReplaceType{
-                    modifiedType: "java.util.Collection<java.lang.String>"
+                    modifiedType: "java.util.@Nullable Collection<java.lang.@NonNull String>"
                 }
                 NoNullPointer{
                 }
@@ -586,26 +470,27 @@ TypeSystem{
     
     ObjectType{
         name: "QSimpleXmlNodeModel"
-        implementing: "java.lang.Cloneable"
-        ModifyFunction{
-            signature: "namePool()const"
-            rename: "namePool_private"
-            access: Modification.Private
-        }
         ModifyFunction{
             signature: "namePool()const"
             ModifyArgument{
                 index: 0
-                ReplaceType{
-                    modifiedType: "io.qt.xmlpatterns.QXmlNamePool"
-                }
-                ConversionRule{
+                DefineOwnership{
                     codeClass: CodeClass.Native
-                    Text{content: "%out = QtJambiAPI::convertNativeToJavaObject(%env, &%in, \"io/qt/xmlpatterns/QXmlNamePool\", false);"}
+                    ownership: Ownership.Dependent
                 }
             }
         }
     }
+
+    Rejection{
+        className: "QPatternist::NodeIndexStorage"
+    }
+    Rejection{
+        className: "QPatternist::Item"
+    }
+    Rejection{
+        className: "QPatternist::NamePool"
+    }
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: horribly broken type ''"}
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: template baseclass 'QExplicitlySharedDataPointer<QXmlSerializer>' of 'QXmlSerializerPointer' is not known"}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml/ui4.qml b/src/cpp/QtJambiGenerator/typesystem/qml/ui4.qml
index 17bc979b..6fbc870e 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml/ui4.qml
+++ b/src/cpp/QtJambiGenerator/typesystem/qml/ui4.qml
@@ -31,9 +31,8 @@ import QtJambiGenerator 1.0
 
 TypeSystem{
     packageName: "io.qt.uic.ui4"
-    defaultSuperClass: "io.qt.QtObject"
+    defaultSuperClass: "QtObject"
     targetName: "QtJambiUIC"
-    noExports: true
     module: "qtjambi.uic"
     description: "QtJambi User Interface Compiler"
     InjectCode{
@@ -164,6 +163,116 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementButtonGroups()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementConnections()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementCustomWidgets()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementDesignerdata()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementIncludes()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementLayoutDefault()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementLayoutFunction()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementResources()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementSlots()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementTabStops()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementWidget()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setElementButtonGroups(DomButtonGroups*)"
             ModifyArgument{
@@ -365,6 +474,46 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementHeader()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementPropertyspecifications()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementSizeHint()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementSlots()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setElementHeader(DomHeader*)"
             ModifyArgument{
@@ -426,6 +575,7 @@ TypeSystem{
     
     ObjectType{
         name: "DomLayoutItem"
+        EnumType{name: "Kind"}
         ModifyFunction{
             signature: "takeElementLayout()"
             ModifyArgument{
@@ -456,6 +606,36 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementLayout()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementSpacer()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementWidget()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setElementLayout(DomLayout*)"
             ModifyArgument{
@@ -526,6 +706,16 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementColor()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setElementColor(DomColor*)"
             ModifyArgument{
@@ -544,6 +734,7 @@ TypeSystem{
     
     ObjectType{
         name: "DomBrush"
+        EnumType{name: "Kind"}
         ModifyFunction{
             signature: "setElementColor(DomColor*)"
             ModifyArgument{
@@ -604,6 +795,66 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementColor()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementGradient()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementTexture()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementColor()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementGradient()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementTexture()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -628,6 +879,16 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementBrush()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
     }
     
     ObjectType{
@@ -670,6 +931,36 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementActive()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementDisabled()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementInactive()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setElementActive(DomColorGroup*)"
             ModifyArgument{
@@ -824,6 +1115,86 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementActiveOff()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementActiveOn()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementDisabledOff()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementDisabledOn()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementNormalOff()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementNormalOn()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementSelectedOff()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementSelectedOn()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setElementSelectedOn(DomResourcePixmap*)"
             ModifyArgument{
@@ -938,6 +1309,16 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementString()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setElementString(DomString*)"
             ModifyArgument{
@@ -952,6 +1333,8 @@ TypeSystem{
     
     ObjectType{
         name: "DomProperty"
+
+        EnumType{name: "Kind"}
         ModifyFunction{
             signature: "takeElementBrush()"
             ModifyArgument{
@@ -1162,6 +1545,216 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementBrush()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementChar()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementColor()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementDate()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementDateTime()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementFont()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementIconSet()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementLocale()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementPalette()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementPixmap()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementPoint()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementPointF()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementRect()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementRectF()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementSize()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementSizeF()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementSizePolicy()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementString()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementStringList()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementTime()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
+        ModifyFunction{
+            signature: "elementUrl()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setElementBrush(DomBrush*)"
             ModifyArgument{
@@ -1390,6 +1983,16 @@ TypeSystem{
                 }
             }
         }
+        ModifyFunction{
+            signature: "elementHints()const"
+            ModifyArgument{
+                index: 0
+                DefineOwnership{
+                    codeClass: CodeClass.Native
+                    ownership: Ownership.Ignore
+                }
+            }
+        }
         ModifyFunction{
             signature: "setElementHints(DomConnectionHints*)"
             ModifyArgument{
@@ -1429,16 +2032,4 @@ TypeSystem{
     ObjectType{
         name: "DomStringPropertySpecification"
     }
-    
-    EnumType{
-        name: "DomProperty::Kind"
-    }
-    
-    EnumType{
-        name: "DomLayoutItem::Kind"
-    }
-    
-    EnumType{
-        name: "DomBrush::Kind"
-    }
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml_abstractobject.h b/src/cpp/QtJambiGenerator/typesystem/qml_abstractobject.h
index dc204a34..94059441 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml_abstractobject.h
+++ b/src/cpp/QtJambiGenerator/typesystem/qml_abstractobject.h
@@ -13,6 +13,7 @@ struct Ownership : public QObject{
         Java,
         Cpp,
         Ignore,
+        Dependent,
         Invalidate
     };
     Q_ENUM(Entries)
@@ -54,7 +55,7 @@ struct CodeClass : public QObject{
         Setter              = 0x2000,
         NativeGetter        = Native | Getter,
         NativeSetter        = Native | Setter,
-        DeleterFunction     = 0x4000,
+        DeleterFunction     = 0x4000
     };
     Q_ENUM(Entries)
     CodeClass() = delete;
@@ -91,6 +92,7 @@ struct Position : public QObject{
         Compare,
         HashCode,
         ToString,
+        Comment,
         End = 1024
     };
     Q_ENUM(Entries)
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml_modify.cpp b/src/cpp/QtJambiGenerator/typesystem/qml_modify.cpp
index 69988313..77f5f6a1 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml_modify.cpp
+++ b/src/cpp/QtJambiGenerator/typesystem/qml_modify.cpp
@@ -981,6 +981,19 @@ void ModifyFunction::setIsPaintMethod(bool newIsPaintMethod)
     emit isPaintMethodChanged();
 }
 
+bool ModifyFunction::noKotlinGetter() const
+{
+    return m_noKotlinGetter;
+}
+
+void ModifyFunction::setNoKotlinGetter(bool newNoKotlinGetter)
+{
+    if (m_noKotlinGetter == newNoKotlinGetter)
+        return;
+    m_noKotlinGetter = newNoKotlinGetter;
+    emit noKotlinGetterChanged();
+}
+
 RemoveFlag::Entries Remove::getCodeClass() const
 {
     return codeClass;
@@ -1059,6 +1072,19 @@ void ModifyField::setRename(const QString &newRename)
     emit renameChanged();
 }
 
+bool ModifyField::noKotlinGetter() const
+{
+    return m_noKotlinGetter;
+}
+
+void ModifyField::setNoKotlinGetter(bool newNoKotlinGetter)
+{
+    if (m_noKotlinGetter == newNoKotlinGetter)
+        return;
+    m_noKotlinGetter = newNoKotlinGetter;
+    emit noKotlinGetterChanged();
+}
+
 const QString &RejectEnumValue::getName() const
 {
     return name;
@@ -1240,3 +1266,55 @@ void Implements::setInterface(const QString &newInterface)
     interface = newInterface;
     emit interfaceChanged();
 }
+
+QString Delegate::name() const
+{
+    return m_name;
+}
+
+void Delegate::setName(const QString &newName)
+{
+    if (m_name == newName)
+        return;
+    m_name = newName;
+    emit nameChanged();
+}
+
+bool Delegate::isDeprecated() const
+{
+    return m_isDeprecated;
+}
+
+void Delegate::setDeprecated(bool newIsDeprecated)
+{
+    if (m_isDeprecated == newIsDeprecated)
+        return;
+    m_isDeprecated = newIsDeprecated;
+    emit isDeprecatedChanged();
+}
+
+AccessModifications Delegate::access() const
+{
+    return m_access;
+}
+
+void Delegate::setAccess(const AccessModifications &newAccess)
+{
+    if (m_access == newAccess)
+        return;
+    m_access = newAccess;
+    emit accessChanged();
+}
+
+bool Delegate::isSelfReturning() const
+{
+    return m_isSelfReturning;
+}
+
+void Delegate::setIsSelfReturning(bool newIsSelfReturning)
+{
+    if (m_isSelfReturning == newIsSelfReturning)
+        return;
+    m_isSelfReturning = newIsSelfReturning;
+    emit isSelfReturningChanged();
+}
diff --git a/src/cpp/QtJambiGenerator/typesystem/qml_modify.h b/src/cpp/QtJambiGenerator/typesystem/qml_modify.h
index 83da46ab..98c09576 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qml_modify.h
+++ b/src/cpp/QtJambiGenerator/typesystem/qml_modify.h
@@ -289,6 +289,44 @@ class DefineOwnership : public AbstractObject
     Q_PROPERTY(QString condition READ getCondition WRITE setCondition NOTIFY conditionChanged)
 };
 
+class Delegate : public AbstractObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+public:
+    explicit Delegate(QObject *parent = nullptr):AbstractObject{parent}{}
+    QString name() const;
+    void setName(const QString &newName);
+
+    bool isDeprecated() const;
+    void setDeprecated(bool newIsDeprecated);
+
+    AccessModifications access() const;
+    void setAccess(const AccessModifications &newAccess);
+
+    bool isSelfReturning() const;
+    void setIsSelfReturning(bool newIsSelfReturning);
+
+signals:
+    void nameChanged();
+
+    void isDeprecatedChanged();
+
+    void accessChanged();
+
+    void isSelfReturningChanged();
+
+private:
+    QString m_name;
+    AccessModifications m_access;
+    bool m_isDeprecated = false;
+    bool m_isSelfReturning = false;
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(bool deprecated READ isDeprecated WRITE setDeprecated NOTIFY isDeprecatedChanged)
+    Q_PROPERTY(AccessModifications access READ access WRITE setAccess NOTIFY accessChanged)
+    Q_PROPERTY(bool selfReturning READ isSelfReturning WRITE setIsSelfReturning NOTIFY isSelfReturningChanged)
+};
+
 class RemoveArgument : public AbstractObject
 {
     Q_OBJECT
@@ -655,6 +693,9 @@ class ModifyFunction : public AbstractObject
     bool getIsPaintMethod() const;
     void setIsPaintMethod(bool newIsPaintMethod);
 
+    bool noKotlinGetter() const;
+    void setNoKotlinGetter(bool newNoKotlinGetter);
+
 signals:
     void signatureChanged();
 
@@ -692,6 +733,8 @@ class ModifyFunction : public AbstractObject
 
     void isPaintMethodChanged();
 
+    void noKotlinGetterChanged();
+
 private:
     QString signature;
     AccessModifications access;
@@ -711,6 +754,7 @@ class ModifyFunction : public AbstractObject
     QString proxyCall;
     QString targetType;
     bool isPaintMethod = false;
+    bool m_noKotlinGetter = false;
     Q_PROPERTY(QString signature READ getSignature WRITE setSignature NOTIFY signatureChanged)
     Q_PROPERTY(AccessModifications access READ getAccess WRITE setAccess NOTIFY accessChanged)
     Q_PROPERTY(bool noExcept READ getNoExcept WRITE setNoExcept NOTIFY noExceptChanged)
@@ -729,6 +773,7 @@ class ModifyFunction : public AbstractObject
     Q_PROPERTY(QString proxyCall READ getProxyCall WRITE setProxyCall NOTIFY proxyCallChanged)
     Q_PROPERTY(QString targetType READ getTargetType WRITE setTargetType NOTIFY targetTypeChanged)
     Q_PROPERTY(bool isPaintMethod READ getIsPaintMethod WRITE setIsPaintMethod NOTIFY isPaintMethodChanged)
+    Q_PROPERTY(bool noKotlinGetter READ noKotlinGetter WRITE setNoKotlinGetter NOTIFY noKotlinGetterChanged)
 };
 
 class GlobalFunction : public ModifyFunction
@@ -761,6 +806,9 @@ class ModifyField : public AbstractObject
     const QString &getRename() const;
     void setRename(const QString &newRename);
 
+    bool noKotlinGetter() const;
+    void setNoKotlinGetter(bool newNoKotlinGetter);
+
 signals:
     void nameChanged();
 
@@ -772,17 +820,21 @@ class ModifyField : public AbstractObject
 
     void renameChanged();
 
+    void noKotlinGetterChanged();
+
 private:
     QString name;
     bool read = true;
     bool write = true;
     AccessModifications access;
     QString rename;
+    bool m_noKotlinGetter = false;
     Q_PROPERTY(QString name READ getName WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(bool read READ getRead WRITE setRead NOTIFY readChanged)
     Q_PROPERTY(bool write READ getWrite WRITE setWrite NOTIFY writeChanged)
     Q_PROPERTY(AccessModifications access READ getAccess WRITE setAccess NOTIFY accessChanged)
     Q_PROPERTY(QString rename READ getRename WRITE setRename NOTIFY renameChanged)
+    Q_PROPERTY(bool noKotlinGetter READ noKotlinGetter WRITE setNoKotlinGetter NOTIFY noKotlinGetterChanged)
 };
 
 class RejectEnumValue : public AbstractObject
@@ -989,6 +1041,7 @@ QML_DECLARE_TYPE(CustomConstructor)
 QML_DECLARE_TYPE(CustomDestructor)
 QML_DECLARE_TYPE(DefineOwnership)
 QML_DECLARE_TYPE(DelegateBaseClass)
+QML_DECLARE_TYPE(Delegate)
 QML_DECLARE_TYPE(GlobalFunction)
 QML_DECLARE_TYPE(Import)
 QML_DECLARE_TYPE(Instantiation)
diff --git a/src/cpp/QtJambiGenerator/typesystem/qmltypesystemreader.cpp b/src/cpp/QtJambiGenerator/typesystem/qmltypesystemreader.cpp
index 0f382fa9..e88f8f2c 100644
--- a/src/cpp/QtJambiGenerator/typesystem/qmltypesystemreader.cpp
+++ b/src/cpp/QtJambiGenerator/typesystem/qmltypesystemreader.cpp
@@ -109,22 +109,23 @@ class QmlTypeSystemReaderPrivate {
     void parseRejection(Rejection* element);
     void parseTemplate(Template* element);
     void parseTemplateArguments(TemplateArguments* element, ComplexTypeEntry* entry);
-    void parsePrimitiveType(PrimitiveType* element);
-    void parseObjectType(ObjectType* element);
+    void parsePrimitiveType(const QString& nameSpace, PrimitiveType* element);
+    void parseObjectType(const QString& nameSpace, ObjectType* element);
     void parseAttributesOfComplexType(ComplexType* element, ComplexTypeEntry* entry);
-    QList<AbstractObject*> parseChildrenOfComplexType(ComplexType* element, ComplexTypeEntry* entry);
-    void parseTemplateType(TemplateType* element);
-    void parseFunctionalType(FunctionalType* element);
-    void parseIteratorType(IteratorType* element);
-    void parseValueType(ValueType* element);
-    void parseTypeAliasType(TypeAliasType* element);
-    void parseInterfaceType(InterfaceType* element);
-    void parseNamespaceType(NamespaceType* element);
+    QList<AbstractObject*> parseChildrenOfComplexType(const QString& nameSpace, ComplexType* element, ComplexTypeEntry* entry);
+    void parseTemplateType(const QString& nameSpace, TemplateType* element);
+    void parseFunctionalType(const QString& nameSpace, FunctionalType* element);
+    void parseIteratorType(const QString& nameSpace, IteratorType* element);
+    void parseValueType(const QString& nameSpace, ValueType* element);
+    void parseTypeAliasType(const QString& nameSpace, TypeAliasType* element);
+    void parseInterfaceType(const QString& nameSpace, InterfaceType* element);
+    void parseNamespaceType(const QString& nameSpace, NamespaceType* element);
     void parseModifyArgument(ModifyArgument* element, AbstractFunctionModification& mod);
+    void parseDelegate(Delegate* element, AbstractFunctionModification& mod);
     void parseModifyFunction(ModifyFunction* element, TypeEntry* entry);
     TemplateInstantiation parseInstantiation(Instantiation* element);
     void parseModifyField(ModifyField* element, ComplexTypeEntry* entry);
-    void parseEnumType(EnumType* element);
+    void parseEnumType(const QString& nameSpace, EnumType* element);
     CustomFunction parseCustomStructor(AbstractStructor* element);
 
     TypeDatabase *m_database;
@@ -160,10 +161,12 @@ void QmlTypeSystemReader::parse(const QString &filepath){
 void QmlTypeSystemReaderPrivate::parse(const QString &filepath){
     QQmlEngine engine;
     QUrl url;
-    if(filepath.startsWith(":"))
+    if(filepath.startsWith(":")){
         url = QUrl("qrc"+filepath);
-    else
-        url = QUrl::fromLocalFile(filepath);
+    }else{
+        QFileInfo file(filepath);
+        url = QUrl::fromLocalFile(file.absoluteFilePath());
+    }
     QQmlComponent component(&engine, url, QQmlComponent::PreferSynchronous);
     if(component.status()==QQmlComponent::Ready){
         QObject* obj = component.create();
@@ -286,25 +289,25 @@ void QmlTypeSystemReaderPrivate::parseTypeSystem(TypeSystem* typeSystem, const Q
                 }else if(Rejection* childElement = qobject_cast<Rejection*>(item)){
                     parseRejection(childElement);
                 }else if(PrimitiveType* childElement = qobject_cast<PrimitiveType*>(item)){
-                    parsePrimitiveType(childElement);
+                    parsePrimitiveType({}, childElement);
                 }else if(ObjectType* childElement = qobject_cast<ObjectType*>(item)){
-                    parseObjectType(childElement);
+                    parseObjectType({}, childElement);
                 }else if(TemplateType* childElement = qobject_cast<TemplateType*>(item)){
-                    parseTemplateType(childElement);
+                    parseTemplateType({}, childElement);
                 }else if(FunctionalType* childElement = qobject_cast<FunctionalType*>(item)){
-                    parseFunctionalType(childElement);
+                    parseFunctionalType({}, childElement);
                 }else if(IteratorType* childElement = qobject_cast<IteratorType*>(item)){
-                    parseIteratorType(childElement);
+                    parseIteratorType({}, childElement);
                 }else if(ValueType* childElement = qobject_cast<ValueType*>(item)){
-                    parseValueType(childElement);
+                    parseValueType({}, childElement);
                 }else if(TypeAliasType* childElement = qobject_cast<TypeAliasType*>(item)){
-                    parseTypeAliasType(childElement);
+                    parseTypeAliasType({}, childElement);
                 }else if(InterfaceType* childElement = qobject_cast<InterfaceType*>(item)){
-                    parseInterfaceType(childElement);
+                    parseInterfaceType({}, childElement);
                 }else if(NamespaceType* childElement = qobject_cast<NamespaceType*>(item)){
-                    parseNamespaceType(childElement);
+                    parseNamespaceType({}, childElement);
                 }else if(EnumType* childElement = qobject_cast<EnumType*>(item)){
-                    parseEnumType(childElement);
+                    parseEnumType({}, childElement);
                 }else if(ExtraIncludes* childElement = qobject_cast<ExtraIncludes*>(item)){
                     parseExtraIncludes(childElement, entry);
                 }else if(InjectCode* childElement = qobject_cast<InjectCode*>(item)){
@@ -323,6 +326,7 @@ void QmlTypeSystemReaderPrivate::parseTypeSystem(TypeSystem* typeSystem, const Q
                         {Position::Position3, CodeSnip::Position3},
                         {Position::Position4, CodeSnip::Position4},
                         {Position::Position5, CodeSnip::Position5},
+                        {Position::Comment, CodeSnip::Comment},
                         {Position::End, CodeSnip::End}
                     };
                     parseInjectCode(childElement, languageNames, positionNames, [entry](const QString& subTypeSystem, const CodeSnip &snip){
@@ -485,6 +489,7 @@ void QmlTypeSystemReaderPrivate::parseInjectCode(InjectCode* element, ComplexTyp
         {Position::Compare, CodeSnip::Compare},
         {Position::HashCode, CodeSnip::HashCode},
         {Position::ToString, CodeSnip::ToString},
+        {Position::Comment, CodeSnip::Comment},
         {Position::End, CodeSnip::End}
     };
     if(entry->isInterface() || entry->designatedInterface()){
@@ -530,6 +535,7 @@ void QmlTypeSystemReaderPrivate::parseInjectCode(InjectCode* element, Functional
         {Position::Compare, CodeSnip::Compare},
         {Position::HashCode, CodeSnip::HashCode},
         {Position::ToString, CodeSnip::ToString},
+        {Position::Comment, CodeSnip::Comment},
         {Position::End, CodeSnip::End}
     };
     return parseInjectCode(element, languageNames, positionNames, [&entry](const QString&,const CodeSnip &snip){entry->addCodeSnip(snip);});
@@ -739,7 +745,7 @@ void QmlTypeSystemReaderPrivate::parseRejection(Rejection* element){
         QString field = element->getFieldName();
         QString enum_ = element->getEnumName();
         if (cls == "*" && function == "*" && field == "*" && enum_ == "*") {
-            TypesystemException::raise(QString("bad reject entry, neither 'class', 'function-name' nor 'field'"));
+            TypesystemException::raise(QString("bad reject entry, neither 'className', 'functionName' nor 'fieldName'"));
         }
         m_database->addRejection(cls, function, field, enum_);
         for(AbstractObject* item2 : element->childrenList()){
@@ -748,9 +754,11 @@ void QmlTypeSystemReaderPrivate::parseRejection(Rejection* element){
     }
 }
 
-void QmlTypeSystemReaderPrivate::parsePrimitiveType(PrimitiveType* element){
+void QmlTypeSystemReaderPrivate::parsePrimitiveType(const QString& nameSpace, PrimitiveType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
             if (name.isEmpty()) {
                 TypesystemException::raise(QString("No 'name' attribute specified for element PrimitiveType"));
@@ -859,9 +867,6 @@ void QmlTypeSystemReaderPrivate::parseAttributesOfComplexType(ComplexType* eleme
         ctype->designatedInterface()->setThreadAffinity(ctype->threadAffinity());
         ctype->designatedInterface()->setPPCondition(ctype->ppCondition());
         ctype->designatedInterface()->setNativeInterface(ctype->isNativeInterface());
-    }
-
-    if(ctype->designatedInterface()){
         ctype->designatedInterface()->setCodeGeneration(ctype->codeGeneration());
     }
 
@@ -879,12 +884,14 @@ void QmlTypeSystemReaderPrivate::parseAttributesOfComplexType(ComplexType* eleme
     }
 }
 
-void QmlTypeSystemReaderPrivate::parseObjectType(ObjectType* element){
+void QmlTypeSystemReaderPrivate::parseObjectType(const QString& nameSpace, ObjectType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
             QString targetName;
-            for(const NameSpacePrefix& prefix : m_namespacePrefixes){
+            for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
                 if(name.startsWith(prefix.prefix)){
                     name = name.mid(prefix.prefix.size());
                     if(prefix.namingPolicy==NameSpacePrefix::Cut)
@@ -893,14 +900,21 @@ void QmlTypeSystemReaderPrivate::parseObjectType(ObjectType* element){
                     break;
                 }
             }
+//            if(!nameSpace.isEmpty()){
+//                if(targetName.endsWith(nameSpace+"::"+element->getName())){
+//                    targetName = targetName.mid(0, targetName.length()-element->getName().length()-2) + "$" + element->getName();
+//                }else if(name.endsWith(nameSpace+"::"+element->getName())){
+//                    targetName = name.mid(0, name.length()-element->getName().length()-2) + "$" + element->getName();
+//                }
+//            }
             std::unique_ptr<ObjectTypeEntry> entry(new ObjectTypeEntry(name));
             if(!targetName.isEmpty())
-                entry->setTargetLangName(targetName);
+                entry->setTargetLangName(targetName.replace("::", "$"));
             entry->setIsValueOwner(element->getIsValueOwner());
             entry->setIsPolymorphicBase(element->getIsPolymorphicBase());
             entry->setPolymorphicIdValue(element->getPolymorphicIdExpression());
             parseAttributesOfComplexType(element, entry.get());
-            QList<AbstractObject*> unhandledElements = parseChildrenOfComplexType(element, entry.get());
+            QList<AbstractObject*> unhandledElements = parseChildrenOfComplexType(nameSpace, element, entry.get());
             for(AbstractObject* unhandledElement : unhandledElements){
                 TypesystemException::raise(QString("Unexpected child element %1 in %2.").arg(unhandledElement->metaObject()->className(), element->metaObject()->className()));
             }
@@ -933,12 +947,30 @@ void QmlTypeSystemReaderPrivate::parseObjectType(ObjectType* element){
     }
 }
 
-QList<AbstractObject*> QmlTypeSystemReaderPrivate::parseChildrenOfComplexType(ComplexType* element, ComplexTypeEntry* entry){
+QList<AbstractObject*> QmlTypeSystemReaderPrivate::parseChildrenOfComplexType(const QString& nameSpace, ComplexType* element, ComplexTypeEntry* entry){
     QList<AbstractObject*> unhandledElements;
     const QList<AbstractObject*>& childrenList = element->childrenList();
     for(int i=0; i<childrenList.size(); ++i){
         AbstractObject* item = childrenList[i];
-        if(Template* childElement = qobject_cast<Template*>(item)){
+        if(NamespacePrefix* namespacePrefix = qobject_cast<NamespacePrefix*>(item)){
+            if(entry->isNamespace()){
+                if (checkQtVersion(namespacePrefix)){
+                    QString prefix = entry->name();
+                    if(!namespacePrefix->getPrefix().isEmpty())
+                        prefix = namespacePrefix->getPrefix();
+                    QString _namespace = entry->name();
+                    if(!namespacePrefix->getNamespace().isEmpty())
+                        _namespace = _namespace+"::"+namespacePrefix->getNamespace();
+                    if(!prefix.isEmpty() && !prefix.endsWith("::"))
+                        prefix += "::";
+                    if(!_namespace.isEmpty() && !_namespace.endsWith("::"))
+                        _namespace += "::";
+                    m_namespacePrefixes.append({prefix, _namespace, NameSpacePrefix::NamingPolicy(namespacePrefix->getNamingPolicy())});
+                }
+            }else{
+                unhandledElements << item;
+            }
+        }else if(Template* childElement = qobject_cast<Template*>(item)){
             parseTemplate(childElement);
         }else if(TemplateArguments* childElement = qobject_cast<TemplateArguments*>(item)){
             if(!entry->isTemplate())
@@ -1044,6 +1076,73 @@ QList<AbstractObject*> QmlTypeSystemReaderPrivate::parseChildrenOfComplexType(Co
             }else{
                 TypesystemException::raise(QString("Unexpected child element CustomDestructor of %1.").arg(element->metaObject()->className()));
             }
+        }else if(PrimitiveType* childElement = qobject_cast<PrimitiveType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parsePrimitiveType(name, childElement);
+        }else if(ObjectType* childElement = qobject_cast<ObjectType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parseObjectType(name, childElement);
+        }else if(TemplateType* childElement = qobject_cast<TemplateType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parseTemplateType(name, childElement);
+        }else if(FunctionalType* childElement = qobject_cast<FunctionalType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parseFunctionalType(name, childElement);
+        }else if(IteratorType* childElement = qobject_cast<IteratorType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parseIteratorType(name, childElement);
+        }else if(ValueType* childElement = qobject_cast<ValueType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parseValueType(name, childElement);
+        }else if(TypeAliasType* childElement = qobject_cast<TypeAliasType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parseTypeAliasType(name, childElement);
+        }else if(InterfaceType* childElement = qobject_cast<InterfaceType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parseInterfaceType(name, childElement);
+        }else if(NamespaceType* childElement = qobject_cast<NamespaceType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parseNamespaceType(name, childElement);
+        }else if(EnumType* childElement = qobject_cast<EnumType*>(item)){
+            QString name = element->getName();
+            if(!nameSpace.isEmpty())
+                name = nameSpace+"::"+name;
+            parseEnumType(name, childElement);
+        }else if(Rejection* rejection = qobject_cast<Rejection*>(item)){
+            if (checkQtVersion(element)){
+                QString cls = rejection->getClassName();
+                QString function = rejection->getFunctionName();
+                QString field = rejection->getFieldName();
+                QString enum_ = rejection->getEnumName();
+                if (cls == "*" && function == "*" && field == "*" && enum_ == "*") {
+                    TypesystemException::raise(QString("bad reject entry, neither 'enumName', 'functionFame' nor 'fieldName'"));
+                }
+                cls = cls=="*" ? element->getName() : element->getName() + "::" + cls;
+                if(!nameSpace.isEmpty())
+                    cls = nameSpace+"::"+cls;
+                m_database->addRejection(cls, function, field, enum_);
+                for(AbstractObject* item2 : item->childrenList()){
+                    TypesystemException::raise(QStringLiteral("Unexpected element %1 as child of %2").arg(item2->metaObject()->className(), element->metaObject()->className()));
+                }
+            }
         }else{
             unhandledElements << item;
         }
@@ -1074,9 +1173,11 @@ CustomFunction QmlTypeSystemReaderPrivate::parseCustomStructor(AbstractStructor*
     return func;
 }
 
-void QmlTypeSystemReaderPrivate::parseTemplateType(TemplateType* element){
+void QmlTypeSystemReaderPrivate::parseTemplateType(const QString& nameSpace, TemplateType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
             std::unique_ptr<TemplateTypeEntry> entry(new TemplateTypeEntry(name));
             const QList<AbstractObject*>& childrenList = element->childrenList();
@@ -1211,6 +1312,55 @@ void QmlTypeSystemReaderPrivate::parseTemplateType(TemplateType* element){
     }
 }
 
+void QmlTypeSystemReaderPrivate::parseDelegate(Delegate* element, AbstractFunctionModification& mod){
+    if (checkQtVersion(element)){
+        uint modifiers = 0;
+        AccessModifications accesses = element->access();
+        if(accesses.testFlag(Modification::Private)){
+            modifiers |= TS::Modification::Private;
+        }
+        if(accesses.testFlag(Modification::Public)){
+            modifiers |= TS::Modification::Public;
+        }
+        if(accesses.testFlag(Modification::Protected)){
+            modifiers |= TS::Modification::Protected;
+        }
+        if(accesses.testFlag(Modification::Friendly)){
+            modifiers |= TS::Modification::Friendly;
+        }
+        if(accesses.testFlag(Modification::Final)){
+            modifiers |= TS::Modification::Final;
+        }
+        if(accesses.testFlag(Modification::DeclFinal)){
+            modifiers |= TS::Modification::NativeDeclFinal;
+        }
+        if(accesses.testFlag(Modification::NonFinal)){
+            modifiers |= TS::Modification::NonFinal;
+        }
+        TS::CodeSnipList snips;
+        const QList<AbstractObject*>& childrenList = element->childrenList();
+        for(int i=0; i<childrenList.size(); ++i){
+            AbstractObject* item = childrenList[i];
+            if(InjectCode* childElement = qobject_cast<InjectCode*>(item)){
+                static const QHash<CodeClass::Entries, TS::Language> languageNames{
+                    {CodeClass::Java, TS::TargetLangCode},
+                    {CodeClass::JavaInterface, TS::Interface}
+                };
+
+                static const QHash<Position::Entries, CodeSnip::Position> positionNames{
+                    {Position::Beginning, CodeSnip::Beginning},
+                    {Position::Comment, CodeSnip::Comment},
+                    {Position::End, CodeSnip::End}
+                };
+                parseInjectCode(childElement, languageNames, positionNames, [&snips](const QString&,const CodeSnip &snip){snips<<snip;});
+            }else{
+                TypesystemException::raise(QStringLiteral("Unexpected element %1 as child of %2").arg(item->metaObject()->className(), element->metaObject()->className()));
+            }
+        }
+        mod.delegates << TS::Delegate{element->name(), element->isDeprecated(), element->isSelfReturning(), modifiers, snips};
+    }
+}
+
 void QmlTypeSystemReaderPrivate::parseModifyArgument(ModifyArgument* element, AbstractFunctionModification& mod){
     if (checkQtVersion(element)){
         int index = 0;
@@ -1402,13 +1552,6 @@ void QmlTypeSystemReaderPrivate::parseModifyArgument(ModifyArgument* element, Ab
                         for(AbstractObject* item2 : item->childrenList()){
                             TypesystemException::raise(QStringLiteral("Unexpected element %1 as child of %2").arg(item2->metaObject()->className(), item->metaObject()->className()));
                         }
-                        static const QHash<CodeClass::Entries, TS::Language> languageNames{
-                            {CodeClass::Java, TS::TargetLangCode},
-                            {CodeClass::Native, TS::NativeCode},
-                            {CodeClass::Shell, TS::ShellCode}
-                        };
-                        if (!languageNames.contains(childElement->getCodeClass()))
-                            TypesystemException::raise(QString("Unsupported codeClass property"));
 
                         static const QHash<Ownership::Entries, TS::Ownership> ownershipNames{
                             {Ownership::Java, TS::TargetLangOwnership},
@@ -1416,12 +1559,26 @@ void QmlTypeSystemReaderPrivate::parseModifyArgument(ModifyArgument* element, Ab
                             {Ownership::Default, TS::DefaultOwnership},
                             {Ownership::Ignore, TS::IgnoreOwnership},
                             {Ownership::Invalidate, TS::Invalidate},
-                            {Ownership::Invalid, TS::InvalidOwnership}
+                            {Ownership::Dependent, TS::RegisterDependency},
+//                            {Ownership::Invalid, TS::InvalidOwnership}
                         };
 
                         if(!ownershipNames.contains(childElement->getOwnership()))
                             TypesystemException::raise(QString("Unsupported ownership property"));
-                        argumentModification.ownerships[languageNames[childElement->getCodeClass()]] = TS::OwnershipRule{ownershipNames[childElement->getOwnership()], childElement->getCondition()};
+
+                        static const QHash<CodeClass::Entries, TS::Language> languageNames{
+                            {CodeClass::Java, TS::TargetLangCode},
+                            {CodeClass::Native, TS::NativeCode},
+                            {CodeClass::Shell, TS::ShellCode}
+                        };
+
+                        QHash<CodeClass::Entries, TS::Language> _languageNames = languageNames;
+                        if(childElement->getOwnership()==Ownership::Ignore)
+                            _languageNames.insert(CodeClass::NoLanguage, TS::NoLanguage);
+                        if (!_languageNames.contains(childElement->getCodeClass()))
+                            TypesystemException::raise(QString("Unsupported codeClass property"));
+
+                        argumentModification.ownerships[_languageNames[childElement->getCodeClass()]] = TS::OwnershipRule{ownershipNames[childElement->getOwnership()], childElement->getCondition()};
                     }
                 }else if(RemoveArgument* childElement = qobject_cast<RemoveArgument*>(item)){
                     if (checkQtVersion(childElement)){
@@ -1617,6 +1774,7 @@ TemplateInstantiation QmlTypeSystemReaderPrivate::parseInstantiation(Instantiati
                     {Position::Position3, CodeSnip::Position3},
                     {Position::Position4, CodeSnip::Position4},
                     {Position::Position5, CodeSnip::Position5},
+                    {Position::Comment, CodeSnip::Comment},
                     {Position::End, CodeSnip::End}
                 };
                 parseInjectCode(childElement,
@@ -1663,14 +1821,14 @@ void QmlTypeSystemReaderPrivate::parseModifyFunction(ModifyFunction* element, Ty
     if (checkQtVersion(element)){
         QString signature = element->getSignature();
         try{
-            for(const NameSpacePrefix& prefix : m_namespacePrefixes){
+            for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
                 if(prefix._namespace!=prefix.prefix)
                     signature = signature.replace(prefix.prefix, prefix._namespace);
             }
-            signature = QString::fromLatin1(QMetaObject::normalizedSignature(qPrintable(signature)));
             if (signature.isEmpty()) {
                 TypesystemException::raise(QString("No signature"));
             }
+            signature = QString::fromLatin1(QMetaObject::normalizedSignature(qPrintable(signature)));
             AccessModifications accesses = element->getAccess();
             QString rename = element->getRename();
             FunctionModification mod;
@@ -1681,6 +1839,9 @@ void QmlTypeSystemReaderPrivate::parseModifyFunction(ModifyFunction* element, Ty
             mod.proxyCall = element->getProxyCall();
             mod.targetType = element->getTargetType();
 
+            if (element->noKotlinGetter()) {
+                mod.modifiers |= TS::Modification::NoKotlinGetter;
+            }
             if (element->getDeprecated()) {
                 mod.modifiers |= TS::Modification::Deprecated;
             }
@@ -1764,10 +1925,24 @@ void QmlTypeSystemReaderPrivate::parseModifyFunction(ModifyFunction* element, Ty
                 AbstractObject* item = childrenList[i];
                 if(ModifyArgument* childElement = qobject_cast<ModifyArgument*>(item)){
                     parseModifyArgument(childElement, mod);
+                }else if(Delegate* childElement = qobject_cast<Delegate*>(item)){
+                    parseDelegate(childElement, mod);
                 }else if(Instantiation* childElement = qobject_cast<Instantiation*>(item)){
                     TemplateInstantiation templateInstantiation = parseInstantiation(childElement);
-                    if(!templateInstantiation.arguments.isEmpty())
+                    if(!templateInstantiation.arguments.isEmpty()){
+                        for(const ArgumentModification& amod : mod.argument_mods){
+                            bool found = false;
+                            for(const ArgumentModification& amod2 : templateInstantiation.argument_mods){
+                                if(amod.index==amod2.index){
+                                    found = true;
+                                    break;
+                                }
+                            }
+                            if(!found)
+                                templateInstantiation.argument_mods << amod;
+                        }
                         mod.template_instantiations << templateInstantiation;
+                    }
                 }else if(Remove* childElement = qobject_cast<Remove*>(item)){
                     if (checkQtVersion(childElement)){
                         if(element->getRemove()!=RemoveFlag::None){
@@ -1851,6 +2026,7 @@ void QmlTypeSystemReaderPrivate::parseModifyFunction(ModifyFunction* element, Ty
                         {Position::Position3, CodeSnip::Position3},
                         {Position::Position4, CodeSnip::Position4},
                         {Position::Position5, CodeSnip::Position5},
+                        {Position::Comment, CodeSnip::Comment},
                         {Position::End, CodeSnip::End}
                     };
                     parseInjectCode(childElement,
@@ -1915,10 +2091,13 @@ void QmlTypeSystemReaderPrivate::parseModifyField(ModifyField* element, ComplexT
         try{
             fm.modifiers = 0;
             if (element->getRead()) {
-                fm.modifiers |= FieldModification::Readable;
+                fm.modifiers |= TS::Modification::Readable;
             }
             if (element->getWrite()) {
-                fm.modifiers |= FieldModification::Writable;
+                fm.modifiers |= TS::Modification::Writable;
+            }
+            if (element->noKotlinGetter()) {
+                fm.modifiers |= TS::Modification::NoKotlinGetter;
             }
             QString rename = element->getRename();
             AccessModifications accesses = element->getAccess();
@@ -2015,26 +2194,31 @@ void QmlTypeSystemReaderPrivate::parseModifyField(ModifyField* element, ComplexT
                         for(AbstractObject* item2 : item->childrenList()){
                             TypesystemException::raise(QStringLiteral("Unexpected element %1 as child of %2").arg(item2->metaObject()->className(), item->metaObject()->className()));
                         }
-                        static const QHash<CodeClass::Entries, TS::Language> languageNames{
-                            {CodeClass::Java, TS::TargetLangCode},
-                            {CodeClass::Native, TS::NativeCode},
-                            {CodeClass::Shell, TS::ShellCode}
-                        };
-                        if (!languageNames.contains(childElement->getCodeClass()))
-                            TypesystemException::raise(QString("Unsupported codeClass property"));
 
                         static const QHash<Ownership::Entries, TS::Ownership> ownershipNames{
                             {Ownership::Java, TS::TargetLangOwnership},
                             {Ownership::Cpp, TS::CppOwnership},
                             {Ownership::Default, TS::DefaultOwnership},
                             {Ownership::Ignore, TS::IgnoreOwnership},
+                            {Ownership::Dependent, TS::RegisterDependency},
                             {Ownership::Invalidate, TS::Invalidate},
-                            {Ownership::Invalid, TS::InvalidOwnership}
+//                            {Ownership::Invalid, TS::InvalidOwnership}
                         };
 
                         if(!ownershipNames.contains(childElement->getOwnership()))
                             TypesystemException::raise(QString("Unsupported ownership property"));
-                        fm.ownerships[languageNames[childElement->getCodeClass()]] = TS::OwnershipRule{ownershipNames[childElement->getOwnership()], childElement->getCondition()};
+
+                        static const QHash<CodeClass::Entries, TS::Language> languageNames{
+                            {CodeClass::Java, TS::TargetLangCode},
+                            {CodeClass::Native, TS::NativeCode},
+                            {CodeClass::Shell, TS::ShellCode}
+                        };
+                        QHash<CodeClass::Entries, TS::Language> _languageNames = languageNames;
+                        if(childElement->getOwnership()==Ownership::Ignore)
+                            _languageNames.insert(CodeClass::NoLanguage, TS::NoLanguage);
+                        if (!_languageNames.contains(childElement->getCodeClass()))
+                            TypesystemException::raise(QString("Unsupported codeClass property"));
+                        fm.ownerships[_languageNames[childElement->getCodeClass()]] = TS::OwnershipRule{ownershipNames[childElement->getOwnership()], childElement->getCondition()};
                     }
                 }else{
                     TypesystemException::raise(QStringLiteral("Unexpected element %1 as child of %2").arg(item->metaObject()->className(), element->metaObject()->className()));
@@ -2075,12 +2259,14 @@ void QmlTypeSystemReaderPrivate::parseModifyField(ModifyField* element, ComplexT
     }
 }
 
-void QmlTypeSystemReaderPrivate::parseFunctionalType(FunctionalType* element){
+void QmlTypeSystemReaderPrivate::parseFunctionalType(const QString& nameSpace, FunctionalType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
             QString targetName;
-            for(const NameSpacePrefix& prefix : m_namespacePrefixes){
+            for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
                 if(name.startsWith(prefix.prefix)){
                     name = name.mid(prefix.prefix.size());
                     if(prefix.namingPolicy==NameSpacePrefix::Cut)
@@ -2089,13 +2275,20 @@ void QmlTypeSystemReaderPrivate::parseFunctionalType(FunctionalType* element){
                     break;
                 }
             }
+//            if(!nameSpace.isEmpty()){
+//                if(targetName.endsWith(nameSpace+"::"+element->getName())){
+//                    targetName = targetName.mid(0, targetName.length()-element->getName().length()-2) + "$" + element->getName();
+//                }else if(name.endsWith(nameSpace+"::"+element->getName())){
+//                    targetName = name.mid(0, name.length()-element->getName().length()-2) + "$" + element->getName();
+//                }
+//            }
             QStringList names = name.split(QLatin1String("::"));
 
             std::unique_ptr<FunctionalTypeEntry> fentry;
             if (names.size() == 1) {
                 fentry.reset(new FunctionalTypeEntry(QString(), name));
                 if(!targetName.isEmpty())
-                    fentry->setTargetLangName(targetName);
+                    fentry->setTargetLangName(targetName.replace("::", "$"));
             } else {
                 fentry.reset(new FunctionalTypeEntry(QStringList(names.mid(0, names.size() - 1)).join("::"), names.last()));
             }
@@ -2161,11 +2354,13 @@ void QmlTypeSystemReaderPrivate::parseFunctionalType(FunctionalType* element){
     }
 }
 
-void QmlTypeSystemReaderPrivate::parseIteratorType(IteratorType* element){
+void QmlTypeSystemReaderPrivate::parseIteratorType(const QString& nameSpace, IteratorType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
-            for(const NameSpacePrefix& prefix : m_namespacePrefixes){
+            for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
                 if(name.startsWith(prefix.prefix)){
                     name = name.mid(prefix.prefix.size());
                     name = prefix._namespace + name;
@@ -2194,12 +2389,14 @@ void QmlTypeSystemReaderPrivate::parseIteratorType(IteratorType* element){
     }
 }
 
-void QmlTypeSystemReaderPrivate::parseValueType(ValueType* element){
+void QmlTypeSystemReaderPrivate::parseValueType(const QString& nameSpace, ValueType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
             QString targetName;
-            for(const NameSpacePrefix& prefix : m_namespacePrefixes){
+            for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
                 if(name.startsWith(prefix.prefix)){
                     name = name.mid(prefix.prefix.size());
                     if(prefix.namingPolicy==NameSpacePrefix::Cut)
@@ -2209,14 +2406,21 @@ void QmlTypeSystemReaderPrivate::parseValueType(ValueType* element){
                 }
             }
             std::unique_ptr<ValueTypeEntry> entry(new ValueTypeEntry(name));
+//            if(!nameSpace.isEmpty()){
+//                if(targetName.endsWith(nameSpace+"::"+element->getName())){
+//                    targetName = targetName.mid(0, targetName.length()-element->getName().length()-2) + "$" + element->getName();
+//                }else if(name.endsWith(nameSpace+"::"+element->getName())){
+//                    targetName = name.mid(0, name.length()-element->getName().length()-2) + "$" + element->getName();
+//                }
+//            }
             if(!targetName.isEmpty())
-                entry->setTargetLangName(targetName);
+                entry->setTargetLangName(targetName.replace("::", "$"));
             entry->setSkipMetaTypeRegistration(element->getNoMetaType());
             entry->setIsPolymorphicBase(element->getIsPolymorphicBase());
             entry->setPolymorphicIdValue(element->getPolymorphicIdExpression());
             parseAttributesOfComplexType(element, entry.get());
-            QList<AbstractObject*> unhandledElements = parseChildrenOfComplexType(element, entry.get());
-            for(AbstractObject* childElement : unhandledElements){
+            QList<AbstractObject*> unhandledElements = parseChildrenOfComplexType(nameSpace, element, entry.get());
+            for(AbstractObject* childElement : qAsConst(unhandledElements)){
                 TypesystemException::raise(QStringLiteral("Unexpected element %1 as child of %2").arg(childElement->metaObject()->className(), element->metaObject()->className()));
             }
             if(name.endsWith(">")){
@@ -2248,11 +2452,13 @@ void QmlTypeSystemReaderPrivate::parseValueType(ValueType* element){
     }
 }
 
-void QmlTypeSystemReaderPrivate::parseTypeAliasType(TypeAliasType* element){
+void QmlTypeSystemReaderPrivate::parseTypeAliasType(const QString& nameSpace, TypeAliasType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
-            for(const NameSpacePrefix& prefix : m_namespacePrefixes){
+            for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
                 if(name.startsWith(prefix.prefix)){
                     name = name.mid(prefix.prefix.size());
                     name = prefix._namespace + name;
@@ -2293,36 +2499,41 @@ void QmlTypeSystemReaderPrivate::parseTypeAliasType(TypeAliasType* element){
     }
 }
 
-void QmlTypeSystemReaderPrivate::parseInterfaceType(InterfaceType* element){
+void QmlTypeSystemReaderPrivate::parseInterfaceType(const QString& nameSpace, InterfaceType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
+            QString implName = InterfaceTypeEntry::implName(name);
             QString targetName;
-            for(const NameSpacePrefix& prefix : m_namespacePrefixes){
+            for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
                 if(name.startsWith(prefix.prefix)){
                     name = name.mid(prefix.prefix.size());
-                    if(prefix.namingPolicy==NameSpacePrefix::Cut)
+                    if(prefix.namingPolicy==NameSpacePrefix::Cut){
                         targetName = name;
+                        implName = InterfaceTypeEntry::implName(targetName);
+                    }
                     name = prefix._namespace + name;
                     break;
                 }
             }
             std::unique_ptr<ImplementorTypeEntry> otype;
             if(element->getIsValue()){
-                ValueTypeEntry* ventry = new ValueTypeEntry(InterfaceTypeEntry::implName(name));
+                ValueTypeEntry* ventry = new ValueTypeEntry(implName);
                 ventry->setSkipMetaTypeRegistration(element->getNoMetaType());
                 otype.reset(ventry);
             }else
-                otype.reset(new ObjectTypeEntry(InterfaceTypeEntry::implName(name)));
-            if(!targetName.isEmpty())
-                otype->setTargetLangName(targetName);
+                otype.reset(new ObjectTypeEntry(implName));
             std::unique_ptr<InterfaceTypeEntry> itype(new InterfaceTypeEntry(name));
+            if(!targetName.isEmpty())
+                itype->setTargetLangName(targetName);
             otype->setDesignatedInterface(itype.get());
             itype->setOrigin(otype.get());
             itype->setNoImpl(element->getNoImpl());
             parseAttributesOfComplexType(element, otype.get());
-            QList<AbstractObject*> unhandledElements = parseChildrenOfComplexType(element, otype.get());
-            for(AbstractObject* childElement : unhandledElements){
+            QList<AbstractObject*> unhandledElements = parseChildrenOfComplexType(nameSpace, element, otype.get());
+            for(AbstractObject* childElement : qAsConst(unhandledElements)){
                 TypesystemException::raise(QStringLiteral("Unexpected element %1 as child of %2").arg(childElement->metaObject()->className(), element->metaObject()->className()));
             }
             m_database->addType(otype.release());
@@ -2333,13 +2544,15 @@ void QmlTypeSystemReaderPrivate::parseInterfaceType(InterfaceType* element){
     }
 }
 
-void QmlTypeSystemReaderPrivate::parseNamespaceType(NamespaceType* element){
+void QmlTypeSystemReaderPrivate::parseNamespaceType(const QString& nameSpace, NamespaceType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
             QString targetName;
-            for(const NameSpacePrefix& prefix : m_namespacePrefixes){
-                if(name.startsWith(prefix.prefix)){
+            for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
+                if(name.startsWith(prefix.prefix) && name!=prefix.prefix){
                     name = name.mid(prefix.prefix.size());
                     if(prefix.namingPolicy==NameSpacePrefix::Cut)
                         targetName = name;
@@ -2347,12 +2560,19 @@ void QmlTypeSystemReaderPrivate::parseNamespaceType(NamespaceType* element){
                     break;
                 }
             }
+//            if(!nameSpace.isEmpty()){
+//                if(targetName.endsWith(nameSpace+"::"+element->getName())){
+//                    targetName = targetName.mid(0, targetName.length()-element->getName().length()-2) + "$" + element->getName();
+//                }else if(name.endsWith(nameSpace+"::"+element->getName())){
+//                    targetName = name.mid(0, name.length()-element->getName().length()-2) + "$" + element->getName();
+//                }
+//            }
             std::unique_ptr<NamespaceTypeEntry> entry(new NamespaceTypeEntry(name, qobject_cast<HeaderType*>(element)!=nullptr));
             if(!targetName.isEmpty())
-                entry->setTargetLangName(targetName);
+                entry->setTargetLangName(targetName.replace("::", "$"));
             parseAttributesOfComplexType(element, entry.get());
-            QList<AbstractObject*> unhandledElements = parseChildrenOfComplexType(element, entry.get());
-            for(AbstractObject* childElement : unhandledElements){
+            QList<AbstractObject*> unhandledElements = parseChildrenOfComplexType(nameSpace, element, entry.get());
+            for(AbstractObject* childElement : qAsConst(unhandledElements)){
                 TypesystemException::raise(QStringLiteral("Unexpected element %1 as child of %2").arg(childElement->metaObject()->className(), element->metaObject()->className()));
             }
             ReportHandler::debugTypes("Adding to TypeDatabase(2): " + entry->name());
@@ -2363,20 +2583,16 @@ void QmlTypeSystemReaderPrivate::parseNamespaceType(NamespaceType* element){
     }
 }
 
-void QmlTypeSystemReaderPrivate::parseEnumType(EnumType* element){
+void QmlTypeSystemReaderPrivate::parseEnumType(const QString& nameSpace, EnumType* element){
     if (checkQtVersion(element)){
         QString name = element->getName();
+        if(!nameSpace.isEmpty())
+            name = nameSpace+"::"+name;
         try{
-            QString flags = element->getFlags();
-            for(const NameSpacePrefix& prefix : m_namespacePrefixes){
+            for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
                 if(name.startsWith(prefix.prefix)){
                     name = name.mid(prefix.prefix.size());
                     name = prefix._namespace + name;
-                    if(flags.startsWith(prefix.prefix)){
-                        flags = flags.mid(prefix.prefix.size());
-                        flags = prefix._namespace + flags;
-                        break;
-                    }
                     break;
                 }
             }
@@ -2443,6 +2659,7 @@ void QmlTypeSystemReaderPrivate::parseEnumType(EnumType* element){
                         {Position::Position3, CodeSnip::Position3},
                         {Position::Position4, CodeSnip::Position4},
                         {Position::Position5, CodeSnip::Position5},
+                        {Position::Comment, CodeSnip::Comment},
                         {Position::End, CodeSnip::End}
                     };
                     parseInjectCode(childElement,
@@ -2454,12 +2671,21 @@ void QmlTypeSystemReaderPrivate::parseEnumType(EnumType* element){
             }
 
             // put in the flags parallel...
+            QString flags = element->getFlags();
             if (!flags.isEmpty() && flags.toLower() != "no") {
-                std::unique_ptr<FlagsTypeEntry> ftype(new FlagsTypeEntry("QFlags<" + eentry->qualifiedCppName() + ">"));
+                for(const NameSpacePrefix& prefix : qAsConst(m_namespacePrefixes)){
+                    if(flags.startsWith(prefix.prefix)){
+                        flags = flags.mid(prefix.prefix.size());
+                        flags = prefix._namespace + flags;
+                        break;
+                    }
+                    break;
+                }
+                std::unique_ptr<FlagsTypeEntry> ftype(new FlagsTypeEntry(flags));
                 ftype->setOriginator(eentry.get());
-                ftype->setOriginalName(flags);
+                ftype->setFlagsTemplate("QFlags<" + eentry->qualifiedCppName() + ">");
                 ftype->setCodeGeneration(eentry->codeGeneration());
-                QString n = ftype->originalName();
+                QString n = flags;
 
                 QStringList lst = n.split("::");
                 if (QStringList(lst.mid(0, lst.size() - 1)).join("::") != QStringList(names.mid(0, names.size() - 1)).join("::")) {
@@ -2474,6 +2700,8 @@ void QmlTypeSystemReaderPrivate::parseEnumType(EnumType* element){
                 //qDebug()<<"Adding ftype"<<ftype->name();
                 ReportHandler::debugTypes("Adding to TypeDatabase(1): " + ftype->name());
                 m_database->addType(ftype.release());
+            }else if(flags.toLower() == "no" || flags.toLower() == "false"){
+                eentry->setForceNoFlags(true);
             }
             m_database->addType(eentry.release());
         }catch(const TypesystemException& exn){
diff --git a/src/cpp/QtJambiGenerator/typesystem/typedatabase.cpp b/src/cpp/QtJambiGenerator/typesystem/typedatabase.cpp
index 5451d54a..e25ce02f 100644
--- a/src/cpp/QtJambiGenerator/typesystem/typedatabase.cpp
+++ b/src/cpp/QtJambiGenerator/typesystem/typedatabase.cpp
@@ -148,7 +148,7 @@ bool TypeDatabase::isSuppressedWarning(const QString &s) {
     return false;
 }
 
-PrimitiveTypeEntry *TypeDatabase::findPrimitiveType(const QString &name) {
+PrimitiveTypeEntry *TypeDatabase::findPrimitiveType(const QString &name) const{
     QList<TypeEntry *> entries = findTypes(name);
 
     for(TypeEntry *entry : entries) {
@@ -159,7 +159,7 @@ PrimitiveTypeEntry *TypeDatabase::findPrimitiveType(const QString &name) {
     return nullptr;
 }
 
-ComplexTypeEntry *TypeDatabase::findComplexType(const QString &name) {
+ComplexTypeEntry *TypeDatabase::findComplexType(const QString &name) const {
     TypeEntry *entry = findType(name);
     if (entry && entry->isComplex())
         return static_cast<ComplexTypeEntry *>(entry);
@@ -167,7 +167,7 @@ ComplexTypeEntry *TypeDatabase::findComplexType(const QString &name) {
         return nullptr;
 }
 
-FunctionalTypeEntry *TypeDatabase::findFunctionalType(const QString &name) {
+FunctionalTypeEntry *TypeDatabase::findFunctionalType(const QString &name) const {
     TypeEntry *entry = findType(name);
     if (entry && entry->isFunctional())
         return static_cast<FunctionalTypeEntry *>(entry);
@@ -175,7 +175,7 @@ FunctionalTypeEntry *TypeDatabase::findFunctionalType(const QString &name) {
         return nullptr;
 }
 
-FunctionalTypeEntry *TypeDatabase::findFunctionalTypeByUsing(const QString &containingClassName, const QString &_using) {
+FunctionalTypeEntry *TypeDatabase::findFunctionalTypeByUsing(const QString &containingClassName, const QString &_using) const {
     for(QList<TypeEntry *> entries : m_entries){
         for(TypeEntry *entry : entries){
             if (entry && entry->isFunctional())
@@ -184,7 +184,7 @@ FunctionalTypeEntry *TypeDatabase::findFunctionalTypeByUsing(const QString &cont
                 if(!fentry->getUsing().isEmpty()){
                     if(( fentry->getUsing()==_using
                             || QString::fromUtf8(QMetaObject::normalizedSignature(qPrintable(fentry->getUsing())))==_using )
-                            && fentry->name().startsWith(containingClassName+"::")){
+                            && (containingClassName.isEmpty() || fentry->name().startsWith(containingClassName+"::"))){
                         return fentry;
                     }
                 }
@@ -194,7 +194,7 @@ FunctionalTypeEntry *TypeDatabase::findFunctionalTypeByUsing(const QString &cont
     return nullptr;
 }
 
-ObjectTypeEntry *TypeDatabase::findObjectType(const QString &name) {
+ObjectTypeEntry *TypeDatabase::findObjectType(const QString &name) const {
     TypeEntry *entry = findType(name);
     if (entry && entry->isObject())
         return static_cast<ObjectTypeEntry *>(entry);
@@ -202,7 +202,7 @@ ObjectTypeEntry *TypeDatabase::findObjectType(const QString &name) {
         return nullptr;
 }
 
-NamespaceTypeEntry *TypeDatabase::findNamespaceType(const QString &name) {
+NamespaceTypeEntry *TypeDatabase::findNamespaceType(const QString &name) const {
     TypeEntry *entry = findType(name);
     if (entry && entry->isNamespace())
         return static_cast<NamespaceTypeEntry *>(entry);
@@ -211,13 +211,13 @@ NamespaceTypeEntry *TypeDatabase::findNamespaceType(const QString &name) {
 }
 
 void TypeDatabase::addType(TypeEntry *e) {
-    if(e->qualifiedCppName()=="QVariant" && !e->isVariant()){
+    if(e->qualifiedCppName()=="QVariant" && !e->isQVariant()){
         m_entries["QtJambiVariant"].append(e);
         m_qvariantType = dynamic_cast<ComplexTypeEntry*>(e);
     }else if(e->qualifiedCppName()=="QString" && !e->isQString()){
         m_entries["QtJambiString"].append(e);
         m_qstringType = dynamic_cast<ComplexTypeEntry*>(e);
-    }else if(e->qualifiedCppName()=="QChar" && !e->isChar()){
+    }else if(e->qualifiedCppName()=="QChar" && !e->isQChar()){
         m_entries["QtJambiChar"].append(e);
         m_qcharType = dynamic_cast<ComplexTypeEntry*>(e);
     }else{
@@ -231,6 +231,8 @@ void TypeDatabase::addType(TypeEntry *e) {
             m_typeSystemsByQtLibrary[tsentry->qtLibrary()] = tsentry;
         }else if(!tsentry->targetName().isEmpty()){
             m_typeSystemsByQtLibrary[tsentry->targetName()] = tsentry;
+        }else{
+            m_otherTypeSystems << tsentry;
         }
     }
     if(!m_pixmapType && e->qualifiedCppName()==QLatin1String("QPixmap")){
@@ -241,6 +243,12 @@ void TypeDatabase::addType(TypeEntry *e) {
     }
 }
 
+QList<TypeSystemTypeEntry*> TypeDatabase::typeSystems() const{
+    QList<TypeSystemTypeEntry*> result = m_otherTypeSystems;
+    result << m_typeSystemsByQtLibrary.values();
+    return result;
+}
+
 void TypeDatabase::initialize(const QString &filename, const QStringList &importInputDirectoryList, const QStringList &typeystemDirectory, const QVersionNumber& qtVersion, bool generate) {
     m_qtVersion = qtVersion;
     m_entries.clear();
@@ -1015,7 +1023,9 @@ void TypeDatabase::initialize(const QString &filename, const QStringList &import
             addType(entry);
         }
         addType(new ContainerTypeEntry("QQmlListProperty", ContainerTypeEntry::QQmlListPropertyContainer));
-        addType(new ContainerTypeEntry("QPair", ContainerTypeEntry::PairContainer));
+        ContainerTypeEntry* pair = new ContainerTypeEntry("QPair", ContainerTypeEntry::PairContainer);
+        addType(pair);
+        m_entries["std::pair"].append(pair);
         addType(new ContainerTypeEntry("std::atomic", ContainerTypeEntry::std_atomic));
         addType(new ContainerTypeEntry("std::optional", ContainerTypeEntry::std_optional));
         {
@@ -1043,13 +1053,7 @@ void TypeDatabase::initialize(const QString &filename, const QStringList &import
             addType(etype);
         }
         addType(new QMetaObjectConnectionTypeEntry());
-
-        ObjectTypeEntry* glsync = new ObjectTypeEntry("__GLsync");
-        glsync->setTargetLangName("GLsync");
-        glsync->setTargetTypeSystem("io.qt.gui");
-        glsync->setTargetLangPackage("io.qt.gui.gl");
-        glsync->setCodeGeneration(TypeEntry::GenerateNothing);
-        addType(glsync);
+        addType(new GLsyncTypeEntry());
     }
     if(!parseFile(filename, importInputDirectoryList, typeystemDirectory, generate)){
         std::exit(-1);
@@ -1107,7 +1111,7 @@ const QStringList &TypeDatabase::rebuildClasses() const
     return m_rebuildClasses;
 }
 
-TypeSystemTypeEntry *TypeDatabase::findTypeSystem(const QString &name){
+TypeSystemTypeEntry *TypeDatabase::findTypeSystem(const QString &name) const{
     TypeEntry *entry = findType(name);
     if (entry && entry->isTypeSystem())
         return static_cast<TypeSystemTypeEntry *>(entry);
@@ -1115,7 +1119,7 @@ TypeSystemTypeEntry *TypeDatabase::findTypeSystem(const QString &name){
         return nullptr;
 }
 
-ContainerTypeEntry *TypeDatabase::findContainerType(const QString &name) {
+ContainerTypeEntry *TypeDatabase::findContainerType(const QString &name) const {
     QString template_name = name;
 
     auto pos = name.indexOf('<');
@@ -1128,7 +1132,7 @@ ContainerTypeEntry *TypeDatabase::findContainerType(const QString &name) {
     return nullptr;
 }
 
-IteratorTypeEntry *TypeDatabase::findIteratorType(const QString &name) {
+IteratorTypeEntry *TypeDatabase::findIteratorType(const QString &name) const {
     QString template_name = name;
 
     auto pos = name.indexOf('<');
@@ -1141,7 +1145,7 @@ IteratorTypeEntry *TypeDatabase::findIteratorType(const QString &name) {
     return nullptr;
 }
 
-IteratorTypeEntry *TypeDatabase::findIteratorType(const ComplexTypeEntry * container) {
+IteratorTypeEntry *TypeDatabase::findIteratorType(const ComplexTypeEntry * container) const {
     for(const QList<TypeEntry *>& list : m_entries){
         for(TypeEntry * entry : list){
             if(entry->isIterator()){
@@ -1155,7 +1159,7 @@ IteratorTypeEntry *TypeDatabase::findIteratorType(const ComplexTypeEntry * conta
     return nullptr;
 }
 
-PointerContainerTypeEntry *TypeDatabase::findPointerContainerType(const QString &name) {
+PointerContainerTypeEntry *TypeDatabase::findPointerContainerType(const QString &name) const {
     QString template_name = name;
 
     auto pos = name.indexOf('<');
@@ -1168,7 +1172,7 @@ PointerContainerTypeEntry *TypeDatabase::findPointerContainerType(const QString
     return nullptr;
 }
 
-InitializerListTypeEntry *TypeDatabase::findInitializerListType(const QString &name) {
+InitializerListTypeEntry *TypeDatabase::findInitializerListType(const QString &name) const {
     QString template_name = name;
 
     auto pos = name.indexOf('<');
@@ -1181,7 +1185,7 @@ InitializerListTypeEntry *TypeDatabase::findInitializerListType(const QString &n
     return nullptr;
 }
 
-PrimitiveTypeEntry *TypeDatabase::findTargetLangPrimitiveType(const QString &java_name) {
+PrimitiveTypeEntry *TypeDatabase::findTargetLangPrimitiveType(const QString &java_name) const {
     for(QList<TypeEntry *> entries : m_entries) {
         for(TypeEntry *e : entries) {
             if (e && e->isPrimitive()) {
@@ -1385,10 +1389,11 @@ QString resolveFilePath(QString fileName, int opts, const QStringList &list) {
         }
         fileName = fileName+".qml";
     }
+    if(fileName.startsWith(":"))
+        return fileName;
     QFileInfo fileinfoAbs(fileName);
-    if(fileinfoAbs.isAbsolute()) {
-        qDebug() << "isAbsolute path: " << fileName;
-        return fileName.trimmed();
+    if(fileinfoAbs.exists()) {
+        return fileinfoAbs.absoluteFilePath();
     }
 
     for(const QString &s : list) {
diff --git a/src/cpp/QtJambiGenerator/typesystem/typedatabase.h b/src/cpp/QtJambiGenerator/typesystem/typedatabase.h
index 98c74b9d..9d71fad6 100644
--- a/src/cpp/QtJambiGenerator/typesystem/typedatabase.h
+++ b/src/cpp/QtJambiGenerator/typesystem/typedatabase.h
@@ -55,19 +55,19 @@ class TypeDatabase {
 
     QList<Include> extraIncludes(const QString &className);
 
-    TypeSystemTypeEntry *findTypeSystem(const QString &name);
-    ComplexTypeEntry *findComplexType(const QString &name);
-    FunctionalTypeEntry *findFunctionalType(const QString &name);
-    FunctionalTypeEntry *findFunctionalTypeByUsing(const QString &containingClassName, const QString &_using);
-    PrimitiveTypeEntry *findPrimitiveType(const QString &name);
-    ObjectTypeEntry *findObjectType(const QString &name);
-    NamespaceTypeEntry *findNamespaceType(const QString &name);
-
-    ContainerTypeEntry *findContainerType(const QString &name);
-    IteratorTypeEntry *findIteratorType(const QString &name);
-    IteratorTypeEntry *findIteratorType(const ComplexTypeEntry * container);
-    PointerContainerTypeEntry *findPointerContainerType(const QString &name);
-    InitializerListTypeEntry *findInitializerListType(const QString &name);
+    TypeSystemTypeEntry *findTypeSystem(const QString &name) const;
+    ComplexTypeEntry *findComplexType(const QString &name) const;
+    FunctionalTypeEntry *findFunctionalType(const QString &name) const;
+    FunctionalTypeEntry *findFunctionalTypeByUsing(const QString &containingClassName, const QString &_using) const;
+    PrimitiveTypeEntry *findPrimitiveType(const QString &name) const;
+    ObjectTypeEntry *findObjectType(const QString &name) const;
+    NamespaceTypeEntry *findNamespaceType(const QString &name) const;
+
+    ContainerTypeEntry *findContainerType(const QString &name) const;
+    IteratorTypeEntry *findIteratorType(const QString &name) const;
+    IteratorTypeEntry *findIteratorType(const ComplexTypeEntry * container) const;
+    PointerContainerTypeEntry *findPointerContainerType(const QString &name) const;
+    InitializerListTypeEntry *findInitializerListType(const QString &name) const;
 
     bool isPixmapType(const TypeEntry *e) const{
         return e==m_pixmapType || e==m_bitmapType;
@@ -85,7 +85,7 @@ class TypeDatabase {
 
     SingleTypeEntryHash entries();
 
-    PrimitiveTypeEntry *findTargetLangPrimitiveType(const QString &java_name);
+    PrimitiveTypeEntry *findTargetLangPrimitiveType(const QString &java_name) const;
 
     void addRejection(const QString &class_name, const QString &function_name,
                       const QString &field_name, const QString &enum_name);
@@ -107,7 +107,7 @@ class TypeDatabase {
     FlagsTypeEntry *findFlagsType(const QString &name) const;
 
     void addFlagsType(FlagsTypeEntry *fte) {
-        m_flags_entries[fte->originalName()] = fte;
+        m_flags_entries[fte->flagsTemplate()] = fte;
     }
 
     TemplateEntry *findTemplate(const QString &name) {
@@ -159,6 +159,8 @@ class TypeDatabase {
 
     const QMap<QString,TypeSystemTypeEntry*>& typeSystemsByQtLibrary() const { return m_typeSystemsByQtLibrary; }
 
+    QList<TypeSystemTypeEntry*> typeSystems() const;
+
     inline const QVersionNumber& qtVersion() const {return m_qtVersion;}
 
     ComplexTypeEntry * qvariantType() const{
@@ -197,6 +199,7 @@ class TypeDatabase {
 
     DefinedPtr m_defined;
     QMap<QString,TypeSystemTypeEntry*> m_typeSystemsByQtLibrary;
+    QList<TypeSystemTypeEntry*> m_otherTypeSystems;
     ComplexTypeEntry * m_pixmapType;
     ComplexTypeEntry * m_bitmapType;
     ComplexTypeEntry * m_qstringType;
diff --git a/src/cpp/QtJambiGenerator/typesystem/typeentry.cpp b/src/cpp/QtJambiGenerator/typesystem/typeentry.cpp
index d6bb4c82..b393beb0 100644
--- a/src/cpp/QtJambiGenerator/typesystem/typeentry.cpp
+++ b/src/cpp/QtJambiGenerator/typesystem/typeentry.cpp
@@ -154,10 +154,19 @@ QString FlagsTypeEntry::qualifiedTargetLangJNIName() const {
 }
 
 QString FunctionalTypeEntry::javaPackage() const {
-    if(!m_qualifier_type)
+    if(!m_qualifier_type){
         m_qualifier_type = TypeDatabase::instance()->findType(m_qualifier);
+        if (m_qualifier_type){
+            if(m_qualifier_type->isQString() && TypeDatabase::instance()->qstringType())
+                m_qualifier_type = TypeDatabase::instance()->qstringType();
+            else if(m_qualifier_type->isQVariant() && TypeDatabase::instance()->qvariantType())
+                m_qualifier_type = TypeDatabase::instance()->qvariantType();
+            else if(m_qualifier_type->isQChar() && TypeDatabase::instance()->qcharType())
+                m_qualifier_type = TypeDatabase::instance()->qcharType();
+        }
+    }
     if (m_qualifier_type){
-        if(m_qualifier_type->isVariant())
+        if(m_qualifier_type->isQVariant())
             return "io.qt.core";
         if(m_qualifier_type->designatedInterface()){
             return m_qualifier_type->designatedInterface()->javaPackage();
@@ -168,10 +177,19 @@ QString FunctionalTypeEntry::javaPackage() const {
 }
 
 QString FunctionalTypeEntry::javaQualifier() const {
-    if(!m_qualifier_type)
+    if(!m_qualifier_type){
         m_qualifier_type = TypeDatabase::instance()->findType(m_qualifier);
+        if (m_qualifier_type){
+            if(m_qualifier_type->isQString() && TypeDatabase::instance()->qstringType())
+                m_qualifier_type = TypeDatabase::instance()->qstringType();
+            else if(m_qualifier_type->isQVariant() && TypeDatabase::instance()->qvariantType())
+                m_qualifier_type = TypeDatabase::instance()->qvariantType();
+            else if(m_qualifier_type->isQChar() && TypeDatabase::instance()->qcharType())
+                m_qualifier_type = TypeDatabase::instance()->qcharType();
+        }
+    }
     if (m_qualifier_type){
-        if(m_qualifier_type->isVariant())
+        if(m_qualifier_type->isQVariant())
             return "QVariant";
         if(m_qualifier_type->designatedInterface()){
             return m_qualifier_type->designatedInterface()->targetLangName();
@@ -188,15 +206,15 @@ QString EnumTypeEntry::javaPackage() const {
         }else{
             m_qualifier_type = TypeDatabase::instance()->findType(m_javaScope);
         }
-        if(m_qualifier_type && m_qualifier_type->isVariant() && TypeDatabase::instance()->qvariantType())
+        if(m_qualifier_type && m_qualifier_type->isQVariant() && TypeDatabase::instance()->qvariantType())
             m_qualifier_type = TypeDatabase::instance()->qvariantType();
         else if(m_qualifier_type && m_qualifier_type->isQString() && TypeDatabase::instance()->qstringType())
             m_qualifier_type = TypeDatabase::instance()->qstringType();
-        else if(m_qualifier_type && m_qualifier_type->isChar() && TypeDatabase::instance()->qcharType())
+        else if(m_qualifier_type && m_qualifier_type->isQChar() && TypeDatabase::instance()->qcharType())
             m_qualifier_type = TypeDatabase::instance()->qcharType();
     }
     if (m_qualifier_type){
-        if(m_qualifier_type->isVariant())
+        if(m_qualifier_type->isQVariant())
             return "io.qt.core";
         if(m_qualifier_type->designatedInterface()){
             return m_qualifier_type->designatedInterface()->javaPackage();
@@ -213,15 +231,17 @@ QString EnumTypeEntry::javaQualifier() const {
         }else{
             m_qualifier_type = TypeDatabase::instance()->findType(m_javaScope);
         }
-        if(m_qualifier_type && m_qualifier_type->isVariant())
-            m_qualifier_type = TypeDatabase::instance()->findType("QtJambiVariant");
-        else if(m_qualifier_type && m_qualifier_type->isQString())
-            m_qualifier_type = TypeDatabase::instance()->findType("QtJambiString");
-        else if(m_qualifier_type && m_qualifier_type->isChar())
-            m_qualifier_type = TypeDatabase::instance()->findType("QtJambiChar");
+        if (m_qualifier_type){
+            if(m_qualifier_type->isQString() && TypeDatabase::instance()->qstringType())
+                m_qualifier_type = TypeDatabase::instance()->qstringType();
+            else if(m_qualifier_type->isQVariant() && TypeDatabase::instance()->qvariantType())
+                m_qualifier_type = TypeDatabase::instance()->qvariantType();
+            else if(m_qualifier_type->isQChar() && TypeDatabase::instance()->qcharType())
+                m_qualifier_type = TypeDatabase::instance()->qcharType();
+        }
     }
     if (m_qualifier_type){
-        if(m_qualifier_type->isVariant())
+        if(m_qualifier_type->isQVariant())
             return "QVariant";
         if(m_qualifier_type->designatedInterface()){
             return m_qualifier_type->designatedInterface()->targetLangName();
@@ -422,6 +442,28 @@ FunctionModificationList ComplexTypeEntry::functionModifications(const QString &
     return lst;
 }
 
+TypeSystemTypeEntry::TypeSystemTypeEntry(const QString &name)
+        : TypeEntry(name, TypeSystemType),
+          snips(),
+          m_include(),
+          m_extra_includes(),
+          m_qtLibrary(),
+          m_module(),
+          m_requiredTypeSystems(),
+          m_noExports(false) {
+}
+
+TypeSystemTypeEntry::TypeSystemTypeEntry(const QString &name, const QString &lib, const QString &module)
+        : TypeEntry(name, TypeSystemType),
+          snips(),
+          m_include(),
+          m_extra_includes(),
+          m_qtLibrary(lib),
+          m_module(module),
+          m_requiredTypeSystems(),
+          m_noExports(false) {
+}
+
 FunctionModificationList TypeSystemTypeEntry::functionModifications(const QString &signature) const {
     FunctionModificationList lst;
     for (const FunctionModification& mod : m_function_mods) {
@@ -452,12 +494,12 @@ QString ComplexTypeEntry::qualifiedCppName() const {
     return m_qualified_cpp_name;
 }
 
-bool ObjectTypeEntry::isValueOwner() const
+bool ImplementorTypeEntry::isValueOwner() const
 {
     return m_attributes.testFlag(IsValueOwner);
 }
 
-void ObjectTypeEntry::setIsValueOwner(bool is_value_owner)
+void ImplementorTypeEntry::setIsValueOwner(bool is_value_owner)
 {
     m_attributes.setFlag(IsValueOwner, is_value_owner);
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/typeentry.h b/src/cpp/QtJambiGenerator/typesystem/typeentry.h
index e7d34331..240b4be2 100644
--- a/src/cpp/QtJambiGenerator/typesystem/typeentry.h
+++ b/src/cpp/QtJambiGenerator/typesystem/typeentry.h
@@ -97,20 +97,20 @@ class TypeEntry {
             TemplateArgumentType,
             InstantiatedTemplateArgumentType,
             BasicValueType,
-            StringType,
-            Latin1StringType,
-            Latin1StringViewType,
-            StringViewType,
-            AnyStringViewType,
-            Utf8StringViewType,
-            StringRefType,
+            QStringType,
+            QLatin1StringType,
+            QLatin1StringViewType,
+            QStringViewType,
+            QAnyStringViewType,
+            QUtf8StringViewType,
+            QStringRefType,
             ContainerType,
             IteratorType,
             InterfaceType,
             ObjectType,
             TemplateType,
             NamespaceType,
-            VariantType,
+            QVariantType,
             PointerContainerType,
             InitializerListType,
             JObjectWrapperType,
@@ -120,16 +120,13 @@ class TypeEntry {
             JIteratorWrapperType,
             JEnumWrapperType,
             JQFlagsWrapperType,
-            CharType,
+            QCharType,
             ArrayType,
             TypeSystemType,
-            QModelIndexType,
             QMetaObjectType,
             QMetaObjectConnectionType,
-            QMetaMethodType,
-            QMetaPropertyType,
-            QMetaEnumType,
             GlobalType,
+            UnknownType,
         };
 
         enum CodeGeneration {
@@ -171,24 +168,12 @@ class TypeEntry {
         bool isGlobal() const {
             return m_type == GlobalType;
         }
-        bool isQModelIndexType() const {
-            return m_type == QModelIndexType;
-        }
         bool isQMetaObjectType() const {
             return m_type == QMetaObjectType;
         }
         bool isQMetaObjectConnectionType() const {
             return m_type == QMetaObjectConnectionType;
         }
-        bool isQMetaEnumType() const {
-            return m_type == QMetaEnumType;
-        }
-        bool isQMetaMethodType() const {
-            return m_type == QMetaMethodType;
-        }
-        bool isQMetaPropertyType() const {
-            return m_type == QMetaPropertyType;
-        }
         virtual bool isScopedEnum() const {
              return false;
         }
@@ -202,37 +187,37 @@ class TypeEntry {
             return m_type == ObjectType;
         }
         bool isString() const {
-            return m_type == StringType
-                    || m_type == Latin1StringType
-                    || m_type == Latin1StringViewType
-                    || m_type == StringViewType
-                    || m_type == AnyStringViewType
-                    || m_type == Utf8StringViewType
-                    || m_type == StringRefType;
+            return m_type == QStringType
+                    || m_type == QLatin1StringType
+                    || m_type == QLatin1StringViewType
+                    || m_type == QStringViewType
+                    || m_type == QAnyStringViewType
+                    || m_type == QUtf8StringViewType
+                    || m_type == QStringRefType;
         }
         bool isQString() const {
-            return m_type == StringType;
+            return m_type == QStringType;
         }
-        bool isLatin1String() const {
-            return m_type == Latin1StringType;
+        bool isQLatin1String() const {
+            return m_type == QLatin1StringType;
         }
-        bool isLatin1StringView() const {
-            return m_type == Latin1StringViewType;
+        bool isQLatin1StringView() const {
+            return m_type == QLatin1StringViewType;
         }
-        bool isStringView() const {
-            return m_type == StringViewType;
+        bool isQStringView() const {
+            return m_type == QStringViewType;
         }
-        bool isAnyStringView() const {
-            return m_type == AnyStringViewType;
+        bool isQAnyStringView() const {
+            return m_type == QAnyStringViewType;
         }
-        bool isUtf8StringView() const {
-            return m_type == Utf8StringViewType;
+        bool isQUtf8StringView() const {
+            return m_type == QUtf8StringViewType;
         }
-        bool isStringRef() const {
-            return m_type == StringRefType;
+        bool isQStringRef() const {
+            return m_type == QStringRefType;
         }
-        bool isChar() const {
-            return m_type == CharType;
+        bool isQChar() const {
+            return m_type == QCharType;
         }
         bool isNamespace() const {
             return m_type == NamespaceType;
@@ -243,8 +228,8 @@ class TypeEntry {
         bool isIterator() const {
             return m_type == IteratorType;
         }
-        bool isVariant() const {
-            return m_type == VariantType;
+        bool isQVariant() const {
+            return m_type == QVariantType;
         }
         bool isJObjectWrapper() const {
             return m_type == JObjectWrapperType;
@@ -279,6 +264,9 @@ class TypeEntry {
         bool isAuto() const {
             return m_type == AutoType;
         }
+        bool isUnknown() const {
+            return m_type == UnknownType;
+        }
         bool isPointerContainer() const {
             return m_type == PointerContainerType;
         }
@@ -378,6 +366,14 @@ class TypeEntry {
         bool isDeclDeprecated() const{
             return m_isDeclaredDeprecated;
         }
+
+        void setInUse(bool inUse){
+            m_in_use = inUse;
+        }
+
+        bool isInUse() const{
+            return m_in_use;
+        }
     private:
         QString m_name;
         Type m_type;
@@ -385,6 +381,7 @@ class TypeEntry {
         bool m_isDeclaredDeprecated;
         // currently not yet in use:
         bool m_preferred_conversion;
+        bool m_in_use;
 };
 typedef QMap<QString, QList<TypeEntry *> > TypeEntryHash;
 typedef QMap<QString, TypeEntry *> SingleTypeEntryHash;
@@ -438,27 +435,8 @@ struct Dependency{
 class TypeSystemTypeEntry : public TypeEntry {
     public:
 
-        TypeSystemTypeEntry(const QString &name)
-                : TypeEntry(name, TypeSystemType),
-                  snips(),
-                  m_include(),
-                  m_extra_includes(),
-                  m_qtLibrary(),
-                  m_module(),
-                  m_requiredTypeSystems(),
-                  m_noExports(false) {
-        }
-
-        TypeSystemTypeEntry(const QString &name, const QString &lib, const QString &module)
-                : TypeEntry(name, TypeSystemType),
-                  snips(),
-                  m_include(),
-                  m_extra_includes(),
-                  m_qtLibrary(lib),
-                  m_module(module),
-                  m_requiredTypeSystems(),
-                  m_noExports(false) {
-        }
+        TypeSystemTypeEntry(const QString &name);
+        TypeSystemTypeEntry(const QString &name, const QString &lib, const QString &module);
 
         const Include& include() const {
             return m_include;
@@ -575,6 +553,13 @@ class AutoTypeEntry : public TypeEntry {
         }
 };
 
+class UnknownTypeEntry : public TypeEntry {
+    public:
+        UnknownTypeEntry(const QString &name) : TypeEntry(name, UnknownType) {
+            setCodeGeneration(GenerateNothing);
+        }
+};
+
 class TemplateArgumentEntry : public TypeEntry {
     public:
         TemplateArgumentEntry(const QString &name)
@@ -588,8 +573,16 @@ class TemplateArgumentEntry : public TypeEntry {
             m_ordinal = o;
         }
 
+        bool isVariadic() const {
+            return m_variadic;
+        }
+        void setVariadic(bool o) {
+            m_variadic = o;
+        }
+
     private:
         int m_ordinal;
+        bool m_variadic;
 };
 
 class ArrayTypeEntry : public TypeEntry {
@@ -609,7 +602,7 @@ class ArrayTypeEntry : public TypeEntry {
             if(m_indirections==0)
                 return m_nested_type->targetLangName() + "[]";
             else
-                return "io.qt.QNativePointer[]";
+                return "QNativePointer[]";
         }
         QString jniName() const override {
             if (m_nested_type->isPrimitive() && m_nested_type->jniName()!="void" && m_indirections==0)
@@ -857,6 +850,7 @@ class EnumTypeEntry : public TypeEntry {
                 m_extensible(false),
                 m_noMetaObject(false),
                 m_force_integer(false),
+                m_force_noFlags(false),
                 m_isEnumClass(false),
                 m_isPublic(true),
                 m_size(32),
@@ -990,6 +984,13 @@ class EnumTypeEntry : public TypeEntry {
             m_force_integer = force;
         }
 
+        bool forceNoFlags() const {
+            return m_force_noFlags;
+        }
+        void setForceNoFlags(bool force) {
+            m_force_noFlags = force;
+        }
+
         QString implements() const {
             return m_implements;
         }
@@ -1064,6 +1065,7 @@ class EnumTypeEntry : public TypeEntry {
         bool m_extensible;
         bool m_noMetaObject;
         bool m_force_integer;
+        bool m_force_noFlags;
         bool m_isEnumClass;
         bool m_isPublic;
         uint m_size;
@@ -1087,11 +1089,11 @@ class FlagsTypeEntry : public TypeEntry {
             return false;
         }
 
-        const QString& originalName() const {
-            return m_original_name;
+        const QString& flagsTemplate() const {
+            return m_flagsTemplate;
         }
-        void setOriginalName(const QString &s) {
-            m_original_name = s;
+        void setFlagsTemplate(const QString &s) {
+            m_flagsTemplate = s;
         }
 
         const QString& flagsName() const {
@@ -1124,7 +1126,7 @@ class FlagsTypeEntry : public TypeEntry {
             return TypeEntry::qualifiedCppName();
         }
     private:
-        QString m_original_name;
+        QString m_flagsTemplate;
         QString m_java_name;
         EnumTypeEntry *m_enum;
 };
@@ -1258,6 +1260,9 @@ class ComplexTypeEntry : public TypeEntry {
         void setQObject(bool qobject) {
             m_attributes.setFlag(IsQObject, qobject);
         }
+        bool isGLsync() const {
+            return m_attributes.testFlag(IsGLsync);
+        }
 
         bool isQWidget() const {
             return m_attributes.testFlag(IsQWidget);
@@ -1435,6 +1440,126 @@ class ComplexTypeEntry : public TypeEntry {
         const CustomFunction& customDestructor() const {
             return m_customDestructor;
         }
+
+        bool skipMetaTypeRegistration() const {
+            return m_attributes.testFlag(SkipMetaTypeRegistration);
+        }
+
+        void setSkipMetaTypeRegistration(bool skipMetaTypeRegistration){
+            m_attributes.setFlag(SkipMetaTypeRegistration, skipMetaTypeRegistration);
+        }
+
+        bool hasAnyConstructor(bool nonPrivate = true) const {
+            return m_functionAttributes.testFlag(nonPrivate ? HasAnyNonPrivateConstructor : HasAnyPrivateConstructor);
+        }
+
+        void setHasAnyConstructor(bool nonPrivate = true){
+            m_functionAttributes.setFlag(nonPrivate ? HasAnyNonPrivateConstructor : HasAnyPrivateConstructor);
+        }
+
+        bool hasDefaultConstructor(bool _public = true) const {
+            return m_functionAttributes.testFlag(_public ? HasPublicDefaultConstructor : HasProtectedDefaultConstructor);
+        }
+
+        void setHasDefaultConstructor(bool _public = true){
+            m_functionAttributes.setFlag(_public ? HasPublicDefaultConstructor : HasProtectedDefaultConstructor);
+        }
+
+        bool hasCopyConstructor(bool _public = true) const {
+            return m_functionAttributes.testFlag(_public ? HasPublicCopyConstructor : HasProtectedCopyConstructor);
+        }
+
+        void setHasCopyConstructor(bool _public = true){
+            m_functionAttributes.setFlag(_public ? HasPublicCopyConstructor : HasProtectedCopyConstructor);
+        }
+
+        bool hasMoveConstructor(bool _public = true) const {
+            return m_functionAttributes.testFlag(_public ? HasPublicMoveConstructor : HasProtectedMoveConstructor);
+        }
+
+        void setHasMoveConstructor(bool _public = true){
+            m_functionAttributes.setFlag(_public ? HasPublicMoveConstructor : HasProtectedMoveConstructor);
+        }
+
+        bool hasMoveAssignment(bool _public = true) const {
+            return m_functionAttributes.testFlag(_public ? HasPublicMoveAssignment : HasProtectedMoveAssignment);
+        }
+
+        void setHasMoveAssignment(bool _public = true){
+            m_functionAttributes.setFlag(_public ? HasPublicMoveAssignment : HasProtectedMoveAssignment);
+        }
+
+        bool hasDefaultAssignment(bool _public = true) const {
+            return m_functionAttributes.testFlag(_public ? HasPublicDefaultAssignment : HasProtectedDefaultAssignment);
+        }
+
+        void setHasDefaultAssignment(bool _public = true){
+            m_functionAttributes.setFlag(_public ? HasPublicDefaultAssignment : HasProtectedDefaultAssignment);
+        }
+
+        void setDestructorPrivate(){
+            m_functionAttributes.setFlag(HasPrivateDestructor, true);
+        }
+
+        bool isDestructorPrivate() const {
+            return m_functionAttributes.testFlag(HasPrivateDestructor);
+        }
+
+        void setDestructorProtected(){
+            m_functionAttributes.setFlag(HasProtectedDestructor, true);
+        }
+
+        bool isDestructorProtected() const {
+            return m_functionAttributes.testFlag(HasProtectedDestructor);
+        }
+
+        void setDestructorVirtual(){
+            m_functionAttributes.setFlag(HasVirtualDestructor, true);
+        }
+
+        bool isDestructorVirtual() const {
+            return m_functionAttributes.testFlag(HasVirtualDestructor);
+        }
+
+        void setHasEquals(){
+            m_functionAttributes.setFlag(HasEquals, true);
+        }
+
+        bool hasEquals() const {
+            return m_functionAttributes.testFlag(HasEquals);
+        }
+
+        void setHasHash(){
+            m_functionAttributes.setFlag(HasHash, true);
+        }
+
+        bool hasHash() const {
+            return m_functionAttributes.testFlag(HasHash);
+        }
+
+        void setHasVirtualFunctions(){
+            m_functionAttributes.setFlag(HasVirtuals, true);
+        }
+
+        bool hasVirtualFunctions() const {
+            return m_functionAttributes.testFlag(HasVirtuals);
+        }
+
+        void setHasFinalFunctions(){
+            m_functionAttributes.setFlag(HasFinals, true);
+        }
+
+        bool hasFinalFunctions() const {
+            return m_functionAttributes.testFlag(HasFinals);
+        }
+
+        bool hasPureVirtualFunctions(bool nonPrivate = true) const {
+            return m_functionAttributes.testFlag(nonPrivate ? HasPureVirtuals : HasPrivatePureVirtuals);
+        }
+
+        void setHasPureVirtualFunctions(bool nonPrivate = true){
+            m_functionAttributes.setFlag(nonPrivate ? HasPureVirtuals : HasPrivatePureVirtuals);
+        }
 protected:
         enum ComplexAttributeFlag{
             IsQObject = 0x01,
@@ -1442,17 +1567,45 @@ class ComplexTypeEntry : public TypeEntry {
             IsQWindow = 0x04,
             IsQAction = 0x08,
             IsQCoreApplication = 0x010,
-            IsPolymorphicBase = 0x020,
-            IsGenericClass = 0x040,
-            IsTemplate = 0x080,
-            IsNativeInterface = 0x0100,
-            InhibitMetaobject = 0x0200,
-            IsNativeIdBased = 0x0400,
-            IsNoImpl = 0x0800,
-            IsValueOwner = 0x01000,
-            SkipMetaTypeRegistration = 0x2000
+            IsGLsync = 0x020,
+            IsPolymorphicBase = 0x0200,
+            IsGenericClass = 0x0400,
+            IsTemplate = 0x0800,
+            IsNativeInterface = 0x01000,
+            InhibitMetaobject = 0x02000,
+            IsNativeIdBased = 0x04000,
+            IsNoImpl = 0x08000,
+            IsValueOwner = 0x010000,
+            SkipMetaTypeRegistration = 0x20000,
+            ForceMetaTypeRegistration = 0x40000
         };
         QFlags<ComplexAttributeFlag> m_attributes;
+
+        enum FunctionAttributeFlag{
+            HasPublicDefaultConstructor = 0x1,
+            HasPublicCopyConstructor = 0x2,
+            HasPublicMoveConstructor = 0x4,
+            HasProtectedDefaultConstructor = 0x8,
+            HasProtectedCopyConstructor = 0x10,
+            HasProtectedMoveConstructor = 0x20,
+            HasPublicDefaultAssignment = 0x40,
+            HasPublicMoveAssignment = 0x80,
+            HasProtectedDefaultAssignment = 0x100,
+            HasProtectedMoveAssignment = 0x200,
+            HasPrivateDestructor = 0x400,
+            HasProtectedDestructor = 0x800,
+            HasVirtualDestructor = 0x1000,
+            HasAnyNonPrivateConstructor = 0x2000,
+            HasAnyPrivateConstructor = 0x4000,
+            HasEquals = 0x8000,
+            HasHash = 0x10000,
+            HasVirtuals = 0x20000,
+            HasPureVirtuals = 0x40000,
+            HasFinals = 0x80000,
+            HasPrivatePureVirtuals = 0x100000
+        };
+        QFlags<FunctionAttributeFlag> m_functionAttributes;
+
 private:
         IncludeList m_extra_includes;
         Include m_include;
@@ -1563,6 +1716,9 @@ class ImplementorTypeEntry : public ComplexTypeEntry {
         return m_interface==nullptr ? ComplexTypeEntry::isNativeIdBased() : m_interface->isNativeIdBased();
     }
 
+    bool isValueOwner() const;
+    void setIsValueOwner(bool is_value_owner);
+
 private:
     InterfaceTypeEntry *m_interface;
 };
@@ -1593,8 +1749,6 @@ class ObjectTypeEntry : public ImplementorTypeEntry {
         ObjectTypeEntry(const QString &name)
                 : ImplementorTypeEntry(name, ObjectType) {
         }
-        bool isValueOwner() const;
-        void setIsValueOwner(bool is_value_owner);
 };
 
 class ValueTypeEntry : public ImplementorTypeEntry {
@@ -1604,15 +1758,6 @@ class ValueTypeEntry : public ImplementorTypeEntry {
         bool isValue() const override {
             return true;
         }
-
-        bool skipMetaTypeRegistration() const {
-            return m_attributes.testFlag(SkipMetaTypeRegistration);
-        }
-
-        void setSkipMetaTypeRegistration(bool skipMetaTypeRegistration){
-            m_attributes.setFlag(SkipMetaTypeRegistration, skipMetaTypeRegistration);
-        }
-
     protected:
         ValueTypeEntry(const QString &name, Type t) : ImplementorTypeEntry(name, t) { }
 };
@@ -1621,12 +1766,12 @@ class StringTypeEntry : public ValueTypeEntry {
     public:
         StringTypeEntry(const QString &name)
                 : ValueTypeEntry(name,
-                                 name=="QString" ? StringType :
-                                (name=="QLatin1String" ? Latin1StringType :
-                                (name=="QLatin1StringView" ? Latin1StringViewType :
-                                (name=="QStringView" ? StringViewType :
-                                (name=="QAnyStringView" ? AnyStringViewType :
-                                (name=="QUtf8StringView" ? Utf8StringViewType : StringRefType)))))) {
+                                 name=="QString" ? QStringType :
+                                (name=="QLatin1String" ? QLatin1StringType :
+                                (name=="QLatin1StringView" ? QLatin1StringViewType :
+                                (name=="QStringView" ? QStringViewType :
+                                (name=="QAnyStringView" ? QAnyStringViewType :
+                                (name=="QUtf8StringView" ? QUtf8StringViewType : QStringRefType)))))) {
             setCodeGeneration(GenerateNothing);
         }
 
@@ -1647,7 +1792,7 @@ class StringTypeEntry : public ValueTypeEntry {
 
 class CharTypeEntry : public ValueTypeEntry {
     public:
-        CharTypeEntry(const QString &name) : ValueTypeEntry(name, CharType) {
+        CharTypeEntry(const QString &name) : ValueTypeEntry(name, QCharType) {
             setCodeGeneration(GenerateNothing);
         }
 
@@ -1694,7 +1839,7 @@ class JWrapperTypeEntry: public ValueTypeEntry {
 
 class VariantTypeEntry: public ValueTypeEntry {
     public:
-        VariantTypeEntry(const QString &name) : ValueTypeEntry(name, VariantType) { }
+        VariantTypeEntry(const QString &name) : ValueTypeEntry(name, QVariantType) { }
 
         QString jniName() const override {
             return strings_jobject;
@@ -1892,17 +2037,16 @@ class InstantiatedTemplateArgumentEntry : public ComplexTypeEntry {
         QString m_javaInstantiationBaseType;
 };
 
-
-class QModelIndexTypeEntry : public ComplexTypeEntry {
+class GLsyncTypeEntry : public ObjectTypeEntry {
     public:
-        QModelIndexTypeEntry() : ComplexTypeEntry("QModelIndex", QModelIndexType) {
+        GLsyncTypeEntry() : ObjectTypeEntry("__GLsync") {
             setCodeGeneration(GenerateNothing);
-            disableNativeIdUsage();
+            setTargetLangName("GLsync");
+            setTargetTypeSystem("io.qt.gui");
+            setTargetLangPackage("io.qt.gui.gl");
+            setCodeGeneration(TypeEntry::GenerateNothing);
+            m_attributes.setFlag(ComplexTypeEntry::IsGLsync);
         }
-
-        QString javaPackage() const override { return "io.qt.core"; }
-
-        bool isValue() const override { return true; }
 };
 
 class QMetaObjectTypeEntry : public ComplexTypeEntry {
diff --git a/src/cpp/QtJambiGenerator/typesystem/utils.cpp b/src/cpp/QtJambiGenerator/typesystem/utils.cpp
index d5015c9c..c78d7bfc 100644
--- a/src/cpp/QtJambiGenerator/typesystem/utils.cpp
+++ b/src/cpp/QtJambiGenerator/typesystem/utils.cpp
@@ -389,15 +389,24 @@ static void addRemoveFunctionToTemplates(TypeDatabase *db)
 
 }
 
-TypesystemException::TypesystemException(const QString& message) : QException(), m_message(message.toUtf8())
+TypesystemException::TypesystemException(const QByteArray& message) : QException(), m_message(message)
 {
 }
 
+TypesystemException *TypesystemException::clone() const{
+    return new TypesystemException(this->m_message);
+}
+
 char const* TypesystemException::what() const noexcept{
     return m_message;
 }
 
 void TypesystemException::raise(const QString& message) {
-    TypesystemException e(message);
+    TypesystemException e(message.toUtf8());
+    throw e;
+}
+
+void TypesystemException::raise() const {
+    TypesystemException e(this->m_message);
     throw e;
 }
diff --git a/src/cpp/QtJambiGenerator/typesystem/utils.h b/src/cpp/QtJambiGenerator/typesystem/utils.h
index 3cf26983..82788b28 100644
--- a/src/cpp/QtJambiGenerator/typesystem/utils.h
+++ b/src/cpp/QtJambiGenerator/typesystem/utils.h
@@ -119,6 +119,7 @@ namespace TS {
         TargetLangOwnership,
         CppOwnership,
         IgnoreOwnership,
+        RegisterDependency,
         Invalidate
     };
 
@@ -208,10 +209,13 @@ namespace TS {
 
 class TypesystemException : public QException{
 public:
+    ~TypesystemException() = default;
+    TypesystemException *clone() const override;
     char const* what() const noexcept override;
+    void raise() const override;
     static void raise(const QString& message);
 private:
-    TypesystemException(const QString& message);
+    TypesystemException(const QByteArray& message);
     QByteArray m_message;
 };
 
diff --git a/src/cpp/QtJambiGenerator/typesystem/xmltypesystemreader.cpp b/src/cpp/QtJambiGenerator/typesystem/xmltypesystemreader.cpp
index 9530067d..33923154 100644
--- a/src/cpp/QtJambiGenerator/typesystem/xmltypesystemreader.cpp
+++ b/src/cpp/QtJambiGenerator/typesystem/xmltypesystemreader.cpp
@@ -2832,7 +2832,7 @@ QString XmlTypeSystemReaderPrivate::parseTypeName(QDomNamedNodeMap& attributes,
         TypesystemException::raise(QString("No 'name' attribute specified for tag <%1> in line %2").arg(element.localName()).arg(element.lineNumber()));
     }
     TypeEntry *tmp = m_database->findType(name);
-    if (tmp && !tmp->isQString() && !tmp->isChar() && !tmp->isVariant()) {
+    if (tmp && !tmp->isQString() && !tmp->isQChar() && !tmp->isQVariant()) {
         ReportHandler::warning(QString("Duplicate type entry: '%1'").arg(name));
     }
     return name;
@@ -3118,12 +3118,12 @@ void XmlTypeSystemReaderPrivate::parseEnumType(const QDomElement &element){
 
             // put in the flags parallel...
             if (!flags.isEmpty() && flags.toLower() != "no") {
-                std::unique_ptr<FlagsTypeEntry> ftype(new FlagsTypeEntry("QFlags<" + eentry->qualifiedCppName() + ">"));
+                std::unique_ptr<FlagsTypeEntry> ftype(new FlagsTypeEntry(flags));
                 ftype->setOriginator(eentry.get());
                 QStringList flagsNames = flags.split(QLatin1String("::"));
-                ftype->setOriginalName(flags);
+                ftype->setFlagsTemplate("QFlags<" + eentry->qualifiedCppName() + ">");
                 ftype->setCodeGeneration(eentry->codeGeneration());
-                QString n = ftype->originalName();
+                QString n = flags;
 
                 QStringList lst = n.split("::");
                 if (QStringList(lst.mid(0, lst.size() - 1)).join("::") != QStringList(names.mid(0, names.size() - 1)).join("::")) {
diff --git a/src/cpp/QtJambiGui/hashes.h b/src/cpp/QtJambiGui/hashes.h
index db7e5f82..5bddc6a4 100644
--- a/src/cpp/QtJambiGui/hashes.h
+++ b/src/cpp/QtJambiGui/hashes.h
@@ -56,145 +56,131 @@ inline bool operator <(const QColor& c1, const QColor& c2){
 }
 #endif
 
-inline hash_type qHash(const QPixmap &value)
+inline hash_type qHash(const QPixmap &value, hash_type seed = 0)
 {
-    return genericHash(value.handle());
+    return genericHash(value.handle(), seed);
 }
 
-inline hash_type qHash(const QCursor &cursor)
+inline hash_type qHash(const QCursor &cursor, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(int(cursor.shape()));
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(cursor.shape()));
     if(cursor.shape()==Qt::BitmapCursor){
-#if QT_VERSION <= QT_VERSION_CHECK(5, 15, 0)
-        hashCode = hashCode * 31 + qHash(cursor.bitmap(Qt::ReturnByValue));
-        hashCode = hashCode * 31 + qHash(cursor.mask(Qt::ReturnByValue));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+        seed = hash(seed, cursor.bitmap(Qt::ReturnByValue));
+        seed = hash(seed, cursor.mask(Qt::ReturnByValue));
 #else
-        hashCode = hashCode * 31 + qHash(cursor.bitmap());
-        hashCode = hashCode * 31 + qHash(cursor.mask());
+        seed = hash(seed, cursor.bitmap());
+        seed = hash(seed, cursor.mask());
 #endif
-        hashCode = hashCode * 31 + qHash(cursor.pixmap());
-        hashCode = hashCode * 31 + qHash(cursor.hotSpot());
+        seed = hash(seed, cursor.pixmap());
+        seed = hash(seed, cursor.hotSpot());
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QPixelFormat &value)
+inline hash_type qHash(const QPixelFormat &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QColor &color)
+inline hash_type qHash(const QColor &color, hash_type seed = 0)
 {
-    return qHash(quint64(color.rgba64()));
+    return qHash(quint64(color.rgba64()), seed);
 }
 
-inline hash_type qHash(const QBrush &brush)
+inline hash_type qHash(const QBrush &brush, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(int(brush.style()));
-    hashCode = hashCode * 31 + qHash(brush.color());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(brush.style()));
+    seed = hash(seed, brush.color());
+    return seed;
 }
 
 #if QT_VERSION >= 0x050000
-inline hash_type qHash(const QGradient &gradient)
+inline hash_type qHash(const QGradient &gradient, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(int(gradient.interpolationMode()));
-    hashCode = hashCode * 31 + qHash(int(gradient.type()));
-    hashCode = hashCode * 31 + qHash(int(gradient.spread()));
-    hashCode = hashCode * 31 + qHash(int(gradient.coordinateMode()));
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, int(gradient.interpolationMode()));
+    seed = hash(seed, int(gradient.type()));
+    seed = hash(seed, int(gradient.spread()));
+    seed = hash(seed, int(gradient.coordinateMode()));
     for(const QGradientStop& stop : gradient.stops()){
-        hashCode = hashCode * 31 + qHash(stop.first);
-        hashCode = hashCode * 31 + qHash(stop.second);
+        seed = hash(seed, stop.first);
+        seed = hash(seed, stop.second);
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QLinearGradient &gradient)
+inline hash_type qHash(const QLinearGradient &gradient, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(int(gradient.interpolationMode()));
-    hashCode = hashCode * 31 + qHash(int(gradient.type()));
-    hashCode = hashCode * 31 + qHash(int(gradient.spread()));
-    hashCode = hashCode * 31 + qHash(int(gradient.coordinateMode()));
-    hashCode = hashCode * 31 + qHash(gradient.start().x());
-    hashCode = hashCode * 31 + qHash(gradient.start().y());
-    hashCode = hashCode * 31 + qHash(gradient.finalStop().x());
-    hashCode = hashCode * 31 + qHash(gradient.finalStop().y());
-    for(const QGradientStop& stop : gradient.stops()){
-        hashCode = hashCode * 31 + qHash(stop.first);
-        hashCode = hashCode * 31 + qHash(stop.second);
-    }
-    return hashCode;
-}
-
-inline hash_type qHash(const QRadialGradient &gradient)
-{
-    hash_type hashCode = qHash(int(gradient.interpolationMode()));
-    hashCode = hashCode * 31 + qHash(int(gradient.type()));
-    hashCode = hashCode * 31 + qHash(int(gradient.spread()));
-    hashCode = hashCode * 31 + qHash(int(gradient.coordinateMode()));
-    hashCode = hashCode * 31 + qHash(gradient.center().x());
-    hashCode = hashCode * 31 + qHash(gradient.center().y());
-    hashCode = hashCode * 31 + qHash(gradient.centerRadius());
-    hashCode = hashCode * 31 + qHash(gradient.focalPoint().x());
-    hashCode = hashCode * 31 + qHash(gradient.focalPoint().y());
-    hashCode = hashCode * 31 + qHash(gradient.focalRadius());
-    hashCode = hashCode * 31 + qHash(gradient.radius());
-    for(const QGradientStop& stop : gradient.stops()){
-        hashCode = hashCode * 31 + qHash(stop.first);
-        hashCode = hashCode * 31 + qHash(stop.second);
-    }
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, gradient.start().x());
+    seed = hash(seed, gradient.start().y());
+    seed = hash(seed, gradient.finalStop().x());
+    seed = hash(seed, gradient.finalStop().y());
+    seed = hash(seed, static_cast<const QGradient &>(gradient));
+    return seed;
 }
 
-inline hash_type qHash(const QConicalGradient &gradient)
+inline hash_type qHash(const QRadialGradient &gradient, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(int(gradient.interpolationMode()));
-    hashCode = hashCode * 31 + qHash(int(gradient.type()));
-    hashCode = hashCode * 31 + qHash(int(gradient.spread()));
-    hashCode = hashCode * 31 + qHash(int(gradient.coordinateMode()));
-    hashCode = hashCode * 31 + qHash(gradient.angle());
-    hashCode = hashCode * 31 + qHash(gradient.center().x());
-    hashCode = hashCode * 31 + qHash(gradient.center().y());
-    for(const QGradientStop& stop : gradient.stops()){
-        hashCode = hashCode * 31 + qHash(stop.first);
-        hashCode = hashCode * 31 + qHash(stop.second);
-    }
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, gradient.center().x());
+    seed = hash(seed, gradient.center().y());
+    seed = hash(seed, gradient.centerRadius());
+    seed = hash(seed, gradient.focalPoint().x());
+    seed = hash(seed, gradient.focalPoint().y());
+    seed = hash(seed, gradient.focalRadius());
+    seed = hash(seed, gradient.radius());
+    seed = hash(seed, static_cast<const QGradient &>(gradient));
+    return seed;
+}
+
+inline hash_type qHash(const QConicalGradient &gradient, hash_type seed = 0)
+{
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, gradient.angle());
+    seed = hash(seed, gradient.center().x());
+    seed = hash(seed, gradient.center().y());
+    seed = hash(seed, static_cast<const QGradient &>(gradient));
+    return seed;
 }
 #endif
 
-inline hash_type qHash(const QRegion &region)
+inline hash_type qHash(const QRegion &region, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(region.rectCount());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, region.rectCount());
     for(const QRect& rect : region)
-        hashCode = hashCode * 31 + qHash(rect);
-    return hashCode;
+        seed = hash(seed, rect);
+    return seed;
 }
 
-inline hash_type qHash(const QPolygon &polygon)
+inline hash_type qHash(const QPolygon &polygon, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(polygon.size());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, polygon.size());
     for (int i=0; i<polygon.size(); ++i)
-        hashCode = hashCode * 31 + qHash(polygon.at(i));
-    return hashCode;
+        seed = hash(seed, polygon.at(i));
+    return seed;
 }
 
-inline hash_type qHash(const QPalette &palette)
+inline hash_type qHash(const QPalette &palette, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
+    QtPrivate::QHashCombine hash;
     for (int role=0;role<int(QPalette::NColorRoles);++role) {
         for (int group=0;group<int(QPalette::NColorGroups);++group) {
-            hashCode = hashCode * 31 + qHash(palette.color(QPalette::ColorGroup(group), QPalette::ColorRole(role)));
+            seed = hash(seed, palette.color(QPalette::ColorGroup(group), QPalette::ColorRole(role)));
         }
     }
-    return hashCode;
+    return seed;
 }
 
 #if QT_VERSION < 0x050300
-inline hash_type qHash(const QFont &font)
+inline hash_type qHash(const QFont &font, hash_type seed = 0)
 {
+    QtPrivate::QHashCombine hash;
     hash_type hashCode = font.pixelSize();
     hashCode = hashCode * 31 + font.weight();
     hashCode = hashCode * 31 + int(font.style());
@@ -202,554 +188,526 @@ inline hash_type qHash(const QFont &font)
     hashCode = hashCode * 31 + int(font.styleHint());
     hashCode = hashCode * 31 + int(font.styleStrategy());
     hashCode = hashCode * 31 + int(font.fixedPitch());
-    hashCode = hashCode * 31 + qHash(font.family());
-    hashCode = hashCode * 31 + qHash(font.pointSize());
+    seed = hash(seed, font.family());
+    seed = hash(seed, font.pointSize());
     hashCode = hashCode * 31 + int(font.underline());
     hashCode = hashCode * 31 + int(font.overline());
     hashCode = hashCode * 31 + int(font.strikeOut());
     hashCode = hashCode * 31 + int(font.kerning());
-    return hashCode;
+    return seed;
 }
 #endif
 
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QMatrix &matrix)
+inline hash_type qHash(const QMatrix &matrix, hash_type seed) noexcept
 {
-    hash_type hashCode = qHash(matrix.m11());
-    hashCode = hashCode * 31 + qHash(matrix.m12());
-    hashCode = hashCode * 31 + qHash(matrix.m21());
-    hashCode = hashCode * 31 + qHash(matrix.m22());
-    hashCode = hashCode * 31 + qHash(matrix.dx());
-    hashCode = hashCode * 31 + qHash(matrix.dy());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, matrix.m11());
+    seed = hash(seed, matrix.m12());
+    seed = hash(seed, matrix.m21());
+    seed = hash(seed, matrix.m22());
+    seed = hash(seed, matrix.dx());
+    seed = hash(seed, matrix.dy());
+    return seed;
 }
 #endif
 
-inline hash_type qHash(const QImage &image)
+inline hash_type qHash(const QImage &image, hash_type seed = 0)
 {
     if(image.isNull())
-        return 0;
-    return qHash(image.cacheKey());
+        return seed;
+    return qHash(image.cacheKey(), seed);
 }
 
-inline hash_type qHash(const QPen &pen)
+inline hash_type qHash(const QPen &pen, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(int(pen.style()));
-    hashCode = hashCode * 31 + qHash(int(pen.capStyle()));
-    hashCode = hashCode * 31 + qHash(int(pen.joinStyle()));
-    hashCode = hashCode * 31 + qHash(pen.width());
-    hashCode = hashCode * 31 + qHash(pen.brush());
-    hashCode = hashCode * 31 + qHash(pen.isCosmetic());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(pen.style()));
+    seed = hash(seed, int(pen.capStyle()));
+    seed = hash(seed, int(pen.joinStyle()));
+    seed = hash(seed, pen.width());
+    seed = hash(seed, pen.brush());
+    seed = hash(seed, pen.isCosmetic());
+    return seed;
 }
 
-#if QT_VERSION < 0x050600
-inline int qHash(const QTransform &transform)
+inline hash_type qHash(const QPolygonF &polygon, hash_type seed = 0)
 {
-    int hashCode = int(transform.m11());
-    hashCode = hashCode * 31 + int(transform.m12());
-    hashCode = hashCode * 31 + int(transform.m13());
-
-    hashCode = hashCode * 31 + int(transform.m21());
-    hashCode = hashCode * 31 + int(transform.m22());
-    hashCode = hashCode * 31 + int(transform.m23());
-
-    hashCode = hashCode * 31 + int(transform.m31());
-    hashCode = hashCode * 31 + int(transform.m32());
-    hashCode = hashCode * 31 + int(transform.m33());
-
-    return hashCode;
-}
-#endif
-
-inline hash_type qHash(const QPolygonF &polygon)
-{
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(polygon.size());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, polygon.size());
     for (int i=0; i<polygon.size(); ++i){
-        hashCode = hashCode * 31 + qHash(polygon.at(i).x());
-        hashCode = hashCode * 31 + qHash(polygon.at(i).y());
+        seed = hash(seed, polygon.at(i).x());
+        seed = hash(seed, polygon.at(i).y());
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QVector2D &vec)
+inline hash_type qHash(const QVector2D &vec, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(vec.x());
-    hashCode = hashCode * 31 + qHash(vec.y());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, vec.x());
+    seed = hash(seed, vec.y());
+    return seed;
 }
 
-inline hash_type qHash(const QVector3D &vec)
+inline hash_type qHash(const QVector3D &vec, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(vec.x());
-    hashCode = hashCode * 31 + qHash(vec.y());
-    hashCode = hashCode * 31 + qHash(vec.z());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, vec.x());
+    seed = hash(seed, vec.y());
+    seed = hash(seed, vec.z());
+    return seed;
 }
 
-inline hash_type qHash(const QVector4D &vec)
+inline hash_type qHash(const QVector4D &vec, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(vec.x());
-    hashCode = hashCode * 31 + qHash(vec.y());
-    hashCode = hashCode * 31 + qHash(vec.z());
-    hashCode = hashCode * 31 + qHash(vec.w());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, vec.x());
+    seed = hash(seed, vec.y());
+    seed = hash(seed, vec.z());
+    seed = hash(seed, vec.w());
+    return seed;
 }
 
-/*
-inline int qHash(const QInputMethodEvent::Attribute &attr)
-{
-    int hashCode = 1;
-    hashCode = hashCode * 31 + qHash((qint32)attr.type);
-    hashCode = hashCode * 31 + qHash(attr.start);
-    hashCode = hashCode * 31 + qHash(attr.length);
-    hashCode = hashCode * 31 + qHash((qint32)attr.value.type());
-    hashCode = hashCode * 31 + qHash((qintptr)attr.value.data());
-    return hashCode;
-}*/
-
-inline hash_type qHash(const QFontMetrics &value)
+inline hash_type qHash(const QFontMetrics &value, hash_type seed = 0)
 {
     struct FontMetrics{
         QExplicitlySharedDataPointer<void*> p;
     };
     const FontMetrics* fontMetrics = reinterpret_cast<const FontMetrics* >(&value);
 
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(quintptr(fontMetrics->p.data()));
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, quintptr(fontMetrics->p.data()));
+    return seed;
 }
 
-inline hash_type qHash(const QFontMetricsF &value)
+inline hash_type qHash(const QFontMetricsF &value, hash_type seed = 0)
 {
     struct FontMetricsF{
         QExplicitlySharedDataPointer<void*> p;
     };
     const FontMetricsF* fontMetrics = reinterpret_cast<const FontMetricsF* >(&value);
 
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(quintptr(fontMetrics->p.data()));
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, quintptr(fontMetrics->p.data()));
+    return seed;
 }
 
-inline hash_type qHash(const QGlyphRun &value)
+inline hash_type qHash(const QGlyphRun &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.rawFont());
-    hashCode = hashCode * 31 + qHash(value.glyphIndexes());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.rawFont());
+    seed = hash(seed, value.glyphIndexes());
     auto positions = value.positions();
-    hashCode = hashCode * 31 + qHash(positions.size());
+    seed = hash(seed, positions.size());
     for (int i=0; i<positions.size(); ++i){
-        hashCode = hashCode * 31 + qHash(positions.at(i).x());
-        hashCode = hashCode * 31 + qHash(positions.at(i).y());
+        seed = hash(seed, positions.at(i).x());
+        seed = hash(seed, positions.at(i).y());
     }
-    hashCode = hashCode * 31 + qHash(value.overline());
-    hashCode = hashCode * 31 + qHash(value.underline());
-    hashCode = hashCode * 31 + qHash(value.strikeOut());
-    hashCode = hashCode * 31 + qHash(value.isRightToLeft());
-    hashCode = hashCode * 31 + qHash(int(value.flags()));
-    hashCode = hashCode * 31 + qHash(value.boundingRect());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    return hashCode;
+    seed = hash(seed, value.overline());
+    seed = hash(seed, value.underline());
+    seed = hash(seed, value.strikeOut());
+    seed = hash(seed, value.isRightToLeft());
+    seed = hash(seed, int(value.flags()));
+    seed = hash(seed, value.boundingRect());
+    seed = hash(seed, value.isEmpty());
+    return seed;
 }
 
-inline hash_type qHash(const QAccessible::State &value)
+inline hash_type qHash(const QAccessible::State &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QMatrix2x2 &value)
+inline hash_type qHash(const QMatrix2x2 &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QMatrix2x3 &value)
+inline hash_type qHash(const QMatrix2x3 &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QMatrix2x4 &value)
+inline hash_type qHash(const QMatrix2x4 &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QMatrix3x2 &value)
+inline hash_type qHash(const QMatrix3x2 &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QMatrix3x3 &value)
+inline hash_type qHash(const QMatrix3x3 &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QMatrix3x4 &value)
+inline hash_type qHash(const QMatrix3x4 &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QMatrix4x2 &value)
+inline hash_type qHash(const QMatrix4x2 &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QMatrix4x3 &value)
+inline hash_type qHash(const QMatrix4x3 &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QMatrix4x4 &value)
+inline hash_type qHash(const QMatrix4x4 &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QOpenGLDebugMessage &value)
+inline hash_type qHash(const QOpenGLDebugMessage &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(value.source()));
-    hashCode = hashCode * 31 + qHash(int(value.type()));
-    hashCode = hashCode * 31 + qHash(int(value.severity()));
-    hashCode = hashCode * 31 + qHash(value.id());
-    hashCode = hashCode * 31 + qHash(value.message());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.source()));
+    seed = hash(seed, int(value.type()));
+    seed = hash(seed, int(value.severity()));
+    seed = hash(seed, value.id());
+    seed = hash(seed, value.message());
+    return seed;
 }
 
-inline hash_type qHash(const QOpenGLFramebufferObjectFormat &value)
+inline hash_type qHash(const QOpenGLFramebufferObjectFormat &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.samples());
-    hashCode = hashCode * 31 + qHash(value.mipmap());
-    hashCode = hashCode * 31 + qHash(int(value.attachment()));
-    hashCode = hashCode * 31 + qHash(value.textureTarget());
-    hashCode = hashCode * 31 + qHash(value.internalTextureFormat());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.samples());
+    seed = hash(seed, value.mipmap());
+    seed = hash(seed, int(value.attachment()));
+    seed = hash(seed, value.textureTarget());
+    seed = hash(seed, value.internalTextureFormat());
+    return seed;
 }
 #else
-inline hash_type qHash(const QEventPoint &value)
-{
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(quintptr(value.device()));
-    hashCode = hashCode * 31 + qHash(value.ellipseDiameters());
-    hashCode = hashCode * 31 + qHash(value.globalGrabPosition().x());
-    hashCode = hashCode * 31 + qHash(value.globalGrabPosition().y());
-    hashCode = hashCode * 31 + qHash(value.globalLastPosition().x());
-    hashCode = hashCode * 31 + qHash(value.globalLastPosition().y());
-    hashCode = hashCode * 31 + qHash(value.globalPosition().x());
-    hashCode = hashCode * 31 + qHash(value.globalPosition().y());
-    hashCode = hashCode * 31 + qHash(value.globalPressPosition().x());
-    hashCode = hashCode * 31 + qHash(value.globalPressPosition().y());
-    hashCode = hashCode * 31 + qHash(value.grabPosition().x());
-    hashCode = hashCode * 31 + qHash(value.grabPosition().y());
-    hashCode = hashCode * 31 + qHash(value.id());
-    hashCode = hashCode * 31 + qHash(value.isAccepted());
-    hashCode = hashCode * 31 + qHash(value.lastPosition().x());
-    hashCode = hashCode * 31 + qHash(value.lastPosition().y());
-    hashCode = hashCode * 31 + qHash(value.lastTimestamp());
-    hashCode = hashCode * 31 + qHash(value.normalizedPosition().x());
-    hashCode = hashCode * 31 + qHash(value.normalizedPosition().y());
-    hashCode = hashCode * 31 + qHash(value.position().x());
-    hashCode = hashCode * 31 + qHash(value.position().y());
-    hashCode = hashCode * 31 + qHash(value.pressPosition().x());
-    hashCode = hashCode * 31 + qHash(value.pressPosition().y());
-    hashCode = hashCode * 31 + qHash(value.pressTimestamp());
-    hashCode = hashCode * 31 + qHash(value.pressure());
-    hashCode = hashCode * 31 + qHash(value.rotation());
-    hashCode = hashCode * 31 + qHash(value.sceneGrabPosition().x());
-    hashCode = hashCode * 31 + qHash(value.sceneGrabPosition().y());
-    hashCode = hashCode * 31 + qHash(value.sceneLastPosition().x());
-    hashCode = hashCode * 31 + qHash(value.sceneLastPosition().y());
-    hashCode = hashCode * 31 + qHash(value.scenePosition().x());
-    hashCode = hashCode * 31 + qHash(value.scenePosition().y());
-    hashCode = hashCode * 31 + qHash(value.scenePressPosition().x());
-    hashCode = hashCode * 31 + qHash(value.scenePressPosition().y());
-    hashCode = hashCode * 31 + qHash(value.state());
-    hashCode = hashCode * 31 + qHash(value.timeHeld());
-    hashCode = hashCode * 31 + qHash(value.timestamp());
-    hashCode = hashCode * 31 + qHash(value.uniqueId());
-    hashCode = hashCode * 31 + qHash(value.velocity());
-    return hashCode;
-}
-
-inline hash_type qHash(const QPageRanges::Range &value)
-{
-    return genericHash(value);
-}
-
-inline hash_type qHash(const QPageRanges &value)
-{
-    return qHash(value.toRangeList());
+inline hash_type qHash(const QEventPoint &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, quintptr(value.device()));
+    seed = hash(seed, value.ellipseDiameters());
+    seed = hash(seed, value.globalGrabPosition().x());
+    seed = hash(seed, value.globalGrabPosition().y());
+    seed = hash(seed, value.globalLastPosition().x());
+    seed = hash(seed, value.globalLastPosition().y());
+    seed = hash(seed, value.globalPosition().x());
+    seed = hash(seed, value.globalPosition().y());
+    seed = hash(seed, value.globalPressPosition().x());
+    seed = hash(seed, value.globalPressPosition().y());
+    seed = hash(seed, value.grabPosition().x());
+    seed = hash(seed, value.grabPosition().y());
+    seed = hash(seed, value.id());
+    seed = hash(seed, value.isAccepted());
+    seed = hash(seed, value.lastPosition().x());
+    seed = hash(seed, value.lastPosition().y());
+    seed = hash(seed, value.lastTimestamp());
+    seed = hash(seed, value.normalizedPosition().x());
+    seed = hash(seed, value.normalizedPosition().y());
+    seed = hash(seed, value.position().x());
+    seed = hash(seed, value.position().y());
+    seed = hash(seed, value.pressPosition().x());
+    seed = hash(seed, value.pressPosition().y());
+    seed = hash(seed, value.pressTimestamp());
+    seed = hash(seed, value.pressure());
+    seed = hash(seed, value.rotation());
+    seed = hash(seed, value.sceneGrabPosition().x());
+    seed = hash(seed, value.sceneGrabPosition().y());
+    seed = hash(seed, value.sceneLastPosition().x());
+    seed = hash(seed, value.sceneLastPosition().y());
+    seed = hash(seed, value.scenePosition().x());
+    seed = hash(seed, value.scenePosition().y());
+    seed = hash(seed, value.scenePressPosition().x());
+    seed = hash(seed, value.scenePressPosition().y());
+    seed = hash(seed, value.state());
+    seed = hash(seed, value.timeHeld());
+    seed = hash(seed, value.timestamp());
+    seed = hash(seed, value.uniqueId());
+    seed = hash(seed, value.velocity());
+    return seed;
+}
+
+inline hash_type qHash(const QPageRanges::Range &value, hash_type seed = 0)
+{
+    return genericHash(value, seed);
+}
+
+inline hash_type qHash(const QPageRanges &value, hash_type seed = 0)
+{
+    return qHash(value.toRangeList(), seed);
 }
 
 #endif
 
-hash_type qHash(const QTextFormat &value);
+hash_type qHash(const QTextFormat &value, hash_type seed = 0);
 
-inline hash_type qHash(const QTextLayout::FormatRange &value)
+inline hash_type qHash(const QTextLayout::FormatRange &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.start);
-    hashCode = hashCode * 31 + qHash(value.length);
-    hashCode = hashCode * 31 + qHash(value.format);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.start);
+    seed = hash(seed, value.length);
+    seed = hash(seed, value.format);
+    return seed;
 }
 
-inline hash_type qHash(const QPageSize &value)
+inline hash_type qHash(const QPageSize &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.key());
-    hashCode = hashCode * 31 + qHash(int(value.id()));
-    hashCode = hashCode * 31 + qHash(int(value.definitionUnits()));
-    hashCode = hashCode * 31 + qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.windowsId());
-    hashCode = hashCode * 31 + qHash(value.definitionSize());
-    hashCode = hashCode * 31 + qHash(value.sizePoints());
-    hashCode = hashCode * 31 + qHash(value.rectPoints());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.key());
+    seed = hash(seed, int(value.id()));
+    seed = hash(seed, int(value.definitionUnits()));
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.windowsId());
+    seed = hash(seed, value.definitionSize());
+    seed = hash(seed, value.sizePoints());
+    seed = hash(seed, value.rectPoints());
+    return seed;
 }
 
-inline hash_type qHash(const QPageLayout &value)
+inline hash_type qHash(const QPageLayout &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.pageSize());
-    hashCode = hashCode * 31 + qHash(int(value.mode()));
-    hashCode = hashCode * 31 + qHash(int(value.orientation()));
-    hashCode = hashCode * 31 + qHash(int(value.units()));
-    hashCode = hashCode * 31 + qHash(value.margins());
-    hashCode = hashCode * 31 + qHash(value.marginsPoints());
-    hashCode = hashCode * 31 + qHash(value.minimumMargins());
-    hashCode = hashCode * 31 + qHash(value.fullRect());
-    hashCode = hashCode * 31 + qHash(value.fullRectPoints());
-    hashCode = hashCode * 31 + qHash(value.paintRect());
-    hashCode = hashCode * 31 + qHash(value.paintRectPoints());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.pageSize());
+    seed = hash(seed, int(value.mode()));
+    seed = hash(seed, int(value.orientation()));
+    seed = hash(seed, int(value.units()));
+    seed = hash(seed, value.margins());
+    seed = hash(seed, value.marginsPoints());
+    seed = hash(seed, value.minimumMargins());
+    seed = hash(seed, value.fullRect());
+    seed = hash(seed, value.fullRectPoints());
+    seed = hash(seed, value.paintRect());
+    seed = hash(seed, value.paintRectPoints());
+    return seed;
 }
 
-inline hash_type qHash(const QPainterPath::Element &value)
+inline hash_type qHash(const QPainterPath::Element &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(value.type));
-    hashCode = hashCode * 31 + qHash(value.x);
-    hashCode = hashCode * 31 + qHash(value.y);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.type));
+    seed = hash(seed, value.x);
+    seed = hash(seed, value.y);
+    return seed;
 }
 
-inline hash_type qHash(const QPainterPath &value)
+inline hash_type qHash(const QPainterPath &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(value.fillRule()));
-    hashCode = hashCode * 31 + qHash(value.elementCount());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.fillRule()));
+    seed = hash(seed, value.elementCount());
     for(int i=0; i<value.elementCount(); ++i){
-        hashCode = hashCode * 31 + qHash(value.elementAt(i));
+        seed = hash(seed, value.elementAt(i));
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QTextOption::Tab &value)
+inline hash_type qHash(const QTextOption::Tab &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QTextOption &value)
+inline hash_type qHash(const QTextOption &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(value.alignment()));
-    hashCode = hashCode * 31 + qHash(int(value.textDirection()));
-    hashCode = hashCode * 31 + qHash(int(value.wrapMode()));
-    hashCode = hashCode * 31 + qHash(int(value.flags()));
-    hashCode = hashCode * 31 + qHash(int(value.useDesignMetrics()));
-    hashCode = hashCode * 31 + qHash(value.tabStopDistance());
-    hashCode = hashCode * 31 + qHash(value.tabArray());
-    hashCode = hashCode * 31 + qHash(value.tabs());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.alignment()));
+    seed = hash(seed, int(value.textDirection()));
+    seed = hash(seed, int(value.wrapMode()));
+    seed = hash(seed, int(value.flags()));
+    seed = hash(seed, int(value.useDesignMetrics()));
+    seed = hash(seed, value.tabStopDistance());
+    seed = hash(seed, value.tabArray());
+    seed = hash(seed, value.tabs());
+    return seed;
 }
 
-inline hash_type qHash(const QStaticText &value)
+inline hash_type qHash(const QStaticText &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(value.textFormat()));
-    hashCode = hashCode * 31 + qHash(int(value.performanceHint()));
-    hashCode = hashCode * 31 + qHash(value.text());
-    hashCode = hashCode * 31 + qHash(value.textWidth());
-    hashCode = hashCode * 31 + qHash(value.textOption());
-    hashCode = hashCode * 31 + qHash(value.size());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.textFormat()));
+    seed = hash(seed, int(value.performanceHint()));
+    seed = hash(seed, value.text());
+    seed = hash(seed, value.textWidth());
+    seed = hash(seed, value.textOption());
+    seed = hash(seed, value.size());
+    return seed;
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
-inline hash_type qHash(const QColorSpace &value)
+inline hash_type qHash(const QColorSpace &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(hash_type(value.primaries()));
-    hashCode = hashCode * 31 + qHash(hash_type(value.transferFunction()));
-    hashCode = hashCode * 31 + qHash(value.gamma());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, hash_type(value.primaries()));
+    seed = hash(seed, hash_type(value.transferFunction()));
+    seed = hash(seed, value.gamma());
+    seed = hash(seed, value.isValid());
+    return seed;
 }
 #endif
 
-inline hash_type qHash(const QSurfaceFormat &value)
+inline hash_type qHash(const QSurfaceFormat &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(value.swapBehavior()));
-    hashCode = hashCode * 31 + qHash(int(value.profile()));
-    hashCode = hashCode * 31 + qHash(int(value.renderableType()));
-    hashCode = hashCode * 31 + qHash(int(value.options()));
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.swapBehavior()));
+    seed = hash(seed, int(value.profile()));
+    seed = hash(seed, int(value.renderableType()));
+    seed = hash(seed, int(value.options()));
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
-    hashCode = hashCode * 31 + qHash(value.colorSpace());
+    seed = hash(seed, value.colorSpace());
 #else
-    hashCode = hashCode * 31 + qHash(int(value.colorSpace()));
+    seed = hash(seed, int(value.colorSpace()));
 #endif
-    hashCode = hashCode * 31 + qHash(value.depthBufferSize());
-    hashCode = hashCode * 31 + qHash(value.stencilBufferSize());
-    hashCode = hashCode * 31 + qHash(value.redBufferSize());
-    hashCode = hashCode * 31 + qHash(value.greenBufferSize());
-    hashCode = hashCode * 31 + qHash(value.blueBufferSize());
-    hashCode = hashCode * 31 + qHash(value.alphaBufferSize());
-    hashCode = hashCode * 31 + qHash(value.samples());
-    hashCode = hashCode * 31 + qHash(value.hasAlpha());
-    hashCode = hashCode * 31 + qHash(value.majorVersion());
-    hashCode = hashCode * 31 + qHash(value.minorVersion());
-    hashCode = hashCode * 31 + qHash(value.stereo());
-    hashCode = hashCode * 31 + qHash(value.swapInterval());
-    return hashCode;
+    seed = hash(seed, value.depthBufferSize());
+    seed = hash(seed, value.stencilBufferSize());
+    seed = hash(seed, value.redBufferSize());
+    seed = hash(seed, value.greenBufferSize());
+    seed = hash(seed, value.blueBufferSize());
+    seed = hash(seed, value.alphaBufferSize());
+    seed = hash(seed, value.samples());
+    seed = hash(seed, value.hasAlpha());
+    seed = hash(seed, value.majorVersion());
+    seed = hash(seed, value.minorVersion());
+    seed = hash(seed, value.stereo());
+    seed = hash(seed, value.swapInterval());
+    return seed;
 }
 
-inline hash_type qHash(const QQuaternion &value)
+inline hash_type qHash(const QQuaternion &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QPixmapCache::Key &value)
+inline hash_type qHash(const QPixmapCache::Key &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QTextFragment &value)
+inline hash_type qHash(const QTextFragment &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.position());
-    hashCode = hashCode * 31 + qHash(value.length());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.position());
+    seed = hash(seed, value.length());
+    return seed;
 }
 
-inline hash_type qHash(const QTextBlock::iterator &value)
+inline hash_type qHash(const QTextBlock::iterator &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QTextBlock &value)
+inline hash_type qHash(const QTextBlock &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.position());
-    hashCode = hashCode * 31 + qHash(value.blockNumber());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.position());
+    seed = hash(seed, value.blockNumber());
+    return seed;
 }
 
-inline hash_type qHash(const QTextCursor &value)
+inline hash_type qHash(const QTextCursor &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.position());
-    hashCode = hashCode * 31 + qHash(value.anchor());
-    hashCode = hashCode * 31 + qHash(value.selectedText());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.position());
+    seed = hash(seed, value.anchor());
+    seed = hash(seed, value.selectedText());
+    return seed;
 }
 
-hash_type qHash(const QTextLength &value);
+hash_type qHash(const QTextLength &value, hash_type seed = 0);
 
-inline hash_type qHash(const QTextFormat &value)
+inline hash_type qHash(const QTextFormat &value, hash_type seed)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.type());
-    hashCode = hashCode * 31 + qHash(value.objectIndex());
-    hashCode = hashCode * 31 + qHash(value.objectType());
-    hashCode = hashCode * 31 + qHash(value.propertyCount());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.type());
+    seed = hash(seed, value.objectIndex());
+    seed = hash(seed, value.objectType());
+    seed = hash(seed, value.propertyCount());
     QMap<int, QVariant> properties = value.properties();
     for(int key : properties.keys()){
-        hashCode = hashCode * 31 + qHash(key);
+        seed = hash(seed, key);
         const QVariant& variant = properties[key];
         switch(variant.userType()){
         case QMetaType::Bool:
-            hashCode = hashCode * 31 + qHash(variant.toBool());
+            seed = hash(seed, variant.toBool());
             break;
         case QMetaType::Int:
-            hashCode = hashCode * 31 + qHash(variant.toInt());
+            seed = hash(seed, variant.toInt());
             break;
         case QMetaType::Float:
-            hashCode = hashCode * 31 + qHash(variant.toFloat());
+            seed = hash(seed, variant.toFloat());
             break;
         case QMetaType::Double:
-            hashCode = hashCode * 31 + qHash(variant.toDouble());
+            seed = hash(seed, variant.toDouble());
             break;
         case QMetaType::QString:
-            hashCode = hashCode * 31 + qHash(variant.toString());
+            seed = hash(seed, variant.toString());
             break;
         case QMetaType::QColor:
-            hashCode = hashCode * 31 + qHash(variant.value<QColor>());
+            seed = hash(seed, variant.value<QColor>());
             break;
         case QMetaType::QPen:
-            hashCode = hashCode * 31 + qHash(variant.value<QPen>());
+            seed = hash(seed, variant.value<QPen>());
             break;
         case QMetaType::QTextLength:
-            hashCode = hashCode * 31 + qHash(variant.value<QTextLength>());
+            seed = hash(seed, variant.value<QTextLength>());
             break;
         default:
             if(variant.userType()==qMetaTypeId<QList<QTextLength>>()){
-                hashCode = hashCode * 31 + qHash(variant.value<QList<QTextLength>>());
+                seed = hash(seed, variant.value<QList<QTextLength>>());
             }
             break;
         }
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QTextFrame &value)
+inline hash_type qHash(const QTextFrame &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.parentFrame());
-    hashCode = hashCode * 31 + qHash(value.firstPosition());
-    hashCode = hashCode * 31 + qHash(value.lastPosition());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.parentFrame());
+    seed = hash(seed, value.firstPosition());
+    seed = hash(seed, value.lastPosition());
+    return seed;
 }
 
-inline hash_type qHash(const QTextFrame::iterator &value)
+inline hash_type qHash(const QTextFrame::iterator &value, hash_type seed = 0)
 {
-    return genericHash(value);
+    return genericHash(value, seed);
 }
 
-inline hash_type qHash(const QTextLength &value)
+inline hash_type qHash(const QTextLength &value, hash_type seed)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.type());
-    hashCode = hashCode * 31 + qHash(value.rawValue());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.type());
+    seed = hash(seed, value.rawValue());
+    return seed;
 }
 
-inline hash_type qHash(const QTextTableCell &value)
+inline hash_type qHash(const QTextTableCell &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.firstPosition());
-    hashCode = hashCode * 31 + qHash(value.lastPosition());
-    hashCode = hashCode * 31 + qHash(value.row());
-    hashCode = hashCode * 31 + qHash(value.column());
-    hashCode = hashCode * 31 + qHash(value.rowSpan());
-    hashCode = hashCode * 31 + qHash(value.columnSpan());
-    hashCode = hashCode * 31 + qHash(value.tableCellFormatIndex());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.firstPosition());
+    seed = hash(seed, value.lastPosition());
+    seed = hash(seed, value.row());
+    seed = hash(seed, value.column());
+    seed = hash(seed, value.rowSpan());
+    seed = hash(seed, value.columnSpan());
+    seed = hash(seed, value.tableCellFormatIndex());
+    return seed;
 }
 
-inline hash_type qHash(const QAbstractTextDocumentLayout::Selection &value)
+inline hash_type qHash(const QAbstractTextDocumentLayout::Selection &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.cursor);
-    hashCode = hashCode * 31 + qHash(value.format);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.cursor);
+    seed = hash(seed, value.format);
+    return seed;
 }
 
 inline bool operator==(const QAbstractTextDocumentLayout::Selection &v1, const QAbstractTextDocumentLayout::Selection &v2){
@@ -757,22 +715,23 @@ inline bool operator==(const QAbstractTextDocumentLayout::Selection &v1, const Q
             && v1.format==v2.format;
 }
 
-inline hash_type qHash(const QRgba64 &value)
+inline hash_type qHash(const QRgba64 &value, hash_type seed = 0)
 {
-    return qHash(value.operator unsigned long long());
+    return qHash(value.operator unsigned long long(), seed);
 }
 
 inline bool operator==(const QRgba64 &v1, const QRgba64 &v2){
     return v1.operator unsigned long long()==v2.operator unsigned long long();
 }
 
-inline hash_type qHash(const QAbstractTextDocumentLayout::PaintContext &value)
+inline hash_type qHash(const QAbstractTextDocumentLayout::PaintContext &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.cursorPosition);
-    hashCode = hashCode * 31 + qHash(value.palette);
-    hashCode = hashCode * 31 + qHash(value.clip);
-    hashCode = hashCode * 31 + qHash(value.selections);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.cursorPosition);
+    seed = hash(seed, value.palette);
+    seed = hash(seed, value.clip);
+    seed = hash(seed, value.selections);
+    return seed;
 }
 
 inline bool operator==(const QAbstractTextDocumentLayout::PaintContext &v1, const QAbstractTextDocumentLayout::PaintContext &v2){
diff --git a/src/cpp/QtJambiGui/impl.cpp b/src/cpp/QtJambiGui/impl.cpp
index 16f82547..94fbb5ed 100644
--- a/src/cpp/QtJambiGui/impl.cpp
+++ b/src/cpp/QtJambiGui/impl.cpp
@@ -201,22 +201,22 @@ extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_gui_
 
 hash_type qHash(const QColorVector &value, hash_type seed = 0)
 {
-    hash_type hashCode = seed;
+    QtPrivate::QHashCombine hash;
     if(!value.isNull()){
-        hashCode = hashCode * 31 + qHash(value.x);
-        hashCode = hashCode * 31 + qHash(value.y);
-        hashCode = hashCode * 31 + qHash(value.z);
+        seed = hash(seed, value.x);
+        seed = hash(seed, value.y);
+        seed = hash(seed, value.z);
     }
-    return hashCode;
+    return seed;
 }
 
 hash_type qHash(const QColorMatrix &value, hash_type seed = 0)
 {
-    hash_type hashCode = seed;
-    hashCode = hashCode * 31 + qHash(value.r);
-    hashCode = hashCode * 31 + qHash(value.g);
-    hashCode = hashCode * 31 + qHash(value.b);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.r);
+    seed = hash(seed, value.g);
+    seed = hash(seed, value.b);
+    return seed;
 }
 #endif
 
@@ -227,18 +227,18 @@ hash_type qHash(const QColorTransform &value, hash_type seed)
 #else
     QColorTransformPrivate* p = QColorTransformPrivate::get(value);
 #endif
-    hash_type hashCode = seed;
+    QtPrivate::QHashCombine hash;
     if(p){
-        hashCode = hashCode * 31 + qHash(p->colorMatrix);
-        hashCode = hashCode * 31 + qHash(bool(p->colorSpaceIn));
+        seed = hash(seed, p->colorMatrix);
+        seed = hash(seed, bool(p->colorSpaceIn));
         if(p->colorSpaceIn){
-            hashCode = hashCode * 31 + qHash(*reinterpret_cast<const QColorSpace*>(&p->colorSpaceIn));
+            seed = hash(seed, *reinterpret_cast<const QColorSpace*>(&p->colorSpaceIn));
         }
-        hashCode = hashCode * 31 + qHash(bool(p->colorSpaceOut));
+        seed = hash(seed, bool(p->colorSpaceOut));
         if(p->colorSpaceOut){
-            hashCode = hashCode * 31 + qHash(*reinterpret_cast<const QColorSpace*>(&p->colorSpaceOut));
+            seed = hash(seed, *reinterpret_cast<const QColorSpace*>(&p->colorSpaceOut));
         }
     }
-    return hashCode;
+    return seed;
 }
 #endif //QT_VERSION >= QT_VERSION_CHECK(5,14,0)
diff --git a/src/cpp/QtJambiHelp/hashes.h b/src/cpp/QtJambiHelp/hashes.h
index bd2ffb19..f4dbdcec 100644
--- a/src/cpp/QtJambiHelp/hashes.h
+++ b/src/cpp/QtJambiHelp/hashes.h
@@ -34,11 +34,12 @@
 #include <QtHelp/QtHelp>
 #include <QtJambi/Global>
 
-inline hash_type qHash(const QHelpFilterData &value)
+inline hash_type qHash(const QHelpFilterData &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.components());
-    hashCode = hashCode * 31 + qHash(value.versions());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.components());
+    seed = hash(seed, value.versions());
+    return seed;
 }
 
 #endif // QTJAMBI_HELP_HASHES_H
diff --git a/src/cpp/QtJambiLocation/hashes.h b/src/cpp/QtJambiLocation/hashes.h
index d8c82899..884d57aa 100644
--- a/src/cpp/QtJambiLocation/hashes.h
+++ b/src/cpp/QtJambiLocation/hashes.h
@@ -34,179 +34,196 @@
 #include <QtLocation/QtLocation>
 #include <QtJambiPositioning/hashes.h>
 
-inline hash_type qHash(const QPlaceUser &value)
+inline hash_type qHash(const QPlaceUser &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.userId());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.userId());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceContentRequest &value)
+inline hash_type qHash(const QPlaceContentRequest &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.placeId());
-    hashCode = hashCode * 31 + qHash(value.limit());
-    hashCode = hashCode * 31 + qHash(value.contentType());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.placeId());
+    seed = hash(seed, value.limit());
+    seed = hash(seed, value.contentType());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceRatings &value)
+inline hash_type qHash(const QPlaceRatings &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.count());
-    hashCode = hashCode * 31 + qHash(value.average());
-    hashCode = hashCode * 31 + qHash(value.maximum());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.count());
+    seed = hash(seed, value.average());
+    seed = hash(seed, value.maximum());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceIcon &value)
+inline hash_type qHash(const QPlaceIcon &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.url());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.url());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceSearchResult &value)
+inline hash_type qHash(const QPlaceSearchResult &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.icon());
-    hashCode = hashCode * 31 + qHash(value.type());
-    hashCode = hashCode * 31 + qHash(value.title());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.icon());
+    seed = hash(seed, value.type());
+    seed = hash(seed, value.title());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceContactDetail &value)
+inline hash_type qHash(const QPlaceContactDetail &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.label());
-    hashCode = hashCode * 31 + qHash(value.value());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.label());
+    seed = hash(seed, value.value());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceCategory &value)
+inline hash_type qHash(const QPlaceCategory &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.icon());
-    hashCode = hashCode * 31 + qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.categoryId());
-    hashCode = hashCode * 31 + qHash(value.visibility());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.icon());
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.categoryId());
+    seed = hash(seed, value.visibility());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceAttribute &value)
+inline hash_type qHash(const QPlaceAttribute &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.text());
-    hashCode = hashCode * 31 + qHash(value.label());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.text());
+    seed = hash(seed, value.label());
+    seed = hash(seed, value.isEmpty());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceSupplier &value)
+inline hash_type qHash(const QPlaceSupplier &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.url());
-    hashCode = hashCode * 31 + qHash(value.icon());
-    hashCode = hashCode * 31 + qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.supplierId());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.url());
+    seed = hash(seed, value.icon());
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.supplierId());
+    seed = hash(seed, value.isEmpty());
+    return seed;
 }
 
-inline hash_type qHash(const QGeoRouteRequest &value)
+inline hash_type qHash(const QGeoRouteRequest &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.waypoints());
-    hashCode = hashCode * 31 + qHash(value.travelModes());
-    hashCode = hashCode * 31 + qHash(value.excludeAreas());
-    hashCode = hashCode * 31 + qHash(value.featureTypes());
-    hashCode = hashCode * 31 + qHash(value.departureTime());
-    hashCode = hashCode * 31 + qHash(value.segmentDetail());
-    hashCode = hashCode * 31 + qHash(value.maneuverDetail());
-    hashCode = hashCode * 31 + qHash(value.routeOptimization());
-    hashCode = hashCode * 31 + qHash(value.numberAlternativeRoutes());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.waypoints());
+    seed = hash(seed, value.travelModes());
+    seed = hash(seed, value.excludeAreas());
+    seed = hash(seed, value.featureTypes());
+    seed = hash(seed, value.departureTime());
+    seed = hash(seed, value.segmentDetail());
+    seed = hash(seed, value.maneuverDetail());
+    seed = hash(seed, value.routeOptimization());
+    seed = hash(seed, value.numberAlternativeRoutes());
+    return seed;
 }
 
-inline hash_type qHash(const QPlace &value)
+inline hash_type qHash(const QPlace &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.icon());
-    hashCode = hashCode * 31 + qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.placeId());
-    hashCode = hashCode * 31 + qHash(value.ratings());
-    hashCode = hashCode * 31 + qHash(value.location());
-    hashCode = hashCode * 31 + qHash(value.supplier());
-    hashCode = hashCode * 31 + qHash(value.categories());
-    hashCode = hashCode * 31 + qHash(value.primaryFax());
-    hashCode = hashCode * 31 + qHash(value.visibility());
-    hashCode = hashCode * 31 + qHash(value.attribution());
-    hashCode = hashCode * 31 + qHash(value.contactTypes());
-    hashCode = hashCode * 31 + qHash(value.primaryEmail());
-    hashCode = hashCode * 31 + qHash(value.primaryPhone());
-    hashCode = hashCode * 31 + qHash(value.detailsFetched());
-    hashCode = hashCode * 31 + qHash(value.primaryWebsite());
-    hashCode = hashCode * 31 + qHash(value.extendedAttributeTypes());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.icon());
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.placeId());
+    seed = hash(seed, value.ratings());
+    seed = hash(seed, value.location());
+    seed = hash(seed, value.supplier());
+    seed = hash(seed, value.categories());
+    seed = hash(seed, value.primaryFax());
+    seed = hash(seed, value.visibility());
+    seed = hash(seed, value.attribution());
+    seed = hash(seed, value.contactTypes());
+    seed = hash(seed, value.primaryEmail());
+    seed = hash(seed, value.primaryPhone());
+    seed = hash(seed, value.detailsFetched());
+    seed = hash(seed, value.primaryWebsite());
+    seed = hash(seed, value.extendedAttributeTypes());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceMatchRequest &value)
+inline hash_type qHash(const QPlaceMatchRequest &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.places());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.places());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceSearchRequest &value)
+inline hash_type qHash(const QPlaceSearchRequest &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.limit());
-    hashCode = hashCode * 31 + qHash(value.categories());
-    hashCode = hashCode * 31 + qHash(value.searchArea());
-    hashCode = hashCode * 31 + qHash(value.searchTerm());
-    hashCode = hashCode * 31 + qHash(value.relevanceHint());
-    hashCode = hashCode * 31 + qHash(value.visibilityScope());
-    hashCode = hashCode * 31 + qHash(value.recommendationId());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.limit());
+    seed = hash(seed, value.categories());
+    seed = hash(seed, value.searchArea());
+    seed = hash(seed, value.searchTerm());
+    seed = hash(seed, value.relevanceHint());
+    seed = hash(seed, value.visibilityScope());
+    seed = hash(seed, value.recommendationId());
+    return seed;
 }
 
-inline hash_type qHash(const QPlaceContent &value)
+inline hash_type qHash(const QPlaceContent &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.type());
-    hashCode = hashCode * 31 + qHash(value.user());
-    hashCode = hashCode * 31 + qHash(value.supplier());
-    hashCode = hashCode * 31 + qHash(value.attribution());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.type());
+    seed = hash(seed, value.user());
+    seed = hash(seed, value.supplier());
+    seed = hash(seed, value.attribution());
+    return seed;
 }
 
-inline hash_type qHash(const QGeoManeuver &value)
+inline hash_type qHash(const QGeoManeuver &value, hash_type seed = 0)
 {
     if(!value.isValid())
-        return 0;
-    hash_type hashCode = qHash(value.position());
-    hashCode = hashCode * 31 + qHash(value.waypoint());
-    hashCode = hashCode * 31 + qHash(value.instructionText());
-    hashCode = hashCode * 31 + qHash(value.timeToNextInstruction());
-    hashCode = hashCode * 31 + qHash(value.distanceToNextInstruction());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.position());
+    seed = hash(seed, value.waypoint());
+    seed = hash(seed, value.instructionText());
+    seed = hash(seed, value.timeToNextInstruction());
+    seed = hash(seed, value.distanceToNextInstruction());
+    return seed;
 }
 
-inline hash_type qHash(const QGeoRouteSegment &value)
+inline hash_type qHash(const QGeoRouteSegment &value, hash_type seed = 0)
 {
     if(!value.isValid())
-        return 0;
-    hash_type hashCode = qHash(value.path());
-    hashCode = hashCode * 31 + qHash(value.maneuver());
-    hashCode = hashCode * 31 + qHash(value.travelTime());
-    hashCode = hashCode * 31 + qHash(value.distance());
-    hashCode = hashCode * 31 + qHash(value.isLegLastSegment());
-    return hashCode;
-}
-
-inline hash_type qHash(const QGeoRoute &value)
-{
-    hash_type hashCode = qHash(value.path());
-    hashCode = hashCode * 31 + qHash(value.bounds());
-    hashCode = hashCode * 31 + qHash(value.request());
-    hashCode = hashCode * 31 + qHash(value.routeId());
-    hashCode = hashCode * 31 + qHash(value.distance());
-    hashCode = hashCode * 31 + qHash(value.routeLegs());
-    hashCode = hashCode * 31 + qHash(value.travelMode());
-    hashCode = hashCode * 31 + qHash(value.travelTime());
-    hashCode = hashCode * 31 + qHash(value.firstRouteSegment());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.path());
+    seed = hash(seed, value.maneuver());
+    seed = hash(seed, value.travelTime());
+    seed = hash(seed, value.distance());
+    seed = hash(seed, value.isLegLastSegment());
+    return seed;
+}
+
+inline hash_type qHash(const QGeoRoute &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.path());
+    seed = hash(seed, value.bounds());
+    seed = hash(seed, value.request());
+    seed = hash(seed, value.routeId());
+    seed = hash(seed, value.distance());
+    seed = hash(seed, value.routeLegs());
+    seed = hash(seed, value.travelMode());
+    seed = hash(seed, value.travelTime());
+    seed = hash(seed, value.firstRouteSegment());
+    return seed;
 }
 
 #endif // QTJAMBI_LOCATION_HASHES_H
diff --git a/src/cpp/QtJambiMultimedia/hashes.h b/src/cpp/QtJambiMultimedia/hashes.h
index dd4807d8..0961c5b4 100644
--- a/src/cpp/QtJambiMultimedia/hashes.h
+++ b/src/cpp/QtJambiMultimedia/hashes.h
@@ -36,256 +36,276 @@
 #include <QtJambiGui/hashes.h>
 #include <QtJambiNetwork/hashes.h>
 
-hash_type qHash(const QAudioFormat& value);
+hash_type qHash(const QAudioFormat& value, hash_type seed = 0);
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QVideoFrame::PaintOptions& value){
-    return qHashMulti(0, value.backgroundColor, int(value.aspectRatioMode));
+inline hash_type qHash(const QVideoFrame::PaintOptions& value, hash_type seed = 0){
+    return qHashMulti(seed, value.backgroundColor, int(value.aspectRatioMode));
 }
 
 inline bool operator==(const QVideoFrame::PaintOptions& value1, const QVideoFrame::PaintOptions& value2){
     return value1.backgroundColor==value2.backgroundColor && value1.aspectRatioMode==value2.aspectRatioMode;
 }
 
-inline hash_type qHash(const QVideoFrameFormat& value){
+inline hash_type qHash(const QVideoFrameFormat& value, hash_type seed = 0){
     if(!value.isValid())
-        return 0;
-    hash_type hashCode = qHash(int(value.pixelFormat()));
-    hashCode = hashCode * 31 + qHash(value.frameWidth());
-    hashCode = hashCode * 31 + qHash(value.frameHeight());
-    hashCode = hashCode * 31 + qHash(value.planeCount());
-    hashCode = hashCode * 31 + qHash(value.viewport());
-    hashCode = hashCode * 31 + qHash(int(value.scanLineDirection()));
-    hashCode = hashCode * 31 + qHash(int(value.frameRate()));
-    hashCode = hashCode * 31 + qHash(int(value.yCbCrColorSpace()));
-    hashCode = hashCode * 31 + qHash(value.isMirrored());
-    hashCode = hashCode * 31 + qHash(value.vertexShaderFileName());
-    hashCode = hashCode * 31 + qHash(value.fragmentShaderFileName());
-    return hashCode;
+        return seed;
+    return qHashMulti(seed, int(value.pixelFormat()), value.frameWidth(),
+               value.frameHeight(), value.planeCount(), value.viewport(),
+               int(value.scanLineDirection()), int(value.frameRate()),
+               int(value.yCbCrColorSpace()), value.isMirrored(), value.vertexShaderFileName(),
+               value.fragmentShaderFileName());
 }
 
-inline hash_type qHash(const QAudioDevice& value){
+inline hash_type qHash(const QAudioDevice& value, hash_type seed = 0){
     if(!value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.id());
-    hashCode = hashCode * 31 + qHash(value.description());
-    hashCode = hashCode * 31 + qHash(value.isDefault());
-    hashCode = hashCode * 31 + qHash(int(value.mode()));
-    hashCode = hashCode * 31 + qHash(value.preferredFormat());
-    hashCode = hashCode * 31 + qHash(value.minimumSampleRate());
-    hashCode = hashCode * 31 + qHash(value.maximumSampleRate());
-    hashCode = hashCode * 31 + qHash(value.minimumChannelCount());
-    hashCode = hashCode * 31 + qHash(value.maximumChannelCount());
-    hashCode = hashCode * 31 + qHash(value.supportedSampleFormats());
-    return hashCode;
+        return seed;
+    return qHashMulti(seed, value.id(),
+                            value.description(),
+                            value.isDefault(),
+                            int(value.mode()),
+                            value.preferredFormat(),
+                            value.minimumSampleRate(),
+                            value.maximumSampleRate(),
+                            value.minimumChannelCount(),
+                            value.maximumChannelCount(),
+                            value.supportedSampleFormats());
 }
 
-inline hash_type qHash(const QCameraFormat& value){
+inline hash_type qHash(const QCameraFormat& value, hash_type seed = 0){
     if(!value.isNull())
-        return 0;
-    hash_type hashCode = qHash(int(value.pixelFormat()));
-    hashCode = hashCode * 31 + qHash(value.resolution());
-    hashCode = hashCode * 31 + qHash(value.minFrameRate());
-    hashCode = hashCode * 31 + qHash(value.maxFrameRate());
-    return hashCode;
+        return seed;
+    return qHashMulti(seed, int(value.pixelFormat()),
+                            value.resolution(),
+                            value.minFrameRate(),
+                            value.maxFrameRate());
 }
 
-inline hash_type qHash(const QCameraDevice& value){
+inline hash_type qHash(const QCameraDevice& value, hash_type seed = 0){
     if(!value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.id());
-    hashCode = hashCode * 31 + qHash(value.description());
-    hashCode = hashCode * 31 + qHash(value.isDefault());
-    hashCode = hashCode * 31 + qHash(int(value.position()));
-    hashCode = hashCode * 31 + qHash(value.photoResolutions());
-    hashCode = hashCode * 31 + qHash(value.videoFormats());
-    return hashCode;
+        return seed;
+    return qHashMulti(seed, value.id(),
+                            value.description(),
+                            value.isDefault(),
+                            int(value.position()),
+                            value.photoResolutions(),
+                            value.videoFormats());
 }
 
-inline hash_type qHash(const QMediaTimeRange::Interval& value){
-    return qHashMulti(0, value.start(), value.end(), value.isNormal());
+inline hash_type qHash(const QMediaTimeRange::Interval& value, hash_type seed = 0){
+    return qHashMulti(seed, value.start(), value.end(), value.isNormal());
 }
 
-inline hash_type qHash(const QMediaFormat& value){
-    return qHashMulti(0, value.fileFormat(), int(value.audioCodec()), int(value.videoCodec()));
+inline hash_type qHash(const QMediaFormat& value, hash_type seed = 0){
+    return qHashMulti(seed, value.fileFormat(), int(value.audioCodec()), int(value.videoCodec()));
 }
 #endif
 
 
-inline hash_type qHash(const QVideoFrame& value){
+inline hash_type qHash(const QVideoFrame& value, hash_type seed = 0){
     if(!value.isValid())
-        return 0;
-    hash_type hashCode = qHash(value.size());
-    hashCode = hashCode * 31 + qHash(value.width());
-    hashCode = hashCode * 31 + qHash(value.height());
-    hashCode = hashCode * 31 + qHash(value.endTime());
-    hashCode = hashCode * 31 + qHash(int(value.mapMode()));
-    hashCode = hashCode * 31 + qHash(value.isMapped());
+        return seed;
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.size());
+    seed = hash(seed, value.width());
+    seed = hash(seed, value.height());
+    seed = hash(seed, value.endTime());
+    seed = hash(seed, int(value.mapMode()));
+    seed = hash(seed, value.isMapped());
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    hashCode = hashCode * 31 + qHash(value.fieldType());
+    seed = hash(seed, value.fieldType());
 #else
-    hashCode = hashCode * 31 + qHash(value.surfaceFormat());
-    hashCode = hashCode * 31 + qHash(value.isReadable());
+    seed = hash(seed, value.surfaceFormat());
+    seed = hash(seed, value.isReadable());
 #endif
-    hashCode = hashCode * 31 + qHash(value.startTime());
-    hashCode = hashCode * 31 + qHash(int(value.handleType()));
-    hashCode = hashCode * 31 + qHash(value.isReadable());
-    hashCode = hashCode * 31 + qHash(value.isWritable());
-    hashCode = hashCode * 31 + qHash(int(value.pixelFormat()));
-    hashCode = hashCode * 31 + qHash(value.planeCount());
+    seed = hash(seed, value.startTime());
+    seed = hash(seed, int(value.handleType()));
+    seed = hash(seed, value.isReadable());
+    seed = hash(seed, value.isWritable());
+    seed = hash(seed, int(value.pixelFormat()));
+    seed = hash(seed, value.planeCount());
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    hashCode = hashCode * 31 + qHash(value.mappedBytes());
-    hashCode = hashCode * 31 + qHash(value.bytesPerLine());
-    hashCode = hashCode * 31 + qHash(QByteArray(reinterpret_cast<const char*>(value.bits()), value.mappedBytes()));
+    seed = hash(seed, value.mappedBytes());
+    seed = hash(seed, value.bytesPerLine());
+    seed = hash(seed, QByteArray(reinterpret_cast<const char*>(value.bits()), value.mappedBytes()));
 #else
     for(int i=0; i< value.planeCount(); ++i){
-        hashCode = hashCode * 31 + qHash(value.mappedBytes(i));
-        hashCode = hashCode * 31 + qHash(value.bytesPerLine(i));
-        hashCode = hashCode * 31 + qHash(QByteArray(reinterpret_cast<const char*>(value.bits(i)), value.mappedBytes(i)));
+        seed = hash(seed, value.mappedBytes(i));
+        seed = hash(seed, value.bytesPerLine(i));
+        seed = hash(seed, QByteArray(reinterpret_cast<const char*>(value.bits(i)), value.mappedBytes(i)));
     }
 #endif
-    return hashCode;
+    return seed;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QVideoEncoderSettings& value){
+inline hash_type qHash(const QVideoEncoderSettings& value, hash_type seed = 0){
     if(value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.encodingMode());
-    hashCode = hashCode * 31 + qHash(value.codec());
-    hashCode = hashCode * 31 + qHash(value.bitRate());
-    hashCode = hashCode * 31 + qHash(value.quality());
-    hashCode = hashCode * 31 + qHash(value.frameRate());
-    hashCode = hashCode * 31 + qHash(value.resolution());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.encodingMode());
+    seed = hash(seed, value.codec());
+    seed = hash(seed, value.bitRate());
+    seed = hash(seed, value.quality());
+    seed = hash(seed, value.frameRate());
+    seed = hash(seed, value.resolution());
+    return seed;
 }
 
-inline hash_type qHash(const QImageEncoderSettings& value){
+inline hash_type qHash(const QImageEncoderSettings& value, hash_type seed = 0){
     if(value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.quality());
-    hashCode = hashCode * 31 + qHash(value.codec());
-    hashCode = hashCode * 31 + qHash(value.resolution());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.quality());
+    seed = hash(seed, value.codec());
+    seed = hash(seed, value.resolution());
+    return seed;
+}
+
+inline hash_type qHash(const QVideoSurfaceFormat& value, hash_type seed = 0){
+    return qHash(quintptr(reinterpret_cast<const QSharedDataPointer<QSharedData>&>(value).data()), seed);
+}
+
+inline hash_type qHash(const QCameraViewfinderSettings& value, hash_type seed = 0){
+    if(value.isNull())
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.resolution());
+    seed = hash(seed, value.minimumFrameRate());
+    seed = hash(seed, value.maximumFrameRate());
+    seed = hash(seed, value.pixelFormat());
+    seed = hash(seed, value.pixelAspectRatio());
+    return seed;
 }
 #endif
 
-inline hash_type qHash(const QMediaTimeRange& value){
-    hash_type hashCode = qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.intervals());
-    hashCode = hashCode * 31 + qHash(value.latestTime());
-    hashCode = hashCode * 31 + qHash(value.earliestTime());
-    hashCode = hashCode * 31 + qHash(value.isContinuous());
-    return hashCode;
+inline hash_type qHash(const QMediaTimeRange& value, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.intervals());
+    seed = hash(seed, value.latestTime());
+    seed = hash(seed, value.earliestTime());
+    seed = hash(seed, value.isContinuous());
+    return seed;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QMediaTimeInterval& value){
-    hash_type hashCode = qHash(value.start());
-    hashCode = hashCode * 31 + qHash(value.end());
-    hashCode = hashCode * 31 + qHash(value.isNormal());
-    return hashCode;
+inline hash_type qHash(const QMediaTimeInterval& value, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.start());
+    seed = hash(seed, value.end());
+    seed = hash(seed, value.isNormal());
+    return seed;
 }
 
-inline hash_type qHash(const QMediaServiceProviderHint& value){
+inline hash_type qHash(const QMediaServiceProviderHint& value, hash_type seed = 0){
     if(value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.type());
-    hashCode = hashCode * 31 + qHash(value.codecs());
-    hashCode = hashCode * 31 + qHash(value.device());
-    hashCode = hashCode * 31 + qHash(int(value.features()));
-    hashCode = hashCode * 31 + qHash(value.mimeType());
-    hashCode = hashCode * 31 + qHash(value.cameraPosition());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.type());
+    seed = hash(seed, value.codecs());
+    seed = hash(seed, value.device());
+    seed = hash(seed, int(value.features()));
+    seed = hash(seed, value.mimeType());
+    seed = hash(seed, value.cameraPosition());
+    return seed;
 }
 
-inline hash_type qHash(const QMediaResource& value){
+inline hash_type qHash(const QMediaResource& value, hash_type seed = 0){
     if(value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.url());
-    hashCode = hashCode * 31 + qHash(value.request());
-    hashCode = hashCode * 31 + qHash(value.dataSize());
-    hashCode = hashCode * 31 + qHash(value.language());
-    hashCode = hashCode * 31 + qHash(value.mimeType());
-    hashCode = hashCode * 31 + qHash(value.audioCodec());
-    hashCode = hashCode * 31 + qHash(value.resolution());
-    hashCode = hashCode * 31 + qHash(value.sampleRate());
-    hashCode = hashCode * 31 + qHash(value.videoCodec());
-    hashCode = hashCode * 31 + qHash(value.audioBitRate());
-    hashCode = hashCode * 31 + qHash(value.channelCount());
-    hashCode = hashCode * 31 + qHash(value.videoBitRate());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.url());
+    seed = hash(seed, value.request());
+    seed = hash(seed, value.dataSize());
+    seed = hash(seed, value.language());
+    seed = hash(seed, value.mimeType());
+    seed = hash(seed, value.audioCodec());
+    seed = hash(seed, value.resolution());
+    seed = hash(seed, value.sampleRate());
+    seed = hash(seed, value.videoCodec());
+    seed = hash(seed, value.audioBitRate());
+    seed = hash(seed, value.channelCount());
+    seed = hash(seed, value.videoBitRate());
+    return seed;
 }
 
-inline hash_type qHash(const QMediaContent& value){
+inline hash_type qHash(const QMediaContent& value, hash_type seed = 0){
     if(value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.canonicalRequest());
-    hashCode = hashCode * 31 + qHash(value.canonicalUrl());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.canonicalRequest());
+    seed = hash(seed, value.canonicalUrl());
+    return seed;
 }
 
-inline hash_type qHash(const QCameraInfo& value){
+inline hash_type qHash(const QCameraInfo& value, hash_type seed = 0){
     if(value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.position());
-    hashCode = hashCode * 31 + qHash(value.deviceName());
-    hashCode = hashCode * 31 + qHash(value.description());
-    hashCode = hashCode * 31 + qHash(value.orientation());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.position());
+    seed = hash(seed, value.deviceName());
+    seed = hash(seed, value.description());
+    seed = hash(seed, value.orientation());
+    return seed;
 }
 
-inline hash_type qHash(const QCameraFocusZone& value){
-    hash_type hashCode = qHash(value.area());
-    hashCode = hashCode * 31 + qHash(value.status());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    return hashCode;
+inline hash_type qHash(const QCameraFocusZone& value, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.area());
+    seed = hash(seed, value.status());
+    seed = hash(seed, value.isValid());
+    return seed;
 }
 
-inline hash_type qHash(const QCamera::FrameRateRange& value){
-    hash_type hashCode = qHash(value.minimumFrameRate);
-    hashCode = hashCode * 31 + qHash(value.maximumFrameRate);
-    return hashCode;
+inline hash_type qHash(const QCamera::FrameRateRange& value, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.minimumFrameRate);
+    seed = hash(seed, value.maximumFrameRate);
+    return seed;
 }
 
-inline hash_type qHash(const QAudioEncoderSettings& value){
+inline hash_type qHash(const QAudioEncoderSettings& value, hash_type seed = 0){
     if(value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.codec());
-    hashCode = hashCode * 31 + qHash(value.bitRate());
-    hashCode = hashCode * 31 + qHash(value.quality());
-    hashCode = hashCode * 31 + qHash(value.sampleRate());
-    hashCode = hashCode * 31 + qHash(value.channelCount());
-    hashCode = hashCode * 31 + qHash(value.encodingMode());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.codec());
+    seed = hash(seed, value.bitRate());
+    seed = hash(seed, value.quality());
+    seed = hash(seed, value.sampleRate());
+    seed = hash(seed, value.channelCount());
+    seed = hash(seed, value.encodingMode());
+    return seed;
 }
 
-inline hash_type qHash(const QAudioDeviceInfo& value){
+inline hash_type qHash(const QAudioDeviceInfo& value, hash_type seed = 0){
     if(value.isNull())
-        return 0;
-    hash_type hashCode = qHash(value.deviceName());
-    hashCode = hashCode * 31 + qHash(value.preferredFormat());
-    hashCode = hashCode * 31 + qHash(value.supportedCodecs());
-    hashCode = hashCode * 31 + qHash(value.supportedByteOrders());
-    hashCode = hashCode * 31 + qHash(value.supportedSampleRates());
-    hashCode = hashCode * 31 + qHash(value.supportedChannelCounts());
-    hashCode = hashCode * 31 + qHash(value.supportedSampleTypes());
-    hashCode = hashCode * 31 + qHash(value.supportedSampleSizes());
-    return hashCode;
+        return seed;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.deviceName());
+    seed = hash(seed, value.preferredFormat());
+    seed = hash(seed, value.supportedCodecs());
+    seed = hash(seed, value.supportedByteOrders());
+    seed = hash(seed, value.supportedSampleRates());
+    seed = hash(seed, value.supportedChannelCounts());
+    seed = hash(seed, value.supportedSampleTypes());
+    seed = hash(seed, value.supportedSampleSizes());
+    return seed;
 }
 #endif
 
-inline hash_type qHash(const QAudioFormat& value){
-    hash_type hashCode = qHash(value.sampleRate());
+inline hash_type qHash(const QAudioFormat& value, hash_type seed){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.sampleRate());
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    hashCode = hashCode * 31 + qHash(value.byteOrder());
-    hashCode = hashCode * 31 + qHash(value.sampleSize());
-    hashCode = hashCode * 31 + qHash(value.sampleType());
-    hashCode = hashCode * 31 + qHash(value.codec());
+    seed = hash(seed, value.byteOrder());
+    seed = hash(seed, value.sampleSize());
+    seed = hash(seed, value.sampleType());
+    seed = hash(seed, value.codec());
 #endif
-    hashCode = hashCode * 31 + qHash(value.channelCount());
-    hashCode = hashCode * 31 + qHash(value.bytesPerFrame());
-    return hashCode;
+    seed = hash(seed, value.channelCount());
+    seed = hash(seed, value.bytesPerFrame());
+    return seed;
 }
 
 #endif // QTJAMBIMULTIMEDIA_HASHES_H
diff --git a/src/cpp/QtJambiMultimedia/impl.cpp b/src/cpp/QtJambiMultimedia/impl.cpp
index 1cf7e715..86d6917a 100644
--- a/src/cpp/QtJambiMultimedia/impl.cpp
+++ b/src/cpp/QtJambiMultimedia/impl.cpp
@@ -42,7 +42,7 @@ QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/multimedia,QMediaService$Result,
 )
 
 QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/multimedia,QMediaService$ListResult,
-    QTJAMBI_REPOSITORY_DEFINE_CONSTRUCTOR(Ljava/util/List;Z)
+    QTJAMBI_REPOSITORY_DEFINE_CONSTRUCTOR(Lio/qt/core/QList;Z)
 )
 
 QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/multimedia,QAbstractVideoBuffer$MapResult,
diff --git a/src/cpp/QtJambiNetwork/hashes.h b/src/cpp/QtJambiNetwork/hashes.h
index 968d3775..36e335bf 100644
--- a/src/cpp/QtJambiNetwork/hashes.h
+++ b/src/cpp/QtJambiNetwork/hashes.h
@@ -34,211 +34,216 @@
 #include <QtCore/QDeadlineTimer>
 #include <QtJambi/Global>
 
-inline hash_type qHash(const QHstsPolicy& p){
-    hash_type hashCode = qHash(p.expiry());
-    hashCode = hashCode * 31 + qHash(p.includesSubDomains());
-    hashCode = hashCode * 31 + qHash(p.host());
-    return hashCode;
+inline hash_type qHash(const QHstsPolicy& p, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, p.expiry());
+    seed = hash(seed, p.includesSubDomains());
+    seed = hash(seed, p.host());
+    return seed;
 }
 
-inline hash_type qHash(const QNetworkAddressEntry& p){
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(p.dnsEligibility()));
-    hashCode = hashCode * 31 + qHash(p.ip());
-    hashCode = hashCode * 31 + qHash(p.netmask());
-    hashCode = hashCode * 31 + qHash(p.prefixLength());
-    hashCode = hashCode * 31 + qHash(p.isLifetimeKnown());
-    hashCode = hashCode * 31 + qHash(p.preferredLifetime().deadline());
-    hashCode = hashCode * 31 + qHash(p.validityLifetime().deadline());
-    hashCode = hashCode * 31 + qHash(p.isPermanent());
-    return hashCode;
+inline hash_type qHash(const QNetworkAddressEntry& p, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(p.dnsEligibility()));
+    seed = hash(seed, p.ip());
+    seed = hash(seed, p.netmask());
+    seed = hash(seed, p.prefixLength());
+    seed = hash(seed, p.isLifetimeKnown());
+    seed = hash(seed, p.preferredLifetime().deadline());
+    seed = hash(seed, p.validityLifetime().deadline());
+    seed = hash(seed, p.isPermanent());
+    return seed;
 }
 
-inline hash_type qHash(const QNetworkCacheMetaData& p){
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(p.isValid());
-    hashCode = hashCode * 31 + qHash(p.url());
-    hashCode = hashCode * 31 + qHash(p.lastModified());
-    hashCode = hashCode * 31 + qHash(p.expirationDate());
-    hashCode = hashCode * 31 + qHash(p.saveToDisk());
+inline hash_type qHash(const QNetworkCacheMetaData& p, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, p.isValid());
+    seed = hash(seed, p.url());
+    seed = hash(seed, p.lastModified());
+    seed = hash(seed, p.expirationDate());
+    seed = hash(seed, p.saveToDisk());
     QNetworkCacheMetaData::RawHeaderList rawHeaders = p.rawHeaders();
-    hashCode = hashCode * 31 + qHash(rawHeaders.size());
+    seed = hash(seed, rawHeaders.size());
     for(const QNetworkCacheMetaData::RawHeader & i : rawHeaders){
-        hashCode = hashCode * 31 + qHash(i.first);
-        hashCode = hashCode * 31 + qHash(i.second);
+        seed = hash(seed, i.first);
+        seed = hash(seed, i.second);
     }
     QNetworkCacheMetaData::AttributesMap attributes = p.attributes();
-    hashCode = hashCode * 31 + qHash(attributes.size());
+    seed = hash(seed, attributes.size());
     for(QNetworkRequest::Attribute i : attributes.keys()){
-        hashCode = hashCode * 31 + qHash(int(i));
+        seed = hash(seed, int(i));
     }
-    return hashCode;
+    return seed;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-inline hash_type qHash(const QNetworkConfiguration& p){
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(p.state()));
-    hashCode = hashCode * 31 + qHash(int(p.type()));
-    hashCode = hashCode * 31 + qHash(int(p.purpose()));
-    hashCode = hashCode * 31 + qHash(int(p.bearerType()));
-    hashCode = hashCode * 31 + qHash(int(p.bearerTypeFamily()));
-    hashCode = hashCode * 31 + qHash(p.bearerTypeName());
-    hashCode = hashCode * 31 + qHash(p.identifier());
-    hashCode = hashCode * 31 + qHash(p.isRoamingAvailable());
-    hashCode = hashCode * 31 + qHash(p.name());
-    hashCode = hashCode * 31 + qHash(p.isValid());
-    hashCode = hashCode * 31 + qHash(p.connectTimeout());
-    hashCode = hashCode * 31 + qHash(p.children().size());
-    return hashCode;
+inline hash_type qHash(const QNetworkConfiguration& p, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(p.state()));
+    seed = hash(seed, int(p.type()));
+    seed = hash(seed, int(p.purpose()));
+    seed = hash(seed, int(p.bearerType()));
+    seed = hash(seed, int(p.bearerTypeFamily()));
+    seed = hash(seed, p.bearerTypeName());
+    seed = hash(seed, p.identifier());
+    seed = hash(seed, p.isRoamingAvailable());
+    seed = hash(seed, p.name());
+    seed = hash(seed, p.isValid());
+    seed = hash(seed, p.connectTimeout());
+    seed = hash(seed, p.children().size());
+    return seed;
 }
 #endif
 
-inline hash_type qHash(const QSslPreSharedKeyAuthenticator& value){
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.identityHint());
-    hashCode = hashCode * 31 + qHash(value.identity());
-    hashCode = hashCode * 31 + qHash(value.maximumIdentityLength());
-    hashCode = hashCode * 31 + qHash(value.preSharedKey());
-    hashCode = hashCode * 31 + qHash(value.maximumPreSharedKeyLength());
-    return hashCode;
+inline hash_type qHash(const QSslPreSharedKeyAuthenticator& value, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.identityHint());
+    seed = hash(seed, value.identity());
+    seed = hash(seed, value.maximumIdentityLength());
+    seed = hash(seed, value.preSharedKey());
+    seed = hash(seed, value.maximumPreSharedKeyLength());
+    return seed;
 }
 
-inline hash_type qHash(const QNetworkCookie& p){
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(p.isSecure());
-    hashCode = hashCode * 31 + qHash(p.isHttpOnly());
-    hashCode = hashCode * 31 + qHash(p.isSessionCookie());
-    hashCode = hashCode * 31 + qHash(p.expirationDate());
-    hashCode = hashCode * 31 + qHash(p.domain());
-    hashCode = hashCode * 31 + qHash(p.path());
-    hashCode = hashCode * 31 + qHash(p.name());
-    hashCode = hashCode * 31 + qHash(p.value());
-    return hashCode;
+inline hash_type qHash(const QNetworkCookie& p, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, p.isSecure());
+    seed = hash(seed, p.isHttpOnly());
+    seed = hash(seed, p.isSessionCookie());
+    seed = hash(seed, p.expirationDate());
+    seed = hash(seed, p.domain());
+    seed = hash(seed, p.path());
+    seed = hash(seed, p.name());
+    seed = hash(seed, p.value());
+    return seed;
 }
 
-inline hash_type qHash(const QNetworkProxy& p){
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(p.type()));
-    hashCode = hashCode * 31 + qHash(p.capabilities());
-    hashCode = hashCode * 31 + qHash(p.isCachingProxy());
-    hashCode = hashCode * 31 + qHash(p.isTransparentProxy());
-    hashCode = hashCode * 31 + qHash(p.user());
-    hashCode = hashCode * 31 + qHash(p.password());
-    hashCode = hashCode * 31 + qHash(p.hostName());
-    hashCode = hashCode * 31 + qHash(p.port());
+inline hash_type qHash(const QNetworkProxy& p, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(p.type()));
+    seed = hash(seed, p.capabilities());
+    seed = hash(seed, p.isCachingProxy());
+    seed = hash(seed, p.isTransparentProxy());
+    seed = hash(seed, p.user());
+    seed = hash(seed, p.password());
+    seed = hash(seed, p.hostName());
+    seed = hash(seed, p.port());
     for(const QByteArray & i : p.rawHeaderList()){
-        hashCode = hashCode * 31 + qHash(i);
+        seed = hash(seed, i);
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QNetworkProxyQuery& p){
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(p.queryType()));
-    hashCode = hashCode * 31 + qHash(p.peerPort());
-    hashCode = hashCode * 31 + qHash(p.peerHostName());
-    hashCode = hashCode * 31 + qHash(p.localPort());
-    hashCode = hashCode * 31 + qHash(p.protocolTag());
-    hashCode = hashCode * 31 + qHash(p.url());
-    return hashCode;
+inline hash_type qHash(const QNetworkProxyQuery& p, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(p.queryType()));
+    seed = hash(seed, p.peerPort());
+    seed = hash(seed, p.peerHostName());
+    seed = hash(seed, p.localPort());
+    seed = hash(seed, p.protocolTag());
+    seed = hash(seed, p.url());
+    return seed;
 }
 
-inline hash_type qHash(const QNetworkRequest& p){
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(p.url());
-    hashCode = hashCode * 31 + qHash(quintptr(p.originatingObject()));
-    hashCode = hashCode * 31 + qHash(int(p.priority()));
-    hashCode = hashCode * 31 + qHash(p.maximumRedirectsAllowed());
-    return hashCode;
+inline hash_type qHash(const QNetworkRequest& p, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, p.url());
+    seed = hash(seed, quintptr(p.originatingObject()));
+    seed = hash(seed, int(p.priority()));
+    seed = hash(seed, p.maximumRedirectsAllowed());
+    return seed;
 }
 
-inline hash_type qHash(const QAuthenticator& p){
+inline hash_type qHash(const QAuthenticator& p, hash_type seed = 0){
     if(p.isNull())
         return 0;
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(p.user());
-    hashCode = hashCode * 31 + qHash(p.password());
-    hashCode = hashCode * 31 + qHash(p.realm());
-    hashCode = hashCode * 31 + qHash(p.options().keys());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, p.user());
+    seed = hash(seed, p.password());
+    seed = hash(seed, p.realm());
+    seed = hash(seed, p.options().keys());
+    return seed;
 }
 
 #ifndef QT_NO_SSL
 
-inline hash_type qHash(const QSslKey& p){
+inline hash_type qHash(const QSslKey& p, hash_type seed = 0){
     if(p.isNull())
         return 0;
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(p.type());
-    hashCode = hashCode * 31 + qHash(quintptr(p.handle()));
-    hashCode = hashCode * 31 + qHash(p.length());
-    hashCode = hashCode * 31 + qHash(p.algorithm());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, p.type());
+    seed = hash(seed, quintptr(p.handle()));
+    seed = hash(seed, p.length());
+    seed = hash(seed, p.algorithm());
+    return seed;
 }
 
-inline hash_type qHash(const QSslCipher& p){
+inline hash_type qHash(const QSslCipher& p, hash_type seed = 0){
     if(p.isNull())
         return 0;
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(p.name());
-    hashCode = hashCode * 31 + qHash(quintptr(p.protocol()));
-    hashCode = hashCode * 31 + qHash(p.usedBits());
-    hashCode = hashCode * 31 + qHash(p.supportedBits());
-    hashCode = hashCode * 31 + qHash(p.protocolString());
-    hashCode = hashCode * 31 + qHash(p.encryptionMethod());
-    hashCode = hashCode * 31 + qHash(p.keyExchangeMethod());
-    hashCode = hashCode * 31 + qHash(p.authenticationMethod());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, p.name());
+    seed = hash(seed, quintptr(p.protocol()));
+    seed = hash(seed, p.usedBits());
+    seed = hash(seed, p.supportedBits());
+    seed = hash(seed, p.protocolString());
+    seed = hash(seed, p.encryptionMethod());
+    seed = hash(seed, p.keyExchangeMethod());
+    seed = hash(seed, p.authenticationMethod());
+    return seed;
 }
 
-inline hash_type qHash(const QSslConfiguration& p){
+inline hash_type qHash(const QSslConfiguration& p, hash_type seed = 0){
     if(p.isNull())
         return 0;
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(p.ciphers());
-    hashCode = hashCode * 31 + qHash(quintptr(p.protocol()));
-    hashCode = hashCode * 31 + qHash(p.privateKey());
-    hashCode = hashCode * 31 + qHash(p.sessionCipher());
-    hashCode = hashCode * 31 + qHash(p.sessionTicket());
-    hashCode = hashCode * 31 + qHash(p.caCertificates());
-    hashCode = hashCode * 31 + qHash(p.ellipticCurves());
-    hashCode = hashCode * 31 + qHash(p.peerVerifyMode());
-    hashCode = hashCode * 31 + qHash(p.peerCertificate());
-    hashCode = hashCode * 31 + qHash(p.peerVerifyDepth());
-    hashCode = hashCode * 31 + qHash(p.sessionProtocol());
-    hashCode = hashCode * 31 + qHash(p.localCertificate());
-    hashCode = hashCode * 31 + qHash(p.ephemeralServerKey());
-    hashCode = hashCode * 31 + qHash(p.ocspStaplingEnabled());
-    hashCode = hashCode * 31 + qHash(p.allowedNextProtocols());
-    hashCode = hashCode * 31 + qHash(p.peerCertificateChain());
-    hashCode = hashCode * 31 + qHash(p.localCertificateChain());
-    hashCode = hashCode * 31 + qHash(p.nextNegotiatedProtocol());
-    hashCode = hashCode * 31 + qHash(p.diffieHellmanParameters());
-    hashCode = hashCode * 31 + qHash(p.preSharedKeyIdentityHint());
-    hashCode = hashCode * 31 + qHash(p.sessionTicketLifeTimeHint());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, p.ciphers());
+    seed = hash(seed, quintptr(p.protocol()));
+    seed = hash(seed, p.privateKey());
+    seed = hash(seed, p.sessionCipher());
+    seed = hash(seed, p.sessionTicket());
+    seed = hash(seed, p.caCertificates());
+    seed = hash(seed, p.ellipticCurves());
+    seed = hash(seed, p.peerVerifyMode());
+    seed = hash(seed, p.peerCertificate());
+    seed = hash(seed, p.peerVerifyDepth());
+    seed = hash(seed, p.sessionProtocol());
+    seed = hash(seed, p.localCertificate());
+    seed = hash(seed, p.ephemeralServerKey());
+    seed = hash(seed, p.ocspStaplingEnabled());
+    seed = hash(seed, p.allowedNextProtocols());
+    seed = hash(seed, p.peerCertificateChain());
+    seed = hash(seed, p.localCertificateChain());
+    seed = hash(seed, p.nextNegotiatedProtocol());
+    seed = hash(seed, p.diffieHellmanParameters());
+    seed = hash(seed, p.preSharedKeyIdentityHint());
+    seed = hash(seed, p.sessionTicketLifeTimeHint());
 #if QT_CONFIG(dtls)
-    hashCode = hashCode * 31 + qHash(p.dtlsCookieVerificationEnabled());
+    seed = hash(seed, p.dtlsCookieVerificationEnabled());
 #endif // dtls
-    hashCode = hashCode * 31 + qHash(p.nextProtocolNegotiationStatus());
-    hashCode = hashCode * 31 + qHash(p.supportedCiphers());
-    return hashCode;
+    seed = hash(seed, p.nextProtocolNegotiationStatus());
+    seed = hash(seed, p.supportedCiphers());
+    return seed;
 }
 
 #endif // def QT_NO_SSL
 
 #if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
 
-inline hash_type qHash(const QHttp2Configuration& p){
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(p.serverPushEnabled());
-    hashCode = hashCode * 31 + qHash(quintptr(p.huffmanCompressionEnabled()));
-    hashCode = hashCode * 31 + qHash(p.sessionReceiveWindowSize());
-    hashCode = hashCode * 31 + qHash(p.streamReceiveWindowSize());
-    hashCode = hashCode * 31 + qHash(p.maxFrameSize());
-    return hashCode;
+inline hash_type qHash(const QHttp2Configuration& p, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, p.serverPushEnabled());
+    seed = hash(seed, quintptr(p.huffmanCompressionEnabled()));
+    seed = hash(seed, p.sessionReceiveWindowSize());
+    seed = hash(seed, p.streamReceiveWindowSize());
+    seed = hash(seed, p.maxFrameSize());
+    return seed;
 }
 
 #endif
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && defined(QTJAMBI_GENERATOR_RUNNING)
+size_t qHash(const QHttp1Configuration &value, size_t seed = 0);
+#endif
+
 #endif // QTJAMBINETWORK_HASHES_H
diff --git a/src/cpp/QtJambiNfc/hashes.h b/src/cpp/QtJambiNfc/hashes.h
index da7b87a4..a928b4ee 100644
--- a/src/cpp/QtJambiNfc/hashes.h
+++ b/src/cpp/QtJambiNfc/hashes.h
@@ -34,20 +34,22 @@
 #include <QtNfc/QNdefMessage>
 #include <QtJambi/Global>
 
-inline hash_type qHash(const QNearFieldTarget::RequestId &value)
+inline hash_type qHash(const QNearFieldTarget::RequestId &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.refCount());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.refCount());
+    return seed;
 }
 
-inline hash_type qHash(const QNdefMessage &value)
+inline hash_type qHash(const QNdefMessage &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.size());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.size());
     for(const QNdefRecord& record : value){
-        hashCode = hashCode * 31 + qHash(record);
+        seed = hash(seed, record);
     }
-    return hashCode;
+    return seed;
 }
 
 #endif // QTJAMBINFC_HASHES_H
diff --git a/src/cpp/QtJambiPlugin/QtJambiPlugin.pro b/src/cpp/QtJambiPlugin/QtJambiPlugin.pro
index c5fb7298..f00807b4 100644
--- a/src/cpp/QtJambiPlugin/QtJambiPlugin.pro
+++ b/src/cpp/QtJambiPlugin/QtJambiPlugin.pro
@@ -29,6 +29,7 @@ contains(QT_CONFIG, release):contains(QT_CONFIG, debug) {
 }
 
 macx:{
+    CONFIG+=no_default_rpath no_qt_rpath
     contains(QT_CONFIG, x86):CONFIG += x86
     contains(QT_CONFIG, ppc):CONFIG += ppc
     contains(QT_CONFIG, x86_64):CONFIG += x86_64
@@ -40,7 +41,7 @@ macx:{
     QMAKE_CXXFLAGS_WARN_OFF += -Wdollar-in-identifier-extension -Woverloaded-virtual
 
     QMAKE_RPATHDIR =  @loader_path/../lib
-    QMAKE_RPATHDIR =  @loader_path/../../lib
+    QMAKE_RPATHDIR += @loader_path/../../lib
     QMAKE_RPATHDIR += @loader_path/../../../lib
     QMAKE_RPATHDIR += @loader_path/../../../../lib
     QMAKE_RPATHDIR += @loader_path/../../../../../lib
diff --git a/src/cpp/QtJambiPositioning/hashes.h b/src/cpp/QtJambiPositioning/hashes.h
index cd60985e..0cf4de87 100644
--- a/src/cpp/QtJambiPositioning/hashes.h
+++ b/src/cpp/QtJambiPositioning/hashes.h
@@ -36,149 +36,159 @@
 #include <QtJambiCore/hashes.h>
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-hash_type qHash(const QGeoAddress &value);
-hash_type qHash(const QGeoShape &value);
+hash_type qHash(const QGeoAddress &value, hash_type seed = 0);
+hash_type qHash(const QGeoShape &value, hash_type seed = 0);
 #endif
 
-hash_type qHash(const QGeoRectangle &value);
-hash_type qHash(const QGeoPath &value);
-hash_type qHash(const QGeoCircle &value);
-hash_type qHash(const QGeoPolygon &value);
+hash_type qHash(const QGeoRectangle &value, hash_type seed = 0);
+hash_type qHash(const QGeoPath &value, hash_type seed = 0);
+hash_type qHash(const QGeoCircle &value, hash_type seed = 0);
+hash_type qHash(const QGeoPolygon &value, hash_type seed = 0);
 
-inline hash_type qHash(const QGeoCircle &value)
+inline hash_type qHash(const QGeoCircle &value, hash_type seed)
 {
     if(!value.isValid())
         return 0;
-    hash_type hashCode = qHash(value.radius());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.center());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.radius());
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.center());
+    return seed;
 }
 
-inline hash_type qHash(const QGeoPath &value)
+inline hash_type qHash(const QGeoPath &value, hash_type seed)
 {
     if(!value.isValid())
         return 0;
-    hash_type hashCode = qHash(value.path());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.center());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.path());
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.center());
+    return seed;
 }
 
-inline hash_type qHash(const QGeoPolygon &value)
+inline hash_type qHash(const QGeoPolygon &value, hash_type seed)
 {
     if(!value.isValid())
         return 0;
-hash_type hashCode =
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed,
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        qHash(value.path());
+        value.path());
 #else
-        qHash(value.perimeter());
+        value.perimeter());
 #endif
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.center());
-    return hashCode;
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.center());
+    return seed;
 }
 
-inline hash_type qHash(const QGeoRectangle &value)
+inline hash_type qHash(const QGeoRectangle &value, hash_type seed)
 {
     if(!value.isValid())
         return 0;
-    hash_type hashCode = qHash(value.width());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.center());
-    hashCode = hashCode * 31 + qHash(value.height());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.width());
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.center());
+    seed = hash(seed, value.height());
+    return seed;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QGeoLocation &value)
+inline hash_type qHash(const QGeoLocation &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.address());
-    hashCode = hashCode * 31 + qHash(value.coordinate());
-    hashCode = hashCode * 31 + qHash(value.boundingBox());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.address());
+    seed = hash(seed, value.coordinate());
+    seed = hash(seed, value.boundingBox());
+    seed = hash(seed, value.isEmpty());
+    return seed;
 }
 
-inline hash_type qHash(const QGeoAreaMonitorInfo &value)
+inline hash_type qHash(const QGeoAreaMonitorInfo &value, hash_type seed = 0)
 {
     if(!value.isValid())
         return 0;
-    hash_type hashCode = qHash(value.area());
-    hashCode = hashCode * 31 + qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.expiration());
-    hashCode = hashCode * 31 + qHash(value.identifier());
-    hashCode = hashCode * 31 + qHash(value.isPersistent());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.area());
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.expiration());
+    seed = hash(seed, value.identifier());
+    seed = hash(seed, value.isPersistent());
+    return seed;
 }
 
-inline hash_type qHash(const QGeoSatelliteInfo &value)
+inline hash_type qHash(const QGeoSatelliteInfo &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.signalStrength());
-    hashCode = hashCode * 31 + qHash(value.satelliteSystem());
-    hashCode = hashCode * 31 + qHash(value.satelliteIdentifier());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.signalStrength());
+    seed = hash(seed, value.satelliteSystem());
+    seed = hash(seed, value.satelliteIdentifier());
     for(int a=QGeoSatelliteInfo::Elevation; a<=QGeoSatelliteInfo::Azimuth; ++a){
         if(value.hasAttribute(QGeoSatelliteInfo::Attribute(a))){
-            hashCode = hashCode * 31 + qHash(value.attribute(QGeoSatelliteInfo::Attribute(a)));
+            seed = hash(seed, value.attribute(QGeoSatelliteInfo::Attribute(a)));
         }else{
-            hashCode = hashCode * 31 + qHash(false);
+            seed = hash(seed, false);
         }
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QGeoPositionInfo &value)
+inline hash_type qHash(const QGeoPositionInfo &value, hash_type seed = 0)
 {
     if(!value.isValid())
         return 0;
-    hash_type hashCode = qHash(value.timestamp());
-    hashCode = hashCode * 31 + qHash(value.coordinate());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.timestamp());
+    seed = hash(seed, value.coordinate());
     for(int a=QGeoPositionInfo::Direction; a<=QGeoPositionInfo::VerticalAccuracy; ++a){
         if(value.hasAttribute(QGeoPositionInfo::Attribute(a))){
-            hashCode = hashCode * 31 + qHash(value.attribute(QGeoPositionInfo::Attribute(a)));
+            seed = hash(seed, value.attribute(QGeoPositionInfo::Attribute(a)));
         }else{
-            hashCode = hashCode * 31 + qHash(false);
+            seed = hash(seed, false);
         }
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QGeoShape &value)
+inline hash_type qHash(const QGeoShape &value, hash_type seed)
 {
     if(!value.isValid())
         return 0;
     switch(value.type()){
     case QGeoShape::RectangleType:
-        return qHash(static_cast<const QGeoRectangle &>(value));
+        return qHash(static_cast<const QGeoRectangle &>(value), seed);
     case QGeoShape::CircleType:
-        return qHash(static_cast<const QGeoCircle &>(value));
+        return qHash(static_cast<const QGeoCircle &>(value), seed);
     case QGeoShape::PathType:
-        return qHash(static_cast<const QGeoPath &>(value));
+        return qHash(static_cast<const QGeoPath &>(value), seed);
     case QGeoShape::PolygonType:
-        return qHash(static_cast<const QGeoPolygon &>(value));
+        return qHash(static_cast<const QGeoPolygon &>(value), seed);
     default:
-        hash_type hashCode = qHash(value.type());
-        hashCode = hashCode * 31 + qHash(value.isEmpty());
-        hashCode = hashCode * 31 + qHash(value.center());
-        return hashCode;
+        QtPrivate::QHashCombine hash;
+        seed = hash(seed, value.type());
+        seed = hash(seed, value.isEmpty());
+        seed = hash(seed, value.center());
+        return seed;
     }
 }
 
-inline hash_type qHash(const QGeoAddress &value)
+inline hash_type qHash(const QGeoAddress &value, hash_type seed)
 {
-    hash_type hashCode = qHash(value.city());
-    hashCode = hashCode * 31 + qHash(value.text());
-    hashCode = hashCode * 31 + qHash(value.state());
-    hashCode = hashCode * 31 + qHash(value.county());
-    hashCode = hashCode * 31 + qHash(value.street());
-    hashCode = hashCode * 31 + qHash(value.country());
-    hashCode = hashCode * 31 + qHash(value.district());
-    hashCode = hashCode * 31 + qHash(value.postalCode());
-    hashCode = hashCode * 31 + qHash(value.countryCode());
-    hashCode = hashCode * 31 + qHash(value.isTextGenerated());
-    hashCode = hashCode * 31 + qHash(value.isEmpty());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.city());
+    seed = hash(seed, value.text());
+    seed = hash(seed, value.state());
+    seed = hash(seed, value.county());
+    seed = hash(seed, value.street());
+    seed = hash(seed, value.country());
+    seed = hash(seed, value.district());
+    seed = hash(seed, value.postalCode());
+    seed = hash(seed, value.countryCode());
+    seed = hash(seed, value.isTextGenerated());
+    seed = hash(seed, value.isEmpty());
+    return seed;
 }
 #endif
 
diff --git a/src/cpp/QtJambiQml/hashes.h b/src/cpp/QtJambiQml/hashes.h
index ff84a173..5dbafc0c 100644
--- a/src/cpp/QtJambiQml/hashes.h
+++ b/src/cpp/QtJambiQml/hashes.h
@@ -11,7 +11,7 @@
 #if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0)
 #include <QtQml/QJSPrimitiveValue>
 
-inline hash_type qHash(const QJSPrimitiveValue &value)
+inline hash_type qHash(const QJSPrimitiveValue &value, hash_type seed = 0)
 {
     switch(value.type()){
     case QJSPrimitiveValue::Undefined:
@@ -19,45 +19,47 @@ inline hash_type qHash(const QJSPrimitiveValue &value)
     case QJSPrimitiveValue::Null:
         return 0;
     case QJSPrimitiveValue::Boolean:
-        return qHash(value.toBoolean());
+        return qHash(value.toBoolean(), seed);
     case QJSPrimitiveValue::Integer:
-        return qHash(value.toInteger());
+        return qHash(value.toInteger(), seed);
     case QJSPrimitiveValue::Double:
-        return qHash(value.toDouble());
+        return qHash(value.toDouble(), seed);
     case QJSPrimitiveValue::String:
-        return qHash(value.toString());
+        return qHash(value.toString(), seed);
     }
     return 0;
 }
 #endif // QT_VERSION >= QT_VERSION_CHECK(6, 1, 0)
 
-inline hash_type qHash(const QQmlScriptString &value)
+inline hash_type qHash(const QQmlScriptString &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.isEmpty());
-    hashCode = hashCode * 31 + qHash(value.isNullLiteral());
-    hashCode = hashCode * 31 + qHash(value.isUndefinedLiteral());
-    hashCode = hashCode * 31 + qHash(value.stringLiteral());
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isEmpty());
+    seed = hash(seed, value.isNullLiteral());
+    seed = hash(seed, value.isUndefinedLiteral());
+    seed = hash(seed, value.stringLiteral());
     bool ok = false;
-    hashCode = hashCode * 31 + qHash(value.numberLiteral(&ok));
-    hashCode = hashCode * 31 + qHash(ok);
+    seed = hash(seed, value.numberLiteral(&ok));
+    seed = hash(seed, ok);
     ok = false;
-    hashCode = hashCode * 31 + qHash(value.booleanLiteral(&ok));
-    hashCode = hashCode * 31 + qHash(ok);
-    return hashCode;
+    seed = hash(seed, value.booleanLiteral(&ok));
+    seed = hash(seed, ok);
+    return seed;
 }
 
-inline hash_type qHash(const QQmlError &value)
+inline hash_type qHash(const QQmlError &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.url());
-    hashCode = hashCode * 31 + qHash(value.description());
-    hashCode = hashCode * 31 + qHash(value.line());
-    hashCode = hashCode * 31 + qHash(value.column());
-    hashCode = hashCode * 31 + qHash(quintptr(value.object()));
-    hashCode = hashCode * 31 + qHash(value.messageType());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.url());
+    seed = hash(seed, value.description());
+    seed = hash(seed, value.line());
+    seed = hash(seed, value.column());
+    seed = hash(seed, quintptr(value.object()));
+    seed = hash(seed, value.messageType());
+    return seed;
 }
 
-hash_type qHash(const QQmlListReference &value);
+hash_type qHash(const QQmlListReference &value, hash_type seed = 0);
 
 namespace QtQml {
     typedef QObject *(*QQmlAttachedPropertiesFunc)(QObject *);
diff --git a/src/cpp/QtJambiQml/impl.cpp b/src/cpp/QtJambiQml/impl.cpp
index 6d82ae6d..d31e2090 100644
--- a/src/cpp/QtJambiQml/impl.cpp
+++ b/src/cpp/QtJambiQml/impl.cpp
@@ -546,6 +546,9 @@ struct QmlTypeRegistractionData{
     QVariant (*createValueType)(const QJSValue &);
     QQmlAttachedPropertiesFunc attachedPropertiesFunction = nullptr;
     const QMetaObject *attachedPropertiesMetaObject = nullptr;
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+    QQmlPrivate::ValueTypeCreationMethod creationMethod = QQmlPrivate::ValueTypeCreationMethod::None;
+#endif
 };
 
 enum RegisterOption{
@@ -802,7 +805,9 @@ int qtjambi_qmlRegisterAnonymousType(JNIEnv *env, jclass clazz, const char* uri,
         };
 #else
         QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+            QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
             /* int structVersion */ 1,
 #else
             /* int structVersion */ 0,
@@ -837,6 +842,9 @@ int qtjambi_qmlRegisterAnonymousType(JNIEnv *env, jclass clazz, const char* uri,
             /*int revision*/ QTypeRevision::zero()
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
             ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+            ,data.creationMethod
 #endif
         };
 #endif
@@ -852,7 +860,11 @@ int qtjambi_qmlRegisterAnonymousType(JNIEnv *env, jclass clazz, int metaObjectRe
     QmlTypeRegistractionData data = registerQmlType(env, clazz, nullptr, RegisterOptions(SkipCreator | SkipObjectSize));
 
     QQmlPrivate::RegisterType type = {
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#else
         /* int structVersion */ 1,
+#endif
 
         /* QMetaType typeId */ QMetaType(data.typeId),
         /* QMetaType listId */ QMetaType(data.listId),
@@ -882,6 +894,9 @@ int qtjambi_qmlRegisterAnonymousType(JNIEnv *env, jclass clazz, int metaObjectRe
         /*QQmlCustomParser *customParser*/ nullptr,
         /*int revision*/ QTypeRevision::fromMinorVersion(metaObjectRevisionMinor)
         ,/*int finalizerCast*/data.fhCast
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,data.creationMethod
+#endif
     };
     return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type);
 }
@@ -999,7 +1014,9 @@ int qtjambi_qmlRegisterExtendedType(JNIEnv *env, jclass clazz, jclass extendedCl
     };
 #else
     QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         /* int structVersion */ 1,
 #else
         /* int structVersion */ 0,
@@ -1033,6 +1050,9 @@ int qtjambi_qmlRegisterExtendedType(JNIEnv *env, jclass clazz, jclass extendedCl
         /*int revision*/ QTypeRevision::zero()
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,data.creationMethod
 #endif
     };
 #endif
@@ -1095,7 +1115,9 @@ int qtjambi_qmlRegisterExtendedType(JNIEnv *env, jclass clazz, jclass extendedCl
     };
 #else
     QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         /* int structVersion */ 1,
 #else
         /* int structVersion */ 0,
@@ -1129,6 +1151,9 @@ int qtjambi_qmlRegisterExtendedType(JNIEnv *env, jclass clazz, jclass extendedCl
         /*int revision*/ QTypeRevision::zero()
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,data.creationMethod
 #endif
     };
 #endif
@@ -1191,7 +1216,9 @@ int qtjambi_qmlRegisterExtendedUncreatableType(JNIEnv *env, jclass clazz, jclass
     };
 #else
     QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         /* int structVersion */ 1,
 #else
         /* int structVersion */ 0,
@@ -1225,6 +1252,9 @@ int qtjambi_qmlRegisterExtendedUncreatableType(JNIEnv *env, jclass clazz, jclass
         /*int revision*/ QTypeRevision::zero()
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,data.creationMethod
 #endif
     };
 #endif
@@ -1290,7 +1320,9 @@ int qtjambi_qmlRegisterExtendedUncreatableType(JNIEnv *env, jclass clazz, jclass
         Java::Runtime::IllegalAccessException::throwNew(env, QStringLiteral("Not a valid metaObjectRevision %1.").arg(metaObjectRevision) QTJAMBI_STACKTRACEINFO );
     }
     QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         /* int structVersion */ 1,
 #else
         /* int structVersion */ 0,
@@ -1324,6 +1356,9 @@ int qtjambi_qmlRegisterExtendedUncreatableType(JNIEnv *env, jclass clazz, jclass
         /*int revision*/ QTypeRevision::fromMajorVersion(metaObjectRevision)
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,data.creationMethod
 #endif
     };
 #endif
@@ -1529,7 +1564,9 @@ int qtjambi_qmlRegisterRevision(JNIEnv *env, jclass clazz, int metaObjectRevisio
         Java::Runtime::IllegalAccessException::throwNew(env, QStringLiteral("Not a valid metaObjectRevision %1.").arg(metaObjectRevision) QTJAMBI_STACKTRACEINFO );
     }
     QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         /* int structVersion */ 1,
 #else
         /* int structVersion */ 0,
@@ -1563,6 +1600,9 @@ int qtjambi_qmlRegisterRevision(JNIEnv *env, jclass clazz, int metaObjectRevisio
         /*int revision*/ QTypeRevision::fromMajorVersion(metaObjectRevision)
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,data.creationMethod
 #endif
     };
 #endif
@@ -1603,7 +1643,9 @@ int qtjambi_qmlRegisterType(JNIEnv *env, jclass clazz, const char* uri, int vers
     };
 #else
     QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         /* int structVersion */ 1,
 #else
         /* int structVersion */ 0,
@@ -1637,6 +1679,9 @@ int qtjambi_qmlRegisterType(JNIEnv *env, jclass clazz, const char* uri, int vers
         /*int revision*/ QTypeRevision::zero()
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,data.creationMethod
 #endif
     };
 #endif
@@ -1680,7 +1725,9 @@ int qtjambi_qmlRegisterType(JNIEnv *env, jclass clazz, int metaObjectRevision, c
         Java::Runtime::IllegalAccessException::throwNew(env, QStringLiteral("Not a valid metaObjectRevision %1.").arg(metaObjectRevision) QTJAMBI_STACKTRACEINFO );
     }
     QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         /* int structVersion */ 1,
 #else
         /* int structVersion */ 0,
@@ -1714,6 +1761,9 @@ int qtjambi_qmlRegisterType(JNIEnv *env, jclass clazz, int metaObjectRevision, c
         /*int revision*/ QTypeRevision::fromMajorVersion(metaObjectRevision)
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,data.creationMethod
 #endif
     };
 #endif
@@ -1753,7 +1803,9 @@ int qtjambi_qmlRegisterUncreatableType(JNIEnv *env, jclass clazz, const char* ur
     };
 #else
     QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         /* int structVersion */ 1,
 #else
         /* int structVersion */ 0,
@@ -1787,6 +1839,9 @@ int qtjambi_qmlRegisterUncreatableType(JNIEnv *env, jclass clazz, const char* ur
         /*int revision*/ QTypeRevision::zero()
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,QQmlPrivate::ValueTypeCreationMethod::None
 #endif
     };
 #endif
@@ -1829,7 +1884,9 @@ int qtjambi_qmlRegisterUncreatableType(JNIEnv *env, jclass clazz, int metaObject
         Java::Runtime::IllegalAccessException::throwNew(env, QStringLiteral("Not a valid metaObjectRevision %1.").arg(metaObjectRevision) QTJAMBI_STACKTRACEINFO );
     }
     QQmlPrivate::RegisterType type = {
-#if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        QQmlPrivate::RegisterType::CurrentVersion,
+#elif QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         /* int structVersion */ 1,
 #else
         /* int structVersion */ 0,
@@ -1863,6 +1920,9 @@ int qtjambi_qmlRegisterUncreatableType(JNIEnv *env, jclass clazz, int metaObject
         /*int revision*/ QTypeRevision::fromMajorVersion(metaObjectRevision)
 #if QT_VERSION >= QT_VERSION_CHECK(6,3,0)
         ,/*int finalizerCast*/data.fhCast
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+        ,QQmlPrivate::ValueTypeCreationMethod::None
 #endif
     };
 #endif
@@ -2508,42 +2568,83 @@ constexpr ConvertVariant qjsvalue_cast<ConvertVariant>(const QJSValue &)
     return &QJSEngine::convertVariant;
 }
 // QJSEngine::fromVariant
-extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_qml_QJSEngine_fromVariant)
-(JNIEnv *env,
- jclass,
- QtJambiNativeID __this_nativeId, jobject jVariant, QtJambiNativeID metaTypeId)
-{
-    QTJAMBI_DEBUG_METHOD_PRINT("native", "QJSEngine::fromVariant")
-    jobject result{nullptr};
-    QTJAMBI_TRY {
-        QJSEngine *__qt_this = QtJambiAPI::objectFromNativeId<QJSEngine>(__this_nativeId);
-        QtJambiAPI::checkPointer(env, __qt_this);
-        QVariant value = QtJambiAPI::convertJavaObjectToQVariant(env, jVariant);
-        QMetaType targetType = QtJambiAPI::objectReferenceFromNativeId<QMetaType>(env, metaTypeId);
-        if (value.metaType()==targetType){
-            result = jVariant;
+jobject qtjambi_fromVariant(JNIEnv *env, QJSEngine *__qt_this, jobject type, const QVariant& value){
+    QMetaType targetType = qtjambi_cast<QMetaType>(env, type);
+    if (value.metaType()==targetType){
+        return QtJambiAPI::convertQVariantToJavaObject(env, value);
+#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
+    }else if (targetType==QMetaType::fromType<QJSValue>()){
+        return qtjambi_cast<jobject>(env, qtjambi_toScriptValue(env, __qt_this, value));
+    }else if (targetType==QMetaType::fromType<QJSPrimitiveValue>()){
+        if(value.userType()==QMetaType::Int){
+            return qtjambi_cast<jobject>(env, __qt_this->toPrimitiveValue(value.value<int>()));
+        }else if(value.userType()==QMetaType::LongLong){
+            return qtjambi_cast<jobject>(env, __qt_this->toPrimitiveValue(value.value<qint64>()));
+        }else if(value.userType()==QMetaType::Short){
+            return qtjambi_cast<jobject>(env, __qt_this->toPrimitiveValue(value.value<qint16>()));
+        }else if(value.userType()==QMetaType::Char){
+            return qtjambi_cast<jobject>(env, __qt_this->toPrimitiveValue(value.value<char>()));
+        }else if(value.userType()==QMetaType::Double){
+            return qtjambi_cast<jobject>(env, __qt_this->toPrimitiveValue(value.value<double>()));
+        }else if(value.userType()==QMetaType::Float){
+            return qtjambi_cast<jobject>(env, __qt_this->toPrimitiveValue(value.value<float>()));
+        }else if(value.userType()==QMetaType::Bool){
+            return qtjambi_cast<jobject>(env, __qt_this->toPrimitiveValue(value.value<bool>()));
+        }else if(value.userType()==QMetaType::QString){
+            return qtjambi_cast<jobject>(env, __qt_this->toPrimitiveValue(value.value<QString>()));
+        }else{
+            return qtjambi_cast<jobject>(env, __qt_this->toPrimitiveValue(value));
+        }
+    }else if (targetType==QMetaType::fromType<QJSManagedValue>()){
+        jobject result = qtjambi_cast<jobject>(env, new QJSManagedValue(qtjambi_toManagedValue(env, __qt_this, value)));
+        QtJambiAPI::setJavaOwnership(env, result);
+        return result;
+    }else if(value.metaType() == QMetaType::fromType<QJSValue>()){
+        return qtjambi_fromScriptValue(env, __qt_this, type, value.value<QJSValue>());
+    }else if(value.metaType() == QMetaType::fromType<QJSManagedValue*>() || QMetaType::canConvert(value.metaType(), QMetaType::fromType<QJSManagedValue*>())){
+        QJSManagedValue* managed = value.value<QJSManagedValue*>();
+        if(managed)
+            return qtjambi_fromManagedValue(env, __qt_this, type, *managed);
+    }else if(value.metaType() == QMetaType::fromType<QJSPrimitiveValue>()){
+        if(targetType.id()==QMetaType::Int){
+            return qtjambi_cast<jobject>(env, __qt_this->fromPrimitiveValue<int>(value.value<QJSPrimitiveValue>()));
+        }else if(targetType.id()==QMetaType::LongLong){
+            return qtjambi_cast<jobject>(env, __qt_this->fromPrimitiveValue<qint64>(value.value<QJSPrimitiveValue>()));
+        }else if(targetType.id()==QMetaType::Short){
+            return qtjambi_cast<jobject>(env, __qt_this->fromPrimitiveValue<qint16>(value.value<QJSPrimitiveValue>()));
+        }else if(targetType.id()==QMetaType::Char){
+            return qtjambi_cast<jobject>(env, __qt_this->fromPrimitiveValue<char>(value.value<QJSPrimitiveValue>()));
+        }else if(targetType.id()==QMetaType::Double){
+            return qtjambi_cast<jobject>(env, __qt_this->fromPrimitiveValue<double>(value.value<QJSPrimitiveValue>()));
+        }else if(targetType.id()==QMetaType::Float){
+            return qtjambi_cast<jobject>(env, __qt_this->fromPrimitiveValue<float>(value.value<QJSPrimitiveValue>()));
+        }else if(targetType.id()==QMetaType::Bool){
+            return qtjambi_cast<jobject>(env, __qt_this->fromPrimitiveValue<bool>(value.value<QJSPrimitiveValue>()));
+        }else if(targetType.id()==QMetaType::QString){
+            return qtjambi_cast<jobject>(env, __qt_this->fromPrimitiveValue<QString>(value.value<QJSPrimitiveValue>()));
         }else{
+            return qtjambi_cast<jobject>(env, __qt_this->fromPrimitiveValue<QVariant>(value.value<QJSPrimitiveValue>()));
+        }
+#endif
+    }else{
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
-            if(!targetType.iface()->defaultCtr){
-                Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing default constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
-            }
-            if(!targetType.iface()->copyCtr){
-                Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing copy constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
-            }
+        if(!targetType.iface()->defaultCtr){
+            Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing default constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
+        }
+        if(!targetType.iface()->copyCtr){
+            Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing copy constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
+        }
 #endif
-            QVariant t(targetType, nullptr);
-            ConvertVariant convertVariant = qjsvalue_cast<ConvertVariant>(QJSValue{});
-            if ((__qt_this->*convertVariant)(value, targetType, t.data())){
-                result = QtJambiAPI::convertQVariantToJavaObject(env, t);
-            }else{
-                QMetaType::convert(value.metaType(), value.constData(), targetType, t.data());
-                result = QtJambiAPI::convertQVariantToJavaObject(env, t);
-            }
+        QVariant t(targetType, nullptr);
+        ConvertVariant convertVariant = qjsvalue_cast<ConvertVariant>(QJSValue{});
+        if ((__qt_this->*convertVariant)(value, targetType, t.data())){
+            return QtJambiAPI::convertQVariantToJavaObject(env, t);
+        }else{
+            QMetaType::convert(value.metaType(), value.constData(), targetType, t.data());
+            return QtJambiAPI::convertQVariantToJavaObject(env, t);
         }
-    }QTJAMBI_CATCH(const JavaException& exn){
-        exn.raiseInJava(env);
-    }QTJAMBI_TRY_END
-    return result;
+    }
+    return nullptr;
 }
 #endif
 
@@ -2555,41 +2656,28 @@ constexpr ConvertV2 qjsvalue_cast<ConvertV2>(const QJSValue &)
     return &QJSEngine::convertV2;
 }
 // QJSEngine::fromScriptValue
-extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_qml_QJSEngine_fromScriptValue)
-(JNIEnv *env,
- jclass,
- QtJambiNativeID __this_nativeId, QtJambiNativeID jmanaged, QtJambiNativeID metaTypeId)
+jobject qtjambi_fromScriptValue(JNIEnv *env, QJSEngine *, jobject type, const QJSValue& value)
 {
-    QTJAMBI_DEBUG_METHOD_PRINT("native", "QJSEngine::fromScriptValue")
-    jobject result{nullptr};
-    QTJAMBI_TRY {
-        QJSEngine *__qt_this = QtJambiAPI::objectFromNativeId<QJSEngine>(__this_nativeId);
-        QtJambiAPI::checkPointer(env, __qt_this);
-        const QJSValue& value = QtJambiAPI::objectReferenceFromNativeId<QJSValue>(env, jmanaged);
-        QMetaType targetType = QtJambiAPI::objectReferenceFromNativeId<QMetaType>(env, metaTypeId);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
-        if(!targetType.iface()->defaultCtr){
-            Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing default constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
-        }
-        if(!targetType.iface()->copyCtr){
-            Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing copy constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
-        }
+    QMetaType targetType = qtjambi_cast<QMetaType>(env, type);
+#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
+    if(!targetType.iface()->defaultCtr){
+        Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing default constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
+    }
+    if(!targetType.iface()->copyCtr){
+        Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing copy constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
+    }
 #endif
-        ConvertV2 convertV2 = qjsvalue_cast<ConvertV2>(QJSValue{});
-        QVariant t(targetType, nullptr);
-        if (convertV2(value, targetType, t.data())){
-            result = QtJambiAPI::convertQVariantToJavaObject(env, t);
-        }else if (value.isVariant()){
-            t = value.toVariant();
-            t.convert(targetType);
-            result = QtJambiAPI::convertQVariantToJavaObject(env, t);
-        }else{
-            result = QtJambiAPI::convertQVariantToJavaObject(env, QVariant(targetType, nullptr));
-        }
-    }QTJAMBI_CATCH(const JavaException& exn){
-        exn.raiseInJava(env);
-    }QTJAMBI_TRY_END
-    return result;
+    ConvertV2 convertV2 = qjsvalue_cast<ConvertV2>(QJSValue{});
+    QVariant t(targetType, nullptr);
+    if (convertV2(value, targetType, t.data())){
+        return QtJambiAPI::convertQVariantToJavaObject(env, t);
+    }else if (value.isVariant()){
+        t = value.toVariant();
+        t.convert(targetType);
+        return QtJambiAPI::convertQVariantToJavaObject(env, t);
+    }else{
+        return QtJambiAPI::convertQVariantToJavaObject(env, QVariant(targetType, nullptr));
+    }
 }
 
 using Create = QJSValue(QJSEngine::*)(QMetaType type, const void *ptr);
@@ -2599,24 +2687,47 @@ constexpr Create qjsvalue_cast<Create>(const QJSValue &)
     return &QJSEngine::create;
 }
 // QJSEngine::toScriptValue
-extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_qml_QJSEngine_toScriptValue)
-(JNIEnv *env,
- jclass,
- QtJambiNativeID __this_nativeId, jobject object)
+QJSValue qtjambi_toScriptValue(JNIEnv *, QJSEngine *__qt_this, const QVariant& variant)
 {
-    QTJAMBI_DEBUG_METHOD_PRINT("native", "QJSEngine::toScriptValue")
-    jobject result{nullptr};
-    QTJAMBI_TRY {
-        QJSEngine *__qt_this = QtJambiAPI::objectFromNativeId<QJSEngine>(__this_nativeId);
-        QtJambiAPI::checkPointer(env, __qt_this);
-        QVariant variant = QtJambiAPI::convertJavaObjectToQVariant(env, object);
-        Create create = qjsvalue_cast<Create>(QJSValue{});
-        QJSValue jsval = (__qt_this->*create)(variant.metaType(), variant.data());
-        result = qtjambi_cast<jobject>(env, jsval);
-    }QTJAMBI_CATCH(const JavaException& exn){
-        exn.raiseInJava(env);
-    }QTJAMBI_TRY_END
-    return result;
+    Create create = qjsvalue_cast<Create>(QJSValue{});
+    return (__qt_this->*create)(variant.metaType(), variant.data());
+}
+#else
+// QJSEngine::fromScriptValue
+jobject qtjambi_fromScriptValue(JNIEnv *env, QJSEngine *, jobject type, const QJSValue& value)
+{
+    const QMetaType& targetType = qtjambi_cast<const QMetaType&>(env, type);
+    QVariant t(targetType.id(), nullptr);
+    if (qjsvalue_cast_helper(value, targetType.id(), t.data())){
+        return QtJambiAPI::convertQVariantToJavaObject(env, t);
+    }else if (value.isVariant()){
+        t = value.toVariant();
+        t.convert(targetType.id());
+        return QtJambiAPI::convertQVariantToJavaObject(env, t);
+    }else{
+        return QtJambiAPI::convertQVariantToJavaObject(env, QVariant(targetType.id(), nullptr));
+    }
+}
+
+Q_GLOBAL_STATIC(QThreadStorage<int>, gMetaType)
+
+struct ValueContainer{};
+template<>
+struct QMetaTypeId2<ValueContainer>{
+    enum { Defined = true, IsBuiltIn=false };
+    static inline int qt_metatype_id() { return gMetaType->localData(); }
+};
+
+// QJSEngine::toScriptValue
+QJSValue qtjambi_toScriptValue(JNIEnv *, QJSEngine *__qt_this, const QVariant& variant)
+{
+    if(variant.constData()){
+        void const*const* data = reinterpret_cast<void const*const*>(variant.constData());
+        gMetaType->setLocalData(variant.userType());
+        return __qt_this->toScriptValue(*reinterpret_cast<const ValueContainer*>(data));
+    }else{
+        return QJSValue();
+    }
 }
 #endif
 
@@ -2628,39 +2739,26 @@ constexpr ConvertManaged qjsvalue_cast<ConvertManaged>(const QJSValue &)
     return &QJSEngine::convertManaged;
 }
 // QJSEngine::fromManagedValue
-extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_qml_QJSEngine_fromManagedValue)
-(JNIEnv *env,
- jclass,
- QtJambiNativeID __this_nativeId, QtJambiNativeID jmanaged, QtJambiNativeID metaTypeId)
+jobject qtjambi_fromManagedValue(JNIEnv *env, QJSEngine *, jobject type, const QJSManagedValue& value)
 {
-    QTJAMBI_DEBUG_METHOD_PRINT("native", "QJSEngine::fromManagedValue")
-    jobject result{nullptr};
-    QTJAMBI_TRY {
-        QJSEngine *__qt_this = QtJambiAPI::objectFromNativeId<QJSEngine>(__this_nativeId);
-        QtJambiAPI::checkPointer(env, __qt_this);
-        const QJSManagedValue& value = QtJambiAPI::objectReferenceFromNativeId<QJSManagedValue>(env, jmanaged);
-        QMetaType targetType = QtJambiAPI::objectReferenceFromNativeId<QMetaType>(env, metaTypeId);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
-        if(!targetType.iface()->defaultCtr){
-            Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing default constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
-        }
-        if(!targetType.iface()->copyCtr){
-            Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing copy constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
-        }
+    QMetaType targetType = qtjambi_cast<QMetaType>(env, type);
+#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
+    if(!targetType.iface()->defaultCtr){
+        Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing default constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
+    }
+    if(!targetType.iface()->copyCtr){
+        Java::Runtime::RuntimeException::throwNew(env, QStringLiteral("Unable to convert to meta type %1 due to missing copy constructor.").arg(QLatin1String(targetType.name())) QTJAMBI_STACKTRACEINFO );
+    }
 #endif
-        ConvertManaged convertManaged = qjsvalue_cast<ConvertManaged>(QJSValue{});
-        QVariant t(targetType, nullptr);
-        if (convertManaged(value, targetType, t.data())){
-            result = QtJambiAPI::convertQVariantToJavaObject(env, t);
-        }else{
-            t = value.toVariant();
-            t.convert(targetType);
-            result = QtJambiAPI::convertQVariantToJavaObject(env, t);
-        }
-    }QTJAMBI_CATCH(const JavaException& exn){
-        exn.raiseInJava(env);
-    }QTJAMBI_TRY_END
-    return result;
+    ConvertManaged convertManaged = qjsvalue_cast<ConvertManaged>(QJSValue{});
+    QVariant t(targetType, nullptr);
+    if (convertManaged(value, targetType, t.data())){
+        return QtJambiAPI::convertQVariantToJavaObject(env, t);
+    }else{
+        t = value.toVariant();
+        t.convert(targetType);
+        return QtJambiAPI::convertQVariantToJavaObject(env, t);
+    }
 }
 
 using CreateManaged = QJSManagedValue(QJSEngine::*)(QMetaType type, const void *ptr);
@@ -2670,24 +2768,10 @@ constexpr CreateManaged qjsvalue_cast<CreateManaged>(const QJSValue &)
     return &QJSEngine::createManaged;
 }
 // QJSEngine::toManagedValue
-extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_qml_QJSEngine_toManagedValue)
-(JNIEnv *env,
- jclass,
- QtJambiNativeID __this_nativeId, jobject object)
+QJSManagedValue qtjambi_toManagedValue(JNIEnv *, QJSEngine *__qt_this, const QVariant& variant)
 {
-    QTJAMBI_DEBUG_METHOD_PRINT("native", "QJSEngine::toManagedValue")
-    jobject result{nullptr};
-    QTJAMBI_TRY {
-        QJSEngine *__qt_this = QtJambiAPI::objectFromNativeId<QJSEngine>(__this_nativeId);
-        QtJambiAPI::checkPointer(env, __qt_this);
-        QVariant variant = QtJambiAPI::convertJavaObjectToQVariant(env, object);
-        CreateManaged createManaged = qjsvalue_cast<CreateManaged>(QJSManagedValue{});
-        QJSManagedValue jsval = (__qt_this->*createManaged)(variant.metaType(), variant.data());
-        result = qtjambi_cast<jobject>(env, jsval);
-    }QTJAMBI_CATCH(const JavaException& exn){
-        exn.raiseInJava(env);
-    }QTJAMBI_TRY_END
-    return result;
+    CreateManaged createManaged = qjsvalue_cast<CreateManaged>(QJSManagedValue{});
+    return (__qt_this->*createManaged)(variant.metaType(), variant.data());
 }
 #endif
 
@@ -2714,7 +2798,7 @@ extern "C" Q_DECL_EXPORT jobject JNICALL QTJAMBI_FUNCTION_PREFIX(Java_io_qt_qml_
     QTJAMBI_TRY{
         QQmlListProperty<void> *__qt_this = QtJambiAPI::convertJavaObjectToNative<QQmlListProperty<void> >(__jni_env, _this);
         QtJambiAPI::checkPointer(__jni_env, __qt_this, typeid(QQmlListProperty<void>));
-        _result = QtJambiAPI::convertNativeToJavaObject(__jni_env, __qt_this, typeid(QQmlListProperty<void>), true);
+        _result = QtJambiAPI::convertNativeToJavaObjectAsCopy(__jni_env, __qt_this, typeid(QQmlListProperty<void>));
     }QTJAMBI_CATCH(const JavaException& exn){
         exn.raiseInJava(__jni_env);
     }QTJAMBI_TRY_END
@@ -3490,20 +3574,21 @@ void initialize_meta_info_QQmlListProperty(){
     registerMetaTypeID(typeId, metaTypeID);
 }
 
-hash_type qHash(const QQmlListReference &value)
+hash_type qHash(const QQmlListReference &value, hash_type seed)
 {
     QQmlListReferencePrivate* p = QQmlListReferencePrivate::get(const_cast<QQmlListReference*>(&value));
     if(!p){
-        return 0;
+        return seed;
     }
-    hash_type hashCode = qHash(quintptr(value.object()));
-    hashCode = hashCode * 31 + qHash(quintptr(p->property.data));
-    hashCode = hashCode * 31 + qHash(value.canAppend());
-    hashCode = hashCode * 31 + qHash(value.canAt());
-    hashCode = hashCode * 31 + qHash(value.canClear());
-    hashCode = hashCode * 31 + qHash(value.canCount());
-    hashCode = hashCode * 31 + qHash(value.canRemoveLast());
-    hashCode = hashCode * 31 + qHash(value.canReplace());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, quintptr(value.object()));
+    seed = hash(seed, quintptr(p->property.data));
+    seed = hash(seed, value.canAppend());
+    seed = hash(seed, value.canAt());
+    seed = hash(seed, value.canClear());
+    seed = hash(seed, value.canCount());
+    seed = hash(seed, value.canRemoveLast());
+    seed = hash(seed, value.canReplace());
+    return seed;
 }
 
diff --git a/src/cpp/QtJambiQml/utils_p.h b/src/cpp/QtJambiQml/utils_p.h
index 74664bda..ae3ea6e2 100644
--- a/src/cpp/QtJambiQml/utils_p.h
+++ b/src/cpp/QtJambiQml/utils_p.h
@@ -123,4 +123,18 @@ int qtjambi_qmlRegisterUncreatableType(JNIEnv *env, jclass type, int metaObjectR
 
 void qtjambi_qmlRegisterTypesAndRevisions(JNIEnv *env, jobjectArray types, const char* uri, int versionMajor, QList<int>* qmlTypeIds = nullptr);
 
+jobject qtjambi_fromScriptValue(JNIEnv *__jni_env, QJSEngine *__qt_this, jobject type, const QJSValue& __qt_value0);
+
+QJSValue qtjambi_toScriptValue(JNIEnv *__jni_env, QJSEngine *__qt_this, const QVariant& value);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0)
+jobject qtjambi_fromManagedValue(JNIEnv *env, QJSEngine *, jobject type, const QJSManagedValue& value);
+QJSManagedValue qtjambi_toManagedValue(JNIEnv *, QJSEngine *__qt_this, const QVariant& variant);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
+jobject qtjambi_fromVariant(JNIEnv *env, QJSEngine *, jobject type, const QVariant& value);
+#endif
+#endif
+#endif
+
 #endif // UTILS_P_H
diff --git a/src/cpp/QtJambiQuick/hashes.h b/src/cpp/QtJambiQuick/hashes.h
index 21fe08a2..6653949f 100644
--- a/src/cpp/QtJambiQuick/hashes.h
+++ b/src/cpp/QtJambiQuick/hashes.h
@@ -44,11 +44,12 @@ struct RenderState{
 };
 #endif
 
-inline hash_type qHash(const QSGMaterialShader::RenderState &value, hash_type hashCode = 0)
+inline hash_type qHash(const QSGMaterialShader::RenderState &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.dirtyStates());
-    hashCode = hashCode * 31 + qHash(quintptr(reinterpret_cast<const RenderState&>(value).m_data));
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.dirtyStates());
+    seed = hash(seed, quintptr(reinterpret_cast<const RenderState&>(value).m_data));
+    return seed;
 }
 inline bool operator==(const QSGMaterialShader::RenderState &value1, const QSGMaterialShader::RenderState &value2)
 {
@@ -59,11 +60,12 @@ inline bool operator==(const QSGMaterialShader::RenderState &value1, const QSGMa
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QtQuick/QSGMaterialRhiShader>
 
-inline hash_type qHash(const QSGMaterialRhiShader::RenderState &value, hash_type hashCode = 0)
+inline hash_type qHash(const QSGMaterialRhiShader::RenderState &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.dirtyStates());
-    hashCode = hashCode * 31 + qHash(quintptr(reinterpret_cast<const RenderState&>(value).m_data));
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.dirtyStates());
+    seed = hash(seed, quintptr(reinterpret_cast<const RenderState&>(value).m_data));
+    return seed;
 }
 inline bool operator==(const QSGMaterialRhiShader::RenderState &value1, const QSGMaterialRhiShader::RenderState &value2)
 {
@@ -71,15 +73,16 @@ inline bool operator==(const QSGMaterialRhiShader::RenderState &value1, const QS
             && reinterpret_cast<const RenderState&>(value1).m_data==reinterpret_cast<const RenderState&>(value2).m_data;
 }
 
-inline hash_type qHash(const QSGMaterialRhiShader::GraphicsPipelineState &value, hash_type hashCode = 0)
+inline hash_type qHash(const QSGMaterialRhiShader::GraphicsPipelineState &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.blendEnable);
-    hashCode = hashCode * 31 + qHash(value.srcColor);
-    hashCode = hashCode * 31 + qHash(value.dstColor);
-    hashCode = hashCode * 31 + qHash(value.colorWrite);
-    hashCode = hashCode * 31 + qHash(value.blendConstant);
-    hashCode = hashCode * 31 + qHash(value.cullMode);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.blendEnable);
+    seed = hash(seed, value.srcColor);
+    seed = hash(seed, value.dstColor);
+    seed = hash(seed, value.colorWrite);
+    seed = hash(seed, value.blendConstant);
+    seed = hash(seed, value.cullMode);
+    return seed;
 }
 inline bool operator==(const QSGMaterialRhiShader::GraphicsPipelineState &value1, const QSGMaterialRhiShader::GraphicsPipelineState &value2)
 {
@@ -92,18 +95,19 @@ inline bool operator==(const QSGMaterialRhiShader::GraphicsPipelineState &value1
 }
 #else
 
-inline hash_type qHash(const QSGMaterialShader::GraphicsPipelineState &value, hash_type hashCode = 0)
+inline hash_type qHash(const QSGMaterialShader::GraphicsPipelineState &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.blendEnable);
-    hashCode = hashCode * 31 + qHash(value.srcColor);
-    hashCode = hashCode * 31 + qHash(value.dstColor);
-    hashCode = hashCode * 31 + qHash(value.colorWrite);
-    hashCode = hashCode * 31 + qHash(value.blendConstant);
-    hashCode = hashCode * 31 + qHash(value.cullMode);
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.blendEnable);
+    seed = hash(seed, value.srcColor);
+    seed = hash(seed, value.dstColor);
+    seed = hash(seed, value.colorWrite);
+    seed = hash(seed, value.blendConstant);
+    seed = hash(seed, value.cullMode);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
-    hashCode = hashCode * 31 + qHash(value.polygonMode);
+    seed = hash(seed, value.polygonMode);
 #endif
-    return hashCode;
+    return seed;
 }
 inline bool operator==(const QSGMaterialShader::GraphicsPipelineState &value1, const QSGMaterialShader::GraphicsPipelineState &value2)
 {
@@ -120,15 +124,16 @@ inline bool operator==(const QSGMaterialShader::GraphicsPipelineState &value1, c
 
 #endif
 
-inline hash_type qHash(const QSGGeometry::ColoredPoint2D &value, hash_type hashCode = 0)
+inline hash_type qHash(const QSGGeometry::ColoredPoint2D &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.x);
-    hashCode = hashCode * 31 + qHash(value.y);
-    hashCode = hashCode * 31 + qHash(value.r);
-    hashCode = hashCode * 31 + qHash(value.g);
-    hashCode = hashCode * 31 + qHash(value.b);
-    hashCode = hashCode * 31 + qHash(value.a);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.x);
+    seed = hash(seed, value.y);
+    seed = hash(seed, value.r);
+    seed = hash(seed, value.g);
+    seed = hash(seed, value.b);
+    seed = hash(seed, value.a);
+    return seed;
 }
 inline bool operator==(const QSGGeometry::ColoredPoint2D &value1, const QSGGeometry::ColoredPoint2D &value2)
 {
@@ -140,13 +145,14 @@ inline bool operator==(const QSGGeometry::ColoredPoint2D &value1, const QSGGeome
             && value1.a==value2.a;
 }
 
-inline hash_type qHash(const QSGGeometry::TexturedPoint2D &value, hash_type hashCode = 0)
+inline hash_type qHash(const QSGGeometry::TexturedPoint2D &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.x);
-    hashCode = hashCode * 31 + qHash(value.y);
-    hashCode = hashCode * 31 + qHash(value.tx);
-    hashCode = hashCode * 31 + qHash(value.ty);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.x);
+    seed = hash(seed, value.y);
+    seed = hash(seed, value.tx);
+    seed = hash(seed, value.ty);
+    return seed;
 }
 inline bool operator==(const QSGGeometry::TexturedPoint2D &value1, const QSGGeometry::TexturedPoint2D &value2)
 {
@@ -156,11 +162,12 @@ inline bool operator==(const QSGGeometry::TexturedPoint2D &value1, const QSGGeom
             && value1.ty==value2.ty;
 }
 
-inline hash_type qHash(const QSGGeometry::Point2D &value, hash_type hashCode = 0)
+inline hash_type qHash(const QSGGeometry::Point2D &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.x);
-    hashCode = hashCode * 31 + qHash(value.y);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.x);
+    seed = hash(seed, value.y);
+    return seed;
 }
 inline bool operator==(const QSGGeometry::Point2D &value1, const QSGGeometry::Point2D &value2)
 {
@@ -168,14 +175,15 @@ inline bool operator==(const QSGGeometry::Point2D &value1, const QSGGeometry::Po
             && value1.y==value2.y;
 }
 
-inline hash_type qHash(const QSGGeometry::Attribute &value, hash_type hashCode = 0)
+inline hash_type qHash(const QSGGeometry::Attribute &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.position);
-    hashCode = hashCode * 31 + qHash(value.tupleSize);
-    hashCode = hashCode * 31 + qHash(value.type);
-    hashCode = hashCode * 31 + qHash(value.isVertexCoordinate);
-    hashCode = hashCode * 31 + qHash(int(value.attributeType));
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.position);
+    seed = hash(seed, value.tupleSize);
+    seed = hash(seed, value.type);
+    seed = hash(seed, value.isVertexCoordinate);
+    seed = hash(seed, int(value.attributeType));
+    return seed;
 }
 inline bool operator==(const QSGGeometry::Attribute &value1, const QSGGeometry::Attribute &value2)
 {
@@ -186,14 +194,15 @@ inline bool operator==(const QSGGeometry::Attribute &value1, const QSGGeometry::
             && value1.attributeType==value2.attributeType;
 }
 
-inline hash_type qHash(const QSGGeometry::AttributeSet &value, hash_type hashCode = 0)
+inline hash_type qHash(const QSGGeometry::AttributeSet &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.stride);
-    hashCode = hashCode * 31 + qHash(value.count);
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.stride);
+    seed = hash(seed, value.count);
     for(int i=0; i<value.count; ++i){
-        hashCode = hashCode * 31 + qHash(value.attributes[i]);
+        seed = hash(seed, value.attributes[i]);
     }
-    return hashCode;
+    return seed;
 }
 inline bool operator==(const QSGGeometry::AttributeSet &value1, const QSGGeometry::AttributeSet &value2)
 {
@@ -210,11 +219,12 @@ inline bool operator==(const QSGGeometry::AttributeSet &value1, const QSGGeometr
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 #include <QtQuick/QQuickWindow>
-inline hash_type qHash(const QQuickWindow::GraphicsStateInfo &value, hash_type hashCode = 0)
+inline hash_type qHash(const QQuickWindow::GraphicsStateInfo &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(value.currentFrameSlot);
-    hashCode = hashCode * 31 + qHash(value.framesInFlight);
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.currentFrameSlot);
+    seed = hash(seed, value.framesInFlight);
+    return seed;
 }
 inline bool operator==(const QQuickWindow::GraphicsStateInfo &value1, const QQuickWindow::GraphicsStateInfo &value2)
 {
@@ -227,19 +237,21 @@ inline bool operator==(const QQuickWindow::GraphicsStateInfo &value1, const QQui
 #include <QtQuick/QQuickGraphicsDevice>
 #include <QtQuick/QQuickGraphicsConfiguration>
 
-inline hash_type qHash(const QQuickGraphicsDevice &value, hash_type hashCode = 0)
+inline hash_type qHash(const QQuickGraphicsDevice &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(*reinterpret_cast<quintptr const*>(&value));
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, *reinterpret_cast<quintptr const*>(&value));
+    return seed;
 }
 inline bool operator==(const QQuickGraphicsDevice &value1, const QQuickGraphicsDevice &value2)
 {
     return *reinterpret_cast<quintptr const*>(&value1)==*reinterpret_cast<quintptr const*>(&value2);
 }
-inline hash_type qHash(const QQuickGraphicsConfiguration &value, hash_type hashCode = 0)
+inline hash_type qHash(const QQuickGraphicsConfiguration &value, hash_type seed = 0)
 {
-    hashCode = hashCode * 31 + qHash(*reinterpret_cast<quintptr const*>(&value));
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, *reinterpret_cast<quintptr const*>(&value));
+    return seed;
 }
 inline bool operator==(const QQuickGraphicsConfiguration &value1, const QQuickGraphicsConfiguration &value2)
 {
@@ -250,30 +262,31 @@ inline bool operator==(const QQuickGraphicsConfiguration &value1, const QQuickGr
 
 #ifndef QTJAMBI_GENERATOR_RUNNING
 #include <QtQuick/private/qquickrendertarget_p.h>
-inline hash_type qHash(const QQuickRenderTarget &value, hash_type hashCode = 0)
+inline hash_type qHash(const QQuickRenderTarget &value, hash_type seed = 0)
 {
     const QQuickRenderTargetPrivate* p = QQuickRenderTargetPrivate::get(&value);
     if(!p){
-        return hashCode;
+        return seed;
     }
-    hashCode = hashCode * 31 + qHash(int(p->type));
-    hashCode = hashCode * 31 + qHash(p->pixelSize);
-    hashCode = hashCode * 31 + qHash(p->sampleCount);
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(p->type));
+    seed = hash(seed, p->pixelSize);
+    seed = hash(seed, p->sampleCount);
     switch(p->type){
     case QQuickRenderTargetPrivate::Type::NativeTexture:
-        hashCode = hashCode * 31 + qHash(p->u.nativeTexture.layout);
-        hashCode = hashCode * 31 + qHash(p->u.nativeTexture.object);
+        seed = hash(seed, p->u.nativeTexture.layout);
+        seed = hash(seed, p->u.nativeTexture.object);
         break;
     case QQuickRenderTargetPrivate::Type::RhiRenderTarget:
-        hashCode = hashCode * 31 + qHash(p->u.rhiRt);
+        seed = hash(seed, p->u.rhiRt);
         break;
     default:
         break;
     }
-    return hashCode;
+    return seed;
 }
 #else
-hash_type qHash(const QQuickRenderTarget &value, hash_type hashCode = 0);
+hash_type qHash(const QQuickRenderTarget &value, hash_type seed = 0);
 #endif
 
 #endif
diff --git a/src/cpp/QtJambiRemoteObjects/hashes.h b/src/cpp/QtJambiRemoteObjects/hashes.h
index ae2c9693..45c7e41f 100644
--- a/src/cpp/QtJambiRemoteObjects/hashes.h
+++ b/src/cpp/QtJambiRemoteObjects/hashes.h
@@ -37,10 +37,11 @@
 #endif
 #endif
 
-inline hash_type qHash(const QRemoteObjectSourceLocationInfo& info){
-    hash_type hashCode = qHash(info.typeName);
-    hashCode = hashCode * 31 + qHash(info.hostUrl);
-    return hashCode;
+inline hash_type qHash(const QRemoteObjectSourceLocationInfo& info, hash_type seed = 0){
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, info.typeName);
+    seed = hash(seed, info.hostUrl);
+    return seed;
 }
 
 #endif // QTJAMBIREMOTEOBJECTS_HASHES_H
diff --git a/src/cpp/QtJambiScript/hashes.h b/src/cpp/QtJambiScript/hashes.h
index f5dc9823..d63dcfff 100644
--- a/src/cpp/QtJambiScript/hashes.h
+++ b/src/cpp/QtJambiScript/hashes.h
@@ -34,29 +34,29 @@
 #include <QtScript/QScriptContextInfo>
 #include <QtScript/QScriptProgram>
 
-inline hash_type qHash(const QScriptContextInfo &value)
+inline hash_type qHash(const QScriptContextInfo &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.scriptId());
-    hashCode = hashCode * 31 + qHash(value.fileName());
-    hashCode = hashCode * 31 + qHash(value.lineNumber());
-    hashCode = hashCode * 31 + qHash(value.columnNumber());
-    hashCode = hashCode * 31 + qHash(value.functionName());
-    hashCode = hashCode * 31 + qHash(value.functionType());
-    hashCode = hashCode * 31 + qHash(value.functionParameterNames());
-    hashCode = hashCode * 31 + qHash(value.functionStartLineNumber());
-    hashCode = hashCode * 31 + qHash(value.functionEndLineNumber());
-    hashCode = hashCode * 31 + qHash(value.functionMetaIndex());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.scriptId());
+    seed = hash(seed, value.fileName());
+    seed = hash(seed, value.lineNumber());
+    seed = hash(seed, value.columnNumber());
+    seed = hash(seed, value.functionName());
+    seed = hash(seed, value.functionType());
+    seed = hash(seed, value.functionParameterNames());
+    seed = hash(seed, value.functionStartLineNumber());
+    seed = hash(seed, value.functionEndLineNumber());
+    seed = hash(seed, value.functionMetaIndex());
+    return seed;
 }
 
-inline hash_type qHash(const QScriptProgram &value)
+inline hash_type qHash(const QScriptProgram &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.fileName());
-    hashCode = hashCode * 31 + qHash(value.firstLineNumber());
-    hashCode = hashCode * 31 + qHash(value.sourceCode());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.fileName());
+    seed = hash(seed, value.firstLineNumber());
+    seed = hash(seed, value.sourceCode());
+    return seed;
 }
 
 #endif // QTJAMBISCRIPT_HASHES_H
diff --git a/src/cpp/QtJambiSensors/QtJambiSensors.pro b/src/cpp/QtJambiSensors/QtJambiSensors.pro
index 7e7aece0..7dc6b87c 100644
--- a/src/cpp/QtJambiSensors/QtJambiSensors.pro
+++ b/src/cpp/QtJambiSensors/QtJambiSensors.pro
@@ -2,6 +2,13 @@ include(../QtJambi/configure.pri)
 
 QT = core sensors
 
+contains(QTJAMBI_MODULE, QtJambiSensors-private):{
+    QT += sensors-private core-private
+    CONFIG+=no_private_qt_headers_warning
+}else{
+    DEFINES += QTJAMBI_NO_SENSORS_PRIVATE
+}
+
 HEADERS += \
     utils_p.h
 
diff --git a/src/cpp/QtJambiSensors/impl.cpp b/src/cpp/QtJambiSensors/impl.cpp
index 894f8719..da69498e 100644
--- a/src/cpp/QtJambiSensors/impl.cpp
+++ b/src/cpp/QtJambiSensors/impl.cpp
@@ -30,6 +30,14 @@
 #include <QtCore/QMutex>
 #include "utils_p.h"
 
+#include <QtSensors/QSensorBackend>
+#ifndef QTJAMBI_NO_SENSORS_PRIVATE
+#include <QtSensors/private/qsensor_p.h>
+#include <QtCore/private/qobject_p.h>
+#endif
+#include <QtJambi/Cast>
+
+
 namespace Java{
 namespace QtCore {
 QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaMethod,
@@ -37,3 +45,43 @@ QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaMethod,
 )
 }
 }
+
+jobject qtjambi_setReading(JNIEnv *env,
+                           QSensorBackend *__qt_this,
+                           jclass readingClass,
+                           jobject readingObject){
+#ifndef QTJAMBI_NO_SENSORS_PRIVATE
+    jmethodID constructor = JavaAPI::resolveMethod(env, "<init>", "(Lio/qt/core/QObject;)V", readingClass, false);
+    jobject backend = qtjambi_cast<jobject>(env, __qt_this);
+    if(!readingObject)
+        readingObject = env->NewObject(readingClass, constructor, backend);
+    JavaException::check(env QTJAMBI_STACKTRACEINFO );
+    jobject filter_reading = env->NewObject(readingClass, constructor, backend);
+    JavaException::check(env QTJAMBI_STACKTRACEINFO );
+    jobject cache_reading = env->NewObject(readingClass, constructor, backend);
+    JavaException::check(env QTJAMBI_STACKTRACEINFO );
+    QSensorPrivate* d = reinterpret_cast<QSensorPrivate*>(QObjectPrivate::get(__qt_this->sensor()));
+    d->device_reading = qtjambi_cast<QSensorReading*>(env, readingObject);
+    d->filter_reading = qtjambi_cast<QSensorReading*>(env, filter_reading);
+    d->cache_reading = qtjambi_cast<QSensorReading*>(env, cache_reading);
+    return readingObject;
+#else
+    Q_UNUSED(__qt_this)
+    Q_UNUSED(readingClass)
+    Q_UNUSED(readingObject)
+    JavaException::raiseQNoImplementationException(env, "The method has no implementation on this platform." QTJAMBI_STACKTRACEINFO );
+    return nullptr;
+#endif
+}
+
+jobject qtjambi_setReading(JNIEnv *env,
+                           QSensorBackend *__qt_this,
+                           jobject readingClass){
+    return qtjambi_setReading(env, __qt_this, env->GetObjectClass(readingClass), readingClass);
+}
+
+jobject qtjambi_setReading(JNIEnv *env,
+                           QSensorBackend *__qt_this,
+                           jclass readingClass){
+    return qtjambi_setReading(env, __qt_this, readingClass, nullptr);
+}
diff --git a/src/cpp/QtJambiSensors/utils_p.h b/src/cpp/QtJambiSensors/utils_p.h
index 5784800a..c4a6e23b 100644
--- a/src/cpp/QtJambiSensors/utils_p.h
+++ b/src/cpp/QtJambiSensors/utils_p.h
@@ -40,4 +40,11 @@ namespace QtCore {
 }
 }
 
+jobject qtjambi_setReading(JNIEnv *env,
+                           class QSensorBackend *__qt_this,
+                           jobject readingClass);
+
+jobject qtjambi_setReading(JNIEnv *env,
+                           class QSensorBackend *__qt_this,
+                           jclass readingClass);
 #endif // UTILS_P_H
diff --git a/src/cpp/QtJambiSerialBus/hashes.h b/src/cpp/QtJambiSerialBus/hashes.h
index 78d162ea..dd7aa833 100644
--- a/src/cpp/QtJambiSerialBus/hashes.h
+++ b/src/cpp/QtJambiSerialBus/hashes.h
@@ -33,16 +33,185 @@
 #include <QtSerialBus/QtSerialBus>
 #include <QtJambi/Global>
 
-inline hash_type qHash(const QCanBusDevice::Filter &value)
+inline bool operator==(const QCanBusDeviceInfo &value1, const QCanBusDeviceInfo &value2){
+    return value1.name()==value2.name()
+            && value1.description()==value2.description()
+            && value1.serialNumber()==value2.serialNumber()
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            && value1.plugin()==value2.plugin()
+            && value1.alias()==value2.alias()
+#endif
+            && value1.channel()==value2.channel()
+            && value1.hasFlexibleDataRate()==value2.hasFlexibleDataRate()
+            && value1.isVirtual()==value2.isVirtual();
+}
+
+inline hash_type qHash(const QCanBusDeviceInfo &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.description());
+    seed = hash(seed, value.serialNumber());
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    seed = hash(seed, value.plugin());
+    seed = hash(seed, value.alias());
+#endif
+    seed = hash(seed, value.channel());
+    seed = hash(seed, value.hasFlexibleDataRate());
+    seed = hash(seed, value.isVirtual());
+    return seed;
+}
+
+inline bool operator==(const QCanBusFrame::TimeStamp &value1, const QCanBusFrame::TimeStamp &value2){
+    return value1.seconds()==value2.seconds()
+            && value1.microSeconds()==value2.microSeconds();
+}
+
+inline hash_type qHash(const QCanBusFrame::TimeStamp &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.seconds());
+    seed = hash(seed, value.microSeconds());
+    return seed;
+}
+
+inline bool operator==(const QCanBusFrame &value1, const QCanBusFrame &value2){
+    return value1.isValid()==value2.isValid()
+            && value1.frameType()==value2.frameType()
+            && value1.hasExtendedFrameFormat()==value2.hasExtendedFrameFormat()
+            && value1.frameId()==value2.frameId()
+            && value1.payload()==value2.payload()
+            && value1.timeStamp()==value2.timeStamp()
+            && value1.error()==value2.error()
+            && value1.hasFlexibleDataRateFormat()==value2.hasFlexibleDataRateFormat()
+            && value1.hasBitrateSwitch()==value2.hasBitrateSwitch()
+            && value1.hasErrorStateIndicator()==value2.hasErrorStateIndicator()
+            && value1.hasLocalEcho()==value2.hasLocalEcho();
+}
+
+inline hash_type qHash(const QCanBusFrame &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.frameType());
+    seed = hash(seed, value.hasExtendedFrameFormat());
+    seed = hash(seed, value.frameId());
+    seed = hash(seed, value.payload());
+    seed = hash(seed, value.timeStamp());
+    seed = hash(seed, value.error());
+    seed = hash(seed, value.hasFlexibleDataRateFormat());
+    seed = hash(seed, value.hasBitrateSwitch());
+    seed = hash(seed, value.hasErrorStateIndicator());
+    seed = hash(seed, value.hasLocalEcho());
+    return seed;
+}
+
+inline hash_type qHash(const QCanBusDevice::Filter &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.format));
+    seed = hash(seed, value.frameId);
+    seed = hash(seed, value.frameIdMask);
+    seed = hash(seed, int(value.type));
+    return seed;
+}
+
+inline bool operator==(const QModbusDataUnit &value1, const QModbusDataUnit &value2){
+    return value1.registerType()==value2.registerType()
+            && value1.startAddress()==value2.startAddress()
+            && value1.values()==value2.values()
+            && value1.valueCount()==value2.valueCount();
+}
+
+inline hash_type qHash(const QModbusDataUnit &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.registerType());
+    seed = hash(seed, value.startAddress());
+    seed = hash(seed, value.values());
+    seed = hash(seed, value.valueCount());
+    return seed;
+}
+
+inline bool operator==(const QModbusDeviceIdentification &value1, const QModbusDeviceIdentification &value2){
+    if(value1.conformityLevel()==value2.conformityLevel()){
+        QList<int> objectIds1 = value1.objectIds();
+        if(objectIds1==value2.objectIds()){
+            for(int id : objectIds1){
+                if(value1.value(id)!=value2.value(id))
+                    return false;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+inline hash_type qHash(const QModbusDeviceIdentification &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.conformityLevel());
+    QList<int> objectIds = value.objectIds();
+    seed = hash(seed, objectIds);
+    for(int id : objectIds){
+        seed = hash(seed, value.value(id));
+    }
+    return seed;
+}
+
+inline bool operator==(const QModbusPdu &value1, const QModbusPdu &value2){
+    return value1.isException()==value2.isException()
+            && value1.functionCode()==value2.functionCode()
+            && value1.data()==value2.data();
+}
+
+inline hash_type qHash(const QModbusPdu &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isException());
+    seed = hash(seed, value.functionCode());
+    seed = hash(seed, value.data());
+    return seed;
+}
+
+inline bool operator==(const QModbusRequest &value1, const QModbusRequest &value2){
+    return static_cast<const QModbusPdu&>(value1)==static_cast<const QModbusPdu&>(value2);
+}
+
+inline hash_type qHash(const QModbusRequest &value, hash_type seed = 0)
+{
+    return qHash(static_cast<const QModbusPdu&>(value), seed);
+}
+
+inline bool operator==(const QModbusResponse &value1, const QModbusResponse &value2){
+    return static_cast<const QModbusPdu&>(value1)==static_cast<const QModbusPdu&>(value2);
+}
+
+inline hash_type qHash(const QModbusResponse &value, hash_type seed = 0)
+{
+    return qHash(static_cast<const QModbusPdu&>(value), seed);
+}
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+
+namespace QTypeTraits
+{
+template <typename Stream>
+struct has_ostream_operator<Stream, QCanSignalDescription::MultiplexValueRange>
+        : std::false_type {};
+}
+
+inline bool operator==(const QCanFrameProcessor::ParseResult &value1, const QCanFrameProcessor::ParseResult &value2){
+    return value1.uniqueId==value2.uniqueId && value1.signalValues==value2.signalValues;
+}
+
+inline size_t qHash(const QCanFrameProcessor::ParseResult &value, size_t seed = 0)
 {
-    hash_type hashCode = qHash(int(value.format));
-    hashCode = hashCode * 31 + qHash(value.frameId);
-    hashCode = hashCode * 31 + qHash(value.frameIdMask);
-    hashCode = hashCode * 31 + qHash(int(value.type));
-    return hashCode;
+    QString signalValues;
+    QDebug(&signalValues) << value.signalValues;
+    return qHashMulti(seed, value.uniqueId, signalValues);
 }
 
-typedef int(*QModbusRequestCalculatorFunction)(const QModbusRequest &);
-typedef int(*QModbusResponseCalculatorFunction)(const QModbusResponse &);
+#endif
 
 #endif // QTJAMBISERIALBUS_HASHES_H
diff --git a/src/cpp/QtJambiSerialBus/impl.cpp b/src/cpp/QtJambiSerialBus/impl.cpp
index f7c92f79..da38663d 100644
--- a/src/cpp/QtJambiSerialBus/impl.cpp
+++ b/src/cpp/QtJambiSerialBus/impl.cpp
@@ -38,6 +38,10 @@ namespace Java{
             QTJAMBI_REPOSITORY_DEFINE_METHOD(getMessage,()Ljava/lang/String;)
         )
     }
+
+    namespace QtNetwork{
+            QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/network,QTcpSocket,)
+    }
 }
 
 class QModbusSerialAdu{
diff --git a/src/cpp/QtJambiSerialBus/utils_p.h b/src/cpp/QtJambiSerialBus/utils_p.h
index c905ba3b..b11305cc 100644
--- a/src/cpp/QtJambiSerialBus/utils_p.h
+++ b/src/cpp/QtJambiSerialBus/utils_p.h
@@ -41,6 +41,9 @@ namespace Java{
                 QTJAMBI_REPOSITORY_DECLARE_THROWABLE_CONSTRUCTOR()
                 QTJAMBI_REPOSITORY_DECLARE_STRING_METHOD(getMessage))
     }
+    namespace QtNetwork{
+            QTJAMBI_REPOSITORY_DECLARE_CLASS(QTcpSocket,)
+    }
 }
 
 #endif // UTILS_P_H
diff --git a/src/cpp/QtJambiSql/hashes.h b/src/cpp/QtJambiSql/hashes.h
index 0e647f28..e9475bbe 100644
--- a/src/cpp/QtJambiSql/hashes.h
+++ b/src/cpp/QtJambiSql/hashes.h
@@ -33,44 +33,44 @@
 #include <QtSql/QtSql>
 #include <QtJambi/Global>
 
-inline hash_type qHash(const QSqlError &value)
+inline hash_type qHash(const QSqlError &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(value.type()));
-    hashCode = hashCode * 31 + qHash(value.driverText());
-    hashCode = hashCode * 31 + qHash(value.databaseText());
-    hashCode = hashCode * 31 + qHash(value.nativeErrorCode());
-    hashCode = hashCode * 31 + qHash(value.text());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.type()));
+    seed = hash(seed, value.driverText());
+    seed = hash(seed, value.databaseText());
+    seed = hash(seed, value.nativeErrorCode());
+    seed = hash(seed, value.text());
+    seed = hash(seed, value.isValid());
+    return seed;
 }
 
-inline hash_type qHash(const QSqlField &value)
+inline hash_type qHash(const QSqlField &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(value.type()));
-    hashCode = hashCode * 31 + qHash(int(value.requiredStatus()));
-    hashCode = hashCode * 31 + qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.tableName());
-    hashCode = hashCode * 31 + qHash(value.isReadOnly());
-    hashCode = hashCode * 31 + qHash(value.isAutoValue());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    hashCode = hashCode * 31 + qHash(value.length());
-    hashCode = hashCode * 31 + qHash(value.precision());
-    hashCode = hashCode * 31 + qHash(value.typeID());
-    hashCode = hashCode * 31 + qHash(value.isGenerated());
-    hashCode = hashCode * 31 + qHash(value.isValid());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.type()));
+    seed = hash(seed, int(value.requiredStatus()));
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.tableName());
+    seed = hash(seed, value.isReadOnly());
+    seed = hash(seed, value.isAutoValue());
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.length());
+    seed = hash(seed, value.precision());
+    seed = hash(seed, value.typeID());
+    seed = hash(seed, value.isGenerated());
+    seed = hash(seed, value.isValid());
+    return seed;
 }
 
-inline hash_type qHash(const QSqlRecord &value)
+inline hash_type qHash(const QSqlRecord &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.count());
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.count());
     for(int i=0; i<value.count(); ++i){
-        hashCode = hashCode * 31 + qHash(value.field(i));
+        seed = hash(seed, value.field(i));
     }
-    return hashCode;
+    return seed;
 }
 
 #endif // QTJAMBISQL_HASHES_H
diff --git a/src/cpp/QtJambiTextToSpeech/hashes.h b/src/cpp/QtJambiTextToSpeech/hashes.h
index 05185500..55314805 100644
--- a/src/cpp/QtJambiTextToSpeech/hashes.h
+++ b/src/cpp/QtJambiTextToSpeech/hashes.h
@@ -40,12 +40,13 @@ inline bool operator==(const QVoice& lhs, const QVoice& rhs)
 }
 #endif
 
-inline hash_type qHash(const QVoice &value)
+inline hash_type qHash(const QVoice &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.age());
-    hashCode = hashCode * 31 + qHash(value.gender());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.age());
+    seed = hash(seed, value.gender());
+    return seed;
 }
 
 #endif // QTJAMBITEXTTOSPEECH_HASHES_H
diff --git a/src/cpp/QtJambiWebEngineCore/hashes.h b/src/cpp/QtJambiWebEngineCore/hashes.h
index b579adf5..d24a1eb2 100644
--- a/src/cpp/QtJambiWebEngineCore/hashes.h
+++ b/src/cpp/QtJambiWebEngineCore/hashes.h
@@ -34,36 +34,76 @@
 #include <QtCore/QtCore>
 #include <QtWebEngineCore/QtWebEngineCore>
 
-inline hash_type qHash(const QWebEngineHttpRequest &value)
+inline hash_type qHash(const QWebEngineHttpRequest &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.url());
-    hashCode = hashCode * 31 + qHash(value.headers());
-    hashCode = hashCode * 31 + hash_type(value.method());
-    hashCode = hashCode * 31 + qHash(value.postData());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.url());
+    seed = hash(seed, value.headers());
+    seed = hash(seed, qint32(value.method()));
+    seed = hash(seed, value.postData());
+    return seed;
 }
 
-inline hash_type qHash(const QWebEngineUrlScheme &value)
+inline hash_type qHash(const QWebEngineUrlScheme &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + hash_type(value.flags());
-    hashCode = hashCode * 31 + hash_type(value.syntax());
-    hashCode = hashCode * 31 + qHash(value.defaultPort());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.flags());
+    seed = hash(seed, qint32(value.syntax()));
+    seed = hash(seed, value.defaultPort());
+    return seed;
 }
 
-inline hash_type qHash(const QWebEngineRegisterProtocolHandlerRequest &value)
+inline hash_type qHash(const QWebEngineRegisterProtocolHandlerRequest &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.origin());
-    hashCode = hashCode * 31 + qHash(value.scheme());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.origin());
+    seed = hash(seed, value.scheme());
+    return seed;
 }
 
-inline hash_type qHash(const QWebEngineQuotaRequest &value)
+inline hash_type qHash(const QWebEngineQuotaRequest &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.origin());
-    hashCode = hashCode * 31 + qHash(value.requestedSize());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.origin());
+    seed = hash(seed, value.requestedSize());
+    return seed;
+}
+
+inline bool operator==(const QWebEngineFindTextResult& arg1, const QWebEngineFindTextResult& arg2){
+    return arg1.numberOfMatches()==arg2.numberOfMatches()
+            && arg1.activeMatch()==arg2.activeMatch();
+}
+
+inline hash_type qHash(const QWebEngineFindTextResult &value, hash_type seed = 0)
+{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return qHashMulti(seed, value.numberOfMatches(), value.activeMatch());
+#else
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.numberOfMatches());
+    seed = hash(seed, value.activeMatch());
+    return seed;
+#endif
+}
+
+inline bool operator==(const QWebEngineCookieStore::FilterRequest& arg1, const QWebEngineCookieStore::FilterRequest& arg2){
+    return arg1.firstPartyUrl==arg2.firstPartyUrl
+            && arg1.origin==arg2.origin
+            && arg1.thirdParty==arg2.thirdParty;
+}
+
+inline hash_type qHash(const QWebEngineCookieStore::FilterRequest &value, hash_type seed = 0)
+{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return qHashMulti(seed, value.thirdParty, value.origin, value.firstPartyUrl);
+#else
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.thirdParty);
+    seed = hash(seed, value.origin);
+    seed = hash(seed, value.firstPartyUrl);
+    return seed;
+#endif
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -80,9 +120,9 @@ inline bool operator==(const QWebEngineCertificateError& arg1, const QWebEngineC
             && arg1.url()==arg2.url();
 }
 
-inline bool operator==(const QWebEngineFindTextResult& arg1, const QWebEngineFindTextResult& arg2){
-    return arg1.numberOfMatches()==arg2.numberOfMatches()
-            && arg1.activeMatch()==arg2.activeMatch();
+inline hash_type qHash(const QWebEngineCertificateError &value, hash_type seed = 0)
+{
+    return qHashMulti(seed, value.certificateChain(), value.url(), value.description(), value.isOverridable(), value.type());
 }
 
 inline bool operator==(const QWebEngineHistoryItem& arg1, const QWebEngineHistoryItem& arg2){
@@ -94,30 +134,18 @@ inline bool operator==(const QWebEngineHistoryItem& arg1, const QWebEngineHistor
             && arg1.isValid()==arg2.isValid();
 }
 
-inline bool operator==(const QWebEngineCookieStore::FilterRequest& arg1, const QWebEngineCookieStore::FilterRequest& arg2){
-    return arg1.firstPartyUrl==arg2.firstPartyUrl
-            && arg1.origin==arg2.origin
-            && arg1.thirdParty==arg2.thirdParty;
-}
-
-inline hash_type qHash(const QWebEngineCookieStore::FilterRequest &value, hash_type seed = 0)
-{
-    return qHashMulti(seed, value.thirdParty, value.origin, value.firstPartyUrl);
-}
-
 inline hash_type qHash(const QWebEngineHistoryItem &value, hash_type seed = 0)
 {
     return qHashMulti(seed, value.originalUrl(), value.url(), value.title(), value.lastVisited(), value.iconUrl(), value.isValid());
 }
 
-inline hash_type qHash(const QWebEngineCertificateError &value, hash_type seed = 0)
-{
-    return qHashMulti(seed, value.certificateChain(), value.url(), value.description(), value.isOverridable(), value.type());
+inline bool operator==(const QWebEngineFullScreenRequest& arg1, const QWebEngineFullScreenRequest& arg2){
+    return reinterpret_cast<const QExplicitlySharedDataPointer<char>&>(arg1).constData() == reinterpret_cast<const QExplicitlySharedDataPointer<char>&>(arg2).constData();
 }
 
-inline hash_type qHash(const QWebEngineFindTextResult &value, hash_type seed = 0)
+inline hash_type qHash(const QWebEngineFullScreenRequest &value, hash_type seed = 0)
 {
-    return qHashMulti(seed, value.numberOfMatches(), value.activeMatch());
+    return qHash(qintptr(reinterpret_cast<const QExplicitlySharedDataPointer<char>&>(value).constData()), seed);
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
diff --git a/src/cpp/QtJambiWebEngineQuick/impl.cpp b/src/cpp/QtJambiWebEngineQuick/impl.cpp
index bf06a7b9..1d71baef 100644
--- a/src/cpp/QtJambiWebEngineQuick/impl.cpp
+++ b/src/cpp/QtJambiWebEngineQuick/impl.cpp
@@ -57,7 +57,7 @@ QTJAMBI_FUNCTION_PREFIX(Java_io_qt_webengine_quick_QtWebEngineQuick_toWebEngineS
         QObject *_object = qtjambi_cast<QObject*>(env, object);
         if(QQuickWebEngineSettings* settings = qobject_cast<QQuickWebEngineSettings*>(_object)){
             QWebEngineSettings* wSettings = QQuickWebEngineViewPrivate::getWebEngineSettings(settings);
-            __java_return_value = QtJambiAPI::convertNativeToJavaObject(env, wSettings, false);
+            __java_return_value = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, wSettings);
             CoreAPI::registerDependentObject(env, __java_return_value, object);
         }
     }QTJAMBI_CATCH(const JavaException& exn){
@@ -75,7 +75,7 @@ QTJAMBI_FUNCTION_PREFIX(Java_io_qt_webengine_quick_QtWebEngineQuick_toWebEngineS
         QObject *_object = qtjambi_cast<QObject*>(env, object);
         if(QQuickWebEngineScriptCollection* collection = qobject_cast<QQuickWebEngineScriptCollection*>(_object)){
             QWebEngineScriptCollection* wCollection = QQuickWebEngineViewPrivate::getWebEngineScriptCollection(collection);
-            __java_return_value = QtJambiAPI::convertNativeToJavaObject(env, wCollection, false);
+            __java_return_value = QtJambiAPI::convertNativeToJavaObjectAsWrapper(env, wCollection);
             CoreAPI::registerDependentObject(env, __java_return_value, object);
         }
     }QTJAMBI_CATCH(const JavaException& exn){
diff --git a/src/cpp/QtJambiWebEngineWidgets/hashes.h b/src/cpp/QtJambiWebEngineWidgets/hashes.h
index 2254b5ea..420b2e1e 100644
--- a/src/cpp/QtJambiWebEngineWidgets/hashes.h
+++ b/src/cpp/QtJambiWebEngineWidgets/hashes.h
@@ -35,16 +35,119 @@
 #include <QtWebEngineWidgets/QtWebEngineWidgets>
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-inline hash_type qHash(const QWebEngineScript &value)
+inline hash_type qHash(const QWebEngineScript &value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.name());
-    hashCode = hashCode * 31 + qHash(value.isNull());
-    hashCode = hashCode * 31 + qHash(value.worldId());
-    hashCode = hashCode * 31 + qHash(value.sourceCode());
-    hashCode = hashCode * 31 + qHash(value.injectionPoint());
-    hashCode = hashCode * 31 + qHash(value.runsOnSubFrames());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.name());
+    seed = hash(seed, value.isNull());
+    seed = hash(seed, value.worldId());
+    seed = hash(seed, value.sourceCode());
+    seed = hash(seed, value.injectionPoint());
+    seed = hash(seed, value.runsOnSubFrames());
+    return seed;
 }
+
+inline bool operator==(const QWebEngineContextMenuData& arg1, const QWebEngineContextMenuData& arg2){
+    return arg1.isValid()==arg2.isValid()
+            && arg1.position()==arg2.position()
+            && arg1.selectedText()==arg2.selectedText()
+            && arg1.linkText()==arg2.linkText()
+            && arg1.linkUrl()==arg2.linkUrl()
+            && arg1.mediaUrl()==arg2.mediaUrl()
+            && arg1.mediaType()==arg2.mediaType()
+            && arg1.isContentEditable()==arg2.isContentEditable()
+            && arg1.misspelledWord()==arg2.misspelledWord()
+            && arg1.spellCheckerSuggestions()==arg2.spellCheckerSuggestions()
+            && arg1.mediaFlags()==arg2.mediaFlags()
+            && arg1.editFlags()==arg2.editFlags();
+}
+
+inline hash_type qHash(const QWebEngineContextMenuData &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.position());
+    seed = hash(seed, value.selectedText());
+    seed = hash(seed, value.linkText());
+    seed = hash(seed, value.linkUrl());
+    seed = hash(seed, value.mediaUrl());
+    seed = hash(seed, value.mediaType());
+    seed = hash(seed, value.isContentEditable());
+    seed = hash(seed, value.misspelledWord());
+    seed = hash(seed, value.spellCheckerSuggestions());
+    seed = hash(seed, value.mediaFlags());
+    seed = hash(seed, value.editFlags());
+    return seed;
+}
+
+inline bool operator==(const QWebEngineCertificateError& arg1, const QWebEngineCertificateError& arg2){
+    return arg1.certificateChain()==arg2.certificateChain()
+            && arg1.errorDescription()==arg2.errorDescription()
+            && arg1.isOverridable()==arg2.isOverridable()
+            && arg1.error()==arg2.error()
+            && arg1.url()==arg2.url();
+}
+
+inline hash_type qHash(const QWebEngineCertificateError &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.certificateChain());
+    seed = hash(seed, value.errorDescription());
+    seed = hash(seed, value.isOverridable());
+    seed = hash(seed, value.error());
+    seed = hash(seed, value.url());
+    return seed;
+}
+
+inline bool operator==(const QWebEngineFindTextResult& arg1, const QWebEngineFindTextResult& arg2){
+    return arg1.numberOfMatches()==arg2.numberOfMatches()
+            && arg1.activeMatch()==arg2.activeMatch();
+}
+
+inline hash_type qHash(const QWebEngineFindTextResult &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.numberOfMatches());
+    seed = hash(seed, value.activeMatch());
+    return seed;
+}
+
+inline bool operator==(const QWebEngineHistoryItem& arg1, const QWebEngineHistoryItem& arg2){
+    return arg1.originalUrl()==arg2.originalUrl()
+            && arg1.url()==arg2.url()
+            && arg1.title()==arg2.title()
+            && arg1.lastVisited()==arg2.lastVisited()
+            && arg1.iconUrl()==arg2.iconUrl()
+            && arg1.isValid()==arg2.isValid();
+}
+
+inline hash_type qHash(const QWebEngineHistoryItem &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.originalUrl());
+    seed = hash(seed, value.url());
+    seed = hash(seed, value.title());
+    seed = hash(seed, value.lastVisited());
+    seed = hash(seed, value.iconUrl());
+    seed = hash(seed, value.isValid());
+    return seed;
+}
+
+inline bool operator==(const QWebEngineCookieStore::FilterRequest& arg1, const QWebEngineCookieStore::FilterRequest& arg2){
+    return arg1.firstPartyUrl==arg2.firstPartyUrl
+            && arg1.origin==arg2.origin
+            && arg1.thirdParty==arg2.thirdParty;
+}
+
+inline hash_type qHash(const QWebEngineCookieStore::FilterRequest &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.thirdParty);
+    seed = hash(seed, value.origin);
+    seed = hash(seed, value.firstPartyUrl);
+    return seed;
+}
+
 #endif
 
 #endif // QTJAMBIWEBENGINEWIDGETS_HASHES_H
diff --git a/src/cpp/QtJambiWidgets/hashes.h b/src/cpp/QtJambiWidgets/hashes.h
index 0988f9e7..d70fa480 100644
--- a/src/cpp/QtJambiWidgets/hashes.h
+++ b/src/cpp/QtJambiWidgets/hashes.h
@@ -35,25 +35,26 @@
 #include <QtJambiGui/hashes.h>
 #include <QtWidgets/QtWidgets>
 
-inline hash_type qHash(const QScrollerProperties & value)
+inline hash_type qHash(const QScrollerProperties & value, hash_type seed = 0)
 {
     class ScrollerProperties : public QScrollerProperties{
     public:
-        inline hash_type hashCode() const{
-            return qHash(qintptr(d.get()));
+        inline hash_type hashCode(hash_type seed) const{
+            return qHash(qintptr(d.get()), seed);
         }
     };
 
-    return reinterpret_cast<const ScrollerProperties&>(value).hashCode();
+    return reinterpret_cast<const ScrollerProperties&>(value).hashCode(seed);
 }
 
-inline hash_type qHash(const QTableWidgetSelectionRange& value)
+inline hash_type qHash(const QTableWidgetSelectionRange& value, hash_type seed = 0)
 {
-    hash_type hashCode = qHash(value.topRow());
-    hashCode = hashCode * 31 + qHash(value.leftColumn());
-    hashCode = hashCode * 31 + qHash(value.bottomRow());
-    hashCode = hashCode * 31 + qHash(value.rightColumn());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.topRow());
+    seed = hash(seed, value.leftColumn());
+    seed = hash(seed, value.bottomRow());
+    seed = hash(seed, value.rightColumn());
+    return seed;
 }
 
 #endif // QTJAMBI_WIDGETS_CORE_H
diff --git a/src/cpp/QtJambiXml/hashes.h b/src/cpp/QtJambiXml/hashes.h
index cfceab87..5988c956 100644
--- a/src/cpp/QtJambiXml/hashes.h
+++ b/src/cpp/QtJambiXml/hashes.h
@@ -33,45 +33,106 @@
 #include <QtXml/QtXml>
 #include <QtJambi/Global>
 
-inline hash_type qHash(const QDomNamedNodeMap &value);
+inline hash_type qHash(const QDomNamedNodeMap &value, hash_type seed = 0);
 
-inline hash_type qHash(const QDomNode &value)
+inline hash_type qHash(const QDomNode &value, hash_type seed = 0)
 {
     if(value.parentNode().isNull())
         return 0;
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(int(value.nodeType()));
-    hashCode = hashCode * 31 + qHash(value.nodeName());
-    hashCode = hashCode * 31 + qHash(value.nodeValue());
-    hashCode = hashCode * 31 + qHash(value.prefix());
-    hashCode = hashCode * 31 + qHash(value.attributes());
-    hashCode = hashCode * 31 + qHash(value.parentNode());
-    return hashCode;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, int(value.nodeType()));
+    seed = hash(seed, value.nodeName());
+    seed = hash(seed, value.nodeValue());
+    seed = hash(seed, value.prefix());
+    seed = hash(seed, value.attributes());
+    seed = hash(seed, value.parentNode());
+    return seed;
 }
 
-inline hash_type qHash(const QDomNamedNodeMap &value)
+inline hash_type qHash(const QDomNamedNodeMap &value, hash_type seed)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.count());
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.count());
     for (int i=0; i< value.count(); ++i) {
-        hashCode = hashCode * 31 + qHash(value.item(i));
+        seed = hash(seed, value.item(i));
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QDomNodeList &value)
+inline hash_type qHash(const QDomNodeList &value, hash_type seed = 0)
 {
-    hash_type hashCode = 1;
-    hashCode = hashCode * 31 + qHash(value.count());
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.count());
     for (int i=0; i< value.count(); ++i) {
-        hashCode = hashCode * 31 + qHash(value.item(i));
+        seed = hash(seed, value.item(i));
     }
-    return hashCode;
+    return seed;
 }
 
-inline hash_type qHash(const QDomImplementation &)
+inline hash_type qHash(const QDomImplementation &impl, hash_type seed = 0)
 {
-    return 0;
+    return qHash(*reinterpret_cast<void*const*>(&impl), seed);
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+inline QT_DEPRECATED_VERSION(5, 15) bool operator==(const QXmlParseException& arg1, const QXmlParseException& arg2){
+    return arg1.columnNumber()==arg2.columnNumber()
+            && arg1.lineNumber()==arg2.lineNumber()
+            && arg1.publicId()==arg2.publicId()
+            && arg1.systemId()==arg2.systemId()
+            && arg1.message()==arg2.message();
+}
+
+inline QT_DEPRECATED_VERSION(5, 15) hash_type qHash(const QXmlParseException &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.columnNumber());
+    seed = hash(seed, value.lineNumber());
+    seed = hash(seed, value.publicId());
+    seed = hash(seed, value.systemId());
+    seed = hash(seed, value.message());
+    return seed;
+}
+
+inline bool operator==(const QXmlAttributes& arg1, const QXmlAttributes& arg2){
+    if(arg1.count()!=arg2.count())
+        return false;
+    for (int i=0; i< arg1.count(); ++i) {
+        if(arg1.localName(i)!=arg2.localName(i)
+                || arg1.qName(i)!=arg2.qName(i)
+                || arg1.uri(i)!=arg2.uri(i)
+                || arg1.type(i)!=arg2.type(i)
+                || arg1.value(i)!=arg2.value(i)){
+            return false;
+        }
+    }
+    return true;
+}
+
+inline hash_type qHash(const QXmlAttributes &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombineCommutative hash;
+    seed = hash(seed, value.count());
+    for (int i=0; i< value.count(); ++i) {
+        seed = hash(seed, value.localName(i));
+        seed = hash(seed, value.qName(i));
+        seed = hash(seed, value.uri(i));
+        seed = hash(seed, value.type(i));
+        seed = hash(seed, value.value(i));
+    }
+    return seed;
+}
+#endif
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+inline bool operator==(const QDomDocument::ParseResult &value1, const QDomDocument::ParseResult &value2){
+    return value1.errorColumn==value2.errorColumn && value1.errorLine==value2.errorLine && value1.errorMessage==value2.errorMessage;
+}
+
+inline size_t qHash(const QDomDocument::ParseResult &value, size_t seed = 0)
+{
+    return qHashMulti(seed, value.errorColumn, value.errorLine, value.errorMessage);
+}
+#endif
+
 #endif // QTJAMBIXML_HASHES_H
diff --git a/src/cpp/QtJambiXmlPatterns/QtJambiXmlPatterns.pro b/src/cpp/QtJambiXmlPatterns/QtJambiXmlPatterns.pro
index a19950b5..e63bc614 100644
--- a/src/cpp/QtJambiXmlPatterns/QtJambiXmlPatterns.pro
+++ b/src/cpp/QtJambiXmlPatterns/QtJambiXmlPatterns.pro
@@ -1,3 +1,6 @@
 include(../QtJambi/configure.pri)
 
 QT = core network xmlpatterns
+
+HEADERS += \
+    hashes.h
diff --git a/src/cpp/QtJambiXmlPatterns/hashes.h b/src/cpp/QtJambiXmlPatterns/hashes.h
new file mode 100644
index 00000000..cab14e54
--- /dev/null
+++ b/src/cpp/QtJambiXmlPatterns/hashes.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009-2023 Dr. Peter Droste, Omix Visualization GmbH & Co. KG. All rights reserved.
+**
+** This file is part of Qt Jambi.
+**
+** $BEGIN_LICENSE$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** $END_LICENSE$
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef QTJAMBIXMLPATTERNS_HASHES_H
+#define QTJAMBIXMLPATTERNS_HASHES_H
+
+#include <QtXmlPatterns/QtXmlPatterns>
+#include <QtJambi/Global>
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+inline bool operator==(const QXmlItem& arg1, const QXmlItem& arg2){
+    if(arg1.isNull()==arg2.isNull())
+        return true;
+    if(arg1.isNode()==arg2.isNode())
+        return arg1.toNodeModelIndex()==arg2.toNodeModelIndex();
+    if(arg1.isAtomicValue()==arg2.isAtomicValue())
+        return arg1.toAtomicValue()==arg2.toAtomicValue();
+    return false;
+}
+
+inline hash_type qHash(const QXmlItem &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isNull());
+    seed = hash(seed, value.isNode());
+    seed = hash(seed, value.isAtomicValue());
+    if(value.isNode())
+        seed = hash(seed, value.toNodeModelIndex());
+    if(value.isAtomicValue())
+        seed = hash(seed, value.toAtomicValue());
+    return seed;
+}
+
+inline bool operator==(const QXmlNamePool& arg1, const QXmlNamePool& arg2){
+    return reinterpret_cast<const QExplicitlySharedDataPointer<char>&>(arg1).constData() == reinterpret_cast<const QExplicitlySharedDataPointer<char>&>(arg2).constData();
+}
+
+inline hash_type qHash(const QXmlNamePool &value, hash_type seed = 0)
+{
+    return qHash(qintptr(reinterpret_cast<const QExplicitlySharedDataPointer<char>&>(value).constData()), seed);
+}
+
+inline bool operator==(const QXmlSchema& arg1, const QXmlSchema& arg2){
+    return arg1.isValid()==arg2.isValid()
+            && arg1.namePool()==arg2.namePool()
+            && arg1.documentUri()==arg2.documentUri()
+            && arg1.messageHandler()==arg2.messageHandler()
+            && arg1.uriResolver()==arg2.uriResolver()
+            && arg1.networkAccessManager()==arg2.networkAccessManager();
+}
+
+inline hash_type qHash(const QXmlSchema &value, hash_type seed = 0)
+{
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, value.isValid());
+    seed = hash(seed, value.namePool());
+    seed = hash(seed, value.documentUri());
+    seed = hash(seed, value.messageHandler());
+    seed = hash(seed, value.uriResolver());
+    seed = hash(seed, value.networkAccessManager());
+    return seed;
+}
+#endif
+
+#endif // QTJAMBIXMLPATTERNS_HASHES_H
diff --git a/src/cpp/autotests/autotests.qml b/src/cpp/autotests/autotests.qml
index add0e582..7149379d 100644
--- a/src/cpp/autotests/autotests.qml
+++ b/src/cpp/autotests/autotests.qml
@@ -73,6 +73,10 @@ TypeSystem{
             fileName: "tulip.h"
             location: Include.Local
         }
+    
+		FunctionalType{
+			name: "TestStdFunction"
+		}
     }
     
     ValueType{
@@ -117,7 +121,6 @@ TypeSystem{
     
     EnumType{
         name: "TheGlobalFlag"
-        flags: "TheGlobalFlags"
     }
     
     EnumType{
@@ -156,43 +159,40 @@ TypeSystem{
     
     NamespaceType{
         name: "EnumNamespace"
-    }
-    
-    EnumType{
-        name: "EnumNamespace::NSFlag"
-        flags: "EnumNamespace::NSFlags"
-    }
-    
-    EnumType{
-        name: "EnumNamespace::NSEnumClass"
-        RejectEnumValue{
-            name: "Repeat1"
-        }
-        RejectEnumValue{
-            name: "Repeat2"
-        }
-        RejectEnumValue{
-            name: "Repeat3"
-        }
-    }
-    
-    EnumType{
-        name: "EnumNamespace::NSClassFlag"
-        flags: "EnumNamespace::NSClassFlags"
-    }
-    
-    EnumType{
-        name: "GlobalEnumTest::ScopedEnum"
-    }
+		EnumType{
+			name: "NSFlag"
+		}
     
-    EnumType{
-        name: "GlobalEnumTest::ScopedEnumClass"
+		EnumType{
+			name: "NSEnumClass"
+			RejectEnumValue{
+				name: "Repeat1"
+			}
+			RejectEnumValue{
+				name: "Repeat2"
+			}
+			RejectEnumValue{
+				name: "Repeat3"
+			}
+		}
+		
+		EnumType{
+			name: "NSClassFlag"
+		}
     }
     
     ObjectType{
         name: "GlobalEnumTest"
+    
+		EnumType{
+			name: "ScopedEnum"
+		}
+		
+		EnumType{
+			name: "ScopedEnumClass"
+		}
         ModifyFunction{
-            signature: "testGlobalFlags(QFlags<TheGlobalFlag>)"
+            signature: "testGlobalFlags(TheGlobalFlags)"
             ModifyArgument{
                 index: 1
                 ReplaceDefaultExpression{
@@ -687,12 +687,6 @@ TypeSystem{
         }
         ModifyFunction{
             signature: "callValidate(QString *, int *)"
-            ModifyArgument{
-                index: 1
-                ArrayType{
-                    minLength: 1
-                }
-            }
             ModifyArgument{
                 index: 2
                 ArrayType{
@@ -896,63 +890,63 @@ TypeSystem{
         }
     }
     
-    NamespaceType{
-        name: "NameSpace::NameSpace2"
-    }
-    
-    NamespaceType{
-        name: "NameSpace::NameSpace2::NameSpace3"
-    }
-    
-    ObjectType{
-        name: "NameSpace::NameSpace2::NameSpace3::ObjectC"
-    }
-    
-    ObjectType{
-        name: "NameSpace::NameSpace2::NameSpace3::ObjectD"
-    }
-    
-    ValueType{
-        name: "NameSpace::NameSpace2::NameSpace3::ValueB"
-    }
-    
-    InterfaceType{
-        name: "NameSpace::NameSpace2::NameSpace3::InterfaceA"
-    }
-    
     NamespaceType{
         name: "NameSpace"
         Include{
             fileName: "namespace.h"
             location: Include.Local
         }
-    }
-    
-    ObjectType{
-        name: "NameSpace::ObjectA"
-        Include{
-            fileName: "namespace.h"
-            location: Include.Local
-        }
-    }
     
-    ObjectType{
-        name: "NameSpace::ObjectB"
-        Include{
-            fileName: "namespace.h"
-            location: Include.Local
-        }
-    }
+		NamespaceType{
+			name: "NameSpace2"
+    
+			NamespaceType{
+				name: "NameSpace3"
+    
+				ObjectType{
+					name: "ObjectC"
+				}
+				
+				ObjectType{
+					name: "ObjectD"
+				}
+				
+				ValueType{
+					name: "ValueB"
+				}
+				
+				InterfaceType{
+					name: "InterfaceA"
+				}
+			}
+		}
     
-    ValueType{
-        name: "NameSpace::ValueA"
-        Include{
-            fileName: "namespace.h"
-            location: Include.Local
-        }
-        ModifyFunction{
-            signature: "operator=(NameSpace::ValueA)"
-			remove: RemoveFlag.All
+		ObjectType{
+			name: "ObjectA"
+			Include{
+				fileName: "namespace.h"
+				location: Include.Local
+			}
+		}
+		
+		ObjectType{
+			name: "ObjectB"
+			Include{
+				fileName: "namespace.h"
+				location: Include.Local
+			}
+		}
+		
+		ValueType{
+			name: "ValueA"
+			Include{
+				fileName: "namespace.h"
+				location: Include.Local
+			}
+			ModifyFunction{
+				signature: "operator=(NameSpace::ValueA)"
+				remove: RemoveFlag.All
+			}
 		}
     }
     
@@ -1424,6 +1418,14 @@ if(java.util.logging.Logger.getLogger("io.qt.autotests").isLoggable(java.util.lo
     
     ObjectType{
         name: "FunctionManager"
+    
+		FunctionalType{
+			name: "StringSupplier"
+		}
+		
+		FunctionalType{
+			name: "StringConsumer"
+		}
     }
     
     ObjectType{
@@ -1434,28 +1436,16 @@ if(java.util.logging.Logger.getLogger("io.qt.autotests").isLoggable(java.util.lo
         name: "ExceptionTest"
     }
     
-    FunctionalType{
-        name: "FunctionManager::StringSupplier"
-    }
-    
-    FunctionalType{
-        name: "FunctionManager::StringConsumer"
-    }
-    
     ObjectType{
         name: "FunctionalTest"
-    }
     
-    FunctionalType{
-        name: "FunctionalTest::TestFunction1"
-    }
-    
-    FunctionalType{
-        name: "FunctionalTest::TestFunction2"
-    }
-    
-    FunctionalType{
-        name: "Tulip::TestStdFunction"
+		FunctionalType{
+			name: "TestFunction1"
+		}
+		
+		FunctionalType{
+			name: "TestFunction2"
+		}
     }
     
     SuppressedWarning{text: "WARNING(MetaJavaBuilder) :: private virtual function 'abstractFunction(const QString*)' in 'AnotherNonAbstractSubclass'"}
diff --git a/src/cpp/autotests/global.cpp b/src/cpp/autotests/global.cpp
index 68827c2a..2edae7b6 100644
--- a/src/cpp/autotests/global.cpp
+++ b/src/cpp/autotests/global.cpp
@@ -121,9 +121,20 @@ void General::qtjambi_jni_test(jobject object){
     }
 }
 
+struct BoolList : QList<bool>{
+};
+
+inline BoolList& operator<<(BoolList& list, bool v){
+    list.append(v);
+    if(!v){
+        list.begin();
+    }
+    return list;
+}
+
 QList<bool> General::start_qtjambi_cast_test(jobject list, jobject qObject, jobject graphicsItem, jobject gradient, jobject functionalPointer, jobject functional, jobject customCList, jobject customJavaList, jobject text){
     QtJambiScope scope(nullptr);
-    QList<bool> results;
+    BoolList results;
     if(JniEnvironment env{300}){
 #ifndef QTJAMBI_NO_WIDGETS
         {
@@ -327,7 +338,7 @@ QList<bool> General::start_qtjambi_cast_test(jobject list, jobject qObject, jobj
             //results << (qtjambi_cast<const QMap<QString,QFileInfo>&>(env, o)==qmap); // this does not work because of returning a reference to local variable.
         }
         {
-            FunctionalTest::TestFunction1 f1 = [](int i,bool b)->int{ return b ? i : -i; };
+            const FunctionalTest::TestFunction1 f1 = [](int i,bool b)->int{ return b ? i : -i; };
             jobject o = qtjambi_cast<jobject>(env, f1, "FunctionalTest::TestFunction1");
             QtJambiAPI::addToJavaCollection(env, list, o);
             FunctionalTest::TestFunction1 _f1 = qtjambi_cast<FunctionalTest::TestFunction1>(env, o, "FunctionalTest::TestFunction1");
@@ -582,7 +593,6 @@ QList<bool> General::start_qtjambi_cast_test(jobject list, jobject qObject, jobj
             results << container.isSharedWith(qtjambi_cast<QMultiHash<const QGraphicsItem*, int>&>(env, scope, o));
         }
 #endif
-
         {
             std::initializer_list<int> container{1,2,3,4,5,6,7,8,9};
             jobject o = qtjambi_cast<jobject>(env, scope, container);
@@ -590,7 +600,7 @@ QList<bool> General::start_qtjambi_cast_test(jobject list, jobject qObject, jobj
             results << (qtjambi_cast<std::initializer_list<int>>(env, scope, o)==container);
         }
         {
-            std::initializer_list<QList<QMap<QString,int>>> container{
+            const std::initializer_list<QList<QMap<QString,int>>> container{
                 /*QList*/{
                     /*QMap*/{
                         {"A", 5}, {"B", 123}, {"C", 9}
diff --git a/src/cpp/autotests/nativepointertester.h b/src/cpp/autotests/nativepointertester.h
index 7de7cdd7..08d150a7 100644
--- a/src/cpp/autotests/nativepointertester.h
+++ b/src/cpp/autotests/nativepointertester.h
@@ -55,12 +55,6 @@ class NativePointerTester
         i = to;
         return tmp;
     }
-
-    QString testString(QString &s, const QString &to) {
-        QString tmp = s;
-        s = to;
-        return tmp;
-    }
 };
 
 #endif // NATIVEPOINTERTESTER_H
diff --git a/src/cpp/functionpointers/functionpointers.pri b/src/cpp/functionpointers/functionpointers.pri
index 04e0433d..ad990193 100644
--- a/src/cpp/functionpointers/functionpointers.pri
+++ b/src/cpp/functionpointers/functionpointers.pri
@@ -69,3 +69,4 @@ contains(QT_CONFIG, release):contains(QT_CONFIG, debug) {
     # Qt was configued with both debug and release libs
     CONFIG += debug_and_release build_all
 }
+
diff --git a/src/cpp/jarimport/jarimport.pro b/src/cpp/jarimport/jarimport.pro
index 3b400c2e..3586f1a8 100644
--- a/src/cpp/jarimport/jarimport.pro
+++ b/src/cpp/jarimport/jarimport.pro
@@ -40,6 +40,7 @@ macx:{
     QMAKE_CXXFLAGS_WARN_OFF += -Wdollar-in-identifier-extension -Woverloaded-virtual
     QMAKE_EXTENSION_SHLIB = dylib
 
+    CONFIG+=no_default_rpath no_qt_rpath
     QMAKE_RPATHDIR =  @loader_path/../lib
     QMAKE_RPATHDIR += @loader_path/../../lib
     QMAKE_RPATHDIR += @loader_path/../../../lib
diff --git a/src/cpp/modules.pro b/src/cpp/modules.pro
index 8ade7221..e9e02c2e 100644
--- a/src/cpp/modules.pro
+++ b/src/cpp/modules.pro
@@ -12,7 +12,7 @@ contains(QTJAMBI_MODULE, QtJambiAxBase): SUBDIRS += QtJambiActiveX
 
 !android:!ios:{
     contains(QTJAMBI_MODULE, QtJambiDesigner-private): SUBDIRS += QtJambiUIC
-    SUBDIRS += QtJambiLauncher
+    SUBDIRS += QtJambiLauncher\
     QtJambiGenerator
     QtJambiGenerator.file = QtJambiGenerator/library.pro
 }
diff --git a/src/java/ant/io/qt/tools/ant/Constants.java b/src/java/ant/io/qt/tools/ant/Constants.java
index 8ef37bb3..29aeae8d 100644
--- a/src/java/ant/io/qt/tools/ant/Constants.java
+++ b/src/java/ant/io/qt/tools/ant/Constants.java
@@ -55,6 +55,7 @@ public abstract class Constants {
     public static final String TRANSLATIONSDIR          = "qtjambi.qt.translationsdir";
     public static final String RESOURCESDIR             = "qtjambi.qt.resourcesdir";
     public static final String GENERATOR_PREPROC_DEFINES = "qtjambi.generator.preproc.defines";
+    public static final String GENERATOR_PREPROC_FILE    = "qtjambi.generator.preproc.file";
     public static final String GENERATOR_STATICLIBS      = "qtjambi.generator.staticlibs";
     public static final String JAVALIBDIR               = "qtjambi.java.library.path";
     public static final String JAMBILIBDIR              = "qtjambi.jambi.libdir";
@@ -153,6 +154,7 @@ public abstract class Constants {
     public static final String EGLDEVICEINTEGRATION = "qtjambi.egldeviceintegration";
     public static final String WAYLANDCLIENT 	  = "qtjambi.waylandclient";
     public static final String QTJAMBI_MODULES    = "qtjambi.modules";
+    public static final String QTJAMBI_FORCE_DEBUG_INFO    = "qtjambi.force.debug.info";
 
     public static final String PLUGINS_ACCESSIBLE_QTACCESSIBLEWIDGETS  = "qtjambi.plugins.accessible.qtaccessiblewidgets";
 
diff --git a/src/java/ant/io/qt/tools/ant/CreateNativeDeploymentTask.java b/src/java/ant/io/qt/tools/ant/CreateNativeDeploymentTask.java
index 91be5742..5dd28696 100644
--- a/src/java/ant/io/qt/tools/ant/CreateNativeDeploymentTask.java
+++ b/src/java/ant/io/qt/tools/ant/CreateNativeDeploymentTask.java
@@ -253,6 +253,8 @@ public void execute() throws BuildException {
 						case Windows:
 							if(!debug && f.endsWith(".dll") && !f.endsWith("d.dll")) {
 								_libraries.add(f);
+							}else if(!debug && forceDebugInfo && f.endsWith(".pdb") && !f.endsWith("d.pdb")) {
+								_libraries.add(f);
 							}else if(debug && (f.endsWith("d.dll") || f.endsWith("d.pdb") || f.endsWith(".dll.debug"))) {
 								_libraries.add(f);
 							}
@@ -444,35 +446,57 @@ public void execute() throws BuildException {
 							}
 						}
 					}
-					if(debug) {
-						switch(OSInfo.crossOS()) {
-						case Windows:
-							if(libName.endsWith(".dll")){
-								String pdbName = libName.substring(0, libName.length()-3)+"pdb";
-								java.io.File pdbFile = new java.io.File(new java.io.File(builddir, _libdir), pdbName);
-								if(!pdbFile.exists() && _libdir.equals("bin")) {
-									pdbFile = new java.io.File(new java.io.File(builddir, "lib"), pdbName);
-								}
-								if(pdbFile.exists()) {
+					switch(OSInfo.crossOS()) {
+					case Windows:
+						if(libName.endsWith(".dll")){
+							String pdbName = libName.substring(0, libName.length()-3)+"pdb";
+							java.io.File pdbFile = new java.io.File(new java.io.File(builddir, _libdir), pdbName);
+							if(!pdbFile.exists() && _libdir.equals("bin")) {
+								pdbFile = new java.io.File(new java.io.File(builddir, "lib"), pdbName);
+							}
+							if(pdbFile.exists()) {
+								if(debug || forceDebugInfo) {
 									java.io.File pdbTarget = new java.io.File(targetLibDir, pdbName);
 									Files.copy(pdbFile.toPath(), pdbTarget.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
 									if(!libraryIncludes.isEmpty())
 										libraryIncludes += ",";
 									libraryIncludes += jarpath + "/" + pdbName;
-								}else {
-									pdbFile = new java.io.File(new java.io.File(builddir, _libdir), libName+".debug");
-									if(pdbFile.exists()) {
-										java.io.File pdbTarget = new java.io.File(targetLibDir, libName+".debug");
-										Files.copy(pdbFile.toPath(), pdbTarget.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
-										if(!libraryIncludes.isEmpty())
-											libraryIncludes += ",";
-										libraryIncludes += jarpath + "/" + libName+".debug";
-									}
+								}
+							}else if(debug){
+								pdbFile = new java.io.File(new java.io.File(builddir, _libdir), libName+".debug");
+								if(pdbFile.exists()) {
+									java.io.File pdbTarget = new java.io.File(targetLibDir, libName+".debug");
+									Files.copy(pdbFile.toPath(), pdbTarget.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+									if(!libraryIncludes.isEmpty())
+										libraryIncludes += ",";
+									libraryIncludes += jarpath + "/" + libName+".debug";
 								}
 							}
+						}
+						switch(moduleName) {
+						case "qtjambi.generator":
+						{
+							java.io.File qtjambiLibFile = new java.io.File(new java.io.File(builddir, "lib"), (debug ? "QtJambid" : "QtJambi")+qtMajorVersion+".lib");
+							if(qtjambiLibFile.exists()) {
+								java.io.File targetLibdir = new java.io.File(directory, "lib");
+								targetLibdir.mkdirs();
+								Files.copy(qtjambiLibFile.toPath(), new java.io.File(targetLibdir, qtjambiLibFile.getName()).toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+								if(!libraryIncludes.isEmpty())
+									libraryIncludes += ",";
+								libraryIncludes += "lib/" + qtjambiLibFile.getName();
+								Element libraryElement = doc.createElement("file");
+								libraryElement.setAttribute("name", "lib/"+qtjambiLibFile.getName());
+								doc.getDocumentElement().appendChild(libraryElement);
+								libraryIncludes += "," + "lib/"+qtjambiLibFile.getName();
+							}
+						}
 							break;
 							default:
+								break;
 						}
+						break;
+						default:
+							break;
 					}
 				}
 				switch(OSInfo.crossOS()) {
@@ -649,31 +673,31 @@ public void execute() throws BuildException {
 					libraryElement.setAttribute("name", _libdir+"/"+libName);
 					doc.getDocumentElement().appendChild(libraryElement);
 					
-					if(debug) {
-						switch(OSInfo.crossOS()) {
-						case Windows:
-							if(libName.endsWith(".dll")){
-								String pdbName = libName.substring(0, libName.length()-3)+"pdb";
-								java.io.File pdbFile = new java.io.File(new java.io.File(builddir, _libdir), pdbName);
-								if(!pdbFile.exists() && _libdir.equals("bin")) {
-									pdbFile = new java.io.File(new java.io.File(builddir, "lib"), pdbName);
+					switch(OSInfo.crossOS()) {
+					case Windows:
+						if(libName.endsWith(".dll")){
+							String pdbName = libName.substring(0, libName.length()-3)+"pdb";
+							java.io.File pdbFile = new java.io.File(new java.io.File(builddir, _libdir), pdbName);
+							if(!pdbFile.exists() && _libdir.equals("bin")) {
+								pdbFile = new java.io.File(new java.io.File(builddir, "lib"), pdbName);
+							}
+							if(pdbFile.exists()) {
+								if(debug || forceDebugInfo) {
+									libraryElement = doc.createElement("file");
+									libraryElement.setAttribute("name", _libdir+"/"+pdbName);
+									doc.getDocumentElement().appendChild(libraryElement);
 								}
+							}else if(debug){
+								pdbFile = new java.io.File(new java.io.File(builddir, _libdir), libName+".debug");
 								if(pdbFile.exists()) {
 									libraryElement = doc.createElement("file");
-									libraryElement.setAttribute("name", _libdir+"/"+pdbName);
+									libraryElement.setAttribute("name", _libdir+"/"+libName+".debug");
 									doc.getDocumentElement().appendChild(libraryElement);
-								}else {
-									pdbFile = new java.io.File(new java.io.File(builddir, _libdir), libName+".debug");
-									if(pdbFile.exists()) {
-										libraryElement = doc.createElement("file");
-										libraryElement.setAttribute("name", _libdir+"/"+libName+".debug");
-										doc.getDocumentElement().appendChild(libraryElement);
-									}
 								}
 							}
-							break;
-							default:
 						}
+						break;
+						default:
 					}
 					
 					String shortName;
@@ -692,22 +716,21 @@ public void execute() throws BuildException {
 //								libraryIncludes += "," + jarpath + "/" + libName + "/Contents/Info.plist";
 //								libraryIncludes += "," + jarpath + "/" + libName + "/Contents/PkgInfo";
 								break;
-							}else {
-								symlinkElement = doc.createElement("symlink");
-								shortName = formatQtJambiName(name, debug, -1, -1, -1);
-								symlinkElement.setAttribute("name", _libdir+"/"+shortName);
-								symlinkElement.setAttribute("target", _libdir+"/"+libName);
-								doc.getDocumentElement().appendChild(symlinkElement);
-								try{
-									getProject().log(this, "create symbolic link " + new java.io.File(target.getParentFile(), shortName) + " -> " + libName, Project.MSG_INFO);
-									Files.createSymbolicLink(new java.io.File(target.getParentFile(), shortName).toPath(), Path.of(target.getName()));
-								}catch(java.nio.file.FileAlreadyExistsException ex) {
-								} catch (Exception ex) {
-									ex.printStackTrace();
-								}
 							}
 							//fallthrough:
 						default:
+							symlinkElement = doc.createElement("symlink");
+							shortName = formatQtJambiName(name, debug, -1, -1, -1);
+							symlinkElement.setAttribute("name", _libdir+"/"+shortName);
+							symlinkElement.setAttribute("target", _libdir+"/"+libName);
+							doc.getDocumentElement().appendChild(symlinkElement);
+							try{
+								getProject().log(this, "create symbolic link " + new java.io.File(target.getParentFile(), shortName) + " -> " + libName, Project.MSG_INFO);
+								Files.createSymbolicLink(new java.io.File(target.getParentFile(), shortName).toPath(), Path.of(target.getName()));
+							}catch(java.nio.file.FileAlreadyExistsException ex) {
+							} catch (Exception ex) {
+								ex.printStackTrace();
+							}
 							symlinkElement = doc.createElement("symlink");
 							shortName = formatQtJambiName(name, debug, qtMajorVersion, -1, -1);
 							symlinkElement.setAttribute("name", _libdir+"/"+shortName);
@@ -784,6 +807,7 @@ public void execute() throws BuildException {
 	private String moduleName;
 	private String outputDirectory;
 	private boolean debug = false;
+	private boolean forceDebugInfo = false;
 	private boolean plugin = false;
     
     static void copySubdirs(File root, File srcDir, File destDir, boolean debug, List<Map.Entry<String,Boolean>> additionalFiles, boolean allowHeaders) throws IOException {
@@ -1381,4 +1405,10 @@ public static String formatQtJambiQmlPluginName(String name, boolean debug, Stri
          }
          throw new BuildException("unhandled case...");
     }
+	public boolean isForceDebugInfo() {
+		return forceDebugInfo;
+	}
+	public void setForceDebugInfo(boolean forceDebugInfo) {
+		this.forceDebugInfo = forceDebugInfo;
+	}
 }
diff --git a/src/java/ant/io/qt/tools/ant/ForeachVersionTask.java b/src/java/ant/io/qt/tools/ant/ForeachVersionTask.java
index b462d2dc..190d4478 100644
--- a/src/java/ant/io/qt/tools/ant/ForeachVersionTask.java
+++ b/src/java/ant/io/qt/tools/ant/ForeachVersionTask.java
@@ -19,7 +19,7 @@ public void execute() throws BuildException {
 		Properties targetProperties = new Properties();
 		PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(getProject());
 		for (String key : Arrays.asList("java.srcdir", 
-				"qtjambi.junit.threads", "qtjambi.junit.timeout", 
+				"qtjambi.junit.threads", "qtjambi.junit.timeout", "qtjambi.generate.nullness", 
 				"parallel", "qtjambi.build.module", "test",
 				"test.enable.criticals", "jnicheck")) {
 			String value = AntUtil.getPropertyAsString(propertyHelper, key);
diff --git a/src/java/ant/io/qt/tools/ant/GeneratorTask.java b/src/java/ant/io/qt/tools/ant/GeneratorTask.java
index eea4ab5f..39f0a05b 100644
--- a/src/java/ant/io/qt/tools/ant/GeneratorTask.java
+++ b/src/java/ant/io/qt/tools/ant/GeneratorTask.java
@@ -60,6 +60,8 @@ public class GeneratorTask extends Task {
     private String generatorExe;
     private String includeDirectories;
 	private String qtjambiVersion;
+	private String nullness;
+	private String kotlinPropertyDelegates;
     private List<String> commandList = new ArrayList<String>();
 
     private List<String> searchPath(boolean generator_debug) {
@@ -124,6 +126,14 @@ private boolean parseArguments() {
         	// replace path separator since linux/mac does not accept semicolon
         	commandList.add("--include-directories=" + includeDirectories.replace(";", File.pathSeparator));
         }
+        
+        if("false".equalsIgnoreCase(nullness)) {
+        	commandList.add("--no-nullness");
+        }
+        
+        if("false".equalsIgnoreCase(kotlinPropertyDelegates)) {
+        	commandList.add("--no-kotlin-property-delegates");
+        }
 
         if(qtDocDirectory != null){
         	// replace path separator since linux/mac does not accept semicolon
@@ -158,6 +168,9 @@ private boolean parseArguments() {
 		o = AntUtil.getProperty(props, Constants.GENERATOR_STATICLIBS);
 		if(o instanceof String && !o.toString().isEmpty())
 			commandList.add("--static="+o);
+		o = AntUtil.getProperty(props, Constants.GENERATOR_PREPROC_FILE);
+		if(o instanceof String && !o.toString().isEmpty())
+			commandList.add("--output-preprocess-file="+o);
 
         if(typesystem!=null && !typesystem.isEmpty()) {
 	        File typesystemFile = Util.makeCanonical(typesystem);
@@ -318,4 +331,20 @@ public String getQtjambiVersion() {
 	public void setQtjambiVersion(String qtjambiVersion) {
 		this.qtjambiVersion = qtjambiVersion;
 	}
+
+	public String getNullness() {
+		return nullness;
+	}
+
+	public void setNullness(String nullness) {
+		this.nullness = nullness;
+	}
+
+	public String getKotlinPropertyDelegates() {
+		return kotlinPropertyDelegates;
+	}
+
+	public void setKotlinPropertyDelegates(String kotlinPropertyDelegates) {
+		this.kotlinPropertyDelegates = kotlinPropertyDelegates;
+	}
 }
diff --git a/src/java/ant/io/qt/tools/ant/IfTask.java b/src/java/ant/io/qt/tools/ant/IfTask.java
new file mode 100644
index 00000000..15ba75a3
--- /dev/null
+++ b/src/java/ant/io/qt/tools/ant/IfTask.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2001-2004 Ant-Contrib project.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.qt.tools.ant;
+
+import java.util.*;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Sequential;
+import org.apache.tools.ant.taskdefs.condition.ConditionBase;
+
+public class IfTask extends ConditionBase {
+	public IfTask() {
+		super();
+	}
+
+	public static class Elseif extends ConditionBase{
+		private Sequential thenTasks = null;
+		public void addThen(Sequential thenTasks) {
+			if (this.thenTasks != null)
+				throw new BuildException("Multiple <then> not allowed in <elseif>");
+			this.thenTasks = thenTasks;
+		}
+		
+		public boolean eval() throws BuildException {
+			if (countConditions() > 1)
+				throw new BuildException("Multiple conditions not allowed for <elseif>");
+			if (countConditions() < 1)
+				throw new BuildException("<elseif> requires condition");
+			return super.getConditions().nextElement().eval();
+		}
+
+		public void execute() throws BuildException {
+			if (thenTasks != null)
+				thenTasks.execute();
+		}
+	}
+	
+	private Sequential thenTasks = null;
+	private List<Elseif> elseIfTasks = new ArrayList<>();
+	private Sequential elseTasks = null;
+	public void addThen(Sequential thenTasks) {
+		if (this.thenTasks != null)
+			throw new BuildException("Multiple <then> not allowed in <if>");
+		this.thenTasks = thenTasks;
+	}
+	public void addElseIf(Elseif elseIf) {
+		this.elseIfTasks.add(elseIf);
+	}
+	public void addElse(Sequential elseTasks) {
+		if (this.elseTasks != null)
+			throw new BuildException("Multiple <else> not allowed in <if>");
+		this.elseTasks = elseTasks;
+	}
+	
+	private boolean test() throws BuildException {
+		if (countConditions() > 1)
+			throw new BuildException("Multiple conditions not allowed for <elseif>");
+		if (countConditions() < 1)
+			throw new BuildException("<elseif> requires condition");
+		return super.getConditions().nextElement().eval();
+	}
+	
+	public void execute() throws BuildException {
+		if (test()) {
+			if (thenTasks != null)
+				thenTasks.execute();
+		} else {
+			boolean done = false;
+			for (Elseif elseIf : elseIfTasks) {
+				if (elseIf.eval()) {
+					done = true;
+					elseIf.execute();
+					break;
+				}
+			}
+
+			if (!done && elseTasks != null)
+				elseTasks.execute();
+		}
+	}
+}
diff --git a/src/java/ant/io/qt/tools/ant/InitializeBuildTask.java b/src/java/ant/io/qt/tools/ant/InitializeBuildTask.java
index bc1fd385..c7f59c84 100644
--- a/src/java/ant/io/qt/tools/ant/InitializeBuildTask.java
+++ b/src/java/ant/io/qt/tools/ant/InitializeBuildTask.java
@@ -134,7 +134,7 @@ Map<String, ModuleInfo> moduleInfos(){
 			_moduleInfos.put("virtualkeyboard", new ModuleInfo("QTJAMBI_NO_VIRTUAL_KEYBOARD", "QtVirtualKeyboard"));
 			_moduleInfos.put("serialport", new ModuleInfo("QTJAMBI_NO_SERIALPORT", "QtSerialPort"));
 			_moduleInfos.put("serialbus", new ModuleInfo("QTJAMBI_NO_SERIALBUS", "QtSerialBus"));
-			_moduleInfos.put("sensors", new ModuleInfo("QTJAMBI_NO_SENSORS", "QtSensors"));
+			_moduleInfos.put("sensors", new ModuleInfo("QTJAMBI_NO_SENSORS", "QtSensors", ModuleInfo.Headers.PrivateOptional));
 			_moduleInfos.put("location", new ModuleInfo("QTJAMBI_NO_LOCATION", "QtLocation"));
 			_moduleInfos.put("positioning", new ModuleInfo("QTJAMBI_NO_POSITIONING", "QtPositioning"));
 			_moduleInfos.put("bluetooth", new ModuleInfo("QTJAMBI_NO_BLUETOOTH", "QtBluetooth"));
@@ -2032,26 +2032,28 @@ private void analyzeLibinfix() {
 			}
 
 			String availableAbis = "";
-			loop: for (String libSuffix : libSuffixes) {
-				if (!new File(libraryPath, libName + libSuffix).exists()) {
-					for (File libfile : libraryPath.listFiles()) {
-						String fileName = libfile.getName();
-						if (libfile.isFile() && fileName.startsWith(libName) && fileName.endsWith(libSuffix)) {
-							fileName = fileName.substring(0, fileName.length() - libSuffix.length());
-							fileName = fileName.substring(libName.length());
-							if (isAndroid) {
-								fileName = fileName.substring(1);
-								availableAbis += " " + fileName;
-								androidAbis.add(fileName);
-							} else {
-								libInfix = fileName;
+			if(libraryPath.isDirectory()) {
+				loop: for (String libSuffix : libSuffixes) {
+					if (!new File(libraryPath, libName + libSuffix).exists()) {
+						for (File libfile : libraryPath.listFiles()) {
+							String fileName = libfile.getName();
+							if (libfile.isFile() && fileName.startsWith(libName) && fileName.endsWith(libSuffix)) {
+								fileName = fileName.substring(0, fileName.length() - libSuffix.length());
+								fileName = fileName.substring(libName.length());
+								if (isAndroid) {
+									fileName = fileName.substring(1);
+									availableAbis += " " + fileName;
+									androidAbis.add(fileName);
+								} else {
+									libInfix = fileName;
+									break loop;
+								}
+							} else if (OSInfo.os() == OSInfo.OS.MacOS && libfile.isDirectory()
+									&& fileName.equals("QtGui.framework")) {
+								mySetProperty(-1, Constants.MAC_OS_USE_FRAMEWORK, " (as detected in lib directory)", "true", true);
+								useQtFramework = true;
 								break loop;
 							}
-						} else if (OSInfo.os() == OSInfo.OS.MacOS && libfile.isDirectory()
-								&& fileName.equals("QtGui.framework")) {
-							mySetProperty(-1, Constants.MAC_OS_USE_FRAMEWORK, " (as detected in lib directory)", "true", true);
-							useQtFramework = true;
-							break loop;
 						}
 					}
 				}
diff --git a/src/java/ant/io/qt/tools/ant/IsLessThan.java b/src/java/ant/io/qt/tools/ant/IsLessThan.java
new file mode 100644
index 00000000..d8706f48
--- /dev/null
+++ b/src/java/ant/io/qt/tools/ant/IsLessThan.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2001-2004, 2007 Ant-Contrib project.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.qt.tools.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.condition.Condition;
+
+public final class IsLessThan implements Condition {
+
+	private String arg1, arg2;
+	private boolean trim = false;
+	private boolean caseSensitive = true;
+
+	public void setArg1(String a1) {
+		arg1 = a1;
+	}
+
+	public void setArg2(String a2) {
+		arg2 = a2;
+	}
+
+	/**
+	 * Should we want to trim the arguments before comparing them?
+	 *
+	 * @since Revision: 1.3, Ant 1.5
+	 */
+	public void setTrim(boolean b) {
+		trim = b;
+	}
+
+	/**
+	 * Should the comparison be case sensitive?
+	 *
+	 * @since Revision: 1.3, Ant 1.5
+	 */
+	public void setCasesensitive(boolean b) {
+		caseSensitive = b;
+	}
+
+	public boolean eval() throws BuildException {
+		if (arg1 == null || arg2 == null) {
+			throw new BuildException("both arg1 and arg2 are required in " + "less than");
+		}
+
+		if (trim) {
+			arg1 = arg1.trim();
+			arg2 = arg2.trim();
+		}
+
+		// check if args are numbers
+		try {
+			int num1 = Integer.parseInt(arg1);
+			int num2 = Integer.parseInt(arg2);
+			return num1 < num2;
+		} catch (NumberFormatException nfe) {
+			// ignored, fall thru to string comparision
+		}
+
+		return caseSensitive ? arg1.compareTo(arg2) < 0 : arg1.compareToIgnoreCase(arg2) < 0;
+	}
+
+}
\ No newline at end of file
diff --git a/src/java/ant/io/qt/tools/ant/MakeTask.java b/src/java/ant/io/qt/tools/ant/MakeTask.java
index 2b9f4613..82e1b580 100644
--- a/src/java/ant/io/qt/tools/ant/MakeTask.java
+++ b/src/java/ant/io/qt/tools/ant/MakeTask.java
@@ -176,8 +176,8 @@ public void execute() throws BuildException {
         			break;
         		}
         	}
-        	if(!hasJArg) {
-        		commandArray.add("-j"+Runtime.getRuntime().availableProcessors()*2);
+        	if(!hasJArg && Runtime.getRuntime().availableProcessors()>1) {
+        		commandArray.add("-j"+Runtime.getRuntime().availableProcessors());
         	}
         }
 
diff --git a/src/java/ant/io/qt/tools/ant/OSInfo.java b/src/java/ant/io/qt/tools/ant/OSInfo.java
index ee3daca1..b5abccd7 100644
--- a/src/java/ant/io/qt/tools/ant/OSInfo.java
+++ b/src/java/ant/io/qt/tools/ant/OSInfo.java
@@ -186,11 +186,29 @@ static void setQMakeXSpec(String qmakeXSpec) {
     		crossOSArchName = null;    		
     	}else {
 	    	switch(qmakeXSpec) {
+	    	case "linux-arm-gnueabi-g++":
+	    		crossOS = OS.Linux;
+	    		crossOSArchName = K_LINUX_ARM32;
+	    		break;
+	    	case "linux-aarch64-gnu-g++":
+	    		crossOS = OS.Linux;
+	    		crossOSArchName = K_LINUX_ARM64;
+	    		break;
+	    	case "linux-g++-32":
+	    		crossOS = OS.Linux;
+	    		crossOSArchName = K_LINUX_X86;
+	    		break;
+	    	case "win32-arm64-msvc":
+	    		crossOS = OS.Windows;
+	    		crossOSArchName = K_WIN_ARM64;
+	    		break;
 	    	case "android-clang":
 	    		crossOS = OS.Android;
 	    		crossOSArchName = "android";
 	    		break;
 	    	case "macx-ios-clang":
+	    	case "macx-tvos-clang":
+	    	case "macx-watchos-clang":
 	    		crossOS = OS.IOS;
 	    		crossOSArchName = "ios";
 	    		break;
diff --git a/src/java/ant/io/qt/tools/ant/QMakeTask.java b/src/java/ant/io/qt/tools/ant/QMakeTask.java
index c53483bc..3802b273 100644
--- a/src/java/ant/io/qt/tools/ant/QMakeTask.java
+++ b/src/java/ant/io/qt/tools/ant/QMakeTask.java
@@ -188,6 +188,9 @@ private List<String> parseParameters() {
 
         if(includepath != null && includepath.length() > 0)
             parameters.add("INCLUDEPATH+=" + includepath);
+        
+        if(Boolean.valueOf(getProject().getProperty(Constants.QTJAMBI_FORCE_DEBUG_INFO)))
+        	parameters.add("CONFIG+=force_debug_info");
 		
         /*
 		String javaVersion = getProject().getProperty("target.java.version");
diff --git a/src/java/ant/io/qt/tools/ant/TryCatchTask.java b/src/java/ant/io/qt/tools/ant/TryCatchTask.java
new file mode 100644
index 00000000..f01a36de
--- /dev/null
+++ b/src/java/ant/io/qt/tools/ant/TryCatchTask.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2001-2004 Ant-Contrib project.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.qt.tools.ant;
+
+import java.util.*;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Sequential;
+
+public class TryCatchTask extends Task {
+	
+	public static final class CatchBlock extends Sequential {
+		private String throwable = BuildException.class.getName();
+
+		public CatchBlock() {
+			super();
+		}
+
+		public void setThrowable(String throwable) {
+			this.throwable = throwable;
+		}
+
+		public boolean execute(Throwable t) throws BuildException {
+			try {
+				Class<?> c = Thread.currentThread().getContextClassLoader().loadClass(throwable);
+				if (c.isAssignableFrom(t.getClass())) {
+					execute();
+					return true;
+				}
+				return false;
+			} catch (ClassNotFoundException e) {
+				throw new BuildException(e);
+			}
+		}
+	}
+
+
+	public TryCatchTask() {
+	}
+
+	private Sequential tryBlock = null;
+	private final List<CatchBlock> catchBlocks = new ArrayList<>();
+	private Sequential finallyBlock = null;
+	private String property = null;
+	private String reference = null;
+	
+	public void addTry(Sequential tr) throws BuildException {
+		if (tryBlock != null)
+			throw new BuildException("<trycatch> does not accept more than one <try>");
+		tryBlock = tr;
+	}
+
+	public void addCatch(CatchBlock cb) {
+		catchBlocks.add(cb);
+	}
+
+	public void addFinally(Sequential fin) throws BuildException {
+		if (finallyBlock != null)
+			throw new BuildException("<trycatch> does not accept more than one <finally>");
+		finallyBlock = fin;
+	}
+
+	public void execute() throws BuildException {
+		Throwable thrown = null;
+		if (tryBlock == null)
+			throw new BuildException("A nested <try> element is required");
+		try {
+			tryBlock.perform();
+		} catch (Throwable e) {
+			if (property != null)
+				getProject().setProperty(property, e.getMessage());
+			if (reference != null)
+				getProject().addReference(reference, e);
+			boolean executed = false;
+			for(CatchBlock cb : catchBlocks) {
+				executed = cb.execute(e);
+				if(executed)
+					break;
+			}
+			if (!executed)
+				thrown = e;
+		} finally {
+			if (finallyBlock != null)
+				finallyBlock.perform();
+		}
+		if (thrown instanceof BuildException)
+			throw (BuildException)thrown;
+		if (thrown != null)
+			throw new BuildException(thrown);
+	}
+
+}
diff --git a/src/java/ant/io/qt/tools/ant/ant-qtjambi.xml b/src/java/ant/io/qt/tools/ant/ant-qtjambi.xml
index d61478f0..c953ef17 100644
--- a/src/java/ant/io/qt/tools/ant/ant-qtjambi.xml
+++ b/src/java/ant/io/qt/tools/ant/ant-qtjambi.xml
@@ -46,27 +46,33 @@
         classname="io.qt.tools.ant.InitializeBuildTask"/>
     <taskdef name="qtjambi-resolve-path"
         classname="io.qt.tools.ant.ResolvePathTask"/>
-
     <!-- Added due to dash in name -->
-    <typedef name="directory"
-         classname="io.qt.tools.ant.Directory"/>
-    <typedef name="file"
-         classname="io.qt.tools.ant.File"/>
-    <typedef name="stringreplace"
+    <taskdef name="stringreplace"
          classname="io.qt.tools.ant.StringReplaceTask"/>
-    <typedef name="dependencies-to-classpath"
+    <taskdef name="dependencies-to-classpath"
          classname="io.qt.tools.ant.DependenciesToClassPathTask"/>
-    <typedef name="select-modules"
+    <taskdef name="select-modules"
          classname="io.qt.tools.ant.JavaModuleSelectorTask"/>
-    <typedef name="foreach-version"
+    <taskdef name="foreach-version"
          classname="io.qt.tools.ant.ForeachVersionTask"/>
-    <typedef name="foreach-native"
+    <taskdef name="foreach-native"
          classname="io.qt.tools.ant.ForeachNativeTask"/>
-    <typedef name="gpg"
+    <taskdef name="gpg"
          classname="io.qt.tools.ant.GPGTask"/>
-    <typedef name="aidl"
+    <taskdef name="aidl"
          classname="io.qt.tools.ant.AidlTask"/>
-    <typedef name="create-function-pointer-qrc"
+    <taskdef name="if"
+         classname="io.qt.tools.ant.IfTask"/>
+    <taskdef name="trycatch"
+         classname="io.qt.tools.ant.TryCatchTask"/>
+    <taskdef name="create-function-pointer-qrc"
          classname="io.qt.tools.ant.CreateFunctionPointerQrcTask"/>
+
+    <typedef name="directory"
+         classname="io.qt.tools.ant.Directory"/>
+    <typedef name="file"
+         classname="io.qt.tools.ant.File"/>
+    <componentdef name="less"
+         classname="io.qt.tools.ant.IsLessThan"/>
 </antlib>
 
diff --git a/src/java/autotests/io/qt/autotests/ApplicationInitializer.java b/src/java/autotests/io/qt/autotests/ApplicationInitializer.java
index ee0916a7..eabd60a3 100644
--- a/src/java/autotests/io/qt/autotests/ApplicationInitializer.java
+++ b/src/java/autotests/io/qt/autotests/ApplicationInitializer.java
@@ -69,6 +69,14 @@
 
 public abstract class ApplicationInitializer extends UnitTestInitializer{
 	
+	@org.junit.Rule public final org.junit.rules.TestRule testRule = new org.junit.rules.TestRule(){
+		@Override
+		public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description) {
+			java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.INFO, "Start test "+description.getClassName()+"."+description.getMethodName());
+			return base;
+		}
+	};
+	
 	protected static final List<WeakReference<QtObjectInterface>> instances = Collections.synchronizedList(new ArrayList<>());
 	
     @BeforeClass
@@ -87,7 +95,7 @@ public static void testInitializeWithWidgets() throws Exception {
     private static void testInitialize(int mode) throws Exception {
         try {
 			if(QCoreApplication.instance()==null) {
-				java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.FINE, "testInitialize: begin");
+				java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.INFO, "testInitialize: BEGIN");
 				QResource.addClassPath(".");
 				QCoreApplication.setApplicationName("QtJambiUnitTest");
 				switch(mode){
@@ -102,7 +110,7 @@ private static void testInitialize(int mode) throws Exception {
 					break;
 				}
 		        QThread.currentThread().setObjectName("main");
-			    java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.FINE, "testInitialize: done");
+			    java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.INFO, "testInitialize: DONE");
 			}
 		} catch (Throwable e) {
 			e.printStackTrace();
@@ -113,6 +121,7 @@ private static void testInitialize(int mode) throws Exception {
     @AfterClass
     public static void testDispose() throws Exception {
     	try {
+	        java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.INFO, "testDispose: BEGIN");
     		Object currentThread = QThread.currentThread();
     		while(!instances.isEmpty()) {
     			WeakReference<QtObjectInterface> weak = instances.remove(0);
@@ -125,7 +134,6 @@ public static void testDispose() throws Exception {
     				}
     			}
     		}
-	        java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.FINE, "testDispose: BEGIN");
 	        runGC();
 	
 	        // We are attempting to reach a point here where memory should be reclaimed
@@ -228,7 +236,7 @@ public static void testDispose() throws Exception {
 	        TestUtility.flushErr();  // fflush(stderr)
 	        java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.FINE, "testDispose: end objectCount="+objectCount);
     	}finally {
-            java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.FINE, "testDispose: DONE");
+            java.util.logging.Logger.getLogger("io.qt.autotests").log(java.util.logging.Level.INFO, "testDispose: DONE");
     	}
     }
     
@@ -247,58 +255,23 @@ static void testDeployerApp(String applicationName, String...modules) throws Int
     	String classPath;
     	String modulePath;
     	String executable = "";
-    	String platform;
     	String osName = System.getProperty("os.name").toLowerCase();
     	if(osName.startsWith("windows")) {
     		if(isDebug)
     			executable += "d";
     		executable += ".exe";
-    		platform = "windows";
-    		switch(System.getProperty("os.arch").toLowerCase()) {
-        	case "arm":
-        	case "arm32":
-        		platform += "-arm32"; break;
-        	case "arm64":
-        	case "aarch64":
-        		platform += "-arm64"; break;
-        	case "x86_64":
-        	case "x64":
-        	case "amd64":
-        		platform += "-x64"; break;
-    		default:
-        		platform += "-x86"; break;
-    		}
     	}else if(osName.startsWith("mac")) {
     		if(isDebug)
     			executable += "_debug";
     		executable += ".app";
-    		platform = "macos";
     	}else if(osName.startsWith("android")) {
     		Assume.assumeFalse("Cannot run on android", true);
     		return;
     	}else {
     		if(isDebug)
     			executable += "_debug";
-    		platform = "linux";
-    		switch(System.getProperty("os.arch").toLowerCase()) {
-        	case "arm":
-        	case "arm32":
-        		platform += "-arm32"; break;
-        	case "arm64":
-        	case "aarch64":
-        		platform += "-arm64"; break;
-        	case "x86_64":
-        	case "x64":
-        	case "amd64":
-        		platform += "-x64"; break;
-    		default:
-        		platform += "-x86"; break;
-    		}
     	}
     	String qtBinariesPath = TestUtility.qtLibraryPath();
-    	if(isDebug) {
-    		platform += "-debug";
-    	}
     	File utilitiesDir = new File(new File(testsDir.getParentFile(), "qtjambi"), "bin");
     	String macosPrefix = "";
     	if(osName.startsWith("mac")) {
diff --git a/src/java/autotests/io/qt/autotests/TestBluetoothDiscovery.java b/src/java/autotests/io/qt/autotests/TestBluetoothDiscovery.java
index d75737af..527fbc73 100644
--- a/src/java/autotests/io/qt/autotests/TestBluetoothDiscovery.java
+++ b/src/java/autotests/io/qt/autotests/TestBluetoothDiscovery.java
@@ -30,8 +30,8 @@
 
 import org.junit.BeforeClass;
 
-import io.qt.autotests.generated.UI_DeviceDiscovery;
-import io.qt.autotests.generated.UI_ServiceDiscovery;
+import io.qt.autotests.generated.Ui_DeviceDiscovery;
+import io.qt.autotests.generated.Ui_ServiceDiscovery;
 import io.qt.bluetooth.QBluetoothAddress;
 import io.qt.bluetooth.QBluetoothDeviceDiscoveryAgent;
 import io.qt.bluetooth.QBluetoothDeviceInfo;
@@ -78,7 +78,7 @@ public DeviceDiscoveryDialog() {
 	public DeviceDiscoveryDialog(QWidget parent) {
 		super(parent);
 	    this.localDevice = new QBluetoothLocalDevice();
-	    this.ui = new UI_DeviceDiscovery();
+	    this.ui = new Ui_DeviceDiscovery();
 	    
 	    ui.setupUi(this);
 
@@ -194,7 +194,7 @@ private void hostModeStateChanged(QBluetoothLocalDevice.HostMode mode){
     
     private final QBluetoothDeviceDiscoveryAgent discoveryAgent;
     private final QBluetoothLocalDevice localDevice;
-    private final UI_DeviceDiscovery ui;
+    private final Ui_DeviceDiscovery ui;
 };
 
 
@@ -205,7 +205,7 @@ public ServiceDiscoveryDialog(String name, QBluetoothAddress address) {
 	}
 	
 	public ServiceDiscoveryDialog(String name, QBluetoothAddress address, QWidget parent) {
-		this.ui = new UI_ServiceDiscovery();
+		this.ui = new Ui_ServiceDiscovery();
 	    ui.setupUi(this);
 
 	    //Using default Bluetooth adapter
@@ -245,5 +245,5 @@ public void addService(QBluetoothServiceInfo info){
 	}
 
 	private final QBluetoothServiceDiscoveryAgent discoveryAgent;
-	private final UI_ServiceDiscovery ui;
+	private final Ui_ServiceDiscovery ui;
 };
\ No newline at end of file
diff --git a/src/java/autotests/io/qt/autotests/TestClassFunctionality.java b/src/java/autotests/io/qt/autotests/TestClassFunctionality.java
index e315a458..80ec3ecb 100644
--- a/src/java/autotests/io/qt/autotests/TestClassFunctionality.java
+++ b/src/java/autotests/io/qt/autotests/TestClassFunctionality.java
@@ -72,6 +72,7 @@
 import io.qt.core.QRectF;
 import io.qt.core.QResource;
 import io.qt.core.QSize;
+import io.qt.core.QString;
 import io.qt.core.QTimer;
 import io.qt.core.QUuid;
 import io.qt.core.Qt;
@@ -740,9 +741,11 @@ static class MySpinBox extends QDoubleSpinBox {
         public int receivedPos;
 
         @Override
-        public String fixup(String input) {
-            receivedString = input;
-            return "As aught of " + input.substring(2, 8) + " birth";
+        public void fixup(QString input) {
+            receivedString = input.toString();
+            input.assign("As aught of ");
+            input.append(receivedString.substring(2, 8));
+            input.append(" birth");
         }
 
         @Override
diff --git a/src/java/autotests/io/qt/autotests/TestConnections.java b/src/java/autotests/io/qt/autotests/TestConnections.java
index 7c475b93..edc995e7 100644
--- a/src/java/autotests/io/qt/autotests/TestConnections.java
+++ b/src/java/autotests/io/qt/autotests/TestConnections.java
@@ -187,11 +187,7 @@ class SignalEmitter implements QtSignalEmitterInterface, QInstanceMemberSignals
 
         QNoSuchSlotException f = null;
         try {
-        	if(!hasSerializableLambdas) {
-        		sas.signal1.connect(sas, "non_slot()test_javaToJavaConnect");
-        	}else {
-        		sas.signal1.connect(sas::non_slot);
-        	}
+    		sas.signal1.connect(sas, "non_slot()");
         } catch (QNoSuchSlotException e) {
             f = e;
         }
diff --git a/src/java/autotests/io/qt/autotests/TestExceptions.java b/src/java/autotests/io/qt/autotests/TestExceptions.java
index f18477b6..76261192 100644
--- a/src/java/autotests/io/qt/autotests/TestExceptions.java
+++ b/src/java/autotests/io/qt/autotests/TestExceptions.java
@@ -48,7 +48,6 @@
 import io.qt.gui.QPaintDevice;
 import io.qt.gui.QPaintEngine;
 import io.qt.widgets.QApplication;
-import io.qt.widgets.QDialog;
 import io.qt.widgets.QWizard;
 import io.qt.widgets.QWizardPage;
 
diff --git a/src/java/autotests/io/qt/autotests/TestFileEngine.java b/src/java/autotests/io/qt/autotests/TestFileEngine.java
index 65457aee..88218d5c 100644
--- a/src/java/autotests/io/qt/autotests/TestFileEngine.java
+++ b/src/java/autotests/io/qt/autotests/TestFileEngine.java
@@ -302,15 +302,15 @@ public void testClassPathFileEngine() {
 		        QDir dirtwo = new QDir("classpath:TestClassFunctionality_dirtwo/");
 		        assertTrue(dirtwo.exists());
 		        // CHECKME FIXME On Windows we see ".." entry, we should explain why this is different and if necessary fix something
-		        List<String> direntList = dirtwo.entryList(); 
+		        QStringList direntList = dirtwo.entryList(); 
 		        int direntCount = direntList.size();
 		        if(direntCount == 2) {
 		            assertEquals(direntList.size(), 2);
-		            assertTrue(direntList.get(0).equals(".."));
-		            assertTrue(direntList.get(1).equals("TestClassFunctionality_dir22"));
+		            assertEquals("..", direntList.get(0));
+		            assertEquals("TestClassFunctionality_dir22", direntList.get(1));
 		        } else {
 		            assertEquals(direntList.size(), 1);
-		            assertTrue(direntList.get(0).equals("TestClassFunctionality_dir22"));
+		            assertEquals("TestClassFunctionality_dir22", direntList.get(0));
 		        }
 
 		        List<QFileInfo> dirTwoEntryInfoList = dirtwo.entryInfoList();
diff --git a/src/java/autotests/io/qt/autotests/TestFuture.java b/src/java/autotests/io/qt/autotests/TestFuture.java
index f04c54a3..c0c6c0b1 100644
--- a/src/java/autotests/io/qt/autotests/TestFuture.java
+++ b/src/java/autotests/io/qt/autotests/TestFuture.java
@@ -265,17 +265,6 @@ public void test_type_missmatch() {
         	Assert.assertFalse(future.isStarted());
     	}
     	
-    	{
-    		QFutureInterface<String> promise = new QFutureInterface<>();
-    		promise.reportStarted();
-    		QFuture<Integer> future = (QFuture<Integer>)(QFuture)promise.future();
-        	Assert.assertTrue(future.isStarted());
-        	future = FutureHandler.forwardInt(future);
-        	promise.reportResult("5");
-        	promise.reportFinished();
-        	Assert.assertEquals(Integer.valueOf(5), future.result());
-    	}
-    	
     	{
     		QFutureInterface<Integer> promise = new QFutureInterface<>();
     		promise.reportStarted();
@@ -289,6 +278,18 @@ public void test_type_missmatch() {
         	Assert.assertEquals(3, future.resultCount());
         	Assert.assertEquals(null, future.result());
     	}
+    	
+    	{
+    		QFutureInterface<String> promise = new QFutureInterface<>();
+    		promise.reportStarted();
+    		QFuture<Integer> future = (QFuture<Integer>)(QFuture)promise.future();
+        	Assert.assertTrue(future.isStarted());
+        	future = FutureHandler.forwardInt(future);
+        	promise.reportResult("5");
+        	promise.reportFinished();
+        	Assert.assertEquals(1, future.resultCount());
+        	Assert.assertEquals(Integer.valueOf(5), future.result());
+    	}
     }
     
     @Test
diff --git a/src/java/autotests/io/qt/autotests/TestInjectedCode.java b/src/java/autotests/io/qt/autotests/TestInjectedCode.java
index c7fec02c..b97fb4f4 100644
--- a/src/java/autotests/io/qt/autotests/TestInjectedCode.java
+++ b/src/java/autotests/io/qt/autotests/TestInjectedCode.java
@@ -267,9 +267,10 @@ static class ValidatorSubclassSubclass extends ValidatorSubclass {
         public int inputPos;
 
         @Override
-        public String fixup(String input) {
-            inputString = input;
-            return super.fixup(input) + "javaPostfix";
+        public void fixup(QString input) {
+            inputString = input.toString();
+            super.fixup(input);
+            input.append("javaPostfix");
         }
 
         @Override
@@ -861,20 +862,20 @@ public void testQGridLayout_getItemPosition() {
     public void testValidatorFixup() {
         ValidatorSubclassSubclass vss = new ValidatorSubclassSubclass();
 
-        String[] str = {"acceptable"};
+        final QString str = new QString("acceptable");
         int[] i = {13};
         assertEquals(QValidator.State.Acceptable, vss.callValidate(str, i));
-        assertEquals("javaPrefixacceptablesomePostfix", str[0]);
+        assertEquals("javaPrefixacceptablesomePostfix", str.toString());
         assertEquals("acceptable".length(), i[0]);
         assertEquals("acceptable", vss.inputString);
         assertEquals(13, vss.inputPos);
         assertEquals("acceptable", vss.inputString());
         assertEquals(13, vss.inputPos());
 
-        str[0] = "intermediate";
+        str.assign("intermediate");
         i[0] = 14;
         assertEquals(QValidator.State.Intermediate, vss.callValidate(str, i));
-        assertEquals("javaPrefixintermediatesomePostfix", str[0]);
+        assertEquals("javaPrefixintermediatesomePostfix", str.toString());
         assertEquals("intermediate".length(), i[0]);
         assertEquals("intermediate", vss.inputString);
         assertEquals(14, vss.inputPos);
diff --git a/src/java/autotests/io/qt/autotests/TestNativePointer.java b/src/java/autotests/io/qt/autotests/TestNativePointer.java
index f7146c12..83eecd36 100644
--- a/src/java/autotests/io/qt/autotests/TestNativePointer.java
+++ b/src/java/autotests/io/qt/autotests/TestNativePointer.java
@@ -357,14 +357,6 @@ public void run_testInOut() {
             assertEquals(returned, 14);
             assertEquals(np_int.intValue(), 15);
         }
-
-        {
-            QNativePointer np_string = new QNativePointer(QNativePointer.Type.String);
-            np_string.setStringValue("First");
-            String returned = npt.testString(np_string, "Second");
-            assertEquals(returned, "First");
-            assertEquals(np_string.stringValue(), "Second");
-        }
     }
     
     @Test
diff --git a/src/java/autotests/io/qt/autotests/TestPlugin.java b/src/java/autotests/io/qt/autotests/TestPlugin.java
index 0355f41b..ed65aa32 100644
--- a/src/java/autotests/io/qt/autotests/TestPlugin.java
+++ b/src/java/autotests/io/qt/autotests/TestPlugin.java
@@ -50,7 +50,6 @@
 import io.qt.gui.QIconEnginePlugin;
 import io.qt.gui.QImageIOHandler;
 import io.qt.gui.QImageIOPlugin;
-import io.qt.widgets.QDialog;
 import io.qt.widgets.QGraphicsItem;
 import io.qt.widgets.QGraphicsObject;
 import io.qt.widgets.QGraphicsWidget;
@@ -129,10 +128,9 @@ public void testCustomPlugin() {
 		Assert.assertTrue(plugin instanceof QGraphicsWidget);
     }
     
-//    @Test
+    @Test
     public void testLoadPluginLibrary() {
 		Assume.assumeTrue("macos only", QOperatingSystemVersion.current().isAnyOfType(OSType.MacOS));
-		new QDialog().exec();
 		for(String path : QCoreApplication.libraryPaths()) {
 			QFileInfo file = new QFileInfo(path+"/designer/libcustomwidgets.dylib");
 			if(file.exists()) {
diff --git a/src/java/autotests/io/qt/autotests/TestQThread.java b/src/java/autotests/io/qt/autotests/TestQThread.java
index 7cf988a3..85c210c7 100644
--- a/src/java/autotests/io/qt/autotests/TestQThread.java
+++ b/src/java/autotests/io/qt/autotests/TestQThread.java
@@ -517,21 +517,28 @@ public void testThreadRequestInterruption() throws InterruptedException, ClassNo
 	}
 	
 	@org.junit.Test
-	public void testDeleteTopLevelRunnerThread() {
+	public void testDeleteTopLevelRunnerThread() throws Throwable {
 		WeakReference<QThread> reference;
 		{
 			boolean[] javaOwnership = {false};
 			Thread[] javaThreads = {null,null};
 			QThread[] qtarray = {null};
+			Throwable[] exception = {null};
 			QThread thread = QThread.create(()->{
-				qtarray[0] = QThread.currentThread();
-				javaOwnership[0] = General.internalAccess.isJavaOwnership(qtarray[0]);
-				javaThreads[0] = Thread.currentThread();
-				javaThreads[1] = qtarray[0].javaThread();
+				try {
+					qtarray[0] = QThread.currentThread();
+					javaOwnership[0] = General.internalAccess.isJavaOwnership(qtarray[0]);
+					javaThreads[0] = Thread.currentThread();
+					javaThreads[1] = qtarray[0].javaThread();
+				}catch(Throwable t) {
+					exception[0] = t;
+				}
 			});
 			reference = new WeakReference<>(thread);
 			thread.start();
 			thread.join();
+			if(exception[0]!=null)
+				throw exception[0];
 			Assert.assertEquals(javaThreads[0], javaThreads[1]);
 			Assert.assertEquals(thread, qtarray[0]);
 			Assert.assertTrue(javaOwnership[0]);
@@ -544,22 +551,29 @@ public void testDeleteTopLevelRunnerThread() {
 	}
 	
 	@org.junit.Test
-	public void testDeleteChildRunnerThread() throws InterruptedException {
+	public void testDeleteChildRunnerThread() throws Throwable {
 		QObject parent = new QObject();
 		WeakReference<QThread> reference;
 		{
 			boolean[] cppOwnership = {false};
 			Thread[] javaThreads = {null,null};
 			QThread[] qtarray = {null};
+			Throwable[] exception = {null};
 			QThread thread = QThread.create(()->{
-				qtarray[0] = QThread.currentThread();
-				cppOwnership[0] = General.internalAccess.isCppOwnership(qtarray[0]);
-				javaThreads[0] = Thread.currentThread();
-				javaThreads[1] = qtarray[0].javaThread();
+				try {
+					qtarray[0] = QThread.currentThread();
+					cppOwnership[0] = General.internalAccess.isCppOwnership(qtarray[0]);
+					javaThreads[0] = Thread.currentThread();
+					javaThreads[1] = qtarray[0].javaThread();
+				}catch(Throwable t) {
+					exception[0] = t;
+				}
 			}, parent);
 			reference = new WeakReference<>(thread);
 			thread.start();
 			thread.join();
+			if(exception[0]!=null)
+				throw exception[0];
 			Assert.assertEquals(javaThreads[0], javaThreads[1]);
 			Assert.assertEquals(thread, qtarray[0]);
 			Assert.assertTrue(cppOwnership[0]);
@@ -586,22 +600,28 @@ public void testDeleteChildRunnerThread() throws InterruptedException {
 	}
 	
 	@org.junit.Test
-	public void testDeleteTopLevelEventThread() {
+	public void testDeleteTopLevelEventThread() throws Throwable {
 		WeakReference<QThread> reference;
 		{
 			boolean[] javaOwnership = {false};
 			Thread[] javaThreads = {null,null};
 			QThread[] qtarray = {null};
 			QThread thread = new QThread();
+			Throwable[] exception = {null};
 			QObject obj = new QObject() {
 				@Override
 				public boolean event(QEvent event) {
 					if(event.type()==QEvent.Type.DeferredDispose) {
-						qtarray[0] = QThread.currentThread();
-						javaOwnership[0] = General.internalAccess.isJavaOwnership(qtarray[0]);
-						javaThreads[0] = Thread.currentThread();
-						javaThreads[1] = qtarray[0].javaThread();
-						qtarray[0].exit();
+						try {
+							qtarray[0] = QThread.currentThread();
+							javaOwnership[0] = General.internalAccess.isJavaOwnership(qtarray[0]);
+							javaThreads[0] = Thread.currentThread();
+							javaThreads[1] = qtarray[0].javaThread();
+						}catch(Throwable t) {
+							exception[0] = t;
+						}finally {
+							qtarray[0].exit();
+						}
 					}
 					return super.event(event);
 				}
@@ -611,6 +631,8 @@ public boolean event(QEvent event) {
 			reference = new WeakReference<>(thread);
 			thread.start();
 			thread.join();
+			if(exception[0]!=null)
+				throw exception[0];
 			Assert.assertEquals(javaThreads[0], javaThreads[1]);
 			Assert.assertEquals(thread, qtarray[0]);
 			Assert.assertTrue(javaOwnership[0]);
@@ -623,23 +645,29 @@ public boolean event(QEvent event) {
 	}
 	
 	@org.junit.Test
-	public void testDeleteChildEventThread() {
+	public void testDeleteChildEventThread() throws Throwable {
 		QObject parent = new QObject();
 		WeakReference<QThread> reference;
 		{
 			boolean[] cppOwnership = {false};
 			Thread[] javaThreads = {null,null};
 			QThread[] qtarray = {null};
+			Throwable[] exception = {null};
 			QThread thread = new QThread(parent);
 			QObject obj = new QObject() {
 				@Override
 				public boolean event(QEvent event) {
 					if(event.type()==QEvent.Type.DeferredDispose) {
-						qtarray[0] = QThread.currentThread();
-						cppOwnership[0] = General.internalAccess.isCppOwnership(qtarray[0]);
-						javaThreads[0] = Thread.currentThread();
-						javaThreads[1] = qtarray[0].javaThread();
-						qtarray[0].exit();
+						try {
+							qtarray[0] = QThread.currentThread();
+							cppOwnership[0] = General.internalAccess.isCppOwnership(qtarray[0]);
+							javaThreads[0] = Thread.currentThread();
+							javaThreads[1] = qtarray[0].javaThread();
+						}catch(Throwable t) {
+							exception[0] = t;
+						}finally {
+							qtarray[0].exit();
+						}
 					}
 					return super.event(event);
 				}
@@ -649,6 +677,8 @@ public boolean event(QEvent event) {
 			reference = new WeakReference<>(thread);
 			thread.start();
 			thread.join();
+			if(exception[0]!=null)
+				throw exception[0];
 			Assert.assertEquals(javaThreads[0], javaThreads[1]);
 			Assert.assertEquals(thread, qtarray[0]);
 			Assert.assertTrue(cppOwnership[0]);
@@ -679,23 +709,32 @@ public boolean event(QEvent event) {
 	}
 	
 	@org.junit.Test
-	public void testDeleteAdoptedThread() throws InterruptedException {
+	public void testDeleteAdoptedThread() throws Throwable {
 		AtomicBoolean threadCleaned = new AtomicBoolean();
 		AtomicBoolean qthreadCleaned = new AtomicBoolean();
 		{
 			boolean[] cppOwnership = {false};
 			Thread[] javaThreads = {null,null};
 			QThread[] qtarray = {null};
+			Throwable[] exception = {null};
 			Thread thread = new Thread(()->{
-				qtarray[0] = QThread.currentThread();
-				cppOwnership[0] = General.internalAccess.isCppOwnership(qtarray[0]);
-				javaThreads[0] = Thread.currentThread();
-				javaThreads[1] = qtarray[0].javaThread();
-				General.internalAccess.registerCleaner(qtarray[0], ()->qthreadCleaned.set(true));
+				try {
+					qtarray[0] = QThread.currentThread();
+					cppOwnership[0] = General.internalAccess.isCppOwnership(qtarray[0]);
+					javaThreads[0] = Thread.currentThread();
+					javaThreads[1] = qtarray[0].javaThread();
+					General.internalAccess.registerCleaner(qtarray[0], ()->qthreadCleaned.set(true));
+				}catch(Throwable t) {
+					exception[0] = t;
+				}finally {
+					qtarray[0].exit();
+				}
 			});
 			General.internalAccess.registerCleaner(thread, ()->threadCleaned.set(true));
 			thread.start();
 			thread.join();
+			if(exception[0]!=null)
+				throw exception[0];
 			Assert.assertEquals(thread, javaThreads[0]);
 			Assert.assertEquals(javaThreads[0], javaThreads[1]);
 			Assert.assertTrue(cppOwnership[0]);
diff --git a/src/java/autotests/io/qt/autotests/TestQmlPlugin.java b/src/java/autotests/io/qt/autotests/TestQmlPlugin.java
index 5aded137..8cd87246 100644
--- a/src/java/autotests/io/qt/autotests/TestQmlPlugin.java
+++ b/src/java/autotests/io/qt/autotests/TestQmlPlugin.java
@@ -55,7 +55,7 @@ public static void testInitialize() throws Exception {
     public void run_testQmlPlugin() {
 		QByteArray data = new QByteArray("import io.qt.test.car 2.0; Car {}");
 		QQmlEngine qmlengine = new QQmlEngine();
-		String imports = System.getProperty("io.qt.qml.imports", "");
+		String imports = System.getProperty("io.qt.qml-imports", "");
 		if(!imports.isEmpty()) {
 			for(String i : imports.split(File.pathSeparator))
 				qmlengine.addImportPath(i);
diff --git a/src/java/autotests/io/qt/autotests/TestSignals.java b/src/java/autotests/io/qt/autotests/TestSignals.java
index 0299967d..0997e3b0 100644
--- a/src/java/autotests/io/qt/autotests/TestSignals.java
+++ b/src/java/autotests/io/qt/autotests/TestSignals.java
@@ -31,6 +31,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
@@ -198,7 +199,7 @@ public void testInstanceMemberSignalInQObject() {
 		o.testSignal.emit("test1");
 		assertEquals("test1", receiver.completionPrefix());
 		QMetaMethod m = QMetaMethod.fromSignal(o.testSignal);
-		assertTrue(m!=null);
+		assertTrue(m.isValid());
 		m.invoke(o, "test2");
 		assertEquals("test2", receiver.completionPrefix());
 	}
@@ -212,7 +213,7 @@ public void testDeclarableMemberSignalInQObject() {
 		o.testSignal.emit("test1");
 		assertEquals("test1", receiver.completionPrefix());
 		QMetaMethod m = QMetaMethod.fromSignal(o.testSignal);
-		assertTrue(m==null);
+		assertFalse(m.isValid());
 	}
 	
     @Test
diff --git a/src/java/autotests/io/qt/autotests/TestThreadAffinity.java b/src/java/autotests/io/qt/autotests/TestThreadAffinity.java
index 96593da2..ca1f1ad2 100644
--- a/src/java/autotests/io/qt/autotests/TestThreadAffinity.java
+++ b/src/java/autotests/io/qt/autotests/TestThreadAffinity.java
@@ -284,6 +284,10 @@ public void testQObject() {
     			parent.removeEventFilter(null);
 				fail("QThreadAffinityException expected to be thrown.");
 			}catch(QThreadAffinityException e) {}
+			try{
+				QtUtilities.threadCheck(parent);
+				fail("QThreadAffinityException expected to be thrown.");
+			}catch(QThreadAffinityException e) {}
     	}finally {
     		parent.disposeLater();
     		thread.quit();
@@ -309,6 +313,10 @@ public void testQGraphicsWidget() throws Throwable{
 				widget.setWidget(comboBox);
 				fail("QThreadAffinityException expected to be thrown.");
 			}catch(QThreadAffinityException e) {}
+			try{
+				QtUtilities.uiThreadCheck();
+				fail("QThreadAffinityException expected to be thrown.");
+			}catch(QThreadAffinityException e) {}
 		});
 		thread.setUncaughtExceptionHandler((Thread t, Throwable e)->throwable = e);
 		thread.finished.connect(loop::quit);
@@ -498,7 +506,7 @@ public void testQWidget() throws Throwable{
 				fail("QThreadAffinityException expected to be thrown.");
 			}catch(QThreadAffinityException e) {}
 			try{
-				QFontDialog.getFont();
+				QFontDialog.getFont((QWidget)null);
 				fail("QThreadAffinityException expected to be thrown.");
 			}catch(QThreadAffinityException e) {}
 			try{
diff --git a/src/java/modules/modules.xml b/src/java/modules/modules.xml
index d29c64b2..f0a68eae 100644
--- a/src/java/modules/modules.xml
+++ b/src/java/modules/modules.xml
@@ -115,21 +115,20 @@
         <echo message="Compiling java classes: ${java.srcdir}/${module} excludes: ${module.excludes}"/>
         <mkdir dir="${deploymentdir}"/>
         <mkdir dir="${java.outdir}/${module}"/>
-        <copy todir="${java.outdir}/${module}" includeemptydirs="false">
+        <copy todir="${java.outdir}/${module}" includeemptydirs="false" overwrite="true">
                 <multirootfileset basedirs="${multiroot.basedirs}"
                                   excludes="**/.*,
                                                     pom.xml,
                                                     build.xml,
                                                     build.properties,
                                                     **/*.java,
-                                                    **/*.jui,
                                                     ${jar.excludes},
                                                     ${qtjambi.jar.excludes}"/>
         </copy>
         <condition property="module.info.exclude" value="" else="module-info.java">
             <istrue value="${java.module.based}"/>
         </condition>
-        <copy todir="${java.outsrcdir}/${module}" includeemptydirs="false">
+        <copy todir="${java.outsrcdir}/${module}" includeemptydirs="false" overwrite="true">
             <multirootfileset basedirs="${multiroot.basedirs}" 
                               excludes="pom.xml,
                                                     build.xml,
@@ -148,32 +147,54 @@
         <if>
             <istrue value="${java.module.based}"/>
             <then>
-                <javac source="8" target="8" debug="true" deprecation="true"
-                        fork="true" memorymaximumsize="1024m" verbose="false"
-                        includeantruntime="false"
-                        excludes="${module.excludes},module-info.java"
-                        srcdir="${sourcedirs2}"
-                        destdir="${java.outdir}/${module}">
-                    <compilerarg value="-Xlint:deprecation" />
-                    <compilerarg value="-Xlint:unchecked" />
-                    <compilerarg value="-Xlint:-module,-options" />
-                    <classpath>
-                        <filelist dir="${deploymentdir}" files="${qtjambi.dependencies}"/>
-                    </classpath>
-                </javac>
-                <javac source="${source.java.version}" target="${minimum.java.version}" debug="true" deprecation="true"
-                        fork="true" memorymaximumsize="1024m" verbose="false"
-                        includeantruntime="false"
-                        includes="module-info.java"
-                        srcdir="${sourcedirs2}"
-                        destdir="${java.outdir}/${module}">
-                    <compilerarg value="-Xlint:deprecation" />
-                    <compilerarg value="-Xlint:unchecked" />
-                    <compilerarg value="-Xlint:-module,-options" />
-                    <modulepath>
-                        <filelist dir="${deploymentdir}" files="${qtjambi.dependencies}"/>
-                    </modulepath>
-                </javac>
+				<if>
+					<istrue value="${qtjambi.no.jsr305}"/>
+					<then>
+						<javac source="8" target="8" debug="true" deprecation="true"
+								fork="true" memorymaximumsize="1024m" verbose="false"
+								includeantruntime="false"
+								excludes="${module.excludes},module-info.java"
+								srcdir="${sourcedirs2}"
+								destdir="${java.outdir}/${module}">
+							<compilerarg value="-Xlint:deprecation" />
+							<compilerarg value="-Xlint:unchecked" />
+							<compilerarg value="-Xlint:-module,-options" />
+							<classpath>
+								<filelist dir="${deploymentdir}" files="${qtjambi.dependencies}"/>
+							</classpath>
+						</javac>
+					</then>
+					<else>
+						<javac source="8" target="8" debug="true" deprecation="true"
+								fork="true" memorymaximumsize="1024m" verbose="false"
+								includeantruntime="false"
+								excludes="${module.excludes},module-info.java"
+								srcdir="${sourcedirs2}"
+								destdir="${java.outdir}/${module}">
+							<compilerarg value="-Xlint:deprecation" />
+							<compilerarg value="-Xlint:unchecked" />
+							<compilerarg value="-Xlint:-module,-options" />
+							<classpath>
+								<filelist dir="${deploymentdir}" files="${qtjambi.dependencies}"/>
+								<pathelement location="${extjardir}/jsr305.jar"/>
+								<pathelement location="${extjardir}/kotlin-annotations-jvm.jar"/>
+							</classpath>
+						</javac>
+					</else>
+				</if>
+				<javac source="${source.java.version}" target="${minimum.java.version}" debug="true" deprecation="true"
+						fork="true" memorymaximumsize="1024m" verbose="false"
+						includeantruntime="false"
+						includes="module-info.java"
+						srcdir="${sourcedirs2}"
+						destdir="${java.outdir}/${module}">
+					<compilerarg value="-Xlint:deprecation" />
+					<compilerarg value="-Xlint:unchecked" />
+					<compilerarg value="-Xlint:-module,-options" />
+					<modulepath>
+						<filelist dir="${deploymentdir}" files="${qtjambi.dependencies}"/>
+					</modulepath>
+				</javac>
             </then>
             <else>
                 <javac source="${source.java.version}" target="${minimum.java.version}" debug="true" deprecation="true"
@@ -442,7 +463,7 @@
                 </jar>
             </then>
         </if>
-		<create-native-deployment outputDirectory="${qtjambi-native-bundle-path}" debug="${platformjar.debug}" module="${module}" libraries="${qtjambi.bundle.libraries}"/>
+		<create-native-deployment outputDirectory="${qtjambi-native-bundle-path}" debug="${platformjar.debug}" module="${module}" libraries="${qtjambi.bundle.libraries}" forcedebuginfo="${qtjambi.force.debug.info}"/>
         <if>
 			<not>
 				<equals arg1="${library.includes}" arg2=""/>
diff --git a/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/BundleGenerator.java b/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/BundleGenerator.java
index 20cd8b7a..66aecaa6 100644
--- a/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/BundleGenerator.java
+++ b/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/BundleGenerator.java
@@ -140,6 +140,7 @@ static void generate(QCommandLineParser parser, String[] args, QCommandLineOptio
 		QCommandLineOption versionOption = new QCommandLineOption(QStringList.of("target-version"), "Qt version", "version");
 	    QCommandLineOption utilitiesOption = new QCommandLineOption(QStringList.of("utilities"), "Path to android utilities.\nExamples:\n--utilities=utilities/QtAndroidBindings.jar", "file");
 	    QCommandLineOption utilitiesLocationOption = new QCommandLineOption(QStringList.of("utilities-location"), "Directory containing android utilities", "path");
+	    QCommandLineOption forceDebugInfoOption = new QCommandLineOption(QStringList.of("force-debug-info"), "Forces to also bundle release debug info if available");
 		parser.addOptions(Arrays.asList(platformOption, dirOption, 
 				configurationOption, 
 				qtdirOption, 
@@ -153,6 +154,7 @@ static void generate(QCommandLineParser parser, String[] args, QCommandLineOptio
 				translationsOption,
 				versionOption, 
 				utilitiesOption, 
+				forceDebugInfoOption,
 				utilitiesLocationOption));
     	parser.process(new QStringList(args));
 		QStringList unusedArguments = new QStringList(parser.positionalArguments());
@@ -161,6 +163,7 @@ static void generate(QCommandLineParser parser, String[] args, QCommandLineOptio
 		if(unusedArguments.size()>1)
 			throw new Error("Qt bundle generation, illegal argument: "+unusedArguments.join(", "));
 		boolean isDebug = parser.isSet(configurationOption) && parser.value(configurationOption).equals("debug");
+		boolean isForceDebugInfo = parser.isSet(forceDebugInfoOption);
 		File targetDir = new File(parser.isSet(dirOption) ? parser.value(dirOption) : System.getProperty("user.dir"));
 		File qtdir = null;
 		File qtbase = null;
@@ -452,7 +455,7 @@ && new File(subdir, "plugins").isDirectory()) {
 				if(!targetDir.exists())
 					targetDir.mkdirs();
 				for (QPair<String, File> qPair : qtdirs) {
-					generateBundles(targetDir, qPair.second, qPair.first, androidBindingsURL, isDebug, isMinGWBuilt, version);
+					generateBundles(targetDir, qPair.second, qPair.first, androidBindingsURL, isDebug, isForceDebugInfo, isMinGWBuilt, version);
 				}
 			}else if(parser.isSet(qtbaseOption)) {
 				throw new Error(String.format("Qt bundle generation: Unable to find Qt in directory specified by --%1$s.", qtbaseOption.valueName()));
@@ -507,12 +510,12 @@ else if(qtdir.getName().endsWith("_arm64"))
 			else
 				version = null;
 			if("android".equals(osArchName)) {
-				generateBundles(targetDir, qtdir, "android-arm64", androidBindingsURL, isDebug, isMinGWBuilt, version);
-				generateBundles(targetDir, qtdir, "android-arm", androidBindingsURL, isDebug, isMinGWBuilt, version);
-				generateBundles(targetDir, qtdir, "android-x64", androidBindingsURL, isDebug, isMinGWBuilt, version);
-				generateBundles(targetDir, qtdir, "android-x86", androidBindingsURL, isDebug, isMinGWBuilt, version);
+				generateBundles(targetDir, qtdir, "android-arm64", androidBindingsURL, isDebug, isForceDebugInfo, isMinGWBuilt, version);
+				generateBundles(targetDir, qtdir, "android-arm", androidBindingsURL, isDebug, isForceDebugInfo, isMinGWBuilt, version);
+				generateBundles(targetDir, qtdir, "android-x64", androidBindingsURL, isDebug, isForceDebugInfo, isMinGWBuilt, version);
+				generateBundles(targetDir, qtdir, "android-x86", androidBindingsURL, isDebug, isForceDebugInfo, isMinGWBuilt, version);
 			}else {
-				generateBundles(targetDir, qtdir, osArchName, androidBindingsURL, isDebug, isMinGWBuilt, version);
+				generateBundles(targetDir, qtdir, osArchName, androidBindingsURL, isDebug, isForceDebugInfo, isMinGWBuilt, version);
 			}
 		}else if(parser.isSet(binsOption)
 				|| parser.isSet(libsOption)
@@ -559,7 +562,7 @@ else if(qtdir.getName().endsWith("_arm64"))
 			if(isMinGWBuilt==null) {
 				isMinGWBuilt = binDir.getParentFile().getName().startsWith("mingw");
 			}
-			generateBundles(targetDir, binDir, libDir, pluginsDir, qmlDir, libExecDir, resourcesDir, translationsDir, osArchName, androidBindingsURL, isDebug, isMinGWBuilt, version);
+			generateBundles(targetDir, binDir, libDir, pluginsDir, qmlDir, libExecDir, resourcesDir, translationsDir, osArchName, androidBindingsURL, isDebug, isForceDebugInfo, isMinGWBuilt, version);
 		}else {
 			if(args.length==1)
 				parser.showHelp();
@@ -606,7 +609,7 @@ private static String findTargetModule(String name) {
 		return null;
 	}
 	
-	private static void generateBundles(File targetDir, File qtdir, String osArchName, URL androidBindingsURL, boolean isDebug, boolean isMinGWBuilt, QVersionNumber version) {
+	private static void generateBundles(File targetDir, File qtdir, String osArchName, URL androidBindingsURL, boolean isDebug, boolean isForceDebugInfo, boolean isMinGWBuilt, QVersionNumber version) {
 		File binDir = new File(qtdir, "bin");
 		File libDir = new File(qtdir, "lib");
 		File pluginsDir = new File(qtdir, "plugins");
@@ -614,7 +617,7 @@ private static void generateBundles(File targetDir, File qtdir, String osArchNam
 		File libexecDir = new File(qtdir, "libexec");
 		File resourcesDir = new File(qtdir, "resources");
 		File translationsDir = new File(qtdir, "translations");
-		generateBundles(targetDir, binDir, libDir, pluginsDir, qmlDir, libexecDir, resourcesDir, translationsDir, osArchName, androidBindingsURL, isDebug, isMinGWBuilt, version);
+		generateBundles(targetDir, binDir, libDir, pluginsDir, qmlDir, libexecDir, resourcesDir, translationsDir, osArchName, androidBindingsURL, isDebug, isForceDebugInfo, isMinGWBuilt, version);
 	}
 	
 	private static void generateBundles(File targetDir, 
@@ -627,7 +630,8 @@ private static void generateBundles(File targetDir,
 										File translationsDir,
 										String osArchName, 
 										URL androidBindingsURL, 
-										boolean isDebug, 
+										boolean isDebug,
+										boolean isForceDebugInfo, 
 										boolean isMinGWBuilt, 
 										QVersionNumber version) {
 		if(System.getProperty("os.name").toLowerCase().startsWith("windows")) {
@@ -1073,7 +1077,7 @@ public void close() throws IOException {
 											libraryElement.setAttribute("name", libraryFile.getParentFile().getName()+"/"+libName+".framework.dSYM");
 											doc.getDocumentElement().appendChild(libraryElement);									
 										}else if(debugSym.isDirectory()) {
-											copyDirectory(debugSym, jarFile, jarUtilFile, libraryFile.getParentFile().getName(), osArchName, isDebug, doc);
+											copyDirectory(debugSym, jarFile, jarUtilFile, libraryFile.getParentFile().getName(), osArchName, isDebug, isForceDebugInfo, doc);
 										}
 									}
 									String libFilePath = libraryFile.getName()+(version.majorVersion()==5 ? "/Versions/5" : "/Versions/A");
@@ -1085,10 +1089,10 @@ public void close() throws IOException {
 									doc.getDocumentElement().appendChild(libraryElement);
 									File macResourcesDir = new File(versionDir, "Resources");
 									if(macResourcesDir.isDirectory())
-										copyDirectory(macResourcesDir, jarFile, jarUtilFile, libraryFile.getParentFile().getName()+"/"+libFilePath, osArchName, isDebug, doc);
+										copyDirectory(macResourcesDir, jarFile, jarUtilFile, libraryFile.getParentFile().getName()+"/"+libFilePath, osArchName, isDebug, isForceDebugInfo, doc);
 									File helpersDir = new File(versionDir, "Helpers");
 									if(helpersDir.isDirectory())
-										copyDirectory(helpersDir, jarFile, jarUtilFile, libraryFile.getParentFile().getName()+"/"+libFilePath, osArchName, isDebug, doc);
+										copyDirectory(helpersDir, jarFile, jarUtilFile, libraryFile.getParentFile().getName()+"/"+libFilePath, osArchName, isDebug, isForceDebugInfo, doc);
 									Element symlinkElement = doc.createElement("symlink");
 									symlinkElement.setAttribute("name", libraryFile.getParentFile().getName()+"/"+libraryFile.getName()+"/Versions/Current");
 									symlinkElement.setAttribute("target", libraryFile.getParentFile().getName()+"/"+libFilePath);
@@ -1225,7 +1229,7 @@ public void close() throws IOException {
 																								String plugin = libResource.getParentFile().getName();
 																								File pluginFile = plugins.remove(plugin);
 																								if(pluginFile!=null) {
-																									copyDirectory(pluginFile, jarFile, jarUtilFile, "plugins", osArchName, isDebug, doc);
+																									copyDirectory(pluginFile, jarFile, jarUtilFile, "plugins", osArchName, isDebug, isForceDebugInfo, doc);
 																								}
 																							}
 																						}
@@ -1253,7 +1257,7 @@ public void close() throws IOException {
 								libraryElement.setAttribute("name", libraryFile.getParentFile().getName()+"/"+libraryFile.getName());
 								doc.getDocumentElement().appendChild(libraryElement);
 								
-								if(isDebug) {
+								if(isDebug || isForceDebugInfo) {
 									File pdb = new File(libraryFile.getParentFile(), libraryFile.getName().substring(0, libraryFile.getName().length()-3)+"pdb");
 									if(pdb.exists()) {
 										jarFile.putNextEntry(new ZipEntry(pdb.getParentFile().getName()+"/"+pdb.getName()));
@@ -1262,7 +1266,7 @@ public void close() throws IOException {
 										libraryElement = doc.createElement("file");
 										libraryElement.setAttribute("name", pdb.getParentFile().getName()+"/"+pdb.getName());
 										doc.getDocumentElement().appendChild(libraryElement);
-									}else {
+									}else if(isDebug){
 										pdb = new File(libraryFile.getParentFile(), libraryFile.getName()+".debug");
 										if(pdb.exists()) {
 											jarFile.putNextEntry(new ZipEntry(pdb.getParentFile().getName()+"/"+pdb.getName()));
@@ -1279,11 +1283,11 @@ public void close() throws IOException {
 							switch(libPair.getKey()) {
 							case "webenginecore": {
 									if(resourcesDir.isDirectory()) {
-										copyDirectory(resourcesDir, jarFile, jarUtilFile, "", osArchName, isDebug, doc);
+										copyDirectory(resourcesDir, jarFile, jarUtilFile, "", osArchName, isDebug, isForceDebugInfo, doc);
 									}
 									File qtwebengine_locales;
 									if(translationsDir.isDirectory() && (qtwebengine_locales = new File(translationsDir, "qtwebengine_locales")).isDirectory()) {
-										copyDirectory(qtwebengine_locales, jarFile, jarUtilFile, "translations/", osArchName, isDebug, doc);
+										copyDirectory(qtwebengine_locales, jarFile, jarUtilFile, "translations/", osArchName, isDebug, isForceDebugInfo, doc);
 									}
 									File exe = null;
 									String path = null;
@@ -1320,6 +1324,12 @@ public void close() throws IOException {
 																	if(new File(pluginFile.getParentFile(), libNoSuffix+"dd.pdb").exists())
 																		continue;
 																}else continue;
+															}else if(isForceDebugInfo) {
+																if(pluginFile.getName().endsWith("d.pdb")) {
+																	String libNoSuffix = pluginFile.getName().substring(0, pluginFile.getName().length()-5);
+																	if(new File(pluginFile.getParentFile(), libNoSuffix+".pdb").exists())
+																		continue;
+																}else continue;
 															}else {
 																continue;
 															}
@@ -1360,7 +1370,7 @@ public void close() throws IOException {
 													libraryElement.setAttribute("name", targetDirName + pluginFile.getName());
 													doc.getDocumentElement().appendChild(libraryElement);
 												}else if(pluginFile.getName().endsWith("dSYM") && isDebug) {
-													copyDirectory(pluginFile, jarFile, jarUtilFile, "plugins/"+subdir, osArchName, isDebug, doc);
+													copyDirectory(pluginFile, jarFile, jarUtilFile, "plugins/"+subdir, osArchName, isDebug, isForceDebugInfo, doc);
 												}
 											}
 										}
@@ -1381,6 +1391,12 @@ public void close() throws IOException {
 																if(new File(pluginFile.getParentFile(), libNoSuffix+"dd.pdb").exists())
 																	continue;
 															}else continue;
+														}else if(isForceDebugInfo) {
+															if(pluginFile.getName().endsWith("d.pdb")) {
+																String libNoSuffix = pluginFile.getName().substring(0, pluginFile.getName().length()-5);
+																if(new File(pluginFile.getParentFile(), libNoSuffix+".pdb").exists())
+																	continue;
+															}else continue;
 														}else {
 															continue;
 														}
@@ -1421,7 +1437,7 @@ public void close() throws IOException {
 												libraryElement.setAttribute("name", targetDirName + pluginFile.getName());
 												doc.getDocumentElement().appendChild(libraryElement);
 											}else if(pluginFile.getName().endsWith("dSYM") && isDebug) {
-												copyDirectory(pluginFile, jarFile, jarUtilFile, "plugins/"+subdir, osArchName, isDebug, doc);
+												copyDirectory(pluginFile, jarFile, jarUtilFile, "plugins/"+subdir, osArchName, isDebug, isForceDebugInfo, doc);
 											}
 										}
 									}
@@ -1436,28 +1452,28 @@ public void close() throws IOException {
 							for(String plugin : associatedPlugins) {
 								File pluginFile = plugins.remove(plugin);
 								if(pluginFile!=null && pluginFile.isDirectory()) {
-									copyDirectory(pluginFile, jarFile, jarUtilFile, "plugins", osArchName, isDebug, doc);
+									copyDirectory(pluginFile, jarFile, jarUtilFile, "plugins", osArchName, isDebug, isForceDebugInfo, doc);
 								}
 							}
 						}
 						if("pdfquick".equals(libPair.getKey())) {
-							copyQmlPaths(qmllibs, Collections.singletonList("QtQuick/Pdf"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+							copyQmlPaths(qmllibs, Collections.singletonList("QtQuick/Pdf"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 						}else if("waylandclient".equals(libPair.getKey())) {
-							copyQmlPaths(qmllibs, Collections.singletonList("QtWayland/Client"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+							copyQmlPaths(qmllibs, Collections.singletonList("QtWayland/Client"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 						}else if("waylandcompositor".equals(libPair.getKey())) {
-							copyQmlPaths(qmllibs, Collections.singletonList("QtWayland/Compositor"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+							copyQmlPaths(qmllibs, Collections.singletonList("QtWayland/Compositor"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 						}else if("virtualkeyboard".equals(libPair.getKey())) {
-							copyQmlPaths(qmllibs, Collections.singletonList("QtQuick/VirtualKeyboard"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+							copyQmlPaths(qmllibs, Collections.singletonList("QtQuick/VirtualKeyboard"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 						}else if("qml".equals(libPair.getKey())) {
 							copyQmlPaths(qmllibs, Arrays.asList("QtQuick/LocalStorage",
 									"QtQml",
 									"QtQuick/Window",
-									"QtQuick/tooling"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+									"QtQuick/tooling"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 							if(version.majorVersion()==5) {
-								copyQmlPaths(qmllibs, Collections.singletonList("QtQuick/LocalStorage"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+								copyQmlPaths(qmllibs, Collections.singletonList("QtQuick/LocalStorage"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 							}
 						}else if("qt3dcore".equals(libPair.getKey())) {
-							copyQmlPaths(qmllibs, Arrays.asList("QtQuick/Scene2D", "QtQuick/Scene3D"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+							copyQmlPaths(qmllibs, Arrays.asList("QtQuick/Scene2D", "QtQuick/Scene3D"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 						}else if("quick".equals(libPair.getKey())) {
 							copyQmlPaths(qmllibs, Arrays.asList(
 									"QtQuick/NativeStyle",
@@ -1470,7 +1486,7 @@ public void close() throws IOException {
 									"QtQuick/Controls",
 									"QtQuick/Dialogs",
 									"QtQuick/Layouts",
-									"QtQuick/Timeline"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+									"QtQuick/Timeline"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 							if(version.majorVersion()==5) {
 								copyQmlPaths(qmllibs, Arrays.asList("QtGraphicalEffects",
 										"QtQuick/Window.2",
@@ -1479,12 +1495,12 @@ public void close() throws IOException {
 										"QtQuick/Particles.2",
 										"QtQuick.2",
 										"QtQuick/Extras",
-										"QtQuick/PrivateWidgets"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+										"QtQuick/PrivateWidgets"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 							}
 						}else if("webenginequick".equals(libPair.getKey())) {
-							copyQmlPaths(qmllibs, Collections.singletonList("QtWebEngine"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+							copyQmlPaths(qmllibs, Collections.singletonList("QtWebEngine"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 						}else if("xmlpatterns".equals(libPair.getKey())) {
-							copyQmlPaths(qmllibs, Collections.singletonList("QtQuick/XmlListModel"), jarFile, jarUtilFile, osArchName, isDebug, doc);
+							copyQmlPaths(qmllibs, Collections.singletonList("QtQuick/XmlListModel"), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 						}
 						if(!"core".equals(libPair.getKey())) {
 							for(String key : new ArrayList<>(qmllibs.keySet())) {
@@ -1529,7 +1545,7 @@ else if(libPair.getKey().endsWith("quick")) {
 								if(libName.equals(libPair.getKey())) {
 									if(!libraries.containsKey(libPair.getKey()+"qml")
 											&& !libraries.containsKey(libPair.getKey()+"quick")) {
-										copyQmlPaths(qmllibs, Collections.singletonList(key), jarFile, jarUtilFile, osArchName, isDebug, doc);
+										copyQmlPaths(qmllibs, Collections.singletonList(key), jarFile, jarUtilFile, osArchName, isDebug, isForceDebugInfo, doc);
 									}
 								}
 							}
@@ -1615,7 +1631,7 @@ else if(libPair.getKey().endsWith("quick")) {
 						doc.getDocumentElement().setAttribute("system", osArchName);
 						doc.getDocumentElement().setAttribute("version", version.toString());
 						doc.getDocumentElement().setAttribute("configuration", isDebug ? "debug" : "release");
-						copyDirectory(libPair.getValue(), jarFile, jarUtilFile, "plugins", osArchName, isDebug, doc);
+						copyDirectory(libPair.getValue(), jarFile, jarUtilFile, "plugins", osArchName, isDebug, isForceDebugInfo, doc);
 						jarFile.putNextEntry(new ZipEntry(JarFile.MANIFEST_NAME));
 						manifest.write(jarFile);
 						jarFile.closeEntry();
@@ -1671,7 +1687,7 @@ else if(libPair.getKey().endsWith("quick")) {
 						path.add("qml");
 						path.addAll(Arrays.asList(libPair.getKey().split("/")));
 						path.remove(path.size()-1);
-						copyDirectory(libPair.getValue(), jarFile, jarUtilFile, String.join("/", path), osArchName, isDebug, doc);
+						copyDirectory(libPair.getValue(), jarFile, jarUtilFile, String.join("/", path), osArchName, isDebug, isForceDebugInfo, doc);
 						jarFile.putNextEntry(new ZipEntry(JarFile.MANIFEST_NAME));
 						manifest.write(jarFile);
 						jarFile.closeEntry();
@@ -1693,7 +1709,7 @@ else if(libPair.getKey().endsWith("quick")) {
 		}
 	}
 	
-	private static void copyQmlPaths(Map<String,File> qmllibs, Iterable<String> paths, JarOutputStream jarFile, JarOutputStream jarUtilFile, String osArchName, boolean isDebug, Document doc) throws IOException {
+	private static void copyQmlPaths(Map<String,File> qmllibs, Iterable<String> paths, JarOutputStream jarFile, JarOutputStream jarUtilFile, String osArchName, boolean isDebug, boolean isForceDebugInfo, Document doc) throws IOException {
 		for (String path : paths) {
 			File qmlLib = qmllibs.remove(path);
 			if(qmlLib!=null && qmlLib.isDirectory()) {
@@ -1701,12 +1717,12 @@ private static void copyQmlPaths(Map<String,File> qmllibs, Iterable<String> path
 				_path.add("qml");
 				_path.addAll(Arrays.asList(path.split("/")));
 				_path.remove(_path.size()-1);
-				copyDirectory(qmlLib, jarFile, jarUtilFile, String.join("/", _path), osArchName, isDebug, doc);
+				copyDirectory(qmlLib, jarFile, jarUtilFile, String.join("/", _path), osArchName, isDebug, isForceDebugInfo, doc);
 			}
 		}
 	}
 	
-	private static void copyDirectory(File dir, JarOutputStream jarFile, JarOutputStream jarUtilFile, String path, String osArchName, boolean isDebug, Document doc) throws IOException {
+	private static void copyDirectory(File dir, JarOutputStream jarFile, JarOutputStream jarUtilFile, String path, String osArchName, boolean isDebug, boolean isForceDebugInfo, Document doc) throws IOException {
 		if(osArchName.equals("macos") && !isDebug && dir.getName().endsWith(".dSYM"))
 			return;
 		if(path==null)
@@ -1741,7 +1757,7 @@ private static void copyDirectory(File dir, JarOutputStream jarFile, JarOutputSt
 					continue;
 				if(osArchName.equals("macos") && !isDebug && file.getName().endsWith(".dSYM"))
 					continue;
-				copyDirectory(file, jarFile, jarUtilFile, path + dir.getName() + "/", osArchName, isDebug, doc);
+				copyDirectory(file, jarFile, jarUtilFile, path + dir.getName() + "/", osArchName, isDebug, isForceDebugInfo, doc);
 			}else {
 				if(file.getName().contains("qsvg") || file.getName().contains("qtvirtualkeyboardplugin")) {
 					continue;
@@ -1755,7 +1771,13 @@ private static void copyDirectory(File dir, JarOutputStream jarFile, JarOutputSt
 						if(isDebug) {
 							if(file.getName().endsWith("d.pdb")) {
 								String libNoSuffix = file.getName().substring(0, file.getName().length()-5);
-								if(new File(dir, libNoSuffix+"dd.pdb").exists())
+								if(new File(file.getParentFile(), libNoSuffix+"dd.pdb").exists())
+									continue;
+							}else continue;
+						}else if(isForceDebugInfo) {
+							if(file.getName().endsWith("d.pdb")) {
+								String libNoSuffix = file.getName().substring(0, file.getName().length()-5);
+								if(new File(file.getParentFile(), libNoSuffix+".pdb").exists())
 									continue;
 							}else continue;
 						}else {
diff --git a/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/ContainerAccessGenerator.java b/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/ContainerAccessGenerator.java
index ca3628dd..1d0df57e 100644
--- a/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/ContainerAccessGenerator.java
+++ b/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/ContainerAccessGenerator.java
@@ -417,7 +417,7 @@ private static void generateFiles(File dir, String flatTypeName, StringBuilder i
 		       		for(String target : targets) {
 		       			targetArray.append(new QJsonValue(target));
 		       		}
-		       		metaData.setValue("Keys", new QJsonValue(targetArray));
+		       		metaData.insert("Keys", new QJsonValue(targetArray));
 		       		cborValue.setValue(/*QtPluginMetaDataKeys::MetaData*/ 4, new QCborValue(QCborMap.fromJsonObject(metaData)));
 		       		QByteArray cborData = cborValue.toCborValue().toCbor();
 		       		byte[] data = cborData.toByteArray();
diff --git a/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/containeraccess.pro b/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/containeraccess.pro
index 4af7d0ba..e2a10bed 100644
--- a/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/containeraccess.pro
+++ b/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/containeraccess.pro
@@ -49,6 +49,7 @@ INCLUDEPATH += $$QTJAMBIPATH
 DEPENDPATH += $$QTJAMBIPATH
 
 macx:{
+	CONFIG+=no_default_rpath no_qt_rpath
     INCLUDEPATH += $$JAVA_HOME_TARGET/include
     INCLUDEPATH += $$JAVA_HOME_TARGET/include/darwin
     # this option is necessary to properly compile on mountain lion because of std::string to char* casts
diff --git a/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/plugin.pro b/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/plugin.pro
index e6c45234..9abbe222 100644
--- a/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/plugin.pro
+++ b/src/java/modules/qtjambi.deployer/io/qt/qtjambi/deployer/plugin.pro
@@ -22,6 +22,7 @@ contains(QT_CONFIG, release):contains(QT_CONFIG, debug) {
 }
 
 macx:{
+	CONFIG+=no_default_rpath no_qt_rpath
     contains(QT_CONFIG, x86):CONFIG += x86
     contains(QT_CONFIG, ppc):CONFIG += ppc
     contains(QT_CONFIG, x86_64):CONFIG += x86_64
diff --git a/src/java/modules/qtjambi.uic/io/qt/uic/java/WriteInitialization.java b/src/java/modules/qtjambi.uic/io/qt/uic/java/WriteInitialization.java
index f8b4e6fb..0f44482c 100644
--- a/src/java/modules/qtjambi.uic/io/qt/uic/java/WriteInitialization.java
+++ b/src/java/modules/qtjambi.uic/io/qt/uic/java/WriteInitialization.java
@@ -1663,6 +1663,8 @@ private void writeProperties(String varName, String objectName, String className
 	        } // QTextStream
 
 	        String varNewName = varName;
+	        boolean needBracket = false;
+            QTextStream o = delayProperty ? m_delayedOut : autoTrOutput(p);
 
 	        switch (p.kind()) {
 	        case Bool: {
@@ -1798,15 +1800,27 @@ private void writeProperties(String varName, String objectName, String className
 		        }
 	            break;
 	        case Font:
+	        	o.append(m_indent).append('{').endl().flush();
+	        	m_indent = m_indent+"    ";
+	        	needBracket = true;
 	            propertyValue = writeFontProperties(p.elementFont());
 	            break;
 	        case IconSet:
+	        	o.append(m_indent).append('{').endl().flush();
+	        	m_indent = m_indent+"    ";
+	        	needBracket = true;
 	            propertyValue = writeIconProperties(p.elementIconSet());
 	            break;
 	        case Pixmap:
+	        	o.append(m_indent).append('{').endl().flush();
+	        	m_indent = m_indent+"    ";
+	        	needBracket = true;
 	            propertyValue = pixCall(p);
 	            break;
 	        case Palette: {
+	        	o.append(m_indent).append('{').endl().flush();
+	        	m_indent = m_indent+"    ";
+	        	needBracket = true;
 	            DomPalette pal = p.elementPalette();
 	            String paletteName = m_driver.unique("palette");
 	            m_output.append(m_indent).append("QPalette ").append(paletteName).append(" = new QPalette();").endl();
@@ -1951,6 +1965,9 @@ private void writeProperties(String varName, String objectName, String className
 	            break;
 	        }
 	        case Brush:
+	        	o.append(m_indent).append('{').endl().flush();
+	        	m_indent = m_indent+"    ";
+	        	needBracket = true;
 	            propertyValue = writeBrushInitialization(p.elementBrush());
 	            break;
 	        case Unknown:
@@ -1958,8 +1975,11 @@ private void writeProperties(String varName, String objectName, String className
 	        }
 
 	        if (!propertyValue.isEmpty()) {
-	            QTextStream o = delayProperty ? m_delayedOut : autoTrOutput(p);
 	            o.append(m_indent).append(varNewName).append(setFunction.toString()).append(propertyValue).append(");").endl().flush();
+	            if(needBracket) {
+	            	m_indent = m_indent.substring(4);
+	            	o.append(m_indent).append('}').endl().flush();
+	            }
 	        }
 	    }
 	    if (leftMargin != -1 || topMargin != -1 || rightMargin != -1 || bottomMargin != -1) {
diff --git a/src/java/modules/qtjambi.uic/io/qt/uic/kotlin/WriteClass.java b/src/java/modules/qtjambi.uic/io/qt/uic/kotlin/WriteClass.java
index 123d66e0..5b171be1 100644
--- a/src/java/modules/qtjambi.uic/io/qt/uic/kotlin/WriteClass.java
+++ b/src/java/modules/qtjambi.uic/io/qt/uic/kotlin/WriteClass.java
@@ -39,6 +39,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import io.qt.core.QObject;
 import io.qt.core.QTextStream;
 import io.qt.uic.CustomWidgetsInfo;
 import io.qt.uic.Option;
@@ -193,6 +194,9 @@ else if(customWidget.hasElementHeader()) {
 							m_output.append(parameters[i].getName());
 							m_output.append(": ");
 							m_output.append(typeName);
+							if(QObject.class.isAssignableFrom(parameters[i].getType())) {
+								m_output.append("?");
+							}
 						}
 						m_output.append(") : super(");
 						for (int i = 0; i < parameters.length; i++) {
@@ -218,9 +222,9 @@ else if(customWidget.hasElementHeader()) {
 		}
 		
 		m_output.endl()
-				.append(m_option.indent).append("protected override fun changeEvent(e: io.qt.core.QEvent) {").endl()
+				.append(m_option.indent).append("protected override fun changeEvent(e: io.qt.core.QEvent?) {").endl()
 				.append(m_option.indent).append(m_option.indent).append("super.changeEvent(e)").endl()
-				.append(m_option.indent).append(m_option.indent).append("when (e.type()) {").endl()
+				.append(m_option.indent).append(m_option.indent).append("when (e?.type()) {").endl()
 				.append(m_option.indent).append(m_option.indent).append("io.qt.core.QEvent.Type.LanguageChange -> ui.retranslateUi(this)").endl()
 				.append(m_option.indent).append(m_option.indent).append("else -> {}").endl()
 				.append(m_option.indent).append(m_option.indent).append("}").endl()
diff --git a/src/java/modules/qtjambi.uic/io/qt/uic/kotlin/WriteInitialization.java b/src/java/modules/qtjambi.uic/io/qt/uic/kotlin/WriteInitialization.java
index 95437298..d5741fe6 100644
--- a/src/java/modules/qtjambi.uic/io/qt/uic/kotlin/WriteInitialization.java
+++ b/src/java/modules/qtjambi.uic/io/qt/uic/kotlin/WriteInitialization.java
@@ -89,6 +89,7 @@
 import io.qt.uic.ui4.DomLayoutDefault;
 import io.qt.uic.ui4.DomLayoutFunction;
 import io.qt.uic.ui4.DomLayoutItem;
+import io.qt.uic.ui4.DomLayoutItem.Kind;
 import io.qt.uic.ui4.DomLocale;
 import io.qt.uic.ui4.DomPalette;
 import io.qt.uic.ui4.DomPoint;
@@ -328,7 +329,7 @@ public String writeSetupUi(String parent, EmptyItemPolicy emptyItemPolicy) {
 
 		    String uniqueName = m_driver.unique("__" + m_itemClassName.toLowerCase());
 		    m_setupUiStream.append(m_indent);
-            m_setupUiStream.append("var ");
+            m_setupUiStream.append("val ");
 		    m_setupUiStream.append(uniqueName);
             m_setupUiStream.append(" = ");
             m_setupUiStream.append(m_itemClassName);
@@ -356,16 +357,16 @@ public void writeRetranslateUi(String parentPath) {
 
 		    String uniqueName = m_driver.unique("___" + m_itemClassName.toLowerCase());
 		    m_retranslateUiStream.append(m_indent);
-	        m_retranslateUiStream.append(m_itemClassName).append(" ");
+	        m_retranslateUiStream.append("val ");
 		    m_retranslateUiStream.append(uniqueName).append(" = ").append(parentPath).endl();
 
 		    for(QPair<String, String> pair : m_retranslateUiData.setters) {
-		        m_retranslateUiStream.append(m_indent).append(uniqueName).append(pair.second).endl();
+		        m_retranslateUiStream.append(m_indent).append(uniqueName).append("?").append(pair.second).endl();
 		    }
 
 		    for (int i = 0; i < m_children.size(); i++) {
 		        StringBuilder method = new StringBuilder();
-		        method.append(uniqueName).append(".child(").append(i).append(')');
+		        method.append(uniqueName).append("?").append(".child(").append(i).append(')');
 		        m_children.get(i).writeRetranslateUi(method.toString());
 		    }
 		}
@@ -467,7 +468,10 @@ void acceptLayoutFunction(DomLayoutFunction node) {
         }
         
         private static void writeSetter(String indent, String varName, String setter, String v, QTextStream str) {
-        	str.append(indent).append(varName).append('.').append(setter)
+        	str.append(indent).append(varName);
+        	if(varName.startsWith("this."))
+        		str.append('?');
+        	str.append('.').append(setter)
         		.append('(').append(v).append(")").endl();
         }
         
@@ -607,7 +611,10 @@ public void acceptUI(DomUI node){
 	            continue;
 	        }
 
-	        m_output.append(m_indent).append(b.labelVarName).append(".setBuddy(").append(buddyVarName).append(")").endl();
+	        m_output.append(m_indent).append(b.labelVarName);
+        	if(b.labelVarName.startsWith("this."))
+        		m_output.append('?');
+        	m_output.append(".setBuddy(").append(buddyVarName).append(")").endl();
 	    }
 
 	    if (node.elementTabStops()!=null)
@@ -657,10 +664,13 @@ private void addWizardPage(String pageVarName, DomWidget page, String parentWidg
 	            }
 	        }
 	    }
+	    m_output.append(m_indent).append(parentWidget);
+    	if(parentWidget.startsWith("this."))
+    		m_output.append('?');
 	    if (id.isEmpty()) {
-	        m_output.append(m_indent).append(parentWidget).append(".addPage(").append(pageVarName).append(")").endl();
+	    	m_output.append(".addPage(").append(pageVarName).append(")").endl();
 	    } else {
-	        m_output.append(m_indent).append(parentWidget).append(".setPage(").append(id).append(", ").append(pageVarName).append(")").endl();
+	    	m_output.append(".setPage(").append(id).append(", ").append(pageVarName).append(")").endl();
 	    }
 	}
 	
@@ -684,6 +694,7 @@ public void acceptWidget(DomWidget node){
 		m_layoutMarginType = m_widgetChain.count() == 1 ? Enum.TopLevelMargin : Enum.ChildMargin;
 	    String className = node.attributeClass();
 	    String varName = m_driver.findOrInsertWidget(node);
+	    final String qm = varName!=null && varName.startsWith("this.") ? "?" : "";
 	    String objectName = node.attributeName();
 
 	    String parentWidget = "", parentClass = "";
@@ -700,10 +711,11 @@ public void acceptWidget(DomWidget node){
 	    CustomWidgetsInfo cwi = m_uic.customWidgetsInfo();
 
 	    if (m_widgetChain.size() != 1) {
-	        m_output.append(m_indent).append(varName).append(" = ").append(cwi.realClassName(className)).append('(').append(parentWidget).append(")").endl();
+    		m_output.append(m_indent).append(varName).append(" = ").append(cwi.realClassName(className)).append('(').append(parentWidget).append(")").endl();
 	    }
 
 	    parentWidget = savedParentWidget;
+	    final String pqm = parentWidget!=null && parentWidget.startsWith("this.") ? "?" : "";
 
 
 	    if (cwi._extends(className, "QComboBox")) {
@@ -754,28 +766,28 @@ public void acceptWidget(DomWidget node){
 
 	    if (cwi._extends(parentClass, "QMainWindow")) {
 	        if (cwi._extends(className, "QMenuBar")) {
-	            m_output.append(m_indent).append(parentWidget).append("?.setMenuBar(").append(varName).append(")").endl();
+	            m_output.append(m_indent).append(parentWidget).append(pqm).append(".setMenuBar(").append(varName).append(")").endl();
 	        } else if (cwi._extends(className, "QToolBar")) {
-	            m_output.append(m_indent).append(parentWidget).append("?.addToolBar("
+	            m_output.append(m_indent).append(parentWidget).append(pqm).append(".addToolBar("
 	               ).append(toolBarAreaStringFromDOMAttributes(attributes).replace("::", ".")).append(varName
 	               ).append(")").endl();
 
 	            DomProperty pbreak = attributes.get("toolBarBreak");
                 if (pbreak!=null && Boolean.parseBoolean(pbreak.elementBool())) {
-                    m_output.append(m_indent).append(parentWidget).append("?.insertToolBarBreak(").append( varName).append(")").endl();
+                    m_output.append(m_indent).append(parentWidget).append(pqm).append(".insertToolBarBreak(").append(varName).append(")").endl();
                 }
 
 	        } else if (cwi._extends(className, "QDockWidget")) {
-	            m_output.append(m_indent).append(parentWidget).append("?.addDockWidget(");
+	            m_output.append(m_indent).append(parentWidget).append(pqm).append(".addDockWidget(");
 	            DomProperty pstyle = attributes.get("dockWidgetArea");
 	            if (pstyle!=null) {
 	                m_output.append("Qt.DockWidgetArea.").append(Qt.DockWidgetArea.resolve(pstyle.elementNumber()).name()).append(", ");
 	            }
 	            m_output.append(varName).append(")").endl();
 	        } else if (m_uic.customWidgetsInfo()._extends(className, "QStatusBar")) {
-	            m_output.append(m_indent).append(parentWidget).append("?.setStatusBar(").append(varName).append(")").endl();
+	            m_output.append(m_indent).append(parentWidget).append(pqm).append(".setStatusBar(").append(varName).append(")").endl();
 	        } else {
-	                m_output.append(m_indent).append(parentWidget).append("?.setCentralWidget(").append(varName).append(")").endl();
+	                m_output.append(m_indent).append(parentWidget).append(pqm).append(".setCentralWidget(").append(varName).append(")").endl();
 	        }
 	    }
 
@@ -784,7 +796,7 @@ public void acceptWidget(DomWidget node){
 	    if (addPageMethod.isEmpty())
 	        addPageMethod = cwi.simpleContainerAddPageMethod(parentClass);
 	    if (!addPageMethod.isEmpty()) {
-	        m_output.append(m_indent).append(parentWidget).append('.').append(addPageMethod).append('(').append(varName).append(")").endl();
+	        m_output.append(m_indent).append(parentWidget).append(pqm).append(".").append(addPageMethod).append('(').append(varName).append(")").endl();
 	    } else if (m_uic.customWidgetsInfo()._extends(parentClass, "QWizard")) {
 	        addWizardPage(varName, node, parentWidget);
 	    } else if (m_uic.customWidgetsInfo()._extends(parentClass, "QToolBox")) {
@@ -794,21 +806,19 @@ public void acceptWidget(DomWidget node){
 	        DomProperty picon = attributes.get("icon");
 	        if (picon!=null)
 	            icon = ", " + iconCall(picon); // Side effect: Writes icon definition
-	        m_output.append(m_indent).append(parentWidget).append("?.addItem("
+	        m_output.append(m_indent).append(parentWidget).append(pqm).append(".addItem("
 	           ).append(varName).append(icon).append(", ").append(noTrCall(plabelString, pageDefaultString)
 	           ).append(")").endl();
 
-	        autoTrOutput(plabelString, pageDefaultString).append(m_indent).append(parentWidget
-	           ).append("?.setItemText(").append(parentWidget
-	           ).append("?.indexOf(" ).append(varName).append("), "
-	           ).append(autoTrCall(plabelString, pageDefaultString)).append(")").flush();
+	        autoTrOutput(plabelString, pageDefaultString).append(m_indent).append(parentWidget).append(pqm)
+	        	.append(".setItemText(").append(parentWidget).append(pqm).append(".indexOf(" ).append(varName).append(")").append(pqm.isEmpty() ? "" : " as Int")
+	        	.append(", ").append(autoTrCall(plabelString, pageDefaultString)).append(")").endl().flush();
 
 	        DomProperty ptoolTip = attributes.get("toolTip");
 	        if (ptoolTip!=null) {
 	            autoTrOutput(ptoolTip.elementString())
-	               .append(m_indent).append(parentWidget).append("?.setItemToolTip(").append(parentWidget
-	               ).append("?.indexOf(").append(varName).append("), "
-	               ).append(autoTrCall(ptoolTip.elementString())).append(")").flush();
+	               .append(m_indent).append(parentWidget).append(pqm).append(".setItemToolTip(").append(parentWidget).append(pqm).append(".indexOf(").append(varName)
+	               .append(")").append(pqm.isEmpty() ? "" : " as Int").append(", ").append(autoTrCall(ptoolTip.elementString())).append(")").flush();
 	        }
 	    } else if (m_uic.customWidgetsInfo()._extends(parentClass, "QTabWidget")) {
 	        DomProperty ptitle = attributes.get("title");
@@ -817,27 +827,24 @@ public void acceptWidget(DomWidget node){
 	        DomProperty picon = attributes.get("icon");
 	        if (picon!=null)
 	            icon = ", " + iconCall(picon); // Side effect: Writes icon definition
-	        m_output.append(m_indent).append(parentWidget).append("?.addTab("
-	           ).append(varName).append(icon).append(", \"\")").endl();
+	        m_output.append(m_indent).append(parentWidget).append(pqm).append(".addTab(").append(varName).append(icon).append(", \"\")").endl();
 
-	        autoTrOutput(ptitleString, pageDefaultString).append(m_indent).append(parentWidget
-	           ).append("?.setTabText(").append(parentWidget
-	           ).append("?.indexOf(").append(varName).append("), "
-	           ).append(autoTrCall(ptitleString, pageDefaultString)).append(")").flush();
+	        autoTrOutput(ptitleString, pageDefaultString).append(m_indent)
+	        .append(parentWidget).append(pqm).append(".setTabText(").append(parentWidget).append(pqm).append(".indexOf(").append(varName)
+	        .append(")").append(pqm.isEmpty() ? "" : " as Int").append(", ").append(autoTrCall(ptitleString, pageDefaultString)).append(")").endl().flush();
 
 	        DomProperty ptoolTip = attributes.get("toolTip");
 	        if (ptoolTip!=null) {
 	            autoTrOutput(ptoolTip.elementString())
-	               .append(m_indent).append(parentWidget).append("?.setTabToolTip("
-	               ).append(parentWidget).append("?.indexOf(").append(varName
-	               ).append("), ").append(autoTrCall(ptoolTip.elementString())).append(")").flush();
+	               .append(m_indent).append(parentWidget).append(pqm).append(".setTabToolTip(")
+	               .append(parentWidget).append(pqm).append(".indexOf(").append(varName).append(")").append(pqm.isEmpty() ? "" : " as Int").append(", ").append(autoTrCall(ptoolTip.elementString())).append(")").endl().flush();
 	        }
 	        DomProperty pwhatsThis = attributes.get("whatsThis");
 	        if (pwhatsThis!=null) {
 	            autoTrOutput(pwhatsThis.elementString())
-	               .append(m_indent).append(parentWidget).append("?.setTabWhatsThis("
-	               ).append(parentWidget).append("?.indexOf(").append(varName
-	               ).append("), ").append(autoTrCall(pwhatsThis.elementString())).append(")").flush();
+	               .append(m_indent).append(parentWidget).append(pqm)
+	               .append(".setTabWhatsThis(").append(parentWidget).append(pqm).append(".indexOf(")
+	               .append(varName).append(")").append(pqm.isEmpty() ? "" : " as Int").append(", ").append(autoTrCall(pwhatsThis.elementString())).append(")").endl().flush();
 	        }
 	    }
 
@@ -851,7 +858,7 @@ public void acceptWidget(DomWidget node){
 	                headerProperties.add(fakeProperty);
 	            }
 	        }
-	        writeProperties(varName + "?.header()", objectName + "_headerView",
+	        writeProperties(varName + qm + ".header()", objectName + "_headerView",
 	                        "QHeaderView", headerProperties,
 	                        Flag.WritePropertyIgnoreObjectName.value());
 
@@ -867,7 +874,7 @@ public void acceptWidget(DomWidget node){
 	                    headerProperties.add(fakeProperty);
 	                }
 	            }
-	            String headerVar = varName + "?." + headerPrefix + "()";
+	            String headerVar = varName + qm + "." + headerPrefix + "()";
 	            writeProperties(headerVar, objectName+"_"+headerPrefix, "QHeaderView",
 	                            headerProperties, Flag.WritePropertyIgnoreObjectName.value());
 	        }
@@ -884,7 +891,7 @@ public void acceptWidget(DomWidget node){
 	                    m_option.messagePrefix(),
 	                    name));
 	        } else {
-	            m_output.append(m_indent).append(_varName).append("?.raise_()").endl();
+	            m_output.append(m_indent).append(_varName).append(qm).append(".raise_()").endl();
 	        }
 	    }
 	}
@@ -1084,7 +1091,7 @@ void writeSpacerItem(DomSpacer node, QTextStream output) {
     public void acceptSpacer(DomSpacer node){
 	    m_output.append(m_indent).append(m_driver.findOrInsertSpacer(node)).append(" = ");
 	    writeSpacerItem(node, m_output);
-	    m_output.append(';').endl();
+	    m_output.endl();
 	}
 	
 	@Override
@@ -1099,8 +1106,10 @@ public void acceptLayoutItem(DomLayoutItem node){
 	    String layoutName = m_driver.findOrInsertLayout(layout);
 	    String itemName = m_driver.findOrInsertLayoutItem(node);
 
-	    m_output.endl().append(m_indent).append(layoutName).append("?.").append(layoutAddMethod(node.kind(), layout.attributeClass())).append('(');
-
+	    m_output.endl().append(m_indent).append(layoutName);
+	    if(layoutName.startsWith("this."))
+	    	m_output.append("?");
+	    m_output.append(".").append(layoutAddMethod(node.kind(), layout.attributeClass())).append('(');
 	    if ("QGridLayout".equals(layout.attributeClass())) {
 	        int row = node.attributeRow();
 	        int col = node.attributeColumn();
@@ -1120,6 +1129,9 @@ public void acceptLayoutItem(DomLayoutItem node){
 	        if (layout.attributeClass().contains("Box") && !node.attributeAlignment().isEmpty())
 	            m_output.append(", 0, ").append(node.attributeAlignment().replace("::", "."));
 	    }
+	    if (node.kind()==Kind.Spacer) {
+	    	m_output.append(" as QSpacerItem");
+	    }
 	    m_output.append(")").endl();
 	}
 
@@ -1167,17 +1179,18 @@ public void acceptActionRef(DomActionRef node){
 	        return;
 	    }
 
-	    String varName = m_driver.findOrInsertWidget(m_widgetChain.top());
+	    final String varName = m_driver.findOrInsertWidget(m_widgetChain.top());
+	    final String qm = varName.startsWith("this.") ? "?" : "";
 
 	    if (m_widgetChain.top()!=null && "separator".equals(actionName)) {
 	        // separator is always reserved!
-	        m_actionOut.append(m_indent).append(varName).append("?.addSeparator()").endl();
+	        m_actionOut.append(m_indent).append(varName).append(qm).append(".addSeparator()").endl();
 	        return;
 	    }
 
 	    DomWidget domWidget = m_driver.widgetByName(actionName);
 	    if (domWidget!=null && m_uic.isMenu(domWidget.attributeClass())) {
-	        m_actionOut.append(m_indent).append(varName).append("?.addAction(").append(m_driver.findOrInsertWidget(domWidget)).append("?.menuAction())").endl();
+	        m_actionOut.append(m_indent).append(varName).append(qm).append(".addAction(").append(m_driver.findOrInsertWidget(domWidget)).append("?.menuAction())").endl();
 	        return;
 	    }
 
@@ -1187,7 +1200,7 @@ public void acceptActionRef(DomActionRef node){
 	        return;
 	    }
 
-	    m_actionOut.append(m_indent).append(varName).append("?.addAction(").append(m_driver.findOrInsertAction(domAction)).append(")").endl();
+	    m_actionOut.append(m_indent).append(varName).append(qm).append(".addAction(").append(m_driver.findOrInsertAction(domAction)).append(")").endl();
 	}
 
 	//
@@ -1346,7 +1359,7 @@ private String trCall(String str, String commentHint, String id){
 
 	    boolean idBasedTranslations = m_driver.useIdBasedTranslations();
 	    if (m_option.translateFunction.isEmpty()) {
-        	result.append("io.qt.core.QCoreApplication.translate("
+        	result.append("QCoreApplication.translate("
                ).append('"').append(m_generatedClass.replace("::", ".")).append("\", ");
 	    } else {
 	    	result.append(m_option.translateFunction).append('(');
@@ -1538,13 +1551,14 @@ private static boolean checkProperty(CustomWidgetsInfo customWidgetsInfo,
 	
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private void writeProperties(String varName, String objectName, String className, List<DomProperty> lst, int flags) {
+		final String qm = varName.startsWith("this.") ? "?" : "";
 	    boolean isTopLevel = m_widgetChain.count() == 1;
 
 	    if (m_uic.customWidgetsInfo()._extends(className, "QAxWidget")) {
 	        Map<String, DomProperty> properties = propertyMap(lst);
 	        DomProperty p = properties.get("control");
 	        if (p!=null) {
-	            m_output.append(m_indent).append(varName).append("?.setControl("
+	            m_output.append(m_indent).append(varName).append(qm).append(".setControl("
 	               ).append(formatString(Utils.toString(p.elementString()))
 	               ).append(")").endl();
 	        }
@@ -1553,14 +1567,14 @@ private void writeProperties(String varName, String objectName, String className
 	    String indent = "";
 	    if (m_widgetChain.top()==null) {
 	        indent = m_option.indent;
-            m_output.append(m_indent).append("if (").append(varName).append("?.objectName().isEmpty())\n");
+            m_output.append(m_indent).append("if (").append(varName).append(qm).append(".objectName.isEmpty())\n");
 	    }
 	    if (0==(flags & Flag.WritePropertyIgnoreObjectName.value())) {
 	        if (objectName.startsWith("this."))
 	        	objectName = objectName.substring(5);
 	        m_output.append(m_indent).append(indent
-	           ).append(varName).append("?.setObjectName("
-	           ).append(formatString(objectName)).append(")").endl();
+	           ).append(varName).append(qm).append(".objectName = "
+	           ).append(formatString(objectName)).endl();
 	    }
 
 	    int leftMargin, topMargin, rightMargin, bottomMargin;
@@ -1577,23 +1591,23 @@ private void writeProperties(String varName, String objectName, String className
 	        // special case for the property `geometry': Do not use position
 	        if (isTopLevel && "geometry".equals(propertyName)  && p.elementRect()!=null) {
 	            DomRect r = p.elementRect();
-	            m_output.append(m_indent).append(varName).append("?.resize("
+	            m_output.append(m_indent).append(varName).append(qm).append(".resize("
 	               ).append(r.elementWidth()).append(", ").append(r.elementHeight()).append(")").endl();
 	            continue;
 	        }
 	        if (propertyName.equals("currentRow") // QListWidget::currentRow
 	                && m_uic.customWidgetsInfo()._extends(className, "QListWidget")) {
-	            m_delayedOut.append(m_indent).append(varName).append("?.setCurrentRow(").append(p.elementNumber()).append(")").endl();
+	            m_delayedOut.append(m_indent).append(varName).append(qm).append(".setCurrentRow(").append(p.elementNumber()).append(")").endl();
 	            continue;
 	        }
 	        if (propertyName.equals("currentIndex") // set currentIndex later
 	            && (m_uic.customWidgetsInfo().extendsOneOf(className, currentIndexWidgets))) {
-	            m_delayedOut.append(m_indent).append(varName).append("?.setCurrentIndex(").append(p.elementNumber()).append(")").endl();
+	            m_delayedOut.append(m_indent).append(varName).append(qm).append(".setCurrentIndex(").append(p.elementNumber()).append(")").endl();
 	            continue;
 	        }
 	        if (propertyName.equals("tabSpacing")
 	            && m_uic.customWidgetsInfo()._extends(className, "QToolBox")) {
-	            m_delayedOut.append(m_indent).append(varName).append("?.layout().setSpacing(").append(p.elementNumber()).append(")").endl();
+	            m_delayedOut.append(m_indent).append(varName).append(qm).append(".layout().setSpacing(").append(p.elementNumber()).append(")").endl();
 	            continue;
 	        }
 	        if (propertyName.equals("control") // ActiveQt support
@@ -1620,10 +1634,10 @@ private void writeProperties(String varName, String objectName, String className
 	            if (p.elementEnum().equals("Qt.Orientation.Vertical"))
 	                shape = "QFrame.Shape.VLine";
 
-	            m_output.append(m_indent).append(varName).append("?.setFrameShape(").append(shape).append(")").endl();
+	            m_output.append(m_indent).append(varName).append(qm).append(".frameShape = ").append(shape).endl();
 	            // QFrame Default is 'Plain'. Make the line 'Sunken' unless otherwise specified
 	            if (!frameShadowEncountered) {
-	                m_output.append(m_indent).append(varName).append("?.setFrameShadow(QFrame.Shadow.Sunken)").endl();
+	                m_output.append(m_indent).append(varName).append(qm).append(".frameShadow = QFrame.Shadow.Sunken").endl();
 	            }
 	            continue;
 	        } else if ((flags & Flag.WritePropertyIgnoreMargin.value())!=0  && propertyName.equals("margin")) {
@@ -1655,16 +1669,20 @@ private void writeProperties(String varName, String objectName, String className
 	            stdset = p.attributeStdset()!=0;
 
         	StringBuilder setFunction = new StringBuilder();
+        	boolean needPar = false;
 	        {
 	            if (stdset) {
-	            	setFunction.append("?.set").append(Character.toUpperCase(propertyName.charAt(0))
-	                   ).append(propertyName.substring(1)).append('(');
+	            	setFunction.append(".").append(propertyName).append(" = ");
 	            } else {
-	            	setFunction.append("?.setProperty(\"").append(propertyName).append("\", ");
+	            	needPar = true;
+	            	setFunction.append(".setProperty(\"").append(propertyName).append("\", ");
 	            }
 	        } // QTextStream
 
 	        String varNewName = varName;
+	        
+	        boolean needBracket = false;
+	        QTextStream o = delayProperty ? m_delayedOut : autoTrOutput(p);
 
 	        switch (p.kind()) {
 	        case Bool: {
@@ -1693,7 +1711,7 @@ private void writeProperties(String varName, String objectName, String className
 	            break;
 	        case CursorShape:
 	            if (p.hasAttributeStdset() && p.attributeStdset()==0)
-	                varNewName += "?.viewport()";
+	                varNewName += ".viewport()";
 	            propertyValue = String.format("QCursor(Qt.CursorShape.%1$s)", p.elementCursorShape());
 	            break;
 	        case Enum:
@@ -1800,18 +1818,30 @@ private void writeProperties(String varName, String objectName, String className
 		        }
 	            break;
 	        case Font:
+//	        	o.append(m_indent).append('{').endl().flush();
+//	        	m_indent = m_indent+"    ";
+//	        	needBracket = true;
 	            propertyValue = writeFontProperties(p.elementFont());
 	            break;
 	        case IconSet:
+//	        	o.append(m_indent).append('{').endl().flush();
+//	        	m_indent = m_indent+"    ";
+//	        	needBracket = true;
 	            propertyValue = writeIconProperties(p.elementIconSet());
 	            break;
 	        case Pixmap:
+//	        	o.append(m_indent).append('{').endl().flush();
+//	        	m_indent = m_indent+"    ";
+//	        	needBracket = true;
 	            propertyValue = pixCall(p);
 	            break;
 	        case Palette: {
+//	        	o.append(m_indent).append('{').endl().flush();
+//	        	m_indent = m_indent+"    ";
+//	        	needBracket = true;
 	            DomPalette pal = p.elementPalette();
 	            String paletteName = m_driver.unique("palette");
-	            m_output.append(m_indent).append("var ").append(paletteName).append(" = QPalette()").endl();
+	            m_output.append(m_indent).append("val ").append(paletteName).append(" = QPalette()").endl();
 	            writeColorGroup(pal.elementActive(), "QPalette.ColorGroup.Active", paletteName);
 	            writeColorGroup(pal.elementInactive(), "QPalette.ColorGroup.Inactive", paletteName);
 	            writeColorGroup(pal.elementDisabled(), "QPalette.ColorGroup.Disabled", paletteName);
@@ -1850,8 +1880,8 @@ private void writeProperties(String varName, String objectName, String className
 	        }
 	        case SizePolicy: {
 	            String spName = writeSizePolicy( p.elementSizePolicy());
-	            m_output.append(m_indent).append(spName).append("?.setHeightForWidth("
-	               ).append(varName).append("?.sizePolicy().hasHeightForWidth())").endl();
+	            m_output.append(m_indent).append(spName).append(".setHeightForWidth("
+	               ).append(varName).append(qm).append(".sizePolicy").append(qm).append(".hasHeightForWidth()").append(qm.isEmpty() ? "" : "==true").append(")").endl();
 
 	            propertyValue = spName;
 	            break;
@@ -1953,6 +1983,9 @@ private void writeProperties(String varName, String objectName, String className
 	            break;
 	        }
 	        case Brush:
+//	        	o.append(m_indent).append('{').endl().flush();
+//	        	m_indent = m_indent+"    ";
+//	        	needBracket = true;
 	            propertyValue = writeBrushInitialization(p.elementBrush());
 	            break;
 	        case Unknown:
@@ -1960,12 +1993,18 @@ private void writeProperties(String varName, String objectName, String className
 	        }
 
 	        if (!propertyValue.isEmpty()) {
-	            QTextStream o = delayProperty ? m_delayedOut : autoTrOutput(p);
-	            o.append(m_indent).append(varNewName).append(setFunction.toString()).append(propertyValue).append(")").endl().flush();
+	            o.append(m_indent).append(varNewName).append(qm).append(setFunction.toString()).append(propertyValue);
+	            if(needPar)
+	            	o.append(")");
+	            o.endl().flush();
+	            if(needBracket) {
+	            	m_indent = m_indent.substring(4);
+	            	o.append(m_indent).append('}').endl().flush();
+	            }
 	        }
 	    }
 	    if (leftMargin != -1 || topMargin != -1 || rightMargin != -1 || bottomMargin != -1) {
-	        m_output.append(m_indent).append(varName).append("?.setContentsMargins("
+	        m_output.append(m_indent).append(varName).append(qm).append(".setContentsMargins("
 	           ).append(leftMargin).append(", ").append(topMargin).append(", "
 	           ).append(rightMargin).append(", ").append(bottomMargin).append(")").endl();
 	    }
@@ -2013,14 +2052,14 @@ private void writeBrush(DomBrush brush, String brushName) {
 	        String gradientName = m_driver.unique("gradient");
 	        if (gradientType.equals("LinearGradient")) {
 	            m_output.append(m_indent
-        		   ).append("var ").append(gradientName).append(" = QLinearGradient("
+        		   ).append("val ").append(gradientName).append(" = QLinearGradient("
 	               ).append(gradient.attributeStartX()
 	               ).append(", ").append(gradient.attributeStartY()
 	               ).append(", ").append(gradient.attributeEndX()
 	               ).append(", ").append(gradient.attributeEndY()).append(")").endl();
 	        } else if (gradientType.equals("RadialGradient")) {
 	            m_output.append(m_indent
-	            	   ).append("var ").append(gradientName).append(" = QRadialGradient("
+	            	   ).append("val ").append(gradientName).append(" = QRadialGradient("
 		               ).append(gradient.attributeCentralX()
 		               ).append(", ").append(gradient.attributeCentralY()
 		               ).append(", ").append(gradient.attributeRadius()
@@ -2028,7 +2067,7 @@ private void writeBrush(DomBrush brush, String brushName) {
 		               ).append(", ").append(gradient.attributeFocalY()).append(")").endl();
 	        } else if (gradientType.equals("ConicalGradient")) {
 	            m_output.append(m_indent
-	            		).append("var ").append(gradientName).append(" = QConicalGradient("
+	            		).append("val ").append(gradientName).append(" = QConicalGradient("
 	               ).append(gradient.attributeCentralX()
 	               ).append(", ").append(gradient.attributeCentralY()
 	               ).append(", ").append(gradient.attributeAngle()).append(")").endl();
@@ -2049,17 +2088,17 @@ private void writeBrush(DomBrush brush, String brushName) {
 	               ).append(stop.attributePosition()).append(", "
 	               ).append(domColor2QString(color)).append(")").endl();
 	        }
-	        m_output.append(m_indent).append("var ").append(brushName)
+	        m_output.append(m_indent).append("val ").append(brushName)
 	        		.append(" = QBrush(").append(gradientName).append(")").endl();
 	    } else if (style.equals("TexturePattern")) {
 	        DomProperty property = brush.elementTexture();
 	        String iconValue = iconCall(property);
 
-	        m_output.append(m_indent).append("var ").append(brushName)
+	        m_output.append(m_indent).append("val ").append(brushName)
 	        		.append(" = QBrush(").append(iconValue).append(")").endl();
 	    } else {
 	        DomColor color = brush.elementColor();
-	        m_output.append(m_indent).append("var ").append(brushName)
+	        m_output.append(m_indent).append("val ").append(brushName)
 	        		.append(" = QBrush(").append(domColor2QString(color)).append(")").endl();
 
 	        m_output.append(m_indent).append(brushName)
@@ -2074,7 +2113,7 @@ private void addInitializer(Item item, String name, int column, String value) {
 	private void addInitializer(Item item, String name, int column, String value, String directive, boolean translatable) {
 	    if (!value.isEmpty()) {
 	        StringBuilder setter = new StringBuilder();
-	        setter.append("?.set").append(Character.toUpperCase(name.charAt(0))).append(name.substring(1)).append('(');
+	        setter.append(".set").append(Character.toUpperCase(name.charAt(0))).append(name.substring(1)).append('(');
 	        if (column >= 0)
 	            setter.append(column).append(", ");
 	        setter.append(value).append(")");
@@ -2170,7 +2209,8 @@ private void initializeMenu(DomWidget w, String parentWidget) {
 	}
 	
 	private void initializeComboBox(DomWidget w) {
-	    String varName = m_driver.findOrInsertWidget(w);
+	    final String varName = m_driver.findOrInsertWidget(w);
+	    final String qm = varName.startsWith("this.") ? "?" : "";
 
 	    List<DomItem> items = w.elementItem();
 
@@ -2187,13 +2227,13 @@ private void initializeComboBox(DomWidget w) {
 	        if (icon!=null)
 	            iconValue = iconCall(icon);
 
-	        m_output.append(m_indent).append(varName).append("?.addItem(");
+	        m_output.append(m_indent).append(varName).append(qm).append(".addItem(");
 	        if (icon!=null)
 	            m_output.append(iconValue).append(", ");
 
 	        if (needsTranslation(text.elementString())) {
 	            m_output.append("\"\")").endl();
-	            m_refreshOut.append(m_indent).append(varName).append("?.setItemText(").append(i).append(", ").append(trCall(text.elementString())
+	            m_refreshOut.append(m_indent).append(varName).append(qm).append(".setItemText(").append(i).append(", ").append(trCall(text.elementString())
 	               ).append(")").endl();
 	        } else {
 	            m_output.append(noTrCall(text.elementString())).append(")").endl();
@@ -2203,7 +2243,8 @@ private void initializeComboBox(DomWidget w) {
 	}
 	
 	private void initializeListWidget(DomWidget w) {
-	    String varName = m_driver.findOrInsertWidget(w);
+	    final String varName = m_driver.findOrInsertWidget(w);
+	    final String qm = varName.startsWith("this.") ? "?" : "";
 
 	    List<DomItem> items = w.elementItem();
 
@@ -2223,14 +2264,15 @@ private void initializeListWidget(DomWidget w) {
 
 	        item.writeSetupUi(varName);
 	        StringBuilder parentPath = new StringBuilder();
-	        parentPath.append(varName).append("?.item(").append(i).append(')');
+	        parentPath.append(varName).append(qm).append(".item(").append(i).append(')');
 	        item.writeRetranslateUi(parentPath.toString());
 	    }
 	    enableSorting(w, varName, tempName);
 	}
 	
 	private void initializeTreeWidget(DomWidget w) {
-	    String varName = m_driver.findOrInsertWidget(w);
+	    final String varName = m_driver.findOrInsertWidget(w);
+	    final String qm = varName.startsWith("this.") ? "?" : "";
 
 	    // columns
 	    Item item = new Item("QTreeWidgetItem", m_indent, m_output, m_refreshOut, m_driver);
@@ -2246,14 +2288,14 @@ private void initializeTreeWidget(DomWidget w) {
 	        if (p!=null) {
 	            DomString str = p.elementString();
 	            if (str!=null && str.text().isEmpty()) {
-	                m_output.append(m_indent).append(varName).append("?.headerItem().setText(").append(i).append(", \"\")").endl();
+	                m_output.append(m_indent).append(varName).append(qm).append(".headerItem()").append(qm).append(".setText(").append(i).append(", \"\")").endl();
 	            }
 	        }
 	    }
 	    String itemName = item.writeSetupUi("", Item.EmptyItemPolicy.DontConstruct);
-	    item.writeRetranslateUi(varName + "?.headerItem()");
+	    item.writeRetranslateUi(varName + qm + ".headerItem()");
 	    if (itemName!=null && !itemName.isEmpty()) {
-	        m_output.append(m_indent).append(varName).append("?.setHeaderItem(").append(itemName).append(")").endl();
+	        m_output.append(m_indent).append(varName).append(qm).append(".setHeaderItem(").append(itemName).append(")").endl();
 	    }
 
 	    if (w.elementItem().isEmpty())
@@ -2266,7 +2308,7 @@ private void initializeTreeWidget(DomWidget w) {
 	        Item itm = items.get(i);
 	        itm.writeSetupUi(varName);
 	        StringBuilder parentPath = new StringBuilder();
-	        parentPath.append(varName).append("?.topLevelItem(").append(i).append(')');
+	        parentPath.append(varName).append(qm).append(".topLevelItem(").append(i).append(')');
 	        itm.writeRetranslateUi(parentPath.toString());
 	    }
 
@@ -2310,15 +2352,15 @@ private List<Item> initializeTreeWidgetItems(List<DomItem > domItems) {
 	}
 	
 	private void initializeTableWidget(DomWidget w) {
-	    String varName = m_driver.findOrInsertWidget(w);
+	    final String varName = m_driver.findOrInsertWidget(w);
+    	final String qm = varName.startsWith("this.") ? "?" : "";
 
 	    // columns
 	    List<DomColumn> columns = w.elementColumn();
 
 	    if (!columns.isEmpty()) {
-	        m_output.append(m_indent).append("if (").append(varName).append("?.columnCount() < ").append(columns.size()).append(')');
-	        m_output.endl().append(m_indent).append(m_option.indent).append(varName).append("?.setColumnCount("
-	           ).append(columns.size()).append(")").endl();
+	        m_output.append(m_indent).append("if (").append(qm.isEmpty() ? "" : "(").append(varName).append(qm).append(".columnCount").append(qm.isEmpty() ? "" : " as Int)").append(" < ").append(columns.size()).append(')');
+	        m_output.endl().append(m_indent).append(m_option.indent).append(varName).append(qm).append(".columnCount = ").append(columns.size()).endl();
 	    }
 
 	    for (int i = 0; i < columns.size(); ++i) {
@@ -2331,9 +2373,9 @@ private void initializeTableWidget(DomWidget w) {
 
 	            String itemName = item.writeSetupUi("", Item.EmptyItemPolicy.ConstructItemAndVariable);
 	            StringBuilder parentPath = new StringBuilder();
-	            parentPath.append(varName).append("?.horizontalHeaderItem(").append(i).append(')');
+	            parentPath.append(varName).append(qm).append(".horizontalHeaderItem(").append(i).append(')');
 	            item.writeRetranslateUi(parentPath.toString());
-	            m_output.append(m_indent).append(varName).append("?.setHorizontalHeaderItem("
+	            m_output.append(m_indent).append(varName).append(qm).append(".setHorizontalHeaderItem("
 	               ).append(i).append(", ").append(itemName).append(")").endl();
 	        }
 	    }
@@ -2342,8 +2384,8 @@ private void initializeTableWidget(DomWidget w) {
 	    List<DomRow> rows = w.elementRow();
 
 	    if (!rows.isEmpty()) {
-	        m_output.append(m_indent).append("if (").append(varName).append("?.rowCount() < ").append(rows.size()).append(')').endl()
-	        		.append(m_indent).append(m_option.indent).append(varName).append("?.setRowCount(").append(rows.size()).append(")").endl();
+	        m_output.append(m_indent).append("if (").append(qm.isEmpty() ? "" : "(").append(varName).append(qm).append(".rowCount").append(qm.isEmpty() ? "" : " as Int)").append(" < ").append(rows.size()).append(')').endl()
+	        		.append(m_indent).append(m_option.indent).append(varName).append(qm).append(".rowCount = ").append(rows.size()).endl();
 	    }
 
 	    for (int i = 0; i < rows.size(); ++i) {
@@ -2356,9 +2398,9 @@ private void initializeTableWidget(DomWidget w) {
 
 	            String itemName = item.writeSetupUi("", Item.EmptyItemPolicy.ConstructItemAndVariable);
 	            StringBuilder parentPath = new StringBuilder();
-	            parentPath.append(varName).append("?.verticalHeaderItem(").append(i).append(')');
+	            parentPath.append(varName).append(qm).append(".verticalHeaderItem(").append(i).append(')');
 	            item.writeRetranslateUi(parentPath.toString());
-	            m_output.append(m_indent).append(varName).append("?.setVerticalHeaderItem("
+	            m_output.append(m_indent).append(varName).append(qm).append(".setVerticalHeaderItem("
 	               ).append(i).append(", ").append(itemName).append(")").endl();
 	        }
 	    }
@@ -2380,10 +2422,10 @@ private void initializeTableWidget(DomWidget w) {
 
 	            String itemName = item.writeSetupUi("", Item.EmptyItemPolicy.ConstructItemAndVariable);
 	            StringBuilder parentPath = new StringBuilder();
-	            parentPath.append(varName).append("?.item(").append(r
+	            parentPath.append(varName).append(qm).append(".item(").append(r
 	               ).append(", ").append(c).append(')');
 	            item.writeRetranslateUi(parentPath.toString());
-	            m_output.append(m_indent).append(varName).append("?.setItem(").append(r).append(", ").append(c).append(", ").append(itemName).append(")").endl();
+	            m_output.append(m_indent).append(varName).append(qm).append(".setItem(").append(r).append(", ").append(c).append(", ").append(itemName).append(")").endl();
 	        }
 	    }
 	    enableSorting(w, varName, tempName);
@@ -2393,19 +2435,21 @@ private String disableSorting(DomWidget w, String varName) {
 	    // turn off sortingEnabled to force programmatic item order (setItem())
 	    String tempName = "";
 	    if (!w.elementItem().isEmpty()) {
+	    	final String qm = varName.startsWith("this.") ? "?" : "";
 	        tempName = m_driver.unique("__sortingEnabled");
 	        m_refreshOut.endl();
 	        m_refreshOut.append(m_indent);
-            m_refreshOut.append("boolean ");
-	        m_refreshOut.append(tempName).append(" = ").append(varName).append("?.isSortingEnabled()").endl()
-	        			.append(m_indent).append(varName).append("?.setSortingEnabled(false)").endl();
+            m_refreshOut.append("val ");
+	        m_refreshOut.append(tempName).append(" = ").append(varName).append(qm).append(".isSortingEnabled()==true").endl()
+	        			.append(m_indent).append(varName).append(qm).append(".setSortingEnabled(false)").endl();
 	    }
 	    return tempName;
 	}
 	
 	private void enableSorting(DomWidget w, String varName, String tempName) {
 	    if (!w.elementItem().isEmpty()) {
-	        m_refreshOut.append(m_indent).append(varName).append("?.setSortingEnabled(").append(tempName).append(")").append('\n');
+	    	final String qm = varName.startsWith("this.") ? "?" : "";
+	        m_refreshOut.append(m_indent).append(varName).append(qm).append(".setSortingEnabled(").append(tempName).append(")").append('\n');
 	    }
 	}
 	
@@ -2432,45 +2476,45 @@ private String writeFontProperties(DomFont f) {
 	    String fontName = m_driver.unique("font");
 	    m_fontPropertiesNameMap.put(f, fontName);
 
-	    m_output.append(m_indent).append("var ").append(fontName).append(" = QFont()").endl();
+	    m_output.append(m_indent).append("val ").append(fontName).append(" = QFont()").endl();
 	    if (f.hasElementFamily() && !f.elementFamily().isEmpty()) {
-	        m_output.append(m_indent).append(fontName).append("?.setFamilies("
-	           ).append("java.util.Arrays.asList("
+	        m_output.append(m_indent).append(fontName).append(".setFamilies("
+	           ).append("QList.of("
 	           ).append(formatString(f.elementFamily())
 	           ).append("))").endl();
 	    }
 	    if (f.hasElementPointSize() && f.elementPointSize() > 0) {
-	         m_output.append(m_indent).append(fontName).append("?.setPointSize(").append(f.elementPointSize()
+	         m_output.append(m_indent).append(fontName).append(".setPointSize(").append(f.elementPointSize()
 	            ).append(")").endl();
 	    }
 
 	    if (f.hasElementBold()) {
-	        m_output.append(m_indent).append(fontName).append("?.setBold("
+	        m_output.append(m_indent).append(fontName).append(".setBold("
 	           ).append(Boolean.toString(f.elementBold())).append(")").endl();
 	    }
 	    if (f.hasElementItalic()) {
-	        m_output.append(m_indent).append(fontName).append("?.setItalic("
+	        m_output.append(m_indent).append(fontName).append(".setItalic("
 	           ).append(Boolean.toString(f.elementItalic())).append(")").endl();
 	    }
 	    if (f.hasElementUnderline()) {
-	        m_output.append(m_indent).append(fontName).append("?.setUnderline("
+	        m_output.append(m_indent).append(fontName).append(".setUnderline("
 	           ).append(Boolean.toString(f.elementUnderline())).append(")").endl();
 	    }
 	    if (f.hasElementStrikeOut()) {
-	         m_output.append(m_indent).append(fontName).append("?.setStrikeOut("
+	         m_output.append(m_indent).append(fontName).append(".setStrikeOut("
 	           ).append(Boolean.toString(f.elementStrikeOut())).append(")").endl();
 	    }
 	    if (f.hasElementKerning()) {
-	        m_output.append(m_indent).append(fontName).append("?.setKerning("
+	        m_output.append(m_indent).append(fontName).append(".setKerning("
 	           ).append(Boolean.toString(f.elementKerning())).append(")").endl();
 	    }
 	    if (f.hasElementAntialiasing()) {
-	        m_output.append(m_indent).append(fontName).append("?.setStyleStrategy(QFont.StyleStrategy."
+	        m_output.append(m_indent).append(fontName).append(".setStyleStrategy(QFont.StyleStrategy."
 	           ).append((f.elementAntialiasing() ? "PreferDefault" : "NoAntialias")
 	           ).append(")").endl();
 	    }
 	    if (f.hasElementStyleStrategy()) {
-	         m_output.append(m_indent).append(fontName).append("?.setStyleStrategy(QFont.StyleStrategy.")
+	         m_output.append(m_indent).append(fontName).append(".setStyleStrategy(QFont.StyleStrategy.")
 	         		 .append(f.elementStyleStrategy()).append(")").endl();
 	    }
 	    return  fontName;
@@ -2479,7 +2523,7 @@ private String writeFontProperties(DomFont f) {
 	private static void writeIconAddFile(QTextStream output, String indent,
             String iconName, String fileName,
             String mode, String state){
-		output.append(indent).append(iconName).append("?.addFile(").append(formatString(fileName)).append(", QSize(), QIcon.Mode.")
+		output.append(indent).append(iconName).append(".addFile(").append(formatString(fileName)).append(", QSize(), QIcon.Mode.")
 			  .append(mode).append(", QIcon.State.").append(state).append(")").endl();
 	}
 	
@@ -2524,7 +2568,7 @@ private static void writeResourceIcon(QTextStream output,
 	private static void writeIconAddPixmap(QTextStream output, String indent,
 	             String iconName, String call,
 	             String mode, String state){
-		output.append(indent).append(iconName).append("?.addPixmap(").append(call)
+		output.append(indent).append(iconName).append(".addPixmap(").append(call)
 		      .append(", QIcon.Mode.").append(mode).append(", QIcon.State.")
 		      .append(state).append(")").endl();
 	}
@@ -2551,7 +2595,7 @@ private String writeIconProperties(DomResourceIcon i) {
 
 	    if (!isIconFormat44(i)) { // pre-4.4 legacy
 	        m_output.append(m_indent);
-            m_output.append("var ");
+            m_output.append("val ");
 	        m_output.append(iconName).append(" = ").append(pixCall("QIcon", i.text())).append(';').endl();
 	        return iconName;
 	    }
@@ -2559,17 +2603,17 @@ private String writeIconProperties(DomResourceIcon i) {
 	    // 4.4 onwards
 	    if (i.attributeTheme().isEmpty()) {
 	        // No theme: Write resource icon as is
-	    	m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon()").endl();
+	    	m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon()").endl();
 	        if (m_uic.pixmapFunction().isEmpty())
 	            writeResourceIcon(m_output, iconName, m_indent, i);
 	        else
 	            writePixmapFunctionIcon(m_output, iconName, m_indent, i);
 	        return iconName;
 	    }else if(i.attributeTheme().startsWith(":") || i.attributeTheme().startsWith("classpath:") || i.attributeTheme().startsWith("/:classpath:")) {
-	    	m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon(").append(formatString(i.attributeTheme())).append(")").endl();
+	    	m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon(").append(formatString(i.attributeTheme())).append(")").endl();
 	    	return iconName;
 	    }else if(i.attributeResource().startsWith(":") || i.attributeResource().startsWith("classpath:") || i.attributeResource().startsWith("/:classpath:")) {
-	    	m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon(").append(formatString(i.attributeResource())).append(")").endl();
+	    	m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon(").append(formatString(i.attributeResource())).append(")").endl();
 	    	return iconName;
 	    }
 
@@ -2577,7 +2621,7 @@ private String writeIconProperties(DomResourceIcon i) {
 	    if (iconHasStatePixmaps(i)) {
 	        // Theme + default state pixmaps:
 	        // Generate code to check the theme and default to state pixmaps
-	    	m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon()").endl();
+	    	m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon()").endl();
 	        String themeNameStringVariableC = "iconThemeName";
 	        // Store theme name in a variable
 	        m_output.append(m_indent);
@@ -2602,7 +2646,7 @@ private String writeIconProperties(DomResourceIcon i) {
 	    }
 
 	    // Theme, but no state pixmaps: Construct from theme directly.
-	    m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon(QIcon.fromTheme(")
+	    m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon(QIcon.fromTheme(")
 	    					 					  .append(formatString(i.attributeTheme())).append("))").endl();
 	    return iconName;
 	}
@@ -2662,7 +2706,7 @@ private String writeSizePolicy(DomSizePolicy sp) {
 	    String spName = m_driver.unique("sizePolicy");
 	    m_sizePolicyNameMap.put(sp, spName);
 
-	    m_output.append(m_indent).append("var ").append(spName).append(" = QSizePolicy(");
+	    m_output.append(m_indent).append("val ").append(spName).append(" = QSizePolicy(");
 	    if (sp.hasElementHSizeType() && sp.hasElementVSizeType()) {
 	        m_output.append("QSizePolicy.Policy.")
 	        		.append(QSizePolicy.Policy.resolve(sp.elementHSizeType()).name())
@@ -2674,9 +2718,9 @@ private String writeSizePolicy(DomSizePolicy sp) {
 	    }
 	    m_output.append(")").endl();
 
-	    m_output.append(m_indent).append(spName).append("?.setHorizontalStretch("
+	    m_output.append(m_indent).append(spName).append(".setHorizontalStretch("
 	       ).append(sp.elementHorStretch()).append(")").endl();
-	    m_output.append(m_indent).append(spName).append("?.setVerticalStretch("
+	    m_output.append(m_indent).append(spName).append(".setVerticalStretch("
 	       ).append(sp.elementVerStretch()).append(")").endl();
 	    return spName;
 	}
@@ -2728,13 +2772,12 @@ private void addButtonGroup(DomWidget buttonNode, String varName) {
 	        String className = "QButtonGroup";
 	        m_output.append(m_indent);
 	        if (createGroupOnTheFly)
-	            m_output.append("var ");
+	            m_output.append("val ");
 	        m_output.append(groupName).append(" = ").append(className).append('(').append(m_mainFormVarName).append(")").endl();
 	        m_buttonGroups.add(groupName);
 	        writeProperties(groupName, objectName, className, group.elementProperty());
 	    }
-	    m_output.append(m_indent).append(groupName).append("?.addButton("
-	       ).append(varName).append(")").endl();
+	    m_output.append(m_indent).append(groupName).append(".addButton(").append(varName).append(")").endl();
 	}
 	
 	@SuppressWarnings("unused")
diff --git a/src/java/modules/qtjambi/Qt6/io/qt/core/QPermission.java b/src/java/modules/qtjambi/Qt6/io/qt/core/QPermission.java
new file mode 100644
index 00000000..ba947f53
--- /dev/null
+++ b/src/java/modules/qtjambi/Qt6/io/qt/core/QPermission.java
@@ -0,0 +1,15 @@
+package io.qt.core;
+
+import io.qt.QtObject;
+
+/**
+ * <p>Java wrapper for Qt's class <a href="https://doc.qt.io/qt/qpermission.html">QPermission</a></p>
+ */
+public abstract class QPermission extends QtObject implements java.lang.Cloneable{
+	QPermission(QPrivateConstructor p) {
+		super(p);
+	}
+
+	@Override
+	public abstract QPermission clone();
+}
diff --git a/src/java/modules/qtjambi/build.xml b/src/java/modules/qtjambi/build.xml
index d3509ba1..6229af53 100644
--- a/src/java/modules/qtjambi/build.xml
+++ b/src/java/modules/qtjambi/build.xml
@@ -9,10 +9,45 @@
         <antcall inheritrefs="true" target="build.impl"/>
     </target>
     <target name="build.impl" if="build.module">
+		<if>
+			<and>
+				<istrue value="${qtjambi-build}"/>
+				<not>
+					<istrue value="${qtjambi.no.jsr305}"/>
+				</not>
+			</and>
+			<then>
+				<if>
+					<not>
+						<available file="${extjardir}/jsr305.jar" type="file"/>
+					</not>
+					<then>
+						<get src="${jsr305.url}" dest="${extjardir}/jsr305.jar" verbose="true"/>
+					</then>
+				</if>
+				<if>
+					<not>
+						<available file="${extjardir}/kotlin-annotations-jvm.jar" type="file"/>
+					</not>
+					<then>
+						<get src="${kotlin-annotations-jvm.url}" dest="${extjardir}/kotlin-annotations-jvm.jar" verbose="true"/>
+					</then>
+				</if>
+			</then>
+		</if>
         <delete dir="${java.outdir}/${module}" failonerror="no"/>
         <condition property="qtjambi-retro" value="Retro" else="RetroJDK8">
             <istrue value="${java.module.based}"/>
         </condition>
+        <condition property="jsr305-dir" value="non-jsr305" else="jsr305">
+			<istrue value="${qtjambi.no.jsr305}"/>
+        </condition>
+        <condition property="no-permission" value="io/qt/core/QPermission*" else="">
+			<and>
+				<equals arg1="${qtjambi.soname.version.major}" arg2="6"/>
+				<less arg1="${qtjambi.soname.version.minor}" arg2="5"/>
+			</and>
+        </condition>
         <property name="destdir" value="${deploymentdir}"/>
         <mkdir dir="${destdir}"/>
         <path id="sourcedirs">
@@ -20,10 +55,24 @@
             <pathelement location="${antfile.dir}/main"/>
             <pathelement location="${antfile.dir}/${qtjambi-retro}"/>
             <pathelement location="${antfile.dir}/Qt${qtjambi.soname.version.major}"/>
+            <pathelement location="${antfile.dir}/${jsr305-dir}"/>
         </path>
         <ant antfile="${basedir}/../modules.xml" inheritrefs="true" target="build-impl">
-            <property name="jar.excludes" value=""/>
-            <property name="module.excludes" value=""/>
+            <property name="jar.excludes" value="${no-permission}"/>
+            <property name="module.excludes" value="${no-permission}"/>
         </ant>
+        <if>
+			<and>
+				<istrue value="${qtjambi-build}"/>
+				<not>
+					<istrue value="${qtjambi.no.jsr305}"/>
+				</not>
+			</and>
+            <then>
+                <copy todir="${java.outsrcdir}/${module}/io/qt" overwrite="true">
+					<fileset dir="${antfile.dir}/non-jsr305/io/qt"/>
+				</copy>
+            </then>
+        </if>
     </target>
 </project>
diff --git a/src/java/modules/qtjambi/jsr305/io/qt/NonNull.java b/src/java/modules/qtjambi/jsr305/io/qt/NonNull.java
new file mode 100644
index 00000000..4c88e193
--- /dev/null
+++ b/src/java/modules/qtjambi/jsr305/io/qt/NonNull.java
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2009-2023 Dr. Peter Droste, Omix Visualization GmbH & Co. KG. All rights reserved.
+**
+** This file is part of Qt Jambi.
+**
+** $BEGIN_LICENSE$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** 
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** $END_LICENSE$
+
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+package io.qt;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation marks a parameter not to be null.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE_USE)
+@javax.annotation.Nonnull(when=javax.annotation.meta.When.ALWAYS)
+@javax.annotation.meta.TypeQualifierNickname
+public @interface NonNull {
+}
diff --git a/src/java/modules/qtjambi/jsr305/io/qt/Nullable.java b/src/java/modules/qtjambi/jsr305/io/qt/Nullable.java
new file mode 100644
index 00000000..9652ddcf
--- /dev/null
+++ b/src/java/modules/qtjambi/jsr305/io/qt/Nullable.java
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2009-2023 Dr. Peter Droste, Omix Visualization GmbH & Co. KG. All rights reserved.
+**
+** This file is part of Qt Jambi.
+**
+** $BEGIN_LICENSE$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** 
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** $END_LICENSE$
+
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+package io.qt;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation marks a parameter to accept null.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE_USE)
+@javax.annotation.Nonnull(when=javax.annotation.meta.When.NEVER)
+@javax.annotation.meta.TypeQualifierNickname
+public @interface Nullable {
+}
diff --git a/src/java/modules/qtjambi/jsr305/io/qt/StrictNonNull.java b/src/java/modules/qtjambi/jsr305/io/qt/StrictNonNull.java
new file mode 100644
index 00000000..7393e38d
--- /dev/null
+++ b/src/java/modules/qtjambi/jsr305/io/qt/StrictNonNull.java
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2009-2023 Dr. Peter Droste, Omix Visualization GmbH & Co. KG. All rights reserved.
+**
+** This file is part of Qt Jambi.
+**
+** $BEGIN_LICENSE$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** 
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** $END_LICENSE$
+
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+package io.qt;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation marks a parameter to not accept null.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE_USE)
+@javax.annotation.Nonnull(when=javax.annotation.meta.When.ALWAYS)
+@javax.annotation.meta.TypeQualifierNickname
+@kotlin.annotations.jvm.UnderMigration(status = kotlin.annotations.jvm.MigrationStatus.STRICT)
+@SuppressWarnings("deprecartion")
+public @interface StrictNonNull {
+}
diff --git a/src/java/modules/qtjambi/main/io/qt/QNativePointer.java b/src/java/modules/qtjambi/main/io/qt/QNativePointer.java
index 86d2bb2b..735a543e 100644
--- a/src/java/modules/qtjambi/main/io/qt/QNativePointer.java
+++ b/src/java/modules/qtjambi/main/io/qt/QNativePointer.java
@@ -808,7 +808,7 @@ public <T extends QtObjectInterface> T objectAt(Class<T> valueType, long pos) {
     	}else {
     		verifyAccess(Type.Pointer, pos);
     	}
-        T object = readObject(data.m_ptr, valueType, pos, data.m_isReadonly);
+        T object = readObject(data.m_ptr, valueType, pos, data.m_isReadonly, data.m_type.value(), data.m_knownSize);
         if(data.m_autodelete!=AutoDeleteMode.None) {
         	if(data.m_dependentObjects==null) {
         		data.m_dependentObjects = new ArrayList<>();
@@ -1104,6 +1104,24 @@ public long pointer() {
         return data.m_ptr;
     }
 
+    /**
+     * This function creates a QNativePointer from an existing c++
+     * pointer of unknown type. The long is the <code>void *</code> (i.e., address)
+     * value of the pointer.
+     *
+     * @param ptr the void * value of the pointer.
+     * @return a QNativePointer object with ptr as the native pointer
+     */
+    public static QNativePointer fromNative(long ptr) {
+        QNativePointer nativePointer = new QNativePointer();
+        nativePointer.data.m_ptr = ptr;
+        nativePointer.data.m_knownSize = -1;
+        nativePointer.data.m_type = Type.Pointer;
+        nativePointer.data.m_indirections = 1;
+        nativePointer.data.m_isReadonly = true;
+        return nativePointer;
+    }
+
     /**
      * This function creates a QNativePointer from an existing c++
      * pointer. The long is the <code>void *</code> (i.e., address)
@@ -1400,7 +1418,7 @@ public QIODevice openAsDevice(QIODevice.OpenMode openMode) {
     private static native double readDouble(long ptr, long pos);
     private static native ByteBuffer toByteBuffer(long ptr, long capacity, boolean readOnly);
     private static native long readPointer(long ptr, long pos);
-    private static native <T extends QtObjectInterface> T readObject(long ptr, Class<T> valueType, long pos, boolean readOnly);
+    private static native <T extends QtObjectInterface> T readObject(long ptr, Class<T> valueType, long pos, boolean readOnly, int type, long size);
     private static native String readString(long ptr, long pos);
     private static native void writeBoolean(long ptr, long pos, boolean value);
     private static native void writeByte(long ptr, long pos, byte value);
diff --git a/src/java/modules/qtjambi/main/io/qt/QtUtilities.java b/src/java/modules/qtjambi/main/io/qt/QtUtilities.java
index 2923de93..92494a20 100644
--- a/src/java/modules/qtjambi/main/io/qt/QtUtilities.java
+++ b/src/java/modules/qtjambi/main/io/qt/QtUtilities.java
@@ -317,4 +317,20 @@ public interface Supplier<T> extends java.util.function.Supplier<T>, java.io.Ser
     public static QVersionNumber qtjambiVersion() {
     	return new QVersionNumber(Utility.majorVersion(), Utility.minorVersion(), Utility.qtjambiPatchVersion());
     }
+    
+    /**
+     * Checks if the current thread is UI thread and throws QThreadAffinityException otherwise.
+     * @throws QThreadAffinityException
+     */
+    public static native void uiThreadCheck() throws QThreadAffinityException;
+    
+    /**
+     * Checks if the current thread is the given object's thread and throws QThreadAffinityException otherwise.
+     * @throws QThreadAffinityException
+     */
+    public static void threadCheck(io.qt.core.QObject object) throws QThreadAffinityException{
+    	threadCheck(QtJambi_LibraryUtilities.internal.checkedNativeId(object));
+    }
+    
+    private static native void threadCheck(long objectId) throws QThreadAffinityException;
 }
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/AbstractAssociativeContainer.java b/src/java/modules/qtjambi/main/io/qt/internal/AbstractAssociativeContainer.java
index 7ad4f936..a2fb80b0 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/AbstractAssociativeContainer.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/AbstractAssociativeContainer.java
@@ -75,10 +75,6 @@ public final Iterator<QPair<K,V>> iterator() {
 		return constBegin().toJavaMapIterator();
 	}
 	
-    protected AbstractAssociativeContainer() {
-		super();
-	}
-
     protected AbstractAssociativeContainer(QPrivateConstructor p) {
 		super(p);
 	}
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/AbstractHash.java b/src/java/modules/qtjambi/main/io/qt/internal/AbstractHash.java
index e94f6475..f27b98ec 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/AbstractHash.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/AbstractHash.java
@@ -38,10 +38,6 @@
 
 public abstract class AbstractHash<K, V> extends AbstractAssociativeContainer<K, V> {
 
-	protected AbstractHash() {
-		super();
-	}
-
 	protected AbstractHash(QPrivateConstructor p) {
 		super(p);
 	}
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/AbstractList.java b/src/java/modules/qtjambi/main/io/qt/internal/AbstractList.java
index 3da84110..fbd3db73 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/AbstractList.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/AbstractList.java
@@ -39,10 +39,6 @@
 
 public abstract class AbstractList<E> extends AbstractSequentialContainer<E> implements List<E> {
 	
-    protected AbstractList() {
-		super();
-	}
-
     protected AbstractList(QPrivateConstructor p) {
 		super(p);
 	}
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/AbstractMap.java b/src/java/modules/qtjambi/main/io/qt/internal/AbstractMap.java
index 5567a8fd..b53321ce 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/AbstractMap.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/AbstractMap.java
@@ -43,10 +43,6 @@
 
 public abstract class AbstractMap<K,V> extends AbstractAssociativeContainer<K,V> implements NavigableMap<K,V> {
 
-	protected AbstractMap() {
-		super();
-	}
-
     protected AbstractMap(QPrivateConstructor p) {
 		super(p);
 	}
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiAssociativeContainer.java b/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiAssociativeContainer.java
index bfac19c1..32638acd 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiAssociativeContainer.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiAssociativeContainer.java
@@ -84,10 +84,6 @@ public final Iterator<QPair<K,V>> iterator() {
 		return constBegin().toJavaMapIterator();
 	}
 	
-    protected AbstractMultiAssociativeContainer() {
-		super();
-	}
-
     protected AbstractMultiAssociativeContainer(QPrivateConstructor p) {
 		super(p);
 	}
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiHash.java b/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiHash.java
index f688a199..e872b71e 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiHash.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiHash.java
@@ -41,10 +41,6 @@
 
 public abstract class AbstractMultiHash<K, V> extends AbstractMultiAssociativeContainer<K, V> {
 
-	protected AbstractMultiHash() {
-		super();
-	}
-
 	protected AbstractMultiHash(QPrivateConstructor p) {
 		super(p);
 	}
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiMap.java b/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiMap.java
index 72ae2c31..6514394f 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiMap.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/AbstractMultiMap.java
@@ -45,10 +45,6 @@
 
 public abstract class AbstractMultiMap<K,V> extends AbstractMultiAssociativeContainer<K,V> implements NavigableMap<K,List<V>> {
 
-	protected AbstractMultiMap() {
-		super();
-	}
-
     protected AbstractMultiMap(QPrivateConstructor p) {
 		super(p);
 	}
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/AbstractSequentialContainer.java b/src/java/modules/qtjambi/main/io/qt/internal/AbstractSequentialContainer.java
index f0d3369b..c1586b53 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/AbstractSequentialContainer.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/AbstractSequentialContainer.java
@@ -40,10 +40,6 @@
 
 public abstract class AbstractSequentialContainer<E> extends QtObject implements Collection<E> {
 	
-	protected AbstractSequentialContainer() {
-		super();
-	}
-
     protected AbstractSequentialContainer(QPrivateConstructor p) {
 		super(p);
 	}
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/LibraryUtility.java b/src/java/modules/qtjambi/main/io/qt/internal/LibraryUtility.java
index 2e909fcb..35afc6af 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/LibraryUtility.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/LibraryUtility.java
@@ -838,7 +838,8 @@ private static List<String> resolveSystemLibraries(List<String> tmpSystemLibrari
     }
     
     private static Architecture decideArchitecture() {
-    	switch(System.getProperty("os.arch").toLowerCase()) {
+    	String arch = System.getProperty("os.arch").toLowerCase();
+    	switch(arch) {
     	case "arm":
     	case "arm32":
     		return Architecture.arm;
@@ -850,7 +851,12 @@ private static Architecture decideArchitecture() {
     	case "amd64":
     		return Architecture.x86_64;
     	default:
-    		return Architecture.x86;
+    		if(arch.startsWith("arm-"))
+    			return Architecture.arm;
+    		else if(arch.startsWith("aarch64-"))
+    			return Architecture.arm64;
+    		else 
+    			return Architecture.x86;
     	}
     }
 
@@ -1796,7 +1802,7 @@ private static Library.ExtractionFunction getLibraryExtractor(String urlBase, St
 				break;
 	        }
     	}
-		List<Dependency> dependencies = qtLibName==null ? Collections.emptyList() : QtJambi_LibraryUtilities.getDependencies().getOrDefault("Qt"+qtLibName, Collections.emptyList());
+		List<Dependency> dependencies = qtLibName==null ? Collections.emptyList() : QtJambi_LibraryUtilities.dependencies.getOrDefault("Qt"+qtLibName, Collections.emptyList());
 		
     	return ()->{
 	    	URL entryURL = new URL(urlBase+libName);
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/MetaTypeUtility.java b/src/java/modules/qtjambi/main/io/qt/internal/MetaTypeUtility.java
index 87427778..120951d2 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/MetaTypeUtility.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/MetaTypeUtility.java
@@ -401,56 +401,56 @@ private static void writeSerializableJavaObject(QDataStream s, Object o) throws
 				s.writeInt(BYTE_ARRAY_MAGIC);
 				s.writeInt(array.length);
 				for (int i = 0; i < array.length; i++) {
-					s.writeByte(array[i]);
+					s.append(array[i]);
 				}
 			}else if(objectClass==short[].class) {
 				short[] array = (short[])o;
 				s.writeInt(SHORT_ARRAY_MAGIC);
 				s.writeInt(array.length);
 				for (int i = 0; i < array.length; i++) {
-					s.writeShort(array[i]);
+					s.append(array[i]);
 				}
 			}else if(objectClass==int[].class) {
 				int[] array = (int[])o;
 				s.writeInt(INT_ARRAY_MAGIC);
 				s.writeInt(array.length);
 				for (int i = 0; i < array.length; i++) {
-					s.writeInt(array[i]);
+					s.append(array[i]);
 				}
 			}else if(objectClass==long[].class) {
 				long[] array = (long[])o;
 				s.writeInt(LONG_ARRAY_MAGIC);
 				s.writeInt(array.length);
 				for (int i = 0; i < array.length; i++) {
-					s.writeLong(array[i]);
+					s.append(array[i]);
 				}
 			}else if(objectClass==float[].class) {
 				float[] array = (float[])o;
 				s.writeInt(FLOAT_ARRAY_MAGIC);
 				s.writeInt(array.length);
 				for (int i = 0; i < array.length; i++) {
-					s.writeFloat(array[i]);
+					s.append(array[i]);
 				}
 			}else if(objectClass==double[].class) {
 				double[] array = (double[])o;
 				s.writeInt(DOUBLE_ARRAY_MAGIC);
 				s.writeInt(array.length);
 				for (int i = 0; i < array.length; i++) {
-					s.writeDouble(array[i]);
+					s.append(array[i]);
 				}
 			}else if(objectClass==boolean[].class) {
 				boolean[] array = (boolean[])o;
 				s.writeInt(BOOLEAN_ARRAY_MAGIC);
 				s.writeInt(array.length);
 				for (int i = 0; i < array.length; i++) {
-					s.writeBoolean(array[i]);
+					s.append(array[i]);
 				}
 			}else if(objectClass==char[].class) {
 				char[] array = (char[])o;
 				s.writeInt(CHAR_ARRAY_MAGIC);
 				s.writeInt(array.length);
 				for (int i = 0; i < array.length; i++) {
-					s.writeChar(array[i]);
+					s.append(array[i]);
 				}
 			}else {
 				Object[] array = (Object[])o;
diff --git a/src/java/modules/qtjambi/main/io/qt/internal/SignalUtility.java b/src/java/modules/qtjambi/main/io/qt/internal/SignalUtility.java
index b4e037e9..241a1896 100644
--- a/src/java/modules/qtjambi/main/io/qt/internal/SignalUtility.java
+++ b/src/java/modules/qtjambi/main/io/qt/internal/SignalUtility.java
@@ -2774,8 +2774,6 @@ private <Slot extends Serializable> QMetaObject.Connection addConnectionToSlotOb
 							QMetaMethod method = QMetaMethod.fromReflectedMethod(reflectiveMethod);
 			            	if(method.isValid()) {
 			            		reflectiveMethod = method.toReflectedMethod();
-			            	}else {
-			            		throw new QUninvokableSlotException(reflectiveMethod);
 			            	}
 						}
 						Object[] lambdaArgs = null;
diff --git a/src/java/modules/qtjambi/non-jsr305/io/qt/NonNull.java b/src/java/modules/qtjambi/non-jsr305/io/qt/NonNull.java
new file mode 100644
index 00000000..31ecaa33
--- /dev/null
+++ b/src/java/modules/qtjambi/non-jsr305/io/qt/NonNull.java
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2009-2023 Dr. Peter Droste, Omix Visualization GmbH & Co. KG. All rights reserved.
+**
+** This file is part of Qt Jambi.
+**
+** $BEGIN_LICENSE$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** 
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** $END_LICENSE$
+
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+package io.qt;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation marks a parameter to be not null.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE_USE)
+public @interface NonNull {
+}
diff --git a/src/java/modules/qtjambi/non-jsr305/io/qt/Nullable.java b/src/java/modules/qtjambi/non-jsr305/io/qt/Nullable.java
new file mode 100644
index 00000000..c9b068bb
--- /dev/null
+++ b/src/java/modules/qtjambi/non-jsr305/io/qt/Nullable.java
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2009-2023 Dr. Peter Droste, Omix Visualization GmbH & Co. KG. All rights reserved.
+**
+** This file is part of Qt Jambi.
+**
+** $BEGIN_LICENSE$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** 
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** $END_LICENSE$
+
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+package io.qt;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation marks a parameter to accept null.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE_USE)
+public @interface Nullable {
+}
diff --git a/src/java/modules/qtjambi/non-jsr305/io/qt/StrictNonNull.java b/src/java/modules/qtjambi/non-jsr305/io/qt/StrictNonNull.java
new file mode 100644
index 00000000..ecad50ec
--- /dev/null
+++ b/src/java/modules/qtjambi/non-jsr305/io/qt/StrictNonNull.java
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2009-2023 Dr. Peter Droste, Omix Visualization GmbH & Co. KG. All rights reserved.
+**
+** This file is part of Qt Jambi.
+**
+** $BEGIN_LICENSE$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** 
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** $END_LICENSE$
+
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+package io.qt;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation marks a parameter to not accept null.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE_USE)
+public @interface StrictNonNull {
+}
diff --git a/src/java/plugins/plugins.xml b/src/java/plugins/plugins.xml
index 5944dfb1..a6dd3743 100644
--- a/src/java/plugins/plugins.xml
+++ b/src/java/plugins/plugins.xml
@@ -311,7 +311,7 @@
 											</then>
 											<else>
 												<property name="jar-includes" value="plugins/${plugin-subdir}/*,qtjambi-deployment.xml"/>
-												<create-native-deployment outputDirectory="${plugindestdir}" debug="${isdebug}" module="${moduledot}" libraries="${plugin-subdir}" plugin="true"/>
+												<create-native-deployment outputDirectory="${plugindestdir}" debug="${isdebug}" module="${moduledot}" libraries="${plugin-subdir}" plugin="true" forcedebuginfo="${qtjambi.force.debug.info}"/>
 											</else>
 										</if>
 									</else>
diff --git a/src/java/qml/qml.xml b/src/java/qml/qml.xml
index 524a7af7..ffde41a9 100644
--- a/src/java/qml/qml.xml
+++ b/src/java/qml/qml.xml
@@ -389,7 +389,7 @@
 											</then>
 											<else>
 												<property name="jar-includes" value="qml/${qml-usc}/*,qtjambi-deployment.xml"/>
-												<create-native-deployment outputDirectory="${plugindestdir}" debug="${isdebug}" module="${moduledot}" libraries="${qml-subdir}" plugin="true"/>
+												<create-native-deployment outputDirectory="${plugindestdir}" debug="${isdebug}" module="${moduledot}" libraries="${qml-subdir}" plugin="true" forcedebuginfo="${qtjambi.force.debug.info}"/>
 											</else>
 										</if>
 									</else>