QtJambi 6.5.1 pre-release

issue #153 issue #152 issue #151 issue #150 issue #149 issue #148 issue #147
OmixVisualization · May 12, 2023 · 8bc0ad8 · 8bc0ad8
1 parent 346ef95
commit 8bc0ad8
Show file tree

Hide file tree

Showing 122 changed files with 4,648 additions and 3,290 deletions.
diff --git a/antfiles/autotests.xml b/antfiles/autotests.xml
@@ -609,8 +609,20 @@
 						<property name="qtjambiPluginPath"   location="${deploymentdir}/native/${qtjambi.osname}/${kind}/plugins" />
 						<property name="testPluginPath"   location="${outputDir}/${qtjambi.osname}/tests/${kind}/plugins" />
 						<property name="testQmlPath"   location="${outputDir}/${qtjambi.osname}/tests/${kind}/qml" />
-						<condition property="env.qtjambi.debug.trace" value="QTJAMBI_DEBUG_TRACE" else="QTJAMBI_DEBUG_TRACE_DISABLED">
-							<istrue value="${qtjambi.debug.trace}"/>
+						<condition property="qtjambi.enable-method-logs" value="true" else="false">
+							<or>
+								<istrue value="${qtjambi.debug.trace}"/>
+								<istrue value="${qtjambi.enable-method-logs}"/>
+							</or>
+						</condition>
+						<condition property="qtjambi.enable-dangling-pointer-check" value="true" else="false">
+							<istrue value="${qtjambi.enable-dangling-pointer-check}"/>
+						</condition>
+						<condition property="qtjambi.enable-thread-affinity-check" value="true" else="false">
+							<istrue value="${qtjambi.enable-thread-affinity-check}"/>
+						</condition>
+						<condition property="qtjambi.enable-event-thread-affinity-check" value="true" else="false">
+							<istrue value="${qtjambi.enable-event-thread-affinity-check}"/>
 						</condition>
 						<if>
 							<available type="file" file="extjars/sqlite-jdbc.jar"/>
@@ -699,14 +711,20 @@
 									<jvmarg value="-Dio.qt.verbose-loading=${io.qt.verbose-loading}"/>
 									<jvmarg value="-Dio.qt.debug=${kind}"/><!-- This should not be needed now, it loads default from MANIFEST.MF -->
 									<jvmarg value="-Dio.qt.log-messages=ALL"/>
+									<jvmarg value="-Dqtjambi.log-level=${qtjambi.log-level}"/>
 									<jvmarg value="-Dio.qt.no-deployment-spec=true"/>
+									<jvmarg value="-Dio.qt.enable-dangling-pointer-check=${qtjambi.enable-dangling-pointer-check}"/>
+									<jvmarg value="-Dio.qt.enable-thread-affinity-check=${qtjambi.enable-thread-affinity-check}"/>
+									<jvmarg value="-Dio.qt.enable-event-thread-affinity-check=${qtjambi.enable-event-thread-affinity-check}"/>
+									<jvmarg value="-Dio.qt.enable-method-logs=${qtjambi.enable-method-logs}"/>
 									<jvmarg value="-Dio.qt.qml-imports=${testQmlPath}"/>
 									<jvmarg value="-Dio.qt.pluginpath=${qtjambiPluginPath}${psep}${testPluginPath}"/>
 									<jvmarg value="${XstartOnFirstThread}"/>
 									<jvmarg value="-Dqtjambi.deployer.test.jdbc=${testJdbcPath}"/>
 									<jvmarg value="-Djava.util.logging.config.file=${basedir}/logging.properties"/>
 									<jvmarg value="-Dqtjambi.antcontrib=${ant.library.dir}/ant.jar"/>
-									<jvmarg value="-Xrs"/><!-- This stops JVM intercepting SIGSEGV
+									<!--jvmarg value="-Xrs"/-->
+									<!-- This stops JVM intercepting SIGSEGV
 									from native code (so we can see where/why it crashed) otherwise
 									the JVM may promote SIGSEGV to NullPointerException, which is
 									not that useful for debugging. -->

diff --git a/releases.properties b/releases.properties
@@ -1,7 +1,7 @@
-5.15=14
-6.0=1
-6.1=1
-6.2=12
-6.3=6
-6.4=4
-6.5=0
+5.15=15
+6.0=2
+6.1=2
+6.2=13
+6.3=7
+6.4=5
+6.5=1
diff --git a/src/cpp/QtJambi/QtJambi.pro b/src/cpp/QtJambi/QtJambi.pro
@@ -57,8 +57,7 @@ SOURCES += \
     thread.cpp \
     typeentry.cpp \
     typemanager.cpp \
-    utils.cpp \
-    variant.cpp
+    utils.cpp
 
 HEADERS += \
     containeraccess.h \
@@ -131,7 +130,8 @@ SOURCES += \
     containeraccess_linkedlist.cpp \
     containeraccess_map.cpp \
     containeraccess_multimap.cpp \
-    containeraccess_vector.cpp
+    containeraccess_vector.cpp \
+    variant.cpp
 
 HEADERS += \
     containeraccess_linkedlist.h \
@@ -184,6 +184,10 @@ linux-g++* | freebsd-g++* | macx | ios | android | win32-g++* {
     QMAKE_CXXFLAGS += -ftemplate-depth=20000
 }
 
+linux-g++* | freebsd-g++* | macx | ios | win32-g++* {
+QMAKE_CXXFLAGS += -Wall -fexceptions -fnon-call-exceptions
+}
+
 DEFINES += QTJAMBI_EXPORT=
 
 INSTALL_HEADERS.path = $$QTJAMBI_PLATFORM_BUILDDIR/include/QtJambi

diff --git a/src/cpp/QtJambi/configure.pri b/src/cpp/QtJambi/configure.pri
@@ -62,6 +62,8 @@ CONFIG(debug, debug|release) {
 INCLUDEPATH += $$PWD/..
 DEPENDPATH += $$PWD/..
 
+DEFINES += QTJAMBI_PATCH_VERSION=$$QTJAMBI_PATCH_VERSION
+
 macx:{
     CONFIG+=no_default_rpath no_qt_rpath
     QMAKE_SONAME_PREFIX = @rpath

diff --git a/src/cpp/QtJambi/containeraccess.cpp b/src/cpp/QtJambi/containeraccess.cpp
@@ -2548,7 +2548,7 @@ TypeAnalysisResult analyzeType(JNIEnv* env, const QMetaType& metaType, const QBy
 }
 
 AbstractListAccess* checkContainerAccess(JNIEnv * env, AbstractListAccess* containerAccess){
-    QtJambiAPI::checkPointer(env, containerAccess);
+    QtJambiAPI::checkNullPointer(env, containerAccess);
     if(!dynamic_cast<WrapperListAccess*>(containerAccess)){
         if(containerAccess->elementMetaType().id() >= QMetaType::HighestInternalId
                 || containerAccess->elementMetaType().id() == QMetaType::QObjectStar
@@ -2567,7 +2567,7 @@ AbstractListAccess* checkContainerAccess(JNIEnv * env, AbstractListAccess* conta
 }
 
 AbstractSetAccess* checkContainerAccess(JNIEnv * env, AbstractSetAccess* containerAccess){
-    QtJambiAPI::checkPointer(env, containerAccess);
+    QtJambiAPI::checkNullPointer(env, containerAccess);
     if(!dynamic_cast<WrapperSetAccess*>(containerAccess)){
         int id = containerAccess->elementMetaType().id();
         if(id != QMetaType::QPoint
@@ -2588,7 +2588,7 @@ AbstractSetAccess* checkContainerAccess(JNIEnv * env, AbstractSetAccess* contain
 
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
 AbstractLinkedListAccess* checkContainerAccess(JNIEnv * env, AbstractLinkedListAccess* containerAccess){
-    QtJambiAPI::checkPointer(env, containerAccess);
+    QtJambiAPI::checkNullPointer(env, containerAccess);
     if(!dynamic_cast<WrapperLinkedListAccess*>(containerAccess)){
         if(AbstractContainerAccess::isPointerType(containerAccess->elementMetaType())){
             containerAccess = new PointerRCLinkedListAccess(containerAccess);
@@ -2603,7 +2603,7 @@ AbstractLinkedListAccess* checkContainerAccess(JNIEnv * env, AbstractLinkedListA
 }
 
 AbstractVectorAccess* checkContainerAccess(JNIEnv * env, AbstractVectorAccess* containerAccess){
-    QtJambiAPI::checkPointer(env, containerAccess);
+    QtJambiAPI::checkNullPointer(env, containerAccess);
     if(!dynamic_cast<WrapperVectorAccess*>(containerAccess)){
         if(AbstractContainerAccess::isPointerType(containerAccess->elementMetaType())){
             containerAccess = new PointerRCVectorAccess(containerAccess);
@@ -2618,7 +2618,7 @@ AbstractVectorAccess* checkContainerAccess(JNIEnv * env, AbstractVectorAccess* c
 }
 #endif
 AbstractHashAccess* checkContainerAccess(JNIEnv * env, AbstractHashAccess* containerAccess){
-    QtJambiAPI::checkPointer(env, containerAccess);
+    QtJambiAPI::checkNullPointer(env, containerAccess);
     if(!dynamic_cast<WrapperHashAccess*>(containerAccess)){
         if(AbstractContainerAccess::isPointerType(containerAccess->keyMetaType())){
             if(AbstractContainerAccess::isPointerType(containerAccess->valueMetaType())){
@@ -2652,7 +2652,7 @@ AbstractHashAccess* checkContainerAccess(JNIEnv * env, AbstractHashAccess* conta
 }
 
 AbstractMapAccess* checkContainerAccess(JNIEnv * env, AbstractMapAccess* containerAccess){
-    QtJambiAPI::checkPointer(env, containerAccess);
+    QtJambiAPI::checkNullPointer(env, containerAccess);
     if(!dynamic_cast<WrapperMapAccess*>(containerAccess)){
         if(AbstractContainerAccess::isPointerType(containerAccess->keyMetaType())){
             if(AbstractContainerAccess::isPointerType(containerAccess->valueMetaType())){
@@ -2686,7 +2686,7 @@ AbstractMapAccess* checkContainerAccess(JNIEnv * env, AbstractMapAccess* contain
 }
 
 AbstractMultiHashAccess* checkContainerAccess(JNIEnv * env, AbstractMultiHashAccess* containerAccess){
-    QtJambiAPI::checkPointer(env, containerAccess);
+    QtJambiAPI::checkNullPointer(env, containerAccess);
     if(!dynamic_cast<WrapperMultiHashAccess*>(containerAccess)){
         if(AbstractContainerAccess::isPointerType(containerAccess->keyMetaType())){
             if(AbstractContainerAccess::isPointerType(containerAccess->valueMetaType())){
@@ -2720,7 +2720,7 @@ AbstractMultiHashAccess* checkContainerAccess(JNIEnv * env, AbstractMultiHashAcc
 }
 
 AbstractMultiMapAccess* checkContainerAccess(JNIEnv * env, AbstractMultiMapAccess* containerAccess){
-    QtJambiAPI::checkPointer(env, containerAccess);
+    QtJambiAPI::checkNullPointer(env, containerAccess);
     if(!dynamic_cast<WrapperMultiMapAccess*>(containerAccess)){
         if(AbstractContainerAccess::isPointerType(containerAccess->keyMetaType())){
             if(AbstractContainerAccess::isPointerType(containerAccess->valueMetaType())){

diff --git a/src/cpp/QtJambi/containeraccess_hash.cpp b/src/cpp/QtJambi/containeraccess_hash.cpp
@@ -1386,7 +1386,7 @@ jobject AutoHashAccess::constFind(JNIEnv * env, QtJambiNativeID ownerId, const v
             auto it = d->find(*this, key);
             if (it.isUnused())
                 it = d->end(*this);
-            return createIterator(env, ownerId, new iterator(it));
+            return createConstIterator(env, ownerId, new iterator(it));
         }
     }
     return createConstIterator(env, ownerId, new iterator(*this));
-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
-.15=14
-.0=1
-.1=1
-.2=12
-.3=6
-.4=4
-.5=0
+.15=15
+.0=2
+.1=2
+.2=13
+.3=7
+.4=5
+.5=1