Merging WebEngine and window icon from tgerring

Author: neclepsio

cpp/capi.cpp

@@ -1,9 +1,10 @@
-#include <QApplication>
-#include <QQuickView>
-#include <QQuickItem>
-#include <QtQml>
-#include <QDebug>
-#include <QQuickImageProvider>
+#include <QtWidgets/QApplication>
+#include <QtQuick/QQuickView>
+#include <QtQuick/QQuickItem>
+#include <QtQml/QtQml>
+#include <QtCore/QDebug>
+#include <QtQuick/QQuickImageProvider>
+#include <QtGui/QIcon>
 
 #include <string.h>
 
@@ -69,6 +70,12 @@ void applicationFlushAll()
     qApp->processEvents();
 }
 
+void setWindowIcon(QString_ *path){
+	QString *str = reinterpret_cast<QString *>(path);
+	QIcon icon(*str);
+	qApp->setWindowIcon(icon);
+}
+
 void *currentThread()
 {
     return QThread::currentThread();
@@ -743,6 +750,15 @@ void packDataValue(QVariant_ *var, DataValue *value)
             *(DataValue**)(value->data) = dvlist;
         }
         break;
+    case QMetaType::User:
+        {
+            static const int qjstype = QVariant::fromValue(QJSValue()).userType();
+            if (qvar->userType() == qjstype) {
+                auto var = qvar->value<QJSValue>().toVariant();
+                packDataValue(&var, value);
+            }
+        }
+        break;
     default:
         if (qvar->type() == (int)QMetaType::QObjectStar || qvar->canConvert<QObject *>()) {
             QObject *qobject = qvar->value<QObject *>();

cpp/capi.h

@@ -109,6 +109,7 @@ void newGuiApplication();
 void applicationExec();
 void applicationExit();
 void applicationFlushAll();
+void setWindowIcon(QString_ *path);
 
 void idleTimerInit(int32_t *guiIdleRun);
 void idleTimerStart();

cpp/connector.cpp

@@ -1,4 +1,4 @@
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "connector.h"
 #include "capi.h"

cpp/connector.h

@@ -1,7 +1,7 @@
 #ifndef CONNECTOR_H
 #define CONNECTOR_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <stdint.h>
 

cpp/govalue.cpp

@@ -4,8 +4,8 @@
 #include <QtOpenGL/QGLFunctions>
 
 #include <QtQml/QtQml>
-#include <QQmlEngine>
-#include <QDebug>
+#include <QtQml/QQmlEngine>
+#include <QtCore/QDebug>
 
 #include "govalue.h"
 #include "capi.h"

cpp/govalue.h

@@ -6,8 +6,8 @@
 // away, and without it this package wouldn't exist.
 #include <private/qmetaobject_p.h>
 
-#include <QQuickPaintedItem>
-#include <QPainter>
+#include <QtQuick/QQuickPaintedItem>
+#include <QtGui/QPainter>
 
 #include "capi.h"
 

examples/customicon/qrcpath/qrc.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"gopkg.in/qml.v1"
+)
+
+func main() {
+	if err := qml.Run(run); err != nil {
+		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		os.Exit(1)
+	}
+}
+
+func run() error {
+	// I genqrc "../res"
+	qml.SetWindowIcon(":../res/1.ico")
+
+	engine := qml.NewEngine()
+	controls, err := engine.LoadFile("qrc:///../res/main.qml")
+	if err != nil {
+		return err
+	}
+
+	window := controls.CreateWindow(nil)
+
+	window.Show()
+	window.Wait()
+	return nil
+}

examples/customicon/qrcpath/qrcpath.go

@@ -0,0 +1,31 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"gopkg.in/qml.v1"
+)
+
+func main() {
+	if err := qml.Run(run); err != nil {
+		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		os.Exit(1)
+	}
+}
+
+func run() error {
+	qml.SetWindowIcon("../res/1.ico")
+
+	engine := qml.NewEngine()
+	controls, err := engine.LoadFile("../res/main.qml")
+	if err != nil {
+		return err
+	}
+
+	window := controls.CreateWindow(nil)
+
+	window.Show()
+	window.Wait()
+	return nil
+}