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
OmixVisualization · Mar 18, 2023 · e8a9dc2 · e8a9dc2
1 parent e198d12
commit e8a9dc2
Show file tree

Hide file tree

Showing 311 changed files with 32,567 additions and 35,310 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
diff --git 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