Update qtlib

src/lib/qtlib/.gitignore

+*.pro.user

src/lib/qtlib/README.txt

+A library for Qt app

src/lib/qtlib/qtlib-test.pro

+include(qtlib.pri)
+
+TARGET = qtlib-test
+
+TEMPLATE = app
+
+CONFIG += c++11
+
+QT += core
+
+SOURCES += test/main.cpp
+
+DISTFILES += README.txt

src/lib/qtlib/qtlib.pri

@@ -3,24 +3,24 @@ QT += \
     network
 
 HEADERS += \
-    $${PWD}/qtlib_file.h \
-    $${PWD}/qtlib_dir.h \
-    $${PWD}/qtlib_json.h \
-    $${PWD}/qtlib_config.h \
-    $${PWD}/qtlib_networkresource.h \
-    $${PWD}/qtlib_ocsapi.h \
-    $${PWD}/qtlib_package.h
+    $${PWD}/src/qtlib_file.h \
+    $${PWD}/src/qtlib_dir.h \
+    $${PWD}/src/qtlib_json.h \
+    $${PWD}/src/qtlib_config.h \
+    $${PWD}/src/qtlib_networkresource.h \
+    $${PWD}/src/qtlib_ocsapi.h \
+    $${PWD}/src/qtlib_package.h
 
 SOURCES += \
-    $${PWD}/qtlib_file.cpp \
-    $${PWD}/qtlib_dir.cpp \
-    $${PWD}/qtlib_json.cpp \
-    $${PWD}/qtlib_config.cpp \
-    $${PWD}/qtlib_networkresource.cpp \
-    $${PWD}/qtlib_ocsapi.cpp \
-    $${PWD}/qtlib_package.cpp
+    $${PWD}/src/qtlib_file.cpp \
+    $${PWD}/src/qtlib_dir.cpp \
+    $${PWD}/src/qtlib_json.cpp \
+    $${PWD}/src/qtlib_config.cpp \
+    $${PWD}/src/qtlib_networkresource.cpp \
+    $${PWD}/src/qtlib_ocsapi.cpp \
+    $${PWD}/src/qtlib_package.cpp
 
-INCLUDEPATH += $${PWD}
+INCLUDEPATH += $${PWD}/src
 
 unix:!ios:!android {
     DEFINES += QTLIB_UNIX

src/lib/qtlib/qtlib_package.cpp → src/lib/qtlib/src/qtlib_package.cpp

@@ -132,6 +132,13 @@ bool Package::uninstallAsPlasmapkg(const QString &type)
 #ifdef Q_OS_ANDROID
 bool Package::installAsApk()
 {
+    /*
+    String apkFile = "/path/to/package.apk";
+    Intent intent = new Intent(Intent.ACTION_VIEW);
+    intent.setDataAndType(Uri.fromFile(new File(apkFile)), "application/vnd.android.package-archive");
+    startActivity(intent);
+    */
+
     QAndroidJniObject activity = QAndroidJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
     if (activity.isValid()) {
         QAndroidJniObject fileUri = QAndroidJniObject::fromString(path());

src/lib/qtlib/test/main.cpp

+#include <QObject>
+#include <QCoreApplication>
+#include <QDebug>
+
+#include "qtlib_file.h"
+#include "qtlib_dir.h"
+#include "qtlib_json.h"
+#include "qtlib_config.h"
+#include "qtlib_networkresource.h"
+#include "qtlib_ocsapi.h"
+#include "qtlib_package.h"
+
+class Test : public QObject
+{
+public:
+    Test() {}
+    virtual ~Test() {}
+
+    void start() {
+        qDebug() << "Start";
+
+        qtlib::NetworkResource *resource = new qtlib::NetworkResource(
+                    "LGPL-3.0",
+                    QUrl("https://api.opensource.org/license/LGPL-3.0"),
+                    false,
+                    this);
+        QJsonObject result = qtlib::Json(resource->get()->readData()).toObject();
+
+        qDebug() << resource->id() << ":" << result["name"].toString();
+
+        resource->setUrl(QUrl(result["text"].toArray()[0].toObject()["url"].toString()));
+        resource->setAsync(true);
+        connect(resource, &qtlib::NetworkResource::finished, this, &Test::finished);
+        resource->get();
+    }
+
+public slots:
+    void finished(qtlib::NetworkResource *resource) {
+        QString path = qtlib::Dir::tempPath() + "/" + resource->url().fileName();
+        resource->saveData(path);
+        resource->deleteLater();
+
+        qDebug() << "Downloaded" << resource->id() << ":" << path;
+        qDebug() << "Finished";
+
+        QCoreApplication::exit();
+    }
+};
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    Test test;
+    test.start();
+
+    return app.exec();
+}