diff --git a/.gitignore b/.gitignore index 83b4332..7fa5147 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ harbour-sailslack.pro.user .qmake.conf -vendor diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..067708c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "vendor/async/future/pri"] + path = vendor/async/future/pri + url = https://github.com/benlau/asyncfuture.git + branch = qpm/0.3.6.5 diff --git a/README.md b/README.md index ffd15f4..563dacf 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ This is a fork of [Slackfish](https://github.com/markussammallahti/harbour-slack ## Development -* Install [qpm](https://www.qpm.io/) * download dependencies ([Qt AsyncFuture](https://github.com/benlau/asyncfuture)) ``` -qpm install +git submodule init +git submodule update ``` * Create [new Slack application](https://api.slack.com/apps?new_app=1) diff --git a/qpm.json b/qpm.json deleted file mode 100644 index a3e16a5..0000000 --- a/qpm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "", - "description": "", - "dependencies": [ - "async.future.pri@0.3.6.5" - ], - "license": "NONE", - "pri_filename": "", - "webpage": "" -} \ No newline at end of file diff --git a/vendor/async/future/pri b/vendor/async/future/pri new file mode 160000 index 0000000..2511afe --- /dev/null +++ b/vendor/async/future/pri @@ -0,0 +1 @@ +Subproject commit 2511afea639bf816f1cc49eefbb3c62ce5eaa8f4 diff --git a/vendor/vendor.pri b/vendor/vendor.pri new file mode 100644 index 0000000..3a4b785 --- /dev/null +++ b/vendor/vendor.pri @@ -0,0 +1,8 @@ + +DEFINES += QPM_INIT\\(E\\)=\"E.addImportPath(QStringLiteral(\\\"qrc:/\\\"));\" +DEFINES += QPM_USE_NS +INCLUDEPATH += $$PWD +QML_IMPORT_PATH += $$PWD + + +include($$PWD/async/future/pri/asyncfuture.pri)