support the change to QtQuick 2

Author: kwindrem

FileSets/PatchSource/PageSettings.qml

@@ -1,6 +1,3 @@
-//////// modified to insert PackageManager menu
-//////// auto-generated by SetupHelper setup script
-
 import QtQuick 1.1
 import com.victron.velib 1.0
 import net.connman 0.1

FileSets/PatchSource/PageSettings.qml.patch

@@ -1,13 +1,6 @@
 --- /Users/Kevin/GitHub/SetupHelper.copy/FileSets/PatchSource/PageSettings.qml.orig	2024-05-15 13:06:53
-+++ /Users/Kevin/GitHub/SetupHelper.copy/FileSets/PatchSource/PageSettings.qml	2024-05-15 13:06:53
-@@ -1,3 +1,6 @@
-+//////// modified to insert PackageManager menu
-+//////// auto-generated by SetupHelper setup script
-+
- import QtQuick 1.1
- import com.victron.velib 1.0
- import net.connman 0.1
-@@ -192,5 +195,11 @@
++++ /Users/Kevin/GitHub/SetupHelper.copy/FileSets/PatchSource/PageSettings.qml	2025-01-24 22:39:59
+@@ -192,5 +192,11 @@
  			subpage: Component { PageDebug {} }
  			showAccessLevel: User.AccessService
  		}

HelperResources/CommonResources

@@ -1536,6 +1536,20 @@ if [ $scriptAction != 'UNINSTALL' ]; then
 		done
 	fi
 
+	# create patched files for all qml files for the change to QtQuick 2
+	versionStringToNumber "v3.60~18"
+	if (( $venusVersionNumber >= $versionNumber )); then
+		logMessage "patching QtQuick 1.1 to QtQuick 2 in all .qml replacements"
+		for file in ${fileListVersionIndependent[@]};  do
+			baseName=$( basename "$file" )
+			if ! [[ "$baseName" == *.qml ]]; then continue; fi
+			sourceFile="$versionIndependentFileSet/$baseName"
+			if ! [ -f "$sourceFile" ]; then continue; fi
+			if (( $(grep -c "QtQuick 1.1" "$sourceFile") == 0 )); then continue; fi
+			sed -e 's/QtQuick 1.1/QtQuick 2/' "$sourceFile" > "$tempFileDir/$baseName"
+		done
+	fi
+
 	# create the forward and reverse patched files
 	# used during the actual install and to test if the patch/reverse patch will succeed
 	# done here so PackageManager knows if this will be possible before starting the install

blindInstall/SetupHelperVersion

@@ -1 +1 @@
-v8.26
+v8.27~1

changes

@@ -1,3 +1,6 @@
+v8.27:
+	support the change to QtQuick 2 first used in v3.60~18
+
 v8.26:
 	added link to IncludeHelpers so that old packages can find correct file to source