From 66e0973242c140ab329d7ec73aa25bcedeb3ff6b Mon Sep 17 00:00:00 2001
From: mappu <mappu04@gmail.com>
Date: Tue, 29 Apr 2025 22:48:36 +1200
Subject: [PATCH] examples/android: merge with helloworld[6] as they are now
 identical

---
 examples/android/main.go                      |  29 ------------------
 examples/android/startup_android.go           |  14 ---------
 examples/android/startup_other.go             |   7 -----
 examples/android6/main.go                     |  29 ------------------
 examples/android6/startup_android.go          |  14 ---------
 examples/android6/startup_other.go            |   7 -----
 .../helloworld.android.png}                   | Bin
 .../screenshot-android.png}                   | Bin
 8 files changed, 100 deletions(-)
 delete mode 100644 examples/android/main.go
 delete mode 100644 examples/android/startup_android.go
 delete mode 100644 examples/android/startup_other.go
 delete mode 100644 examples/android6/main.go
 delete mode 100644 examples/android6/startup_android.go
 delete mode 100644 examples/android6/startup_other.go
 rename examples/{android/screenshot.png => helloworld/helloworld.android.png} (100%)
 rename examples/{android6/screenshot.png => helloworld6/screenshot-android.png} (100%)

diff --git a/examples/android/main.go b/examples/android/main.go
deleted file mode 100644
index 71455ef4..00000000
--- a/examples/android/main.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/mappu/miqt/qt"
-)
-
-func myRealMainFunc() {
-
-	qt.NewQApplication(os.Args)
-
-	btn := qt.NewQPushButton3("Hello world!")
-	btn.SetFixedWidth(320)
-
-	var counter int = 0
-
-	btn.OnPressed(func() {
-		counter++
-		btn.SetText(fmt.Sprintf("You have clicked the button %d time(s)", counter))
-	})
-
-	btn.Show()
-
-	qt.QApplication_Exec()
-
-	fmt.Println("OK!")
-}
diff --git a/examples/android/startup_android.go b/examples/android/startup_android.go
deleted file mode 100644
index 2fbc4d5b..00000000
--- a/examples/android/startup_android.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build android
-
-package main
-
-import "C" // Required for export support
-
-//export AndroidMain
-func AndroidMain() {
-	myRealMainFunc()
-}
-
-func main() {
-	// Must be empty
-}
diff --git a/examples/android/startup_other.go b/examples/android/startup_other.go
deleted file mode 100644
index d2382476..00000000
--- a/examples/android/startup_other.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !android
-
-package main
-
-func main() {
-	myRealMainFunc()
-}
diff --git a/examples/android6/main.go b/examples/android6/main.go
deleted file mode 100644
index 7ce9703b..00000000
--- a/examples/android6/main.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	qt "github.com/mappu/miqt/qt6"
-)
-
-func myRealMainFunc() {
-
-	qt.NewQApplication(os.Args)
-
-	btn := qt.NewQPushButton3("Hello world!")
-	btn.SetFixedWidth(320)
-
-	var counter int = 0
-
-	btn.OnPressed(func() {
-		counter++
-		btn.SetText(fmt.Sprintf("You have clicked the button %d time(s)", counter))
-	})
-
-	btn.Show()
-
-	qt.QApplication_Exec()
-
-	fmt.Println("OK!")
-}
diff --git a/examples/android6/startup_android.go b/examples/android6/startup_android.go
deleted file mode 100644
index 2fbc4d5b..00000000
--- a/examples/android6/startup_android.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build android
-
-package main
-
-import "C" // Required for export support
-
-//export AndroidMain
-func AndroidMain() {
-	myRealMainFunc()
-}
-
-func main() {
-	// Must be empty
-}
diff --git a/examples/android6/startup_other.go b/examples/android6/startup_other.go
deleted file mode 100644
index d2382476..00000000
--- a/examples/android6/startup_other.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !android
-
-package main
-
-func main() {
-	myRealMainFunc()
-}
diff --git a/examples/android/screenshot.png b/examples/helloworld/helloworld.android.png
similarity index 100%
rename from examples/android/screenshot.png
rename to examples/helloworld/helloworld.android.png
diff --git a/examples/android6/screenshot.png b/examples/helloworld6/screenshot-android.png
similarity index 100%
rename from examples/android6/screenshot.png
rename to examples/helloworld6/screenshot-android.png