From e04fbdccb527255324c48da084e9a56541242385 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Fri, 2 Dec 2016 22:19:52 +0900
Subject: [PATCH] Update qtlib
---
src/lib/qtlib/.gitignore | 1 +
src/lib/qtlib/README.txt | 1 +
src/lib/qtlib/qtlib-test.pro | 13 +++++
src/lib/qtlib/qtlib.pri | 30 +++++-----
src/lib/qtlib/{ => src}/qtlib_config.cpp | 0
src/lib/qtlib/{ => src}/qtlib_config.h | 0
src/lib/qtlib/{ => src}/qtlib_dir.cpp | 0
src/lib/qtlib/{ => src}/qtlib_dir.h | 0
src/lib/qtlib/{ => src}/qtlib_file.cpp | 0
src/lib/qtlib/{ => src}/qtlib_file.h | 0
src/lib/qtlib/{ => src}/qtlib_json.cpp | 0
src/lib/qtlib/{ => src}/qtlib_json.h | 0
.../qtlib/{ => src}/qtlib_networkresource.cpp | 0
.../qtlib/{ => src}/qtlib_networkresource.h | 0
src/lib/qtlib/{ => src}/qtlib_ocsapi.cpp | 0
src/lib/qtlib/{ => src}/qtlib_ocsapi.h | 0
src/lib/qtlib/{ => src}/qtlib_package.cpp | 7 +++
src/lib/qtlib/{ => src}/qtlib_package.h | 0
src/lib/qtlib/test/main.cpp | 58 +++++++++++++++++++
19 files changed, 95 insertions(+), 15 deletions(-)
create mode 100644 src/lib/qtlib/.gitignore
create mode 100644 src/lib/qtlib/README.txt
create mode 100644 src/lib/qtlib/qtlib-test.pro
rename src/lib/qtlib/{ => src}/qtlib_config.cpp (100%)
rename src/lib/qtlib/{ => src}/qtlib_config.h (100%)
rename src/lib/qtlib/{ => src}/qtlib_dir.cpp (100%)
rename src/lib/qtlib/{ => src}/qtlib_dir.h (100%)
rename src/lib/qtlib/{ => src}/qtlib_file.cpp (100%)
rename src/lib/qtlib/{ => src}/qtlib_file.h (100%)
rename src/lib/qtlib/{ => src}/qtlib_json.cpp (100%)
rename src/lib/qtlib/{ => src}/qtlib_json.h (100%)
rename src/lib/qtlib/{ => src}/qtlib_networkresource.cpp (100%)
rename src/lib/qtlib/{ => src}/qtlib_networkresource.h (100%)
rename src/lib/qtlib/{ => src}/qtlib_ocsapi.cpp (100%)
rename src/lib/qtlib/{ => src}/qtlib_ocsapi.h (100%)
rename src/lib/qtlib/{ => src}/qtlib_package.cpp (95%)
rename src/lib/qtlib/{ => src}/qtlib_package.h (100%)
create mode 100644 src/lib/qtlib/test/main.cpp
diff --git a/src/lib/qtlib/.gitignore b/src/lib/qtlib/.gitignore
new file mode 100644
index 0000000..75c107b
--- /dev/null
+++ b/src/lib/qtlib/.gitignore
@@ -0,0 +1 @@
+*.pro.user
diff --git a/src/lib/qtlib/README.txt b/src/lib/qtlib/README.txt
new file mode 100644
index 0000000..3dc2fdf
--- /dev/null
+++ b/src/lib/qtlib/README.txt
@@ -0,0 +1 @@
+A library for Qt app
diff --git a/src/lib/qtlib/qtlib-test.pro b/src/lib/qtlib/qtlib-test.pro
new file mode 100644
index 0000000..6d61b4c
--- /dev/null
+++ b/src/lib/qtlib/qtlib-test.pro
@@ -0,0 +1,13 @@
+include(qtlib.pri)
+
+TARGET = qtlib-test
+
+TEMPLATE = app
+
+CONFIG += c++11
+
+QT += core
+
+SOURCES += test/main.cpp
+
+DISTFILES += README.txt
diff --git a/src/lib/qtlib/qtlib.pri b/src/lib/qtlib/qtlib.pri
index 2cc38b2..8d8e381 100644
--- a/src/lib/qtlib/qtlib.pri
+++ b/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
diff --git a/src/lib/qtlib/qtlib_config.cpp b/src/lib/qtlib/src/qtlib_config.cpp
similarity index 100%
rename from src/lib/qtlib/qtlib_config.cpp
rename to src/lib/qtlib/src/qtlib_config.cpp
diff --git a/src/lib/qtlib/qtlib_config.h b/src/lib/qtlib/src/qtlib_config.h
similarity index 100%
rename from src/lib/qtlib/qtlib_config.h
rename to src/lib/qtlib/src/qtlib_config.h
diff --git a/src/lib/qtlib/qtlib_dir.cpp b/src/lib/qtlib/src/qtlib_dir.cpp
similarity index 100%
rename from src/lib/qtlib/qtlib_dir.cpp
rename to src/lib/qtlib/src/qtlib_dir.cpp
diff --git a/src/lib/qtlib/qtlib_dir.h b/src/lib/qtlib/src/qtlib_dir.h
similarity index 100%
rename from src/lib/qtlib/qtlib_dir.h
rename to src/lib/qtlib/src/qtlib_dir.h
diff --git a/src/lib/qtlib/qtlib_file.cpp b/src/lib/qtlib/src/qtlib_file.cpp
similarity index 100%
rename from src/lib/qtlib/qtlib_file.cpp
rename to src/lib/qtlib/src/qtlib_file.cpp
diff --git a/src/lib/qtlib/qtlib_file.h b/src/lib/qtlib/src/qtlib_file.h
similarity index 100%
rename from src/lib/qtlib/qtlib_file.h
rename to src/lib/qtlib/src/qtlib_file.h
diff --git a/src/lib/qtlib/qtlib_json.cpp b/src/lib/qtlib/src/qtlib_json.cpp
similarity index 100%
rename from src/lib/qtlib/qtlib_json.cpp
rename to src/lib/qtlib/src/qtlib_json.cpp
diff --git a/src/lib/qtlib/qtlib_json.h b/src/lib/qtlib/src/qtlib_json.h
similarity index 100%
rename from src/lib/qtlib/qtlib_json.h
rename to src/lib/qtlib/src/qtlib_json.h
diff --git a/src/lib/qtlib/qtlib_networkresource.cpp b/src/lib/qtlib/src/qtlib_networkresource.cpp
similarity index 100%
rename from src/lib/qtlib/qtlib_networkresource.cpp
rename to src/lib/qtlib/src/qtlib_networkresource.cpp
diff --git a/src/lib/qtlib/qtlib_networkresource.h b/src/lib/qtlib/src/qtlib_networkresource.h
similarity index 100%
rename from src/lib/qtlib/qtlib_networkresource.h
rename to src/lib/qtlib/src/qtlib_networkresource.h
diff --git a/src/lib/qtlib/qtlib_ocsapi.cpp b/src/lib/qtlib/src/qtlib_ocsapi.cpp
similarity index 100%
rename from src/lib/qtlib/qtlib_ocsapi.cpp
rename to src/lib/qtlib/src/qtlib_ocsapi.cpp
diff --git a/src/lib/qtlib/qtlib_ocsapi.h b/src/lib/qtlib/src/qtlib_ocsapi.h
similarity index 100%
rename from src/lib/qtlib/qtlib_ocsapi.h
rename to src/lib/qtlib/src/qtlib_ocsapi.h
diff --git a/src/lib/qtlib/qtlib_package.cpp b/src/lib/qtlib/src/qtlib_package.cpp
similarity index 95%
rename from src/lib/qtlib/qtlib_package.cpp
rename to src/lib/qtlib/src/qtlib_package.cpp
index c3541c4..570d69f 100644
--- a/src/lib/qtlib/qtlib_package.cpp
+++ b/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());
diff --git a/src/lib/qtlib/qtlib_package.h b/src/lib/qtlib/src/qtlib_package.h
similarity index 100%
rename from src/lib/qtlib/qtlib_package.h
rename to src/lib/qtlib/src/qtlib_package.h
diff --git a/src/lib/qtlib/test/main.cpp b/src/lib/qtlib/test/main.cpp
new file mode 100644
index 0000000..c43cf3d
--- /dev/null
+++ b/src/lib/qtlib/test/main.cpp
@@ -0,0 +1,58 @@
+#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();
+}
--
GitLab