summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2014-12-20 13:42:59 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2014-12-20 13:47:42 +0100
commit2c043e55aca89486ac90008afa8e73d016bb5e74 (patch)
tree531408615e42d0548428c19d9ea3be3cd0b905c1 /src
parentbc41e893edf6ce67f636ae4cb42a0043220e617b (diff)
Revert automatic anc generation for now
Diffstat (limited to 'src')
-rw-r--r--src/qmlandroid/view/animation/animation.pri10
-rw-r--r--src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp15
-rw-r--r--src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h28
-rw-r--r--src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator.json13
-rw-r--r--src/qmlandroid/view/animation/qqmlandroidbounceinterpolator.cpp15
-rw-r--r--src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h28
-rw-r--r--src/qmlandroid/view/animation/qqmlandroidlinearinterpolator.cpp15
-rw-r--r--src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h28
8 files changed, 152 insertions, 0 deletions
diff --git a/src/qmlandroid/view/animation/animation.pri b/src/qmlandroid/view/animation/animation.pri
index ad26db0..e8b752b 100644
--- a/src/qmlandroid/view/animation/animation.pri
+++ b/src/qmlandroid/view/animation/animation.pri
@@ -1,15 +1,18 @@
INCLUDEPATH += $$PWD
HEADERS += \
+ $$PWD/qqmlandroidacceleratedecelerateinterpolator_p.h \
$$PWD/qqmlandroidaccelerateinterpolator_p.h \
$$PWD/qqmlandroidalphaanimation_p.h \
$$PWD/qqmlandroidanimation_p.h \
$$PWD/qqmlandroidanimationset_p.h \
$$PWD/qqmlandroidanticipateinterpolator_p.h \
$$PWD/qqmlandroidanticipateovershootinterpolator_p.h \
+ $$PWD/qqmlandroidbounceinterpolator_p.h \
$$PWD/qqmlandroidcycleinterpolator_p.h \
$$PWD/qqmlandroiddecelerateinterpolator_p.h \
$$PWD/qqmlandroidinterpolator_p.h \
+ $$PWD/qqmlandroidlinearinterpolator_p.h \
$$PWD/qqmlandroidovershootinterpolator_p.h \
$$PWD/qqmlandroidpathinterpolator_p.h \
$$PWD/qqmlandroidrotateanimation_p.h \
@@ -18,15 +21,18 @@ HEADERS += \
$$PWD/qtqmlandroidanimationmodule_p.h
SOURCES += \
+ $$PWD/qqmlandroidacceleratedecelerateinterpolator.cpp \
$$PWD/qqmlandroidaccelerateinterpolator.cpp \
$$PWD/qqmlandroidalphaanimation.cpp \
$$PWD/qqmlandroidanimation.cpp \
$$PWD/qqmlandroidanimationset.cpp \
$$PWD/qqmlandroidanticipateinterpolator.cpp \
$$PWD/qqmlandroidanticipateovershootinterpolator.cpp \
+ $$PWD/qqmlandroidbounceinterpolator.cpp \
$$PWD/qqmlandroidcycleinterpolator.cpp \
$$PWD/qqmlandroiddecelerateinterpolator.cpp \
$$PWD/qqmlandroidinterpolator.cpp \
+ $$PWD/qqmlandroidlinearinterpolator.cpp \
$$PWD/qqmlandroidovershootinterpolator.cpp \
$$PWD/qqmlandroidpathinterpolator.cpp \
$$PWD/qqmlandroidrotateanimation.cpp \
@@ -36,7 +42,11 @@ SOURCES += \
ANDROID_CLASSES = \
$$PWD/qqmlandroidacceleratedecelerateinterpolator.json \
+ $$PWD/qqmlandroidaccelerateinterpolator.json \
$$PWD/qqmlandroidbounceinterpolator.json \
$$PWD/qqmlandroidlinearinterpolator.json
+# TODO
+ANC_DIR = $$PWD
+
CONFIG += anc
diff --git a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp
new file mode 100644
index 0000000..5553aa0
--- /dev/null
+++ b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp
@@ -0,0 +1,15 @@
+#include "qqmlandroidacceleratedecelerateinterpolator_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QQmlAndroidAccelerateDecelerateInterpolator::QQmlAndroidAccelerateDecelerateInterpolator(QObject *parent) :
+ QQmlAndroidInterpolator(parent)
+{
+}
+
+QAndroidJniObject QQmlAndroidAccelerateDecelerateInterpolator::onCreate()
+{
+ return QAndroidJniObject("android/view/animation/AccelerateDecelerateInterpolator");
+}
+
+QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
new file mode 100644
index 0000000..266845b
--- /dev/null
+++ b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
@@ -0,0 +1,28 @@
+#ifndef QQMLANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
+#define QQMLANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
+
+#include "qtqmlandroidglobal_p.h"
+#include "qqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include <QtAndroidExtras/qandroidjniobject.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlAndroidAccelerateDecelerateInterpolator : public QQmlAndroidInterpolator
+{
+ Q_OBJECT
+
+public:
+ explicit QQmlAndroidAccelerateDecelerateInterpolator(QObject *parent = 0);
+
+Q_SIGNALS:
+
+protected:
+ QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+
+private:
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
diff --git a/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator.json b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator.json
new file mode 100644
index 0000000..bd718eb
--- /dev/null
+++ b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator.json
@@ -0,0 +1,13 @@
+{
+ "class": "AccelerateInterpolator",
+ "base": "Interpolator",
+ "package": "android/view/animation",
+ "properties": [
+ {
+ "name": "factor",
+ "type": "qreal",
+ "optional": true,
+ "value": 1.0
+ }
+ ]
+}
diff --git a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator.cpp
new file mode 100644
index 0000000..f6fecc2
--- /dev/null
+++ b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator.cpp
@@ -0,0 +1,15 @@
+#include "qqmlandroidbounceinterpolator_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QQmlAndroidBounceInterpolator::QQmlAndroidBounceInterpolator(QObject *parent) :
+ QQmlAndroidInterpolator(parent)
+{
+}
+
+QAndroidJniObject QQmlAndroidBounceInterpolator::onCreate()
+{
+ return QAndroidJniObject("android/view/animation/BounceInterpolator");
+}
+
+QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h
new file mode 100644
index 0000000..852111e
--- /dev/null
+++ b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h
@@ -0,0 +1,28 @@
+#ifndef QQMLANDROIDBOUNCEINTERPOLATOR_P_H
+#define QQMLANDROIDBOUNCEINTERPOLATOR_P_H
+
+#include "qtqmlandroidglobal_p.h"
+#include "qqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include <QtAndroidExtras/qandroidjniobject.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlAndroidBounceInterpolator : public QQmlAndroidInterpolator
+{
+ Q_OBJECT
+
+public:
+ explicit QQmlAndroidBounceInterpolator(QObject *parent = 0);
+
+Q_SIGNALS:
+
+protected:
+ QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+
+private:
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLANDROIDBOUNCEINTERPOLATOR_P_H
diff --git a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator.cpp
new file mode 100644
index 0000000..3864bdd
--- /dev/null
+++ b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator.cpp
@@ -0,0 +1,15 @@
+#include "qqmlandroidlinearinterpolator_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QQmlAndroidLinearInterpolator::QQmlAndroidLinearInterpolator(QObject *parent) :
+ QQmlAndroidInterpolator(parent)
+{
+}
+
+QAndroidJniObject QQmlAndroidLinearInterpolator::onCreate()
+{
+ return QAndroidJniObject("android/view/animation/LinearInterpolator");
+}
+
+QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h
new file mode 100644
index 0000000..a6d051a
--- /dev/null
+++ b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h
@@ -0,0 +1,28 @@
+#ifndef QQMLANDROIDLINEARINTERPOLATOR_P_H
+#define QQMLANDROIDLINEARINTERPOLATOR_P_H
+
+#include "qtqmlandroidglobal_p.h"
+#include "qqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include <QtAndroidExtras/qandroidjniobject.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlAndroidLinearInterpolator : public QQmlAndroidInterpolator
+{
+ Q_OBJECT
+
+public:
+ explicit QQmlAndroidLinearInterpolator(QObject *parent = 0);
+
+Q_SIGNALS:
+
+protected:
+ QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+
+private:
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLANDROIDLINEARINTERPOLATOR_P_H