From ff93ac88f94319da2d21280f9a1fab4a98c6c867 Mon Sep 17 00:00:00 2001 From: Rick Calixte <10281587+rcalixte@users.noreply.github.com> Date: Mon, 31 Mar 2025 02:34:01 -0400 Subject: [PATCH 1/4] charts6/cflags.go: Update package name --- qt-restricted-extras/charts6/cflags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-restricted-extras/charts6/cflags.go b/qt-restricted-extras/charts6/cflags.go index 7e51056d..fd04e507 100644 --- a/qt-restricted-extras/charts6/cflags.go +++ b/qt-restricted-extras/charts6/cflags.go @@ -1,4 +1,4 @@ -package charts +package charts6 /* #cgo pkg-config: Qt6Charts From ee6f0871250a270a4421190c990cd776f82e5113 Mon Sep 17 00:00:00 2001 From: Rick Calixte <10281587+rcalixte@users.noreply.github.com> Date: Mon, 31 Mar 2025 02:34:38 -0400 Subject: [PATCH 2/4] Update chart6 example for update package --- .../main.go | 2 +- .../screenshot.png | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename examples/libraries/{qt6-charts => restricted-extras-charts6}/main.go (91%) rename examples/libraries/{qt6-charts => restricted-extras-charts6}/screenshot.png (100%) diff --git a/examples/libraries/qt6-charts/main.go b/examples/libraries/restricted-extras-charts6/main.go similarity index 91% rename from examples/libraries/qt6-charts/main.go rename to examples/libraries/restricted-extras-charts6/main.go index 92e791e1..58d74d09 100644 --- a/examples/libraries/qt6-charts/main.go +++ b/examples/libraries/restricted-extras-charts6/main.go @@ -5,7 +5,7 @@ import ( "os" qt "github.com/mappu/miqt/qt6" - "github.com/mappu/miqt/qt6/charts" + charts "github.com/mappu/miqt/qt-restricted-extras/charts6" ) func main() { diff --git a/examples/libraries/qt6-charts/screenshot.png b/examples/libraries/restricted-extras-charts6/screenshot.png similarity index 100% rename from examples/libraries/qt6-charts/screenshot.png rename to examples/libraries/restricted-extras-charts6/screenshot.png From f241fe741da6bfd98aa0de18f0ac6d401d86b680 Mon Sep 17 00:00:00 2001 From: Rick Calixte <10281587+rcalixte@users.noreply.github.com> Date: Mon, 31 Mar 2025 02:35:18 -0400 Subject: [PATCH 3/4] .gitignore: Update charts6 example output path --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2bc6c97f..9045085e 100644 --- a/.gitignore +++ b/.gitignore @@ -39,9 +39,9 @@ examples/libraries/qt-script/qt-script examples/libraries/qt-svg/qt-svg examples/libraries/qt-webengine/qt-webengine examples/libraries/qt-webkit/qt-webkit -examples/libraries/qt6-charts/qt6-charts examples/libraries/qt6-multimedia/qt6-multimedia examples/libraries/qt6-webengine/qt6-webengine +examples/libraries/restricted-extras-charts6/restricted-extras-charts6 examples/libraries/restricted-extras-qscintilla/restricted-extras-qscintilla # android temporary build files From 8a3fd7c98b6236621d11a45ca7a23203b5d3c50c Mon Sep 17 00:00:00 2001 From: Rick Calixte <10281587+rcalixte@users.noreply.github.com> Date: Mon, 31 Mar 2025 03:23:38 -0400 Subject: [PATCH 4/4] README: Amend Qt Charts licensing --- qt-restricted-extras/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-restricted-extras/README.md b/qt-restricted-extras/README.md index 53e99e92..14152a1c 100644 --- a/qt-restricted-extras/README.md +++ b/qt-restricted-extras/README.md @@ -5,4 +5,4 @@ This directory contains bindings to Qt libraries that use more restrictive licen |Library|License| |---|---| |[QScintilla](https://riverbankcomputing.com/software/qscintilla)|GPL/Commercial| -|[Qt Charts](https://doc.qt.io/qt-6/qtcharts-index.html#licenses)|GPLv3| +|[Qt Charts](https://doc.qt.io/qt-6/qtcharts-index.html#licenses)|GPLv3/Commercial|