From 7eb7cfd3f9a538bd75685c2976b953bf7791d07b Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Thu, 15 Dec 2016 11:11:31 +0100
Subject: Add Activity::start()

    #include <QGuiApplication>
    #include <QQmlApplicationEngine>
    #include <QtQmlAndroid/private/qnativeandroidactivity_p.h>
    #include <QtQmlAndroid/private/qnativeandroidbutton_p.h>

    int main(int argc, char *argv[])
    {
        QGuiApplication app(argc, argv);

        QNativeAndroidActivity activity;
        QNativeAndroidButton button(&activity);
        button.setText("Button");
        activity.setContentView(&button);
        activity.start();

        return app.exec();
    }

Change-Id: I3b1da906f17d8623d7ad68ea2f4a0fba81f966ba
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/android/app/qnativeandroidactivity.cpp | 20 ++++++++++++--------
 src/android/app/qnativeandroidactivity_p.h |  3 +++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/android/app/qnativeandroidactivity.cpp b/src/android/app/qnativeandroidactivity.cpp
index 68fd292..a1fea4d 100644
--- a/src/android/app/qnativeandroidactivity.cpp
+++ b/src/android/app/qnativeandroidactivity.cpp
@@ -118,15 +118,8 @@ void QNativeAndroidActivity::setContentView(QNativeAndroidView *view)
     }
 }
 
-void QNativeAndroidActivity::classBegin()
+void QNativeAndroidActivity::start()
 {
-    QNativeAndroidContextWrapper::classBegin();
-}
-
-void QNativeAndroidActivity::componentComplete()
-{
-    QNativeAndroidContextWrapper::componentComplete();
-
     foreach (QObject *child, children()) {
         QNativeAndroidObject *object = qobject_cast<QNativeAndroidObject *>(child);
         if (object)
@@ -140,6 +133,17 @@ void QNativeAndroidActivity::componentComplete()
         setupWindow();
 }
 
+void QNativeAndroidActivity::classBegin()
+{
+    QNativeAndroidContextWrapper::classBegin();
+}
+
+void QNativeAndroidActivity::componentComplete()
+{
+    QNativeAndroidContextWrapper::componentComplete();
+    start();
+}
+
 void QNativeAndroidActivity::setupWindow()
 {
     if (!isValid())
diff --git a/src/android/app/qnativeandroidactivity_p.h b/src/android/app/qnativeandroidactivity_p.h
index c87de51..20ae6bf 100644
--- a/src/android/app/qnativeandroidactivity_p.h
+++ b/src/android/app/qnativeandroidactivity_p.h
@@ -79,6 +79,9 @@ public:
     QNativeAndroidView *contentView() const;
     void setContentView(QNativeAndroidView *view);
 
+public Q_SLOTS:
+    void start();
+
 protected:
     void classBegin() override;
     void componentComplete() override;
-- 
cgit v1.2.3