Add "QuickFuture 1.0" package name

benlau · Apr 19, 2017 · 95d872a · 95d872a
1 parent ef451a2
commit 95d872a
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ QuickFuture is a QML wrapper of QFuture. It allows user to access and listen fro
 **Example**
 
 ```
-import Future 1.0
+import QuickFuture 1.0
 
 ...
 
@@ -85,10 +85,39 @@ API
 
 Returns true if the asynchronous computation represented by this future has finished; otherwise returns false.
 
+**Future.isRunning(future)**
+
+**Future.isCanceled(future)**
+
 **Future.onFinished(future, callback)**
 
 The callback will be invoked when the watched future finishes.
 
+**Future.onCanceled(future, callback)**
+
 **Future.promise(future)**
 
 Create a promise object which will be resolved when the future has finished. It must have QuickPromise installed and setup properly before using this function.
+
+**Future.result(future)**
+
+Object the result of a Future object.
+
+**Future.sync(future, propertyAtFuture, target, propertyAtTarget)**
+
+Synchronize a property in future object to target object.
+
+Example:
+```
+
+QtObject {
+    id: target1
+    property var isRunning
+    property var isFinished
+}
+
+// Future.sync(future,"isRunning", target1, "isRunning");
+```
+
+Supported properties: "isRunning", "isCanceled", "isFinished"
+
diff --git a/qffuture.cpp b/qffuture.cpp
@@ -49,7 +49,7 @@ void Future::setEngine(QQmlEngine *engine)
 
     QString qml = "import QtQuick 2.0\n"
                   "import QuickPromise 1.0\n"
-                  "import Future 1.0\n"
+                  "import QuickFuture 1.0\n"
                   "QtObject { \n"
                   "function create(future) {\n"
                   "    var promise = Q.promise();\n"
@@ -184,6 +184,7 @@ static void init() {
     });
 
     qmlRegisterSingletonType<Future>("Future", 1, 0, "Future", provider);
+    qmlRegisterSingletonType<Future>("QuickFuture", 1, 0, "Future", provider);
 
     Future::registerType<QString>();
     Future::registerType<int>();
@@ -196,7 +197,6 @@ static void init() {
     Future::registerType<QSize>();
 }
 
-
 Q_COREAPP_STARTUP_FUNCTION(init)
 
 } // End of namespace
diff --git a/qpm.json b/qpm.json
@@ -10,7 +10,7 @@
     "url": "[email protected]:benlau/quickfuture.git"
   },
   "version": {
-    "label": "1.0.1",
+    "label": "1.0.2",
     "revision": "",
     "fingerprint": ""
   },

diff --git a/tests/quickfutureunittests/qmltests/PromiseIsNotInstalled.qml b/tests/quickfutureunittests/qmltests/PromiseIsNotInstalled.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Future 1.0
+import QuickFuture 1.0
 
 Item {
 

diff --git a/tests/quickfutureunittests/qmltests/tst_Callback.qml b/tests/quickfutureunittests/qmltests/tst_Callback.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import QtTest 1.1
 import Testable 1.0
-import Future 1.0
+import QuickFuture 1.0
 import FutureTests 1.0
 
 CustomTestCase {

diff --git a/tests/quickfutureunittests/qmltests/tst_Promise.qml b/tests/quickfutureunittests/qmltests/tst_Promise.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Testable 1.0
-import Future 1.0
+import QuickFuture 1.0
 import FutureTests 1.0
 import QtTest 1.1
 

diff --git a/tests/quickfutureunittests/qmltests/tst_Sync.qml b/tests/quickfutureunittests/qmltests/tst_Sync.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import QtTest 1.1
 import Testable 1.0
-import Future 1.0
+import QuickFuture 1.0
 import FutureTests 1.0
 
 CustomTestCase {