From 8de1becd8e240512ada3e529c6c7bb16599dca2c Mon Sep 17 00:00:00 2001
From: Raphael Cotty <raphael.cotty@gmail.com>
Date: Fri, 2 Apr 2021 07:52:38 +0200
Subject: Android: Correct qt6 test

Change-Id: I1f05ae51f30f0158cb3dec6ce189d96f52987c7a
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
---
 .../blackbox/testdata-android/qt-app/TestQt6.java  | 54 ++++++++++++++++++++++
 .../blackbox/testdata-android/qt-app/qt-app.qbs    | 11 ++++-
 tests/auto/blackbox/tst_blackboxandroid.cpp        |  4 ++
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/blackbox/testdata-android/qt-app/TestQt6.java

(limited to 'tests/auto')

diff --git a/tests/auto/blackbox/testdata-android/qt-app/TestQt6.java b/tests/auto/blackbox/testdata-android/qt-app/TestQt6.java
new file mode 100644
index 000000000..239507122
--- /dev/null
+++ b/tests/auto/blackbox/testdata-android/qt-app/TestQt6.java
@@ -0,0 +1,54 @@
+package org.qbs.example;
+
+import org.qtproject.qt.android.bindings.QtActivity;
+import android.os.*;
+import android.content.*;
+import android.app.*;
+import android.util.Log;
+
+import java.lang.String;
+import android.content.Intent;
+
+import org.qbs.example.*;
+
+
+public class TestQt6 extends QtActivity
+{
+    public static native void testFunc(String test);
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+      super.onCreate(savedInstanceState);
+          Log.d("qbs", "onCreate Test");
+          Intent theIntent = getIntent();
+          if (theIntent != null) {
+              String theAction = theIntent.getAction();
+              if (theAction != null) {
+                  Log.d("qbs onCreate ", theAction);
+              }
+          }
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.d("qbs", "onDestroy");
+        System.exit(0);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        Log.d("qbs onActivityResult", "requestCode: "+requestCode);
+        if (resultCode == RESULT_OK) {
+            Log.d("qbs onActivityResult - resultCode: ", "SUCCESS");
+        } else {
+            Log.d("qbs onActivityResult - resultCode: ", "CANCEL");
+        }
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+      Log.d("qbs", "onNewIntent");
+      super.onNewIntent(intent);
+      setIntent(intent);
+    }
+}
diff --git a/tests/auto/blackbox/testdata-android/qt-app/qt-app.qbs b/tests/auto/blackbox/testdata-android/qt-app/qt-app.qbs
index 94093af64..04dcbf403 100644
--- a/tests/auto/blackbox/testdata-android/qt-app/qt-app.qbs
+++ b/tests/auto/blackbox/testdata-android/qt-app/qt-app.qbs
@@ -1,7 +1,16 @@
 Project {
     QtGuiApplication {
         Depends { name: "Lib" }
-        files: ["main.cpp", "MainWindow.cpp", "MainWindow.h", "Test.java"]
+        files: ["main.cpp", "MainWindow.cpp", "MainWindow.h" ]
+        Group {
+            condition: Qt.core.versionMajor == 5
+            files: ["Test.java"]
+        }
+        Group {
+            condition: Qt.core.versionMajor == 6
+            files: ["TestQt6.java"]
+        }
+
         Android.sdk.packageName: "my.qtapp"
         Android.sdk.apkBaseName: name
         Depends { name: "Qt"; submodules: ["core", "widgets"] }
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp
index f8ed8a0b9..df48c35e9 100644
--- a/tests/auto/blackbox/tst_blackboxandroid.cpp
+++ b/tests/auto/blackbox/tst_blackboxandroid.cpp
@@ -619,6 +619,8 @@ void TestBlackboxAndroid::android_data()
                            "lib/${ARCH}/libqml_QtQml_Models_modelsplugin_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQml_WorkerScript_workerscriptplugin_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQml_qmlplugin_${ARCH}.so",
+                           "lib/${ARCH}/libqml_QtQuick_Window_quickwindow_${ARCH}.so",
+                           "lib/${ARCH}/libqml_QtQuick_tooling_quicktooling_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQuick_Controls_Basic_impl_qtquickcontrols2basicstyleimplplugin_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQuick_Controls_Basic_qtquickcontrols2basicstyleplugin_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQuick_Controls_Fusion_impl_qtquickcontrols2fusionstyleimplplugin_${ARCH}.so",
@@ -774,6 +776,8 @@ void TestBlackboxAndroid::android_data()
                            "lib/${ARCH}/libqml_QtQml_Models_modelsplugin_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQml_WorkerScript_workerscriptplugin_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQml_qmlplugin_${ARCH}.so",
+                           "lib/${ARCH}/libqml_QtQuick_Window_quickwindow_${ARCH}.so",
+                           "lib/${ARCH}/libqml_QtQuick_tooling_quicktooling_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQuick_Controls_Basic_impl_qtquickcontrols2basicstyleimplplugin_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQuick_Controls_Basic_qtquickcontrols2basicstyleplugin_${ARCH}.so",
                            "lib/${ARCH}/libqml_QtQuick_Controls_Fusion_impl_qtquickcontrols2fusionstyleimplplugin_${ARCH}.so",
-- 
cgit v1.2.3