Skip to content

Commit

Permalink
support the change to QtQuick 2
Browse files Browse the repository at this point in the history
  • Loading branch information
kwindrem committed Jan 25, 2025
1 parent 705e2b0 commit 51e6afb
Show file tree
Hide file tree
Showing 23 changed files with 4,832 additions and 14 deletions.
3 changes: 0 additions & 3 deletions FileSets/PatchSource/PageSettings.qml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 2 additions & 9 deletions FileSets/PatchSource/PageSettings.qml.patch
Original file line number Diff line number Diff line change
@@ -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
}
Expand Down
14 changes: 14 additions & 0 deletions HelperResources/CommonResources
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion blindInstall/SetupHelperVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.26
v8.27~1
3 changes: 3 additions & 0 deletions changes
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading

0 comments on commit 51e6afb

Please sign in to comment.