Restructure

Change-Id: I63af251b05686f78daf441b1ed7a999bf6685bf6
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

193 files changed, 20 insertions, 26 deletions

diff --git a/src/qmlandroid/qmlandroid.pri b/src/android/android.pri
index d7ecc31..d7ecc31 100644
--- a/src/qmlandroid/qmlandroid.pri
+++ b/src/android/android.pri
diff --git a/src/android/android.pro b/src/android/android.pro
index 5221a4c..bfc111f 100644
--- a/src/android/android.pro
+++ b/src/android/android.pro
@@ -1,3 +1,16 @@
-TEMPLATE = subdirs
-SUBDIRS += \
-    java
+TARGET = QtQmlAndroid
+
+QT += androidextras qml
+QT += core-private # qjnihelpers
+
+CONFIG += c++11
+CONFIG -= create_cmake
+
+features.files = $$QMLANDROID_PREFIX/features/qmlandroid.prf
+features.path = $$[QT_HOST_DATA]/mkspecs/features
+!prefix_build: COPIES += features
+INSTALLS += features
+
+include(qmlandroid.pri)
+
+load(qt_module)
diff --git a/src/qmlandroid/app/app.pri b/src/android/app/app.pri
index f7951c0..f7951c0 100644
--- a/src/qmlandroid/app/app.pri
+++ b/src/android/app/app.pri
diff --git a/src/qmlandroid/app/qqmlandroidactionbar.cpp b/src/android/app/qqmlandroidactionbar.cpp
index 6b6893b..6b6893b 100644
--- a/src/qmlandroid/app/qqmlandroidactionbar.cpp
+++ b/src/android/app/qqmlandroidactionbar.cpp
diff --git a/src/qmlandroid/app/qqmlandroidactionbar_p.h b/src/android/app/qqmlandroidactionbar_p.h
index 2bc70a2..2bc70a2 100644
--- a/src/qmlandroid/app/qqmlandroidactionbar_p.h
+++ b/src/android/app/qqmlandroidactionbar_p.h
diff --git a/src/qmlandroid/app/qqmlandroidactivity.cpp b/src/android/app/qqmlandroidactivity.cpp
index b740efb..b740efb 100644
--- a/src/qmlandroid/app/qqmlandroidactivity.cpp
+++ b/src/android/app/qqmlandroidactivity.cpp
diff --git a/src/qmlandroid/app/qqmlandroidactivity_p.h b/src/android/app/qqmlandroidactivity_p.h
index 58d119f..58d119f 100644
--- a/src/qmlandroid/app/qqmlandroidactivity_p.h
+++ b/src/android/app/qqmlandroidactivity_p.h
diff --git a/src/qmlandroid/app/qqmlandroidalertdialog.cpp b/src/android/app/qqmlandroidalertdialog.cpp
index 84dff83..84dff83 100644
--- a/src/qmlandroid/app/qqmlandroidalertdialog.cpp
+++ b/src/android/app/qqmlandroidalertdialog.cpp
diff --git a/src/qmlandroid/app/qqmlandroidalertdialog_p.h b/src/android/app/qqmlandroidalertdialog_p.h
index 129a1c1..129a1c1 100644
--- a/src/qmlandroid/app/qqmlandroidalertdialog_p.h
+++ b/src/android/app/qqmlandroidalertdialog_p.h
diff --git a/src/qmlandroid/app/qqmlandroiddialog.cpp b/src/android/app/qqmlandroiddialog.cpp
index 397ee60..397ee60 100644
--- a/src/qmlandroid/app/qqmlandroiddialog.cpp
+++ b/src/android/app/qqmlandroiddialog.cpp
diff --git a/src/qmlandroid/app/qqmlandroiddialog_p.h b/src/android/app/qqmlandroiddialog_p.h
index fdacdfe..fdacdfe 100644
--- a/src/qmlandroid/app/qqmlandroiddialog_p.h
+++ b/src/android/app/qqmlandroiddialog_p.h
diff --git a/src/qmlandroid/app/qqmlandroidservice.cpp b/src/android/app/qqmlandroidservice.cpp
index 6db3d51..6db3d51 100644
--- a/src/qmlandroid/app/qqmlandroidservice.cpp
+++ b/src/android/app/qqmlandroidservice.cpp
diff --git a/src/qmlandroid/app/qqmlandroidservice_p.h b/src/android/app/qqmlandroidservice_p.h
index 8c5c01e..8c5c01e 100644
--- a/src/qmlandroid/app/qqmlandroidservice_p.h
+++ b/src/android/app/qqmlandroidservice_p.h
diff --git a/src/qmlandroid/content/content.pri b/src/android/content/content.pri
index 6a48b09..6a48b09 100644
--- a/src/qmlandroid/content/content.pri
+++ b/src/android/content/content.pri
diff --git a/src/qmlandroid/content/qqmlandroidcontext.cpp b/src/android/content/qqmlandroidcontext.cpp
index 5156e08..5156e08 100644
--- a/src/qmlandroid/content/qqmlandroidcontext.cpp
+++ b/src/android/content/qqmlandroidcontext.cpp
diff --git a/src/qmlandroid/content/qqmlandroidcontext_p.h b/src/android/content/qqmlandroidcontext_p.h
index 6bb6736..6bb6736 100644
--- a/src/qmlandroid/content/qqmlandroidcontext_p.h
+++ b/src/android/content/qqmlandroidcontext_p.h
diff --git a/src/qmlandroid/content/qqmlandroidcontextual.cpp b/src/android/content/qqmlandroidcontextual.cpp
index 60af40c..60af40c 100644
--- a/src/qmlandroid/content/qqmlandroidcontextual.cpp
+++ b/src/android/content/qqmlandroidcontextual.cpp
diff --git a/src/qmlandroid/content/qqmlandroidcontextual_p.h b/src/android/content/qqmlandroidcontextual_p.h
index de9691b..de9691b 100644
--- a/src/qmlandroid/content/qqmlandroidcontextual_p.h
+++ b/src/android/content/qqmlandroidcontextual_p.h
diff --git a/src/qmlandroid/content/qqmlandroidcontextwrapper.cpp b/src/android/content/qqmlandroidcontextwrapper.cpp
index 576ee28..576ee28 100644
--- a/src/qmlandroid/content/qqmlandroidcontextwrapper.cpp
+++ b/src/android/content/qqmlandroidcontextwrapper.cpp
diff --git a/src/qmlandroid/content/qqmlandroidcontextwrapper_p.h b/src/android/content/qqmlandroidcontextwrapper_p.h
index 59e73a5..59e73a5 100644
--- a/src/qmlandroid/content/qqmlandroidcontextwrapper_p.h
+++ b/src/android/content/qqmlandroidcontextwrapper_p.h
diff --git a/src/qmlandroid/core/core.pri b/src/android/core/core.pri
index f3eb64f..f3eb64f 100644
--- a/src/qmlandroid/core/core.pri
+++ b/src/android/core/core.pri
diff --git a/src/qmlandroid/core/qqmlandroidobject.cpp b/src/android/core/qqmlandroidobject.cpp
index c760260..c760260 100644
--- a/src/qmlandroid/core/qqmlandroidobject.cpp
+++ b/src/android/core/qqmlandroidobject.cpp
diff --git a/src/qmlandroid/core/qqmlandroidobject_p.h b/src/android/core/qqmlandroidobject_p.h
index 17056c9..17056c9 100644
--- a/src/qmlandroid/core/qqmlandroidobject_p.h
+++ b/src/android/core/qqmlandroidobject_p.h
diff --git a/src/qmlandroid/core/qqmlandroidoptional_p.h b/src/android/core/qqmlandroidoptional_p.h
index aea3316..aea3316 100644
--- a/src/qmlandroid/core/qqmlandroidoptional_p.h
+++ b/src/android/core/qqmlandroidoptional_p.h
diff --git a/src/qmlandroid/core/qtqmlandroidfunctions.cpp b/src/android/core/qtqmlandroidfunctions.cpp
index 628737c..628737c 100644
--- a/src/qmlandroid/core/qtqmlandroidfunctions.cpp
+++ b/src/android/core/qtqmlandroidfunctions.cpp
diff --git a/src/qmlandroid/core/qtqmlandroidfunctions_p.h b/src/android/core/qtqmlandroidfunctions_p.h
index b9b9e35..b9b9e35 100644
--- a/src/qmlandroid/core/qtqmlandroidfunctions_p.h
+++ b/src/android/core/qtqmlandroidfunctions_p.h
diff --git a/src/qmlandroid/core/qtqmlandroidglobal_p.h b/src/android/core/qtqmlandroidglobal_p.h
index 2737a4d..2737a4d 100644
--- a/src/qmlandroid/core/qtqmlandroidglobal_p.h
+++ b/src/android/core/qtqmlandroidglobal_p.h
diff --git a/src/qmlandroid/graphics/drawable/drawable.pri b/src/android/graphics/drawable/drawable.pri
index 6c04e80..6c04e80 100644
--- a/src/qmlandroid/graphics/drawable/drawable.pri
+++ b/src/android/graphics/drawable/drawable.pri
diff --git a/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable.cpp b/src/android/graphics/drawable/qqmlandroidcolordrawable.cpp
index 6dcf2b8..6dcf2b8 100644
--- a/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable.cpp
+++ b/src/android/graphics/drawable/qqmlandroidcolordrawable.cpp
diff --git a/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h b/src/android/graphics/drawable/qqmlandroidcolordrawable_p.h
index b0bf19f..b0bf19f 100644
--- a/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h
+++ b/src/android/graphics/drawable/qqmlandroidcolordrawable_p.h
diff --git a/src/qmlandroid/graphics/drawable/qqmlandroiddrawable.cpp b/src/android/graphics/drawable/qqmlandroiddrawable.cpp
index 68414b7..68414b7 100644
--- a/src/qmlandroid/graphics/drawable/qqmlandroiddrawable.cpp
+++ b/src/android/graphics/drawable/qqmlandroiddrawable.cpp
diff --git a/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h b/src/android/graphics/drawable/qqmlandroiddrawable_p.h
index 52f2386..52f2386 100644
--- a/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h
+++ b/src/android/graphics/drawable/qqmlandroiddrawable_p.h
diff --git a/src/qmlandroid/graphics/graphics.pri b/src/android/graphics/graphics.pri
index 7061563..7061563 100644
--- a/src/qmlandroid/graphics/graphics.pri
+++ b/src/android/graphics/graphics.pri
diff --git a/src/qmlandroid/graphics/qqmlandroidcolor.cpp b/src/android/graphics/qqmlandroidcolor.cpp
index 0327c58..0327c58 100644
--- a/src/qmlandroid/graphics/qqmlandroidcolor.cpp
+++ b/src/android/graphics/qqmlandroidcolor.cpp
diff --git a/src/qmlandroid/graphics/qqmlandroidcolor_p.h b/src/android/graphics/qqmlandroidcolor_p.h
index 74f9961..74f9961 100644
--- a/src/qmlandroid/graphics/qqmlandroidcolor_p.h
+++ b/src/android/graphics/qqmlandroidcolor_p.h
diff --git a/src/android/java/java.pro b/src/android/java/java.pri
index 9eaf2ae..73ba60d 100644
--- a/src/android/java/java.pro
+++ b/src/android/java/java.pri
@@ -1,5 +1,3 @@
-CONFIG -= qt android_install
-
 OTHER_FILES += \
     $$PWD/qml/qt/android/app/QmlActivity.java \
     $$PWD/qml/qt/android/app/QmlService.java \
diff --git a/src/qmlandroid/qqmlandroidr.cpp b/src/android/qqmlandroidr.cpp
index d50a142..d50a142 100644
--- a/src/qmlandroid/qqmlandroidr.cpp
+++ b/src/android/qqmlandroidr.cpp
diff --git a/src/qmlandroid/qqmlandroidr_p.h b/src/android/qqmlandroidr_p.h
index 07c4f36..07c4f36 100644
--- a/src/qmlandroid/qqmlandroidr_p.h
+++ b/src/android/qqmlandroidr_p.h
diff --git a/src/qmlandroid/support/support.pri b/src/android/support/support.pri
index 6c62701..6c62701 100644
--- a/src/qmlandroid/support/support.pri
+++ b/src/android/support/support.pri
diff --git a/src/qmlandroid/support/v4/v4.pri b/src/android/support/v4/v4.pri
index 014f027..014f027 100644
--- a/src/qmlandroid/support/v4/v4.pri
+++ b/src/android/support/v4/v4.pri
diff --git a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout.cpp b/src/android/support/v4/widget/qqmlandroiddrawerlayout.cpp
index 4f7a50e..4f7a50e 100644
--- a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout.cpp
+++ b/src/android/support/v4/widget/qqmlandroiddrawerlayout.cpp
diff --git a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h b/src/android/support/v4/widget/qqmlandroiddrawerlayout_p.h
index cb9dd84..cb9dd84 100644
--- a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h
+++ b/src/android/support/v4/widget/qqmlandroiddrawerlayout_p.h
diff --git a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams.cpp b/src/android/support/v4/widget/qqmlandroiddrawerlayoutparams.cpp
index 908d42b..908d42b 100644
--- a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams.cpp
+++ b/src/android/support/v4/widget/qqmlandroiddrawerlayoutparams.cpp
diff --git a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h b/src/android/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h
index 54816f4..54816f4 100644
--- a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h
+++ b/src/android/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h
diff --git a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout.cpp b/src/android/support/v4/widget/qqmlandroidswiperefreshlayout.cpp
index 80b631c..80b631c 100644
--- a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout.cpp
+++ b/src/android/support/v4/widget/qqmlandroidswiperefreshlayout.cpp
diff --git a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h b/src/android/support/v4/widget/qqmlandroidswiperefreshlayout_p.h
index 79b9f51..79b9f51 100644
--- a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h
+++ b/src/android/support/v4/widget/qqmlandroidswiperefreshlayout_p.h
diff --git a/src/qmlandroid/support/v4/widget/widget.pri b/src/android/support/v4/widget/widget.pri
index cbf1b84..cbf1b84 100644
--- a/src/qmlandroid/support/v4/widget/widget.pri
+++ b/src/android/support/v4/widget/widget.pri
diff --git a/src/qmlandroid/support/v7/app/app.pri b/src/android/support/v7/app/app.pri
index a203273..a203273 100644
--- a/src/qmlandroid/support/v7/app/app.pri
+++ b/src/android/support/v7/app/app.pri
diff --git a/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle.cpp b/src/android/support/v7/app/qqmlandroidactionbardrawertoggle.cpp
index 16bb0bb..16bb0bb 100644
--- a/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle.cpp
+++ b/src/android/support/v7/app/qqmlandroidactionbardrawertoggle.cpp
diff --git a/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle_p.h b/src/android/support/v7/app/qqmlandroidactionbardrawertoggle_p.h
index b649219..b649219 100644
--- a/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle_p.h
+++ b/src/android/support/v7/app/qqmlandroidactionbardrawertoggle_p.h
diff --git a/src/qmlandroid/support/v7/v7.pri b/src/android/support/v7/v7.pri
index 9d185ab..9d185ab 100644
--- a/src/qmlandroid/support/v7/v7.pri
+++ b/src/android/support/v7/v7.pri
diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidcardview.cpp b/src/android/support/v7/widget/qqmlandroidcardview.cpp
index 1a49bbb..1a49bbb 100644
--- a/src/qmlandroid/support/v7/widget/qqmlandroidcardview.cpp
+++ b/src/android/support/v7/widget/qqmlandroidcardview.cpp
diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h b/src/android/support/v7/widget/qqmlandroidcardview_p.h
index 6916eda..6916eda 100644
--- a/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h
+++ b/src/android/support/v7/widget/qqmlandroidcardview_p.h
diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp b/src/android/support/v7/widget/qqmlandroidrecycleradapter.cpp
index 54056ca..54056ca 100644
--- a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp
+++ b/src/android/support/v7/widget/qqmlandroidrecycleradapter.cpp
diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h b/src/android/support/v7/widget/qqmlandroidrecycleradapter_p.h
index 1e2b9ea..1e2b9ea 100644
--- a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h
+++ b/src/android/support/v7/widget/qqmlandroidrecycleradapter_p.h
diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview.cpp b/src/android/support/v7/widget/qqmlandroidrecyclerview.cpp
index 684ccda..684ccda 100644
--- a/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview.cpp
+++ b/src/android/support/v7/widget/qqmlandroidrecyclerview.cpp
diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h b/src/android/support/v7/widget/qqmlandroidrecyclerview_p.h
index a56a5cd..a56a5cd 100644
--- a/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h
+++ b/src/android/support/v7/widget/qqmlandroidrecyclerview_p.h
diff --git a/src/qmlandroid/support/v7/widget/widget.pri b/src/android/support/v7/widget/widget.pri
index 3f67ebc..3f67ebc 100644
--- a/src/qmlandroid/support/v7/widget/widget.pri
+++ b/src/android/support/v7/widget/widget.pri
diff --git a/src/qmlandroid/view/animation/animation.pri b/src/android/view/animation/animation.pri
index 0a90fd9..0a90fd9 100644
--- a/src/qmlandroid/view/animation/animation.pri
+++ b/src/android/view/animation/animation.pri
diff --git a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp b/src/android/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp
index 43088da..43088da 100644
--- a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h b/src/android/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
index 91a9055..91a9055 100644
--- a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator.cpp b/src/android/view/animation/qqmlandroidaccelerateinterpolator.cpp
index cc983fb..cc983fb 100644
--- a/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidaccelerateinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h b/src/android/view/animation/qqmlandroidaccelerateinterpolator_p.h
index ab2ab14..ab2ab14 100644
--- a/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidaccelerateinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidalphaanimation.cpp b/src/android/view/animation/qqmlandroidalphaanimation.cpp
index 833b7fe..833b7fe 100644
--- a/src/qmlandroid/view/animation/qqmlandroidalphaanimation.cpp
+++ b/src/android/view/animation/qqmlandroidalphaanimation.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h b/src/android/view/animation/qqmlandroidalphaanimation_p.h
index 0bddd50..0bddd50 100644
--- a/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h
+++ b/src/android/view/animation/qqmlandroidalphaanimation_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidanimation.cpp b/src/android/view/animation/qqmlandroidanimation.cpp
index 6dd43c3..6dd43c3 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanimation.cpp
+++ b/src/android/view/animation/qqmlandroidanimation.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidanimation_p.h b/src/android/view/animation/qqmlandroidanimation_p.h
index 47717e6..47717e6 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanimation_p.h
+++ b/src/android/view/animation/qqmlandroidanimation_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidanimationset.cpp b/src/android/view/animation/qqmlandroidanimationset.cpp
index f5c85b5..f5c85b5 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanimationset.cpp
+++ b/src/android/view/animation/qqmlandroidanimationset.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h b/src/android/view/animation/qqmlandroidanimationset_p.h
index 2891e86..2891e86 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h
+++ b/src/android/view/animation/qqmlandroidanimationset_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator.cpp b/src/android/view/animation/qqmlandroidanticipateinterpolator.cpp
index 5588dec..5588dec 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidanticipateinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h b/src/android/view/animation/qqmlandroidanticipateinterpolator_p.h
index 2a524b8..2a524b8 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidanticipateinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator.cpp b/src/android/view/animation/qqmlandroidanticipateovershootinterpolator.cpp
index 6e2b21b..6e2b21b 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidanticipateovershootinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h b/src/android/view/animation/qqmlandroidanticipateovershootinterpolator_p.h
index 05a4092..05a4092 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidanticipateovershootinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator.cpp b/src/android/view/animation/qqmlandroidbounceinterpolator.cpp
index c615d2d..c615d2d 100644
--- a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidbounceinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h b/src/android/view/animation/qqmlandroidbounceinterpolator_p.h
index 4a9da71..4a9da71 100644
--- a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidbounceinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator.cpp b/src/android/view/animation/qqmlandroidcycleinterpolator.cpp
index 6c88540..6c88540 100644
--- a/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidcycleinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h b/src/android/view/animation/qqmlandroidcycleinterpolator_p.h
index 6fbeeeb..6fbeeeb 100644
--- a/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidcycleinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator.cpp b/src/android/view/animation/qqmlandroiddecelerateinterpolator.cpp
index e634367..e634367 100644
--- a/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroiddecelerateinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h b/src/android/view/animation/qqmlandroiddecelerateinterpolator_p.h
index 3fa2800..3fa2800 100644
--- a/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroiddecelerateinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidinterpolator.cpp b/src/android/view/animation/qqmlandroidinterpolator.cpp
index 9764bda..9764bda 100644
--- a/src/qmlandroid/view/animation/qqmlandroidinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h b/src/android/view/animation/qqmlandroidinterpolator_p.h
index cd27e0b..cd27e0b 100644
--- a/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator.cpp b/src/android/view/animation/qqmlandroidlinearinterpolator.cpp
index 57dcfa6..57dcfa6 100644
--- a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidlinearinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h b/src/android/view/animation/qqmlandroidlinearinterpolator_p.h
index 4ccc2d3..4ccc2d3 100644
--- a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidlinearinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator.cpp b/src/android/view/animation/qqmlandroidovershootinterpolator.cpp
index 595a209..595a209 100644
--- a/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidovershootinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h b/src/android/view/animation/qqmlandroidovershootinterpolator_p.h
index b7eebb0..b7eebb0 100644
--- a/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidovershootinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidpathinterpolator.cpp b/src/android/view/animation/qqmlandroidpathinterpolator.cpp
index ae6a56c..ae6a56c 100644
--- a/src/qmlandroid/view/animation/qqmlandroidpathinterpolator.cpp
+++ b/src/android/view/animation/qqmlandroidpathinterpolator.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h b/src/android/view/animation/qqmlandroidpathinterpolator_p.h
index 7e80fcf..7e80fcf 100644
--- a/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h
+++ b/src/android/view/animation/qqmlandroidpathinterpolator_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidrotateanimation.cpp b/src/android/view/animation/qqmlandroidrotateanimation.cpp
index 03c921f..03c921f 100644
--- a/src/qmlandroid/view/animation/qqmlandroidrotateanimation.cpp
+++ b/src/android/view/animation/qqmlandroidrotateanimation.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h b/src/android/view/animation/qqmlandroidrotateanimation_p.h
index 7615a42..7615a42 100644
--- a/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h
+++ b/src/android/view/animation/qqmlandroidrotateanimation_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidscaleanimation.cpp b/src/android/view/animation/qqmlandroidscaleanimation.cpp
index 4c21bdc..4c21bdc 100644
--- a/src/qmlandroid/view/animation/qqmlandroidscaleanimation.cpp
+++ b/src/android/view/animation/qqmlandroidscaleanimation.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h b/src/android/view/animation/qqmlandroidscaleanimation_p.h
index 7dd118d..7dd118d 100644
--- a/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h
+++ b/src/android/view/animation/qqmlandroidscaleanimation_p.h
diff --git a/src/qmlandroid/view/animation/qqmlandroidtranslateanimation.cpp b/src/android/view/animation/qqmlandroidtranslateanimation.cpp
index f432c22..f432c22 100644
--- a/src/qmlandroid/view/animation/qqmlandroidtranslateanimation.cpp
+++ b/src/android/view/animation/qqmlandroidtranslateanimation.cpp
diff --git a/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h b/src/android/view/animation/qqmlandroidtranslateanimation_p.h
index 6c3859b..6c3859b 100644
--- a/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h
+++ b/src/android/view/animation/qqmlandroidtranslateanimation_p.h
diff --git a/src/qmlandroid/view/qqmlandroidgravity_p.h b/src/android/view/qqmlandroidgravity_p.h
index 331e7e4..331e7e4 100644
--- a/src/qmlandroid/view/qqmlandroidgravity_p.h
+++ b/src/android/view/qqmlandroidgravity_p.h
diff --git a/src/qmlandroid/view/qqmlandroidlayoutparams.cpp b/src/android/view/qqmlandroidlayoutparams.cpp
index d5ef865..d5ef865 100644
--- a/src/qmlandroid/view/qqmlandroidlayoutparams.cpp
+++ b/src/android/view/qqmlandroidlayoutparams.cpp
diff --git a/src/qmlandroid/view/qqmlandroidlayoutparams_p.h b/src/android/view/qqmlandroidlayoutparams_p.h
index 3c87699..3c87699 100644
--- a/src/qmlandroid/view/qqmlandroidlayoutparams_p.h
+++ b/src/android/view/qqmlandroidlayoutparams_p.h
diff --git a/src/qmlandroid/view/qqmlandroidmenu.cpp b/src/android/view/qqmlandroidmenu.cpp
index a571cde..a571cde 100644
--- a/src/qmlandroid/view/qqmlandroidmenu.cpp
+++ b/src/android/view/qqmlandroidmenu.cpp
diff --git a/src/qmlandroid/view/qqmlandroidmenu_p.h b/src/android/view/qqmlandroidmenu_p.h
index 5e4a087..5e4a087 100644
--- a/src/qmlandroid/view/qqmlandroidmenu_p.h
+++ b/src/android/view/qqmlandroidmenu_p.h
diff --git a/src/qmlandroid/view/qqmlandroidmenuitem.cpp b/src/android/view/qqmlandroidmenuitem.cpp
index 5982073..5982073 100644
--- a/src/qmlandroid/view/qqmlandroidmenuitem.cpp
+++ b/src/android/view/qqmlandroidmenuitem.cpp
diff --git a/src/qmlandroid/view/qqmlandroidmenuitem_p.h b/src/android/view/qqmlandroidmenuitem_p.h
index b3c9be2..b3c9be2 100644
--- a/src/qmlandroid/view/qqmlandroidmenuitem_p.h
+++ b/src/android/view/qqmlandroidmenuitem_p.h
diff --git a/src/qmlandroid/view/qqmlandroidview.cpp b/src/android/view/qqmlandroidview.cpp
index 23e8e46..23e8e46 100644
--- a/src/qmlandroid/view/qqmlandroidview.cpp
+++ b/src/android/view/qqmlandroidview.cpp
diff --git a/src/qmlandroid/view/qqmlandroidview_p.h b/src/android/view/qqmlandroidview_p.h
index 5f4a3cb..5f4a3cb 100644
--- a/src/qmlandroid/view/qqmlandroidview_p.h
+++ b/src/android/view/qqmlandroidview_p.h
diff --git a/src/qmlandroid/view/qqmlandroidviewgroup.cpp b/src/android/view/qqmlandroidviewgroup.cpp
index 60defbe..60defbe 100644
--- a/src/qmlandroid/view/qqmlandroidviewgroup.cpp
+++ b/src/android/view/qqmlandroidviewgroup.cpp
diff --git a/src/qmlandroid/view/qqmlandroidviewgroup_p.h b/src/android/view/qqmlandroidviewgroup_p.h
index 8d72ea3..8d72ea3 100644
--- a/src/qmlandroid/view/qqmlandroidviewgroup_p.h
+++ b/src/android/view/qqmlandroidviewgroup_p.h
diff --git a/src/qmlandroid/view/qqmlandroidwindow.cpp b/src/android/view/qqmlandroidwindow.cpp
index 14fc5ae..14fc5ae 100644
--- a/src/qmlandroid/view/qqmlandroidwindow.cpp
+++ b/src/android/view/qqmlandroidwindow.cpp
diff --git a/src/qmlandroid/view/qqmlandroidwindow_p.h b/src/android/view/qqmlandroidwindow_p.h
index 41a0fca..41a0fca 100644
--- a/src/qmlandroid/view/qqmlandroidwindow_p.h
+++ b/src/android/view/qqmlandroidwindow_p.h
diff --git a/src/qmlandroid/view/view.pri b/src/android/view/view.pri
index 1647d73..1647d73 100644
--- a/src/qmlandroid/view/view.pri
+++ b/src/android/view/view.pri
diff --git a/src/qmlandroid/widget/qqmlandroidabsseekbar.cpp b/src/android/widget/qqmlandroidabsseekbar.cpp
index c03457f..c03457f 100644
--- a/src/qmlandroid/widget/qqmlandroidabsseekbar.cpp
+++ b/src/android/widget/qqmlandroidabsseekbar.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h b/src/android/widget/qqmlandroidabsseekbar_p.h
index f7bb356..f7bb356 100644
--- a/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h
+++ b/src/android/widget/qqmlandroidabsseekbar_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidadapterview.cpp b/src/android/widget/qqmlandroidadapterview.cpp
index 09bffb2..09bffb2 100644
--- a/src/qmlandroid/widget/qqmlandroidadapterview.cpp
+++ b/src/android/widget/qqmlandroidadapterview.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidadapterview_p.h b/src/android/widget/qqmlandroidadapterview_p.h
index 8418e30..8418e30 100644
--- a/src/qmlandroid/widget/qqmlandroidadapterview_p.h
+++ b/src/android/widget/qqmlandroidadapterview_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidarrayadapter.cpp b/src/android/widget/qqmlandroidarrayadapter.cpp
index 066f44d..066f44d 100644
--- a/src/qmlandroid/widget/qqmlandroidarrayadapter.cpp
+++ b/src/android/widget/qqmlandroidarrayadapter.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h b/src/android/widget/qqmlandroidarrayadapter_p.h
index 06110c3..06110c3 100644
--- a/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h
+++ b/src/android/widget/qqmlandroidarrayadapter_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidbaseadapter.cpp b/src/android/widget/qqmlandroidbaseadapter.cpp
index 8282500..8282500 100644
--- a/src/qmlandroid/widget/qqmlandroidbaseadapter.cpp
+++ b/src/android/widget/qqmlandroidbaseadapter.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h b/src/android/widget/qqmlandroidbaseadapter_p.h
index a32cd61..a32cd61 100644
--- a/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h
+++ b/src/android/widget/qqmlandroidbaseadapter_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidbutton.cpp b/src/android/widget/qqmlandroidbutton.cpp
index 36e4937..36e4937 100644
--- a/src/qmlandroid/widget/qqmlandroidbutton.cpp
+++ b/src/android/widget/qqmlandroidbutton.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidbutton_p.h b/src/android/widget/qqmlandroidbutton_p.h
index 888dd0e..888dd0e 100644
--- a/src/qmlandroid/widget/qqmlandroidbutton_p.h
+++ b/src/android/widget/qqmlandroidbutton_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidcalendarview.cpp b/src/android/widget/qqmlandroidcalendarview.cpp
index 7c1a627..7c1a627 100644
--- a/src/qmlandroid/widget/qqmlandroidcalendarview.cpp
+++ b/src/android/widget/qqmlandroidcalendarview.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidcalendarview_p.h b/src/android/widget/qqmlandroidcalendarview_p.h
index cf39cc6..cf39cc6 100644
--- a/src/qmlandroid/widget/qqmlandroidcalendarview_p.h
+++ b/src/android/widget/qqmlandroidcalendarview_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidcheckbox.cpp b/src/android/widget/qqmlandroidcheckbox.cpp
index 806da94..806da94 100644
--- a/src/qmlandroid/widget/qqmlandroidcheckbox.cpp
+++ b/src/android/widget/qqmlandroidcheckbox.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidcheckbox_p.h b/src/android/widget/qqmlandroidcheckbox_p.h
index 947487a..947487a 100644
--- a/src/qmlandroid/widget/qqmlandroidcheckbox_p.h
+++ b/src/android/widget/qqmlandroidcheckbox_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidcompoundbutton.cpp b/src/android/widget/qqmlandroidcompoundbutton.cpp
index 617f61e..617f61e 100644
--- a/src/qmlandroid/widget/qqmlandroidcompoundbutton.cpp
+++ b/src/android/widget/qqmlandroidcompoundbutton.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h b/src/android/widget/qqmlandroidcompoundbutton_p.h
index 81f7830..81f7830 100644
--- a/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h
+++ b/src/android/widget/qqmlandroidcompoundbutton_p.h
diff --git a/src/qmlandroid/widget/qqmlandroiddatepicker.cpp b/src/android/widget/qqmlandroiddatepicker.cpp
index 6487766..6487766 100644
--- a/src/qmlandroid/widget/qqmlandroiddatepicker.cpp
+++ b/src/android/widget/qqmlandroiddatepicker.cpp
diff --git a/src/qmlandroid/widget/qqmlandroiddatepicker_p.h b/src/android/widget/qqmlandroiddatepicker_p.h
index 56626a6..56626a6 100644
--- a/src/qmlandroid/widget/qqmlandroiddatepicker_p.h
+++ b/src/android/widget/qqmlandroiddatepicker_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidedittext.cpp b/src/android/widget/qqmlandroidedittext.cpp
index 6697ac9..6697ac9 100644
--- a/src/qmlandroid/widget/qqmlandroidedittext.cpp
+++ b/src/android/widget/qqmlandroidedittext.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidedittext_p.h b/src/android/widget/qqmlandroidedittext_p.h
index 5263a90..5263a90 100644
--- a/src/qmlandroid/widget/qqmlandroidedittext_p.h
+++ b/src/android/widget/qqmlandroidedittext_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidframelayout.cpp b/src/android/widget/qqmlandroidframelayout.cpp
index b240433..b240433 100644
--- a/src/qmlandroid/widget/qqmlandroidframelayout.cpp
+++ b/src/android/widget/qqmlandroidframelayout.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidframelayout_p.h b/src/android/widget/qqmlandroidframelayout_p.h
index f7debd5..f7debd5 100644
--- a/src/qmlandroid/widget/qqmlandroidframelayout_p.h
+++ b/src/android/widget/qqmlandroidframelayout_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidframelayoutparams.cpp b/src/android/widget/qqmlandroidframelayoutparams.cpp
index 2c8f5aa..2c8f5aa 100644
--- a/src/qmlandroid/widget/qqmlandroidframelayoutparams.cpp
+++ b/src/android/widget/qqmlandroidframelayoutparams.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidframelayoutparams_p.h b/src/android/widget/qqmlandroidframelayoutparams_p.h
index db3709a..db3709a 100644
--- a/src/qmlandroid/widget/qqmlandroidframelayoutparams_p.h
+++ b/src/android/widget/qqmlandroidframelayoutparams_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidimageview.cpp b/src/android/widget/qqmlandroidimageview.cpp
index fe76930..fe76930 100644
--- a/src/qmlandroid/widget/qqmlandroidimageview.cpp
+++ b/src/android/widget/qqmlandroidimageview.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidimageview_p.h b/src/android/widget/qqmlandroidimageview_p.h
index ab933d2..ab933d2 100644
--- a/src/qmlandroid/widget/qqmlandroidimageview_p.h
+++ b/src/android/widget/qqmlandroidimageview_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidlinearlayout.cpp b/src/android/widget/qqmlandroidlinearlayout.cpp
index a1732dc..a1732dc 100644
--- a/src/qmlandroid/widget/qqmlandroidlinearlayout.cpp
+++ b/src/android/widget/qqmlandroidlinearlayout.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h b/src/android/widget/qqmlandroidlinearlayout_p.h
index 104af96..104af96 100644
--- a/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h
+++ b/src/android/widget/qqmlandroidlinearlayout_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidlinearlayoutparams.cpp b/src/android/widget/qqmlandroidlinearlayoutparams.cpp
index d700450..d700450 100644
--- a/src/qmlandroid/widget/qqmlandroidlinearlayoutparams.cpp
+++ b/src/android/widget/qqmlandroidlinearlayoutparams.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidlinearlayoutparams_p.h b/src/android/widget/qqmlandroidlinearlayoutparams_p.h
index a6084e8..a6084e8 100644
--- a/src/qmlandroid/widget/qqmlandroidlinearlayoutparams_p.h
+++ b/src/android/widget/qqmlandroidlinearlayoutparams_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidlistview.cpp b/src/android/widget/qqmlandroidlistview.cpp
index 8b04e6c..8b04e6c 100644
--- a/src/qmlandroid/widget/qqmlandroidlistview.cpp
+++ b/src/android/widget/qqmlandroidlistview.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidlistview_p.h b/src/android/widget/qqmlandroidlistview_p.h
index 5262a24..5262a24 100644
--- a/src/qmlandroid/widget/qqmlandroidlistview_p.h
+++ b/src/android/widget/qqmlandroidlistview_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidmarginlayoutparams.cpp b/src/android/widget/qqmlandroidmarginlayoutparams.cpp
index 9e3fd1f..9e3fd1f 100644
--- a/src/qmlandroid/widget/qqmlandroidmarginlayoutparams.cpp
+++ b/src/android/widget/qqmlandroidmarginlayoutparams.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidmarginlayoutparams_p.h b/src/android/widget/qqmlandroidmarginlayoutparams_p.h
index f608bb7..f608bb7 100644
--- a/src/qmlandroid/widget/qqmlandroidmarginlayoutparams_p.h
+++ b/src/android/widget/qqmlandroidmarginlayoutparams_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidnumberpicker.cpp b/src/android/widget/qqmlandroidnumberpicker.cpp
index b96f0a1..b96f0a1 100644
--- a/src/qmlandroid/widget/qqmlandroidnumberpicker.cpp
+++ b/src/android/widget/qqmlandroidnumberpicker.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h b/src/android/widget/qqmlandroidnumberpicker_p.h
index 1b21354..1b21354 100644
--- a/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h
+++ b/src/android/widget/qqmlandroidnumberpicker_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidpopupmenu.cpp b/src/android/widget/qqmlandroidpopupmenu.cpp
index bf2a32f..bf2a32f 100644
--- a/src/qmlandroid/widget/qqmlandroidpopupmenu.cpp
+++ b/src/android/widget/qqmlandroidpopupmenu.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidpopupmenu_p.h b/src/android/widget/qqmlandroidpopupmenu_p.h
index 1f96d7b..1f96d7b 100644
--- a/src/qmlandroid/widget/qqmlandroidpopupmenu_p.h
+++ b/src/android/widget/qqmlandroidpopupmenu_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidprogressbar.cpp b/src/android/widget/qqmlandroidprogressbar.cpp
index c5871c9..c5871c9 100644
--- a/src/qmlandroid/widget/qqmlandroidprogressbar.cpp
+++ b/src/android/widget/qqmlandroidprogressbar.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidprogressbar_p.h b/src/android/widget/qqmlandroidprogressbar_p.h
index ddd54b0..ddd54b0 100644
--- a/src/qmlandroid/widget/qqmlandroidprogressbar_p.h
+++ b/src/android/widget/qqmlandroidprogressbar_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidradiobutton.cpp b/src/android/widget/qqmlandroidradiobutton.cpp
index f2361c8..f2361c8 100644
--- a/src/qmlandroid/widget/qqmlandroidradiobutton.cpp
+++ b/src/android/widget/qqmlandroidradiobutton.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidradiobutton_p.h b/src/android/widget/qqmlandroidradiobutton_p.h
index 977d45d..977d45d 100644
--- a/src/qmlandroid/widget/qqmlandroidradiobutton_p.h
+++ b/src/android/widget/qqmlandroidradiobutton_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidradiogroup.cpp b/src/android/widget/qqmlandroidradiogroup.cpp
index cbe1d45..cbe1d45 100644
--- a/src/qmlandroid/widget/qqmlandroidradiogroup.cpp
+++ b/src/android/widget/qqmlandroidradiogroup.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidradiogroup_p.h b/src/android/widget/qqmlandroidradiogroup_p.h
index 8b4cb7a..8b4cb7a 100644
--- a/src/qmlandroid/widget/qqmlandroidradiogroup_p.h
+++ b/src/android/widget/qqmlandroidradiogroup_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidratingbar.cpp b/src/android/widget/qqmlandroidratingbar.cpp
index 1d4b1b9..1d4b1b9 100644
--- a/src/qmlandroid/widget/qqmlandroidratingbar.cpp
+++ b/src/android/widget/qqmlandroidratingbar.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidratingbar_p.h b/src/android/widget/qqmlandroidratingbar_p.h
index 64ec58b..64ec58b 100644
--- a/src/qmlandroid/widget/qqmlandroidratingbar_p.h
+++ b/src/android/widget/qqmlandroidratingbar_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidrelativelayout.cpp b/src/android/widget/qqmlandroidrelativelayout.cpp
index a1b418c..a1b418c 100644
--- a/src/qmlandroid/widget/qqmlandroidrelativelayout.cpp
+++ b/src/android/widget/qqmlandroidrelativelayout.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h b/src/android/widget/qqmlandroidrelativelayout_p.h
index 4a3ed3b..4a3ed3b 100644
--- a/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h
+++ b/src/android/widget/qqmlandroidrelativelayout_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidrelativelayoutparams.cpp b/src/android/widget/qqmlandroidrelativelayoutparams.cpp
index 890b921..890b921 100644
--- a/src/qmlandroid/widget/qqmlandroidrelativelayoutparams.cpp
+++ b/src/android/widget/qqmlandroidrelativelayoutparams.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidrelativelayoutparams_p.h b/src/android/widget/qqmlandroidrelativelayoutparams_p.h
index 332eaf7..332eaf7 100644
--- a/src/qmlandroid/widget/qqmlandroidrelativelayoutparams_p.h
+++ b/src/android/widget/qqmlandroidrelativelayoutparams_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidscrollview.cpp b/src/android/widget/qqmlandroidscrollview.cpp
index 5c1f9b0..5c1f9b0 100644
--- a/src/qmlandroid/widget/qqmlandroidscrollview.cpp
+++ b/src/android/widget/qqmlandroidscrollview.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidscrollview_p.h b/src/android/widget/qqmlandroidscrollview_p.h
index a7037d1..a7037d1 100644
--- a/src/qmlandroid/widget/qqmlandroidscrollview_p.h
+++ b/src/android/widget/qqmlandroidscrollview_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidsearchview.cpp b/src/android/widget/qqmlandroidsearchview.cpp
index 45a6769..45a6769 100644
--- a/src/qmlandroid/widget/qqmlandroidsearchview.cpp
+++ b/src/android/widget/qqmlandroidsearchview.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidsearchview_p.h b/src/android/widget/qqmlandroidsearchview_p.h
index 323a725..323a725 100644
--- a/src/qmlandroid/widget/qqmlandroidsearchview_p.h
+++ b/src/android/widget/qqmlandroidsearchview_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidseekbar.cpp b/src/android/widget/qqmlandroidseekbar.cpp
index d7ddce5..d7ddce5 100644
--- a/src/qmlandroid/widget/qqmlandroidseekbar.cpp
+++ b/src/android/widget/qqmlandroidseekbar.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidseekbar_p.h b/src/android/widget/qqmlandroidseekbar_p.h
index 971985a..971985a 100644
--- a/src/qmlandroid/widget/qqmlandroidseekbar_p.h
+++ b/src/android/widget/qqmlandroidseekbar_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidspace.cpp b/src/android/widget/qqmlandroidspace.cpp
index 66fb525..66fb525 100644
--- a/src/qmlandroid/widget/qqmlandroidspace.cpp
+++ b/src/android/widget/qqmlandroidspace.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidspace_p.h b/src/android/widget/qqmlandroidspace_p.h
index 1429dc0..1429dc0 100644
--- a/src/qmlandroid/widget/qqmlandroidspace_p.h
+++ b/src/android/widget/qqmlandroidspace_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidspinner.cpp b/src/android/widget/qqmlandroidspinner.cpp
index bce7b6c..bce7b6c 100644
--- a/src/qmlandroid/widget/qqmlandroidspinner.cpp
+++ b/src/android/widget/qqmlandroidspinner.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidspinner_p.h b/src/android/widget/qqmlandroidspinner_p.h
index b20dd30..b20dd30 100644
--- a/src/qmlandroid/widget/qqmlandroidspinner_p.h
+++ b/src/android/widget/qqmlandroidspinner_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidswitch.cpp b/src/android/widget/qqmlandroidswitch.cpp
index a4aed2c..a4aed2c 100644
--- a/src/qmlandroid/widget/qqmlandroidswitch.cpp
+++ b/src/android/widget/qqmlandroidswitch.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidswitch_p.h b/src/android/widget/qqmlandroidswitch_p.h
index 988ae5d..988ae5d 100644
--- a/src/qmlandroid/widget/qqmlandroidswitch_p.h
+++ b/src/android/widget/qqmlandroidswitch_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidtabhost.cpp b/src/android/widget/qqmlandroidtabhost.cpp
index c237281..c237281 100644
--- a/src/qmlandroid/widget/qqmlandroidtabhost.cpp
+++ b/src/android/widget/qqmlandroidtabhost.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidtabhost_p.h b/src/android/widget/qqmlandroidtabhost_p.h
index b3cccea..b3cccea 100644
--- a/src/qmlandroid/widget/qqmlandroidtabhost_p.h
+++ b/src/android/widget/qqmlandroidtabhost_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidtabspec.cpp b/src/android/widget/qqmlandroidtabspec.cpp
index 1b8502d..1b8502d 100644
--- a/src/qmlandroid/widget/qqmlandroidtabspec.cpp
+++ b/src/android/widget/qqmlandroidtabspec.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidtabspec_p.h b/src/android/widget/qqmlandroidtabspec_p.h
index 0828098..0828098 100644
--- a/src/qmlandroid/widget/qqmlandroidtabspec_p.h
+++ b/src/android/widget/qqmlandroidtabspec_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidtabwidget.cpp b/src/android/widget/qqmlandroidtabwidget.cpp
index a73bfa5..a73bfa5 100644
--- a/src/qmlandroid/widget/qqmlandroidtabwidget.cpp
+++ b/src/android/widget/qqmlandroidtabwidget.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidtabwidget_p.h b/src/android/widget/qqmlandroidtabwidget_p.h
index f072db2..f072db2 100644
--- a/src/qmlandroid/widget/qqmlandroidtabwidget_p.h
+++ b/src/android/widget/qqmlandroidtabwidget_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidtextview.cpp b/src/android/widget/qqmlandroidtextview.cpp
index f4d6115..f4d6115 100644
--- a/src/qmlandroid/widget/qqmlandroidtextview.cpp
+++ b/src/android/widget/qqmlandroidtextview.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidtextview_p.h b/src/android/widget/qqmlandroidtextview_p.h
index b6c6c2e..b6c6c2e 100644
--- a/src/qmlandroid/widget/qqmlandroidtextview_p.h
+++ b/src/android/widget/qqmlandroidtextview_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidtimepicker.cpp b/src/android/widget/qqmlandroidtimepicker.cpp
index 9a4853d..9a4853d 100644
--- a/src/qmlandroid/widget/qqmlandroidtimepicker.cpp
+++ b/src/android/widget/qqmlandroidtimepicker.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidtimepicker_p.h b/src/android/widget/qqmlandroidtimepicker_p.h
index adce9a3..adce9a3 100644
--- a/src/qmlandroid/widget/qqmlandroidtimepicker_p.h
+++ b/src/android/widget/qqmlandroidtimepicker_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidtoast.cpp b/src/android/widget/qqmlandroidtoast.cpp
index 2f2af16..2f2af16 100644
--- a/src/qmlandroid/widget/qqmlandroidtoast.cpp
+++ b/src/android/widget/qqmlandroidtoast.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidtoast_p.h b/src/android/widget/qqmlandroidtoast_p.h
index 9e9f256..9e9f256 100644
--- a/src/qmlandroid/widget/qqmlandroidtoast_p.h
+++ b/src/android/widget/qqmlandroidtoast_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidtogglebutton.cpp b/src/android/widget/qqmlandroidtogglebutton.cpp
index d976fd2..d976fd2 100644
--- a/src/qmlandroid/widget/qqmlandroidtogglebutton.cpp
+++ b/src/android/widget/qqmlandroidtogglebutton.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h b/src/android/widget/qqmlandroidtogglebutton_p.h
index 9749692..9749692 100644
--- a/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h
+++ b/src/android/widget/qqmlandroidtogglebutton_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidviewanimator.cpp b/src/android/widget/qqmlandroidviewanimator.cpp
index 4d27ca0..4d27ca0 100644
--- a/src/qmlandroid/widget/qqmlandroidviewanimator.cpp
+++ b/src/android/widget/qqmlandroidviewanimator.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidviewanimator_p.h b/src/android/widget/qqmlandroidviewanimator_p.h
index 21a8d05..21a8d05 100644
--- a/src/qmlandroid/widget/qqmlandroidviewanimator_p.h
+++ b/src/android/widget/qqmlandroidviewanimator_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidviewflipper.cpp b/src/android/widget/qqmlandroidviewflipper.cpp
index 363ed27..363ed27 100644
--- a/src/qmlandroid/widget/qqmlandroidviewflipper.cpp
+++ b/src/android/widget/qqmlandroidviewflipper.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidviewflipper_p.h b/src/android/widget/qqmlandroidviewflipper_p.h
index c489973..c489973 100644
--- a/src/qmlandroid/widget/qqmlandroidviewflipper_p.h
+++ b/src/android/widget/qqmlandroidviewflipper_p.h
diff --git a/src/qmlandroid/widget/qqmlandroidviewswitcher.cpp b/src/android/widget/qqmlandroidviewswitcher.cpp
index 820d3c1..820d3c1 100644
--- a/src/qmlandroid/widget/qqmlandroidviewswitcher.cpp
+++ b/src/android/widget/qqmlandroidviewswitcher.cpp
diff --git a/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h b/src/android/widget/qqmlandroidviewswitcher_p.h
index a7124c0..a7124c0 100644
--- a/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h
+++ b/src/android/widget/qqmlandroidviewswitcher_p.h
diff --git a/src/qmlandroid/widget/widget.pri b/src/android/widget/widget.pri
index 22d5aea..22d5aea 100644
--- a/src/qmlandroid/widget/widget.pri
+++ b/src/android/widget/widget.pri
diff --git a/src/qmlandroid/qmlandroid.pro b/src/qmlandroid/qmlandroid.pro
deleted file mode 100644
index 8f5c2ab..0000000
--- a/src/qmlandroid/qmlandroid.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TARGET  = QtQmlAndroid
-
-QT += androidextras qml
-QT += core-private # qjnihelpers
-
-CONFIG += c++11
-CONFIG -= create_cmake
-
-features.files = $$QMLANDROID_PREFIX/features/qmlandroid.prf
-features.path = $$[QT_HOST_DATA]/mkspecs/features
-!prefix_build: COPIES += features
-INSTALLS += features
-
-include(qmlandroid.pri)
-
-load(qt_module)
diff --git a/src/src.pro b/src/src.pro
index 1308d42..5002839 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,7 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    qmlandroid \
-    imports \
-    android
+    android \
+    imports
 
-imports.depends = qmlandroid
+imports.depends = android
diff --git a/sync.profile b/sync.profile
index d1d19cb..83ecd90 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,5 @@
 %modules = ( # path to module name map
-    "QtQmlAndroid" => "$basedir/src/qmlandroid",
+    "QtQmlAndroid" => "$basedir/src/android",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );