Proper Qt module - part V

191 files changed, 483 insertions, 483 deletions

diff --git a/src/qmlandroid/app/app.pri b/src/qmlandroid/app/app.pri
index 024155a..11105a7 100644
--- a/src/qmlandroid/app/app.pri
+++ b/src/qmlandroid/app/app.pri
@@ -1,17 +1,17 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidactionbar_p.h \
-    $$PWD/qtqmlandroidactivity_p.h \
-    $$PWD/qtqmlandroidalertdialog_p.h \
-    $$PWD/qtqmlandroidappmodule_p.h \
-    $$PWD/qtqmlandroiddialog_p.h \
-    $$PWD/qtqmlandroidservice_p.h
+    $$PWD/qqmlandroidactionbar_p.h \
+    $$PWD/qqmlandroidactivity_p.h \
+    $$PWD/qqmlandroidalertdialog_p.h \
+    $$PWD/qqmlandroiddialog_p.h \
+    $$PWD/qqmlandroidservice_p.h \
+    $$PWD/qtqmlandroidappmodule_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidactionbar.cpp \
-    $$PWD/qtqmlandroidactivity.cpp \
-    $$PWD/qtqmlandroidalertdialog.cpp \
-    $$PWD/qtqmlandroidappmodule.cpp \
-    $$PWD/qtqmlandroiddialog.cpp \
-    $$PWD/qtqmlandroidservice.cpp
+    $$PWD/qqmlandroidactionbar.cpp \
+    $$PWD/qqmlandroidactivity.cpp \
+    $$PWD/qqmlandroidalertdialog.cpp \
+    $$PWD/qqmlandroiddialog.cpp \
+    $$PWD/qqmlandroidservice.cpp \
+    $$PWD/qtqmlandroidappmodule.cpp
diff --git a/src/qmlandroid/app/qtqmlandroidactionbar.cpp b/src/qmlandroid/app/qqmlandroidactionbar.cpp
index 517f9b4..ffe553a 100644
--- a/src/qmlandroid/app/qtqmlandroidactionbar.cpp
+++ b/src/qmlandroid/app/qqmlandroidactionbar.cpp
@@ -1,6 +1,6 @@
-#include "qtqmlandroidactionbar_p.h"
+#include "qqmlandroidactionbar_p.h"
+#include "qqmlandroiddrawable_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qtqmlandroiddrawable_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/app/qtqmlandroidactionbar_p.h b/src/qmlandroid/app/qqmlandroidactionbar_p.h
index d2a2666..d7ade9f 100644
--- a/src/qmlandroid/app/qtqmlandroidactionbar_p.h
+++ b/src/qmlandroid/app/qqmlandroidactionbar_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDACTIONBAR_P_H
 #define QQMLANDROIDACTIONBAR_P_H
 
-#include "qtqmlandroidobject_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidobject_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/app/qtqmlandroidactivity.cpp b/src/qmlandroid/app/qqmlandroidactivity.cpp
index 89b4f14..76c1162 100644
--- a/src/qmlandroid/app/qtqmlandroidactivity.cpp
+++ b/src/qmlandroid/app/qqmlandroidactivity.cpp
@@ -1,9 +1,9 @@
-#include "qtqmlandroidactivity_p.h"
-#include "qtqmlandroidactionbar_p.h"
-#include "qtqmlandroidmenuitem_p.h"
-#include "qtqmlandroidmenu_p.h"
-#include "qtqmlandroidview_p.h"
-#include "qtqmlandroidwindow_p.h"
+#include "qqmlandroidactivity_p.h"
+#include "qqmlandroidactionbar_p.h"
+#include "qqmlandroidmenuitem_p.h"
+#include "qqmlandroidmenu_p.h"
+#include "qqmlandroidview_p.h"
+#include "qqmlandroidwindow_p.h"
 #include "qtqmlandroidfunctions_p.h"
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtAndroidExtras/qandroidfunctions.h>
diff --git a/src/qmlandroid/app/qtqmlandroidactivity_p.h b/src/qmlandroid/app/qqmlandroidactivity_p.h
index fd23ef2..6a353b4 100644
--- a/src/qmlandroid/app/qtqmlandroidactivity_p.h
+++ b/src/qmlandroid/app/qqmlandroidactivity_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDACTIVITY_P_H
 #define QQMLANDROIDACTIVITY_P_H
 
-#include "qtqmlandroidcontextwrapper_p.h"
+#include "qqmlandroidcontextwrapper_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/app/qtqmlandroidalertdialog.cpp b/src/qmlandroid/app/qqmlandroidalertdialog.cpp
index 90e1db0..22a5a9a 100644
--- a/src/qmlandroid/app/qtqmlandroidalertdialog.cpp
+++ b/src/qmlandroid/app/qqmlandroidalertdialog.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidalertdialog_p.h"
+#include "qqmlandroidalertdialog_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/app/qtqmlandroidalertdialog_p.h b/src/qmlandroid/app/qqmlandroidalertdialog_p.h
index fadd0bb..366e51b 100644
--- a/src/qmlandroid/app/qtqmlandroidalertdialog_p.h
+++ b/src/qmlandroid/app/qqmlandroidalertdialog_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDALERTDIALOG_P_H
 #define QQMLANDROIDALERTDIALOG_P_H
 
-#include "qtqmlandroiddialog_p.h"
+#include "qqmlandroiddialog_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/app/qtqmlandroiddialog.cpp b/src/qmlandroid/app/qqmlandroiddialog.cpp
index 77ab26c..44f8e7d 100644
--- a/src/qmlandroid/app/qtqmlandroiddialog.cpp
+++ b/src/qmlandroid/app/qqmlandroiddialog.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroiddialog_p.h"
+#include "qqmlandroiddialog_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/app/qtqmlandroiddialog_p.h b/src/qmlandroid/app/qqmlandroiddialog_p.h
index d96d35b..9a43f2a 100644
--- a/src/qmlandroid/app/qtqmlandroiddialog_p.h
+++ b/src/qmlandroid/app/qqmlandroiddialog_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDDIALOG_P_H
 #define QQMLANDROIDDIALOG_P_H
 
-#include "qtqmlandroidcontextual_p.h"
+#include "qqmlandroidcontextual_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/app/qtqmlandroidservice.cpp b/src/qmlandroid/app/qqmlandroidservice.cpp
index dfc2bb9..861b1c1 100644
--- a/src/qmlandroid/app/qtqmlandroidservice.cpp
+++ b/src/qmlandroid/app/qqmlandroidservice.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidservice_p.h"
+#include "qqmlandroidservice_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/app/qtqmlandroidservice_p.h b/src/qmlandroid/app/qqmlandroidservice_p.h
index fed4072..1b2a0b0 100644
--- a/src/qmlandroid/app/qtqmlandroidservice_p.h
+++ b/src/qmlandroid/app/qqmlandroidservice_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDSERVICE_P_H
 #define QQMLANDROIDSERVICE_P_H
 
-#include "qtqmlandroidcontextwrapper_p.h"
+#include "qqmlandroidcontextwrapper_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/app/qtqmlandroidappmodule.cpp b/src/qmlandroid/app/qtqmlandroidappmodule.cpp
index f2deee6..852f0bd 100644
--- a/src/qmlandroid/app/qtqmlandroidappmodule.cpp
+++ b/src/qmlandroid/app/qtqmlandroidappmodule.cpp
@@ -1,10 +1,10 @@
 #include "qtqmlandroidappmodule_p.h"
 
-#include "qtqmlandroidactionbar_p.h"
-#include "qtqmlandroidactivity_p.h"
-#include "qtqmlandroidalertdialog_p.h"
-#include "qtqmlandroiddialog_p.h"
-#include "qtqmlandroidservice_p.h"
+#include "qqmlandroidactionbar_p.h"
+#include "qqmlandroidactivity_p.h"
+#include "qqmlandroidalertdialog_p.h"
+#include "qqmlandroiddialog_p.h"
+#include "qqmlandroidservice_p.h"
 
 #include <QtQml/qqml.h>
 
diff --git a/src/qmlandroid/content/content.pri b/src/qmlandroid/content/content.pri
index fcec3b6..3570e4a 100644
--- a/src/qmlandroid/content/content.pri
+++ b/src/qmlandroid/content/content.pri
@@ -1,13 +1,13 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidcontentmodule_p.h \
-    $$PWD/qtqmlandroidcontext_p.h \
-    $$PWD/qtqmlandroidcontextual_p.h \
-    $$PWD/qtqmlandroidcontextwrapper_p.h
+    $$PWD/qqmlandroidcontext_p.h \
+    $$PWD/qqmlandroidcontextual_p.h \
+    $$PWD/qqmlandroidcontextwrapper_p.h \
+    $$PWD/qtqmlandroidcontentmodule_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidcontentmodule.cpp \
-    $$PWD/qtqmlandroidcontext.cpp \
-    $$PWD/qtqmlandroidcontextual.cpp \
-    $$PWD/qtqmlandroidcontextwrapper.cpp
+    $$PWD/qqmlandroidcontext.cpp \
+    $$PWD/qqmlandroidcontextual.cpp \
+    $$PWD/qqmlandroidcontextwrapper.cpp \
+    $$PWD/qtqmlandroidcontentmodule.cpp
diff --git a/src/qmlandroid/content/qtqmlandroidcontext.cpp b/src/qmlandroid/content/qqmlandroidcontext.cpp
index 502ef4c..a0dc0b6 100644
--- a/src/qmlandroid/content/qtqmlandroidcontext.cpp
+++ b/src/qmlandroid/content/qqmlandroidcontext.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidcontext_p.h"
+#include "qqmlandroidcontext_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/content/qtqmlandroidcontext_p.h b/src/qmlandroid/content/qqmlandroidcontext_p.h
index 999cce0..663463f 100644
--- a/src/qmlandroid/content/qtqmlandroidcontext_p.h
+++ b/src/qmlandroid/content/qqmlandroidcontext_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDCONTEXT_P_H
 #define QQMLANDROIDCONTEXT_P_H
 
-#include "qtqmlandroidcontextual_p.h"
+#include "qqmlandroidcontextual_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/content/qtqmlandroidcontextual.cpp b/src/qmlandroid/content/qqmlandroidcontextual.cpp
index b64e408..b46c166 100644
--- a/src/qmlandroid/content/qtqmlandroidcontextual.cpp
+++ b/src/qmlandroid/content/qqmlandroidcontextual.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidcontextual_p.h"
-#include "qtqmlandroidcontext_p.h"
+#include "qqmlandroidcontextual_p.h"
+#include "qqmlandroidcontext_p.h"
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/content/qtqmlandroidcontextual_p.h b/src/qmlandroid/content/qqmlandroidcontextual_p.h
index da08dfe..733ccc4 100644
--- a/src/qmlandroid/content/qtqmlandroidcontextual_p.h
+++ b/src/qmlandroid/content/qqmlandroidcontextual_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDCONTEXTUAL_P_H
 #define QQMLANDROIDCONTEXTUAL_P_H
 
-#include "qtqmlandroidobject_p.h"
+#include "qqmlandroidobject_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/content/qtqmlandroidcontextwrapper.cpp b/src/qmlandroid/content/qqmlandroidcontextwrapper.cpp
index 464bf8b..0a70b88 100644
--- a/src/qmlandroid/content/qtqmlandroidcontextwrapper.cpp
+++ b/src/qmlandroid/content/qqmlandroidcontextwrapper.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidcontextwrapper_p.h"
+#include "qqmlandroidcontextwrapper_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/content/qtqmlandroidcontextwrapper_p.h b/src/qmlandroid/content/qqmlandroidcontextwrapper_p.h
index 6a30931..62905f6 100644
--- a/src/qmlandroid/content/qtqmlandroidcontextwrapper_p.h
+++ b/src/qmlandroid/content/qqmlandroidcontextwrapper_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDCONTEXTWRAPPER_P_H
 #define QQMLANDROIDCONTEXTWRAPPER_P_H
 
-#include "qtqmlandroidcontext_p.h"
+#include "qqmlandroidcontext_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp b/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp
index 7cca85f..dc68ae5 100644
--- a/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp
+++ b/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp
@@ -1,6 +1,6 @@
 #include "qtqmlandroidcontentmodule_p.h"
 
-#include "qtqmlandroidcontext_p.h"
+#include "qqmlandroidcontext_p.h"
 
 #include <QtQml/qqml.h>
 
diff --git a/src/qmlandroid/core/core.pri b/src/qmlandroid/core/core.pri
index 9249ff4..f3eb64f 100644
--- a/src/qmlandroid/core/core.pri
+++ b/src/qmlandroid/core/core.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
+    $$PWD/qqmlandroidobject_p.h \
+    $$PWD/qqmlandroidoptional_p.h \
     $$PWD/qtqmlandroidfunctions_p.h \
-    $$PWD/qtqmlandroidglobal_p.h \
-    $$PWD/qtqmlandroidobject_p.h \
-    $$PWD/qtqmlandroidoptional_p.h
+    $$PWD/qtqmlandroidglobal_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidfunctions.cpp \
-    $$PWD/qtqmlandroidobject.cpp
+    $$PWD/qqmlandroidobject.cpp \
+    $$PWD/qtqmlandroidfunctions.cpp
diff --git a/src/qmlandroid/core/qtqmlandroidobject.cpp b/src/qmlandroid/core/qqmlandroidobject.cpp
index 71929e3..b46d55f 100644
--- a/src/qmlandroid/core/qtqmlandroidobject.cpp
+++ b/src/qmlandroid/core/qqmlandroidobject.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidobject_p.h"
+#include "qqmlandroidobject_p.h"
 #include "qtqmlandroidfunctions_p.h"
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qcoreevent.h>
diff --git a/src/qmlandroid/core/qtqmlandroidobject_p.h b/src/qmlandroid/core/qqmlandroidobject_p.h
index 896f1ae..896f1ae 100644
--- a/src/qmlandroid/core/qtqmlandroidobject_p.h
+++ b/src/qmlandroid/core/qqmlandroidobject_p.h
diff --git a/src/qmlandroid/core/qtqmlandroidoptional_p.h b/src/qmlandroid/core/qqmlandroidoptional_p.h
index 749a88b..749a88b 100644
--- a/src/qmlandroid/core/qtqmlandroidoptional_p.h
+++ b/src/qmlandroid/core/qqmlandroidoptional_p.h
diff --git a/src/qmlandroid/graphics/drawable/drawable.pri b/src/qmlandroid/graphics/drawable/drawable.pri
index 55c08ea..1960e87 100644
--- a/src/qmlandroid/graphics/drawable/drawable.pri
+++ b/src/qmlandroid/graphics/drawable/drawable.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidcolordrawable_p.h \
-    $$PWD/qtqmlandroiddrawable_p.h \
+    $$PWD/qqmlandroidcolordrawable_p.h \
+    $$PWD/qqmlandroiddrawable_p.h \
     $$PWD/qtqmlandroiddrawablemodule_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidcolordrawable.cpp \
-    $$PWD/qtqmlandroiddrawable.cpp \
+    $$PWD/qqmlandroidcolordrawable.cpp \
+    $$PWD/qqmlandroiddrawable.cpp \
     $$PWD/qtqmlandroiddrawablemodule.cpp
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable.cpp b/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable.cpp
index 674ef22..9bbfd5d 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable.cpp
+++ b/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidcolordrawable_p.h"
+#include "qqmlandroidcolordrawable_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable_p.h b/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h
index ff2bab4..cd9e2a6 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable_p.h
+++ b/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDCOLORDRAWABLE_P_H
 #define QQMLANDROIDCOLORDRAWABLE_P_H
 
-#include "qtqmlandroiddrawable_p.h"
+#include "qqmlandroiddrawable_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable.cpp b/src/qmlandroid/graphics/drawable/qqmlandroiddrawable.cpp
index 009a332..b9fb9ad 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable.cpp
+++ b/src/qmlandroid/graphics/drawable/qqmlandroiddrawable.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroiddrawable_p.h"
+#include "qqmlandroiddrawable_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable_p.h b/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h
index 0c51d88..98c1c3c 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable_p.h
+++ b/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDDRAWABLE_P_H
 #define QQMLANDROIDDRAWABLE_P_H
 
-#include "qtqmlandroidobject_p.h"
+#include "qqmlandroidobject_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp
index b6a7ec7..48860f1 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp
+++ b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp
@@ -1,7 +1,7 @@
 #include "qtqmlandroiddrawablemodule_p.h"
 
-#include "qtqmlandroidcolordrawable_p.h"
-#include "qtqmlandroiddrawable_p.h"
+#include "qqmlandroidcolordrawable_p.h"
+#include "qqmlandroiddrawable_p.h"
 
 #include <QtQml/qqml.h>
 
diff --git a/src/qmlandroid/graphics/graphics.pri b/src/qmlandroid/graphics/graphics.pri
index 700d8b8..280aa37 100644
--- a/src/qmlandroid/graphics/graphics.pri
+++ b/src/qmlandroid/graphics/graphics.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidcolor_p.h \
+    $$PWD/qqmlandroidcolor_p.h \
     $$PWD/qtqmlandroidgraphicsmodule_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidcolor.cpp \
+    $$PWD/qqmlandroidcolor.cpp \
     $$PWD/qtqmlandroidgraphicsmodule.cpp
 
 include(drawable/drawable.pri)
diff --git a/src/qmlandroid/graphics/qtqmlandroidcolor.cpp b/src/qmlandroid/graphics/qqmlandroidcolor.cpp
index 5ff3fb0..67259b5 100644
--- a/src/qmlandroid/graphics/qtqmlandroidcolor.cpp
+++ b/src/qmlandroid/graphics/qqmlandroidcolor.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidcolor_p.h"
+#include "qqmlandroidcolor_p.h"
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/graphics/qtqmlandroidcolor_p.h b/src/qmlandroid/graphics/qqmlandroidcolor_p.h
index 3bf0f53..3bf0f53 100644
--- a/src/qmlandroid/graphics/qtqmlandroidcolor_p.h
+++ b/src/qmlandroid/graphics/qqmlandroidcolor_p.h
diff --git a/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp b/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp
index cb8e923..f3dde34 100644
--- a/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp
+++ b/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp
@@ -1,6 +1,6 @@
 #include "qtqmlandroidgraphicsmodule_p.h"
 
-#include "qtqmlandroidcolor_p.h"
+#include "qqmlandroidcolor_p.h"
 
 #include <QtQml/qqml.h>
 
diff --git a/src/qmlandroid/qmlandroid.pri b/src/qmlandroid/qmlandroid.pri
index e827a19..e58634a 100644
--- a/src/qmlandroid/qmlandroid.pri
+++ b/src/qmlandroid/qmlandroid.pri
@@ -1,12 +1,12 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidmodule_p.h \
-    $$PWD/qtqmlandroidr_p.h
+    $$PWD/qqmlandroidr_p.h \
+    $$PWD/qtqmlandroidmodule_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidmodule.cpp \
-    $$PWD/qtqmlandroidr.cpp
+    $$PWD/qqmlandroidr.cpp \
+    $$PWD/qtqmlandroidmodule.cpp
 
 include(app/app.pri)
 include(core/core.pri)
diff --git a/src/qmlandroid/qtqmlandroidr.cpp b/src/qmlandroid/qqmlandroidr.cpp
index b1fdcb8..e3bbb8f 100644
--- a/src/qmlandroid/qtqmlandroidr.cpp
+++ b/src/qmlandroid/qqmlandroidr.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidr_p.h"
+#include "qqmlandroidr_p.h"
 #include <QtAndroidExtras/qandroidjniobject.h>
 #include <QtAndroidExtras/qandroidjnienvironment.h>
 
diff --git a/src/qmlandroid/qtqmlandroidr_p.h b/src/qmlandroid/qqmlandroidr_p.h
index 582e867..582e867 100644
--- a/src/qmlandroid/qtqmlandroidr_p.h
+++ b/src/qmlandroid/qqmlandroidr_p.h
diff --git a/src/qmlandroid/qtqmlandroidmodule.cpp b/src/qmlandroid/qtqmlandroidmodule.cpp
index fe4e393..352d9be 100644
--- a/src/qmlandroid/qtqmlandroidmodule.cpp
+++ b/src/qmlandroid/qtqmlandroidmodule.cpp
@@ -1,6 +1,6 @@
 #include "qtqmlandroidmodule_p.h"
 
-#include "qtqmlandroidr_p.h"
+#include "qqmlandroidr_p.h"
 
 #include <QtQml/qqml.h>
 
diff --git a/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp b/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp
index a1744f4..fa1c938 100644
--- a/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp
+++ b/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp
@@ -1,13 +1,13 @@
 #include "qtqmlandroidsupportmodule_p.h"
 
-#include "qtqmlandroiddrawerlayout_p.h"
-#include "qtqmlandroidswiperefreshlayout_p.h"
+#include "qqmlandroiddrawerlayout_p.h"
+#include "qqmlandroidswiperefreshlayout_p.h"
 
-#include "qtqmlandroidactionbardrawertoggle_p.h"
+#include "qqmlandroidactionbardrawertoggle_p.h"
 
-#include "qtqmlandroidcardview_p.h"
-#include "qtqmlandroidrecycleradapter_p.h"
-#include "qtqmlandroidrecyclerview_p.h"
+#include "qqmlandroidcardview_p.h"
+#include "qqmlandroidrecycleradapter_p.h"
+#include "qqmlandroidrecyclerview_p.h"
 
 #include <QtQml/qqml.h>
 
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout.cpp b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout.cpp
index f873cd0..8b4d845 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout.cpp
+++ b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroiddrawerlayout_p.h"
-#include "qtqmlandroidactionbardrawertoggle_p.h"
+#include "qqmlandroiddrawerlayout_p.h"
+#include "qqmlandroidactionbardrawertoggle_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout_p.h b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h
index 9b8add4..fbb63c2 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout_p.h
+++ b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDDRAWERLAYOUT_P_H
 #define QQMLANDROIDDRAWERLAYOUT_P_H
 
-#include "qtqmlandroidviewgroup_p.h"
-#include "qtqmlandroiddrawerlayoutparams_p.h"
+#include "qqmlandroidviewgroup_p.h"
+#include "qqmlandroiddrawerlayoutparams_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams.cpp b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams.cpp
index 874d97c..60d4df9 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams.cpp
+++ b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams.cpp
@@ -1,6 +1,6 @@
-#include "qtqmlandroiddrawerlayoutparams_p.h"
-#include "qtqmlandroiddrawerlayout_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroiddrawerlayoutparams_p.h"
+#include "qqmlandroiddrawerlayout_p.h"
+#include "qqmlandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams_p.h b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h
index 52ba0f7..fbafa0d 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams_p.h
+++ b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDDRAWERLAYOUTPARAMS_P_H
 #define QQMLANDROIDDRAWERLAYOUTPARAMS_P_H
 
-#include "qtqmlandroidmarginlayoutparams_p.h"
+#include "qqmlandroidmarginlayoutparams_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout.cpp b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout.cpp
index 4b28d9d..47296e6 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout.cpp
+++ b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidswiperefreshlayout_p.h"
+#include "qqmlandroidswiperefreshlayout_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout_p.h b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h
index ae9484f..d00dd6d 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout_p.h
+++ b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDSWIPEREFRESHLAYOUT_P_H
 #define QQMLANDROIDSWIPEREFRESHLAYOUT_P_H
 
-#include "qtqmlandroidviewgroup_p.h"
+#include "qqmlandroidviewgroup_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v4/widget/widget.pri b/src/qmlandroid/support/v4/widget/widget.pri
index 47b19ac..cbf1b84 100644
--- a/src/qmlandroid/support/v4/widget/widget.pri
+++ b/src/qmlandroid/support/v4/widget/widget.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroiddrawerlayout_p.h \
-    $$PWD/qtqmlandroiddrawerlayoutparams_p.h \
-    $$PWD/qtqmlandroidswiperefreshlayout_p.h
+    $$PWD/qqmlandroiddrawerlayout_p.h \
+    $$PWD/qqmlandroiddrawerlayoutparams_p.h \
+    $$PWD/qqmlandroidswiperefreshlayout_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroiddrawerlayout.cpp \
-    $$PWD/qtqmlandroiddrawerlayoutparams.cpp \
-    $$PWD/qtqmlandroidswiperefreshlayout.cpp
+    $$PWD/qqmlandroiddrawerlayout.cpp \
+    $$PWD/qqmlandroiddrawerlayoutparams.cpp \
+    $$PWD/qqmlandroidswiperefreshlayout.cpp
diff --git a/src/qmlandroid/support/v7/app/app.pri b/src/qmlandroid/support/v7/app/app.pri
index 81fbadd..a203273 100644
--- a/src/qmlandroid/support/v7/app/app.pri
+++ b/src/qmlandroid/support/v7/app/app.pri
@@ -1,7 +1,7 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidactionbardrawertoggle_p.h
+    $$PWD/qqmlandroidactionbardrawertoggle_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidactionbardrawertoggle.cpp
+    $$PWD/qqmlandroidactionbardrawertoggle.cpp
diff --git a/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle.cpp b/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle.cpp
index f265e25..7438d24 100644
--- a/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle.cpp
+++ b/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidactionbardrawertoggle_p.h"
+#include "qqmlandroidactionbardrawertoggle_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle_p.h b/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle_p.h
index 27d7f23..444e531 100644
--- a/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle_p.h
+++ b/src/qmlandroid/support/v7/app/qqmlandroidactionbardrawertoggle_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDACTIONBARDRAWERTOGGLE_P_H
 #define QQMLANDROIDACTIONBARDRAWERTOGGLE_P_H
 
-#include "qtqmlandroidobject_p.h"
+#include "qqmlandroidobject_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidcardview.cpp b/src/qmlandroid/support/v7/widget/qqmlandroidcardview.cpp
index 1a83bee..69e8034 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidcardview.cpp
+++ b/src/qmlandroid/support/v7/widget/qqmlandroidcardview.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidcardview_p.h"
+#include "qqmlandroidcardview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidcardview_p.h b/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h
index 64e5bc1..74c4fa2 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidcardview_p.h
+++ b/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDCARDVIEW_P_H
 #define QQMLANDROIDCARDVIEW_P_H
 
-#include "qtqmlandroidframelayout_p.h"
+#include "qqmlandroidframelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter.cpp b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp
index c41f4bf..65efd34 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter.cpp
+++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp
@@ -1,6 +1,6 @@
-#include "qtqmlandroidrecycleradapter_p.h"
+#include "qqmlandroidrecycleradapter_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidview_p.h"
 #include <QtQml/qqmlcomponent.h>
 #include <QtQml/qqmlcontext.h>
 
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter_p.h b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h
index 19b910e..d6a1126 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter_p.h
+++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDRECYCLERADAPTER_P_H
 #define QQMLANDROIDRECYCLERADAPTER_P_H
 
-#include "qtqmlandroidcontextual_p.h"
+#include "qqmlandroidcontextual_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview.cpp b/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview.cpp
index b291a79..3815aa6 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview.cpp
+++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidrecyclerview_p.h"
-#include "qtqmlandroidrecycleradapter_p.h"
+#include "qqmlandroidrecyclerview_p.h"
+#include "qqmlandroidrecycleradapter_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview_p.h b/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h
index 4ff3dfe..90bdd6a 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview_p.h
+++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDRECYCLERVIEW_P_H
 #define QQMLANDROIDRECYCLERVIEW_P_H
 
-#include "qtqmlandroidviewgroup_p.h"
+#include "qqmlandroidviewgroup_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/support/v7/widget/widget.pri b/src/qmlandroid/support/v7/widget/widget.pri
index 79875e7..3f67ebc 100644
--- a/src/qmlandroid/support/v7/widget/widget.pri
+++ b/src/qmlandroid/support/v7/widget/widget.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidcardview_p.h \
-    $$PWD/qtqmlandroidrecycleradapter_p.h \
-    $$PWD/qtqmlandroidrecyclerview_p.h
+    $$PWD/qqmlandroidcardview_p.h \
+    $$PWD/qqmlandroidrecycleradapter_p.h \
+    $$PWD/qqmlandroidrecyclerview_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidcardview.cpp \
-    $$PWD/qtqmlandroidrecycleradapter.cpp \
-    $$PWD/qtqmlandroidrecyclerview.cpp
+    $$PWD/qqmlandroidcardview.cpp \
+    $$PWD/qqmlandroidrecycleradapter.cpp \
+    $$PWD/qqmlandroidrecyclerview.cpp
diff --git a/src/qmlandroid/view/animation/animation.pri b/src/qmlandroid/view/animation/animation.pri
index b36e804..6b0caee 100644
--- a/src/qmlandroid/view/animation/animation.pri
+++ b/src/qmlandroid/view/animation/animation.pri
@@ -1,41 +1,41 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidacceleratedecelerateinterpolator_p.h \
-    $$PWD/qtqmlandroidaccelerateinterpolator_p.h \
-    $$PWD/qtqmlandroidalphaanimation_p.h \
-    $$PWD/qtqmlandroidanimation_p.h \
-    $$PWD/qtqmlandroidanimationmodule_p.h \
-    $$PWD/qtqmlandroidanimationset_p.h \
-    $$PWD/qtqmlandroidanticipateinterpolator_p.h \
-    $$PWD/qtqmlandroidanticipateovershootinterpolator_p.h \
-    $$PWD/qtqmlandroidbounceinterpolator_p.h \
-    $$PWD/qtqmlandroidcycleinterpolator_p.h \
-    $$PWD/qtqmlandroiddecelerateinterpolator_p.h \
-    $$PWD/qtqmlandroidinterpolator_p.h \
-    $$PWD/qtqmlandroidlinearinterpolator_p.h \
-    $$PWD/qtqmlandroidovershootinterpolator_p.h \
-    $$PWD/qtqmlandroidpathinterpolator_p.h \
-    $$PWD/qtqmlandroidrotateanimation_p.h \
-    $$PWD/qtqmlandroidscaleanimation_p.h \
-    $$PWD/qtqmlandroidtranslateanimation_p.h
+    $$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 \
+    $$PWD/qqmlandroidscaleanimation_p.h \
+    $$PWD/qqmlandroidtranslateanimation_p.h \
+    $$PWD/qtqmlandroidanimationmodule_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidacceleratedecelerateinterpolator.cpp \
-    $$PWD/qtqmlandroidaccelerateinterpolator.cpp \
-    $$PWD/qtqmlandroidalphaanimation.cpp \
-    $$PWD/qtqmlandroidanimation.cpp \
-    $$PWD/qtqmlandroidanimationmodule.cpp \
-    $$PWD/qtqmlandroidanimationset.cpp \
-    $$PWD/qtqmlandroidanticipateinterpolator.cpp \
-    $$PWD/qtqmlandroidanticipateovershootinterpolator.cpp \
-    $$PWD/qtqmlandroidbounceinterpolator.cpp \
-    $$PWD/qtqmlandroidcycleinterpolator.cpp \
-    $$PWD/qtqmlandroiddecelerateinterpolator.cpp \
-    $$PWD/qtqmlandroidinterpolator.cpp \
-    $$PWD/qtqmlandroidlinearinterpolator.cpp \
-    $$PWD/qtqmlandroidovershootinterpolator.cpp \
-    $$PWD/qtqmlandroidpathinterpolator.cpp \
-    $$PWD/qtqmlandroidrotateanimation.cpp \
-    $$PWD/qtqmlandroidscaleanimation.cpp \
-    $$PWD/qtqmlandroidtranslateanimation.cpp
+    $$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 \
+    $$PWD/qqmlandroidscaleanimation.cpp \
+    $$PWD/qqmlandroidtranslateanimation.cpp \
+    $$PWD/qtqmlandroidanimationmodule.cpp
diff --git a/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp
index 4fb3878..5553aa0 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidacceleratedecelerateinterpolator_p.h"
+#include "qqmlandroidacceleratedecelerateinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
index 85acb54..ace83ec 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
 #define QQMLANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
+#include "qqmlandroidinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator.cpp
index 28d520a..03d6c71 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidaccelerateinterpolator_p.h"
+#include "qqmlandroidaccelerateinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h
index 3e34f64..ace09d1 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDACCELERATEINTERPOLATOR_P_H
 #define QQMLANDROIDACCELERATEINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidalphaanimation.cpp b/src/qmlandroid/view/animation/qqmlandroidalphaanimation.cpp
index 4a3ccab..c9d1532 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidalphaanimation.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidalphaanimation.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidalphaanimation_p.h"
+#include "qqmlandroidalphaanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidalphaanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h
index 9b7df32..6626839 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidalphaanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDALPHAANIMATION_P_H
 #define QQMLANDROIDALPHAANIMATION_P_H
 
-#include "qtqmlandroidanimation_p.h"
+#include "qqmlandroidanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimation.cpp b/src/qmlandroid/view/animation/qqmlandroidanimation.cpp
index 00f83b5..745945c 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimation.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidanimation.cpp
@@ -1,6 +1,6 @@
-#include "qtqmlandroidanimation_p.h"
+#include "qqmlandroidanimation_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qtqmlandroidinterpolator_p.h"
+#include "qqmlandroidinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidanimation_p.h
index a4b9eeb..4d84dd9 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidanimation_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDANIMATION_P_H
 #define QQMLANDROIDANIMATION_P_H
 
-#include "qtqmlandroidcontextual_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidcontextual_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimationset.cpp b/src/qmlandroid/view/animation/qqmlandroidanimationset.cpp
index 070d550..fe08b30 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimationset.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidanimationset.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidanimationset_p.h"
+#include "qqmlandroidanimationset_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimationset_p.h b/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h
index 6a826c0..852681e 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimationset_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDANIMATIONSET_P_H
 #define QQMLANDROIDANIMATIONSET_P_H
 
-#include "qtqmlandroidanimation_p.h"
+#include "qqmlandroidanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator.cpp
index 32cb12e..a798980 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidanticipateinterpolator_p.h"
+#include "qqmlandroidanticipateinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h
index 21ca63f..d78a2f1 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDANTICIPATEINTERPOLATOR_P_H
 #define QQMLANDROIDANTICIPATEINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator.cpp
index 2ecb5d2..cc8a97d 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidanticipateovershootinterpolator_p.h"
+#include "qqmlandroidanticipateovershootinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h
index c78d850..547a8a8 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDANTICIPATEOVERSHOOTINTERPOLATOR_P_H
 #define QQMLANDROIDANTICIPATEOVERSHOOTINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator.cpp
index 07235c6..f6fecc2 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidbounceinterpolator_p.h"
+#include "qqmlandroidbounceinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h
index 21bef4a..3e6d5ee 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDBOUNCEINTERPOLATOR_P_H
 #define QQMLANDROIDBOUNCEINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
+#include "qqmlandroidinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator.cpp
index 070af6b..2792a14 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidcycleinterpolator_p.h"
+#include "qqmlandroidcycleinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h
index fd9dd44..fe259ec 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDCYCLEINTERPOLATOR_P_H
 #define QQMLANDROIDCYCLEINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator.cpp
index c7ea1cc..1a711d3 100644
--- a/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroiddecelerateinterpolator_p.h"
+#include "qqmlandroiddecelerateinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h
index 9deab26..ce7b0f7 100644
--- a/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDDECELERATEINTERPOLATOR_P_H
 #define QQMLANDROIDDECELERATEINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidinterpolator.cpp
index d410664..1af9f09 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidinterpolator_p.h"
+#include "qqmlandroidinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h
index b516a8e..5697df4 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDINTERPOLATOR_P_H
 #define QQMLANDROIDINTERPOLATOR_P_H
 
-#include "qtqmlandroidobject_p.h"
+#include "qqmlandroidobject_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator.cpp
index 2585c2b..3864bdd 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidlinearinterpolator_p.h"
+#include "qqmlandroidlinearinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h
index aeb551b..03a1e36 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDLINEARINTERPOLATOR_P_H
 #define QQMLANDROIDLINEARINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
+#include "qqmlandroidinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator.cpp
index b676e64..977c51b 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidovershootinterpolator_p.h"
+#include "qqmlandroidovershootinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h
index f49ec6c..6e5461c 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDOVERSHOOTINTERPOLATOR_P_H
 #define QQMLANDROIDOVERSHOOTINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator.cpp b/src/qmlandroid/view/animation/qqmlandroidpathinterpolator.cpp
index f809438..b8b27ca 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidpathinterpolator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidpathinterpolator_p.h"
+#include "qqmlandroidpathinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h
index cb90e63..84f925d 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDAPATHINTERPOLATOR_P_H
 #define QQMLANDROIDAPATHINTERPOLATOR_P_H
 
-#include "qtqmlandroidinterpolator_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidinterpolator_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidrotateanimation.cpp b/src/qmlandroid/view/animation/qqmlandroidrotateanimation.cpp
index 7a2585a..3a9fdef 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidrotateanimation.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidrotateanimation.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidrotateanimation_p.h"
+#include "qqmlandroidrotateanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidrotateanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h
index b56e1e6..8f906c9 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidrotateanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDROTATEANIMATION_P_H
 #define QQMLANDROIDROTATEANIMATION_P_H
 
-#include "qtqmlandroidanimation_p.h"
+#include "qqmlandroidanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidscaleanimation.cpp b/src/qmlandroid/view/animation/qqmlandroidscaleanimation.cpp
index 2cd7520..ee5f667 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidscaleanimation.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidscaleanimation.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidscaleanimation_p.h"
+#include "qqmlandroidscaleanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidscaleanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h
index 6fdd2d4..48a6a66 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidscaleanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDSCALEANIMATION_P_H
 #define QQMLANDROIDSCALEANIMATION_P_H
 
-#include "qtqmlandroidanimation_p.h"
+#include "qqmlandroidanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation.cpp b/src/qmlandroid/view/animation/qqmlandroidtranslateanimation.cpp
index 61db250..4fbb31c 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation.cpp
+++ b/src/qmlandroid/view/animation/qqmlandroidtranslateanimation.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidtranslateanimation_p.h"
+#include "qqmlandroidtranslateanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h
index 69d87f0..5f7fd6f 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDTRANSLATEANIMATION_P_H
 #define QQMLANDROIDTRANSLATEANIMATION_P_H
 
-#include "qtqmlandroidanimation_p.h"
+#include "qqmlandroidanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp b/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp
index 6fc93d3..6155a52 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp
@@ -1,21 +1,21 @@
 #include "qtqmlandroidanimationmodule_p.h"
 
-#include "qtqmlandroidacceleratedecelerateinterpolator_p.h"
-#include "qtqmlandroidaccelerateinterpolator_p.h"
-#include "qtqmlandroidalphaanimation_p.h"
-#include "qtqmlandroidanimation_p.h"
-#include "qtqmlandroidanimationset_p.h"
-#include "qtqmlandroidanticipateinterpolator_p.h"
-#include "qtqmlandroidanticipateovershootinterpolator_p.h"
-#include "qtqmlandroidbounceinterpolator_p.h"
-#include "qtqmlandroidcycleinterpolator_p.h"
-#include "qtqmlandroiddecelerateinterpolator_p.h"
-#include "qtqmlandroidlinearinterpolator_p.h"
-#include "qtqmlandroidovershootinterpolator_p.h"
-#include "qtqmlandroidpathinterpolator_p.h"
-#include "qtqmlandroidrotateanimation_p.h"
-#include "qtqmlandroidscaleanimation_p.h"
-#include "qtqmlandroidtranslateanimation_p.h"
+#include "qqmlandroidacceleratedecelerateinterpolator_p.h"
+#include "qqmlandroidaccelerateinterpolator_p.h"
+#include "qqmlandroidalphaanimation_p.h"
+#include "qqmlandroidanimation_p.h"
+#include "qqmlandroidanimationset_p.h"
+#include "qqmlandroidanticipateinterpolator_p.h"
+#include "qqmlandroidanticipateovershootinterpolator_p.h"
+#include "qqmlandroidbounceinterpolator_p.h"
+#include "qqmlandroidcycleinterpolator_p.h"
+#include "qqmlandroiddecelerateinterpolator_p.h"
+#include "qqmlandroidlinearinterpolator_p.h"
+#include "qqmlandroidovershootinterpolator_p.h"
+#include "qqmlandroidpathinterpolator_p.h"
+#include "qqmlandroidrotateanimation_p.h"
+#include "qqmlandroidscaleanimation_p.h"
+#include "qqmlandroidtranslateanimation_p.h"
 
 #include <QtQml/qqml.h>
 
diff --git a/src/qmlandroid/view/qtqmlandroidgravity_p.h b/src/qmlandroid/view/qqmlandroidgravity_p.h
index 2757119..2757119 100644
--- a/src/qmlandroid/view/qtqmlandroidgravity_p.h
+++ b/src/qmlandroid/view/qqmlandroidgravity_p.h
diff --git a/src/qmlandroid/view/qtqmlandroidlayoutparams.cpp b/src/qmlandroid/view/qqmlandroidlayoutparams.cpp
index c72cd87..d17df0f 100644
--- a/src/qmlandroid/view/qtqmlandroidlayoutparams.cpp
+++ b/src/qmlandroid/view/qqmlandroidlayoutparams.cpp
@@ -1,6 +1,6 @@
-#include "qtqmlandroidlayoutparams_p.h"
+#include "qqmlandroidlayoutparams_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/qtqmlandroidlayoutparams_p.h b/src/qmlandroid/view/qqmlandroidlayoutparams_p.h
index 7289d58..e202b41 100644
--- a/src/qmlandroid/view/qtqmlandroidlayoutparams_p.h
+++ b/src/qmlandroid/view/qqmlandroidlayoutparams_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDLAYOUTPARAMS_P_H
 #define QQMLANDROIDLAYOUTPARAMS_P_H
 
-#include "qtqmlandroidobject_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidobject_p.h"
+#include "qqmlandroidoptional_p.h"
 #include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/view/qtqmlandroidmenu.cpp b/src/qmlandroid/view/qqmlandroidmenu.cpp
index 96239e8..a5f0b8c 100644
--- a/src/qmlandroid/view/qtqmlandroidmenu.cpp
+++ b/src/qmlandroid/view/qqmlandroidmenu.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidmenu_p.h"
-#include "qtqmlandroidmenuitem_p.h"
+#include "qqmlandroidmenu_p.h"
+#include "qqmlandroidmenuitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/qtqmlandroidmenu_p.h b/src/qmlandroid/view/qqmlandroidmenu_p.h
index 7c923a4..6e3d16f 100644
--- a/src/qmlandroid/view/qtqmlandroidmenu_p.h
+++ b/src/qmlandroid/view/qqmlandroidmenu_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDMENU_P_H
 #define QQMLANDROIDMENU_P_H
 
-#include "qtqmlandroidcontextual_p.h"
+#include "qqmlandroidcontextual_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/qtqmlandroidmenuitem.cpp b/src/qmlandroid/view/qqmlandroidmenuitem.cpp
index 510891a..9b86fd0 100644
--- a/src/qmlandroid/view/qtqmlandroidmenuitem.cpp
+++ b/src/qmlandroid/view/qqmlandroidmenuitem.cpp
@@ -1,7 +1,7 @@
-#include "qtqmlandroidmenuitem_p.h"
+#include "qqmlandroidmenuitem_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qtqmlandroidcontext_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidcontext_p.h"
+#include "qqmlandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/qtqmlandroidmenuitem_p.h b/src/qmlandroid/view/qqmlandroidmenuitem_p.h
index aeb9790..42f658c 100644
--- a/src/qmlandroid/view/qtqmlandroidmenuitem_p.h
+++ b/src/qmlandroid/view/qqmlandroidmenuitem_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDMENUITEM_P_H
 #define QQMLANDROIDMENUITEM_P_H
 
-#include "qtqmlandroidcontextual_p.h"
+#include "qqmlandroidcontextual_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/qtqmlandroidview.cpp b/src/qmlandroid/view/qqmlandroidview.cpp
index 5dbbaac..dc12a3a 100644
--- a/src/qmlandroid/view/qtqmlandroidview.cpp
+++ b/src/qmlandroid/view/qqmlandroidview.cpp
@@ -1,8 +1,8 @@
-#include "qtqmlandroidview_p.h"
-#include "qtqmlandroiddrawable_p.h"
-#include "qtqmlandroidcolordrawable_p.h"
-#include "qtqmlandroidlayoutparams_p.h"
-#include "qtqmlandroidanimation_p.h"
+#include "qqmlandroidview_p.h"
+#include "qqmlandroiddrawable_p.h"
+#include "qqmlandroidcolordrawable_p.h"
+#include "qqmlandroidlayoutparams_p.h"
+#include "qqmlandroidanimation_p.h"
 #include "qtqmlandroidfunctions_p.h"
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qcoreevent.h>
diff --git a/src/qmlandroid/view/qtqmlandroidview_p.h b/src/qmlandroid/view/qqmlandroidview_p.h
index 7757896..b498967 100644
--- a/src/qmlandroid/view/qtqmlandroidview_p.h
+++ b/src/qmlandroid/view/qqmlandroidview_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDVIEW_P_H
 #define QQMLANDROIDVIEW_P_H
 
-#include "qtqmlandroidcontextual_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidcontextual_p.h"
+#include "qqmlandroidoptional_p.h"
 #include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/view/qtqmlandroidviewgroup.cpp b/src/qmlandroid/view/qqmlandroidviewgroup.cpp
index 6aa9b12..63da5ec 100644
--- a/src/qmlandroid/view/qtqmlandroidviewgroup.cpp
+++ b/src/qmlandroid/view/qqmlandroidviewgroup.cpp
@@ -1,7 +1,7 @@
-#include "qtqmlandroidviewgroup_p.h"
-#include "qtqmlandroidlayoutparams_p.h"
+#include "qqmlandroidviewgroup_p.h"
+#include "qqmlandroidlayoutparams_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qtqmlandroidcontext_p.h"
+#include "qqmlandroidcontext_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/qtqmlandroidviewgroup_p.h b/src/qmlandroid/view/qqmlandroidviewgroup_p.h
index 9f09bad..a93d648 100644
--- a/src/qmlandroid/view/qtqmlandroidviewgroup_p.h
+++ b/src/qmlandroid/view/qqmlandroidviewgroup_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDVIEWGROUP_P_H
 #define QQMLANDROIDVIEWGROUP_P_H
 
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/qtqmlandroidwindow.cpp b/src/qmlandroid/view/qqmlandroidwindow.cpp
index f1c9906..d4de163 100644
--- a/src/qmlandroid/view/qtqmlandroidwindow.cpp
+++ b/src/qmlandroid/view/qqmlandroidwindow.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidwindow_p.h"
-#include "qtqmlandroidcontext_p.h"
+#include "qqmlandroidwindow_p.h"
+#include "qqmlandroidcontext_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/view/qtqmlandroidwindow_p.h b/src/qmlandroid/view/qqmlandroidwindow_p.h
index ef13832..9b7bf68 100644
--- a/src/qmlandroid/view/qtqmlandroidwindow_p.h
+++ b/src/qmlandroid/view/qqmlandroidwindow_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDWINDOW_P_H
 #define QQMLANDROIDWINDOW_P_H
 
-#include "qtqmlandroidcontextual_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidcontextual_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/view/qtqmlandroidviewmodule.cpp b/src/qmlandroid/view/qtqmlandroidviewmodule.cpp
index be408a6..082e83d 100644
--- a/src/qmlandroid/view/qtqmlandroidviewmodule.cpp
+++ b/src/qmlandroid/view/qtqmlandroidviewmodule.cpp
@@ -1,12 +1,12 @@
 #include "qtqmlandroidviewmodule_p.h"
 
-#include "qtqmlandroidgravity_p.h"
-#include "qtqmlandroidlayoutparams_p.h"
-#include "qtqmlandroidmenu_p.h"
-#include "qtqmlandroidmenuitem_p.h"
-#include "qtqmlandroidview_p.h"
-#include "qtqmlandroidviewgroup_p.h"
-#include "qtqmlandroidwindow_p.h"
+#include "qqmlandroidgravity_p.h"
+#include "qqmlandroidlayoutparams_p.h"
+#include "qqmlandroidmenu_p.h"
+#include "qqmlandroidmenuitem_p.h"
+#include "qqmlandroidview_p.h"
+#include "qqmlandroidviewgroup_p.h"
+#include "qqmlandroidwindow_p.h"
 
 #include <QtQml/qqml.h>
 
diff --git a/src/qmlandroid/view/view.pri b/src/qmlandroid/view/view.pri
index 2dcd09a..6705bd5 100644
--- a/src/qmlandroid/view/view.pri
+++ b/src/qmlandroid/view/view.pri
@@ -1,22 +1,22 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidgravity_p.h \
-    $$PWD/qtqmlandroidlayoutparams_p.h \
-    $$PWD/qtqmlandroidmenu_p.h \
-    $$PWD/qtqmlandroidmenuitem_p.h \
-    $$PWD/qtqmlandroidview_p.h \
-    $$PWD/qtqmlandroidviewgroup_p.h \
-    $$PWD/qtqmlandroidviewmodule_p.h \
-    $$PWD/qtqmlandroidwindow_p.h
+    $$PWD/qqmlandroidgravity_p.h \
+    $$PWD/qqmlandroidlayoutparams_p.h \
+    $$PWD/qqmlandroidmenu_p.h \
+    $$PWD/qqmlandroidmenuitem_p.h \
+    $$PWD/qqmlandroidview_p.h \
+    $$PWD/qqmlandroidviewgroup_p.h \
+    $$PWD/qqmlandroidwindow_p.h \
+    $$PWD/qtqmlandroidviewmodule_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidlayoutparams.cpp \
-    $$PWD/qtqmlandroidmenu.cpp \
-    $$PWD/qtqmlandroidmenuitem.cpp \
-    $$PWD/qtqmlandroidview.cpp \
-    $$PWD/qtqmlandroidviewgroup.cpp \
-    $$PWD/qtqmlandroidviewmodule.cpp \
-    $$PWD/qtqmlandroidwindow.cpp
+    $$PWD/qqmlandroidlayoutparams.cpp \
+    $$PWD/qqmlandroidmenu.cpp \
+    $$PWD/qqmlandroidmenuitem.cpp \
+    $$PWD/qqmlandroidview.cpp \
+    $$PWD/qqmlandroidviewgroup.cpp \
+    $$PWD/qqmlandroidwindow.cpp \
+    $$PWD/qtqmlandroidviewmodule.cpp
 
 include(animation/animation.pri)
diff --git a/src/qmlandroid/widget/qtqmlandroidabsseekbar.cpp b/src/qmlandroid/widget/qqmlandroidabsseekbar.cpp
index 3c7501f..4f06968 100644
--- a/src/qmlandroid/widget/qtqmlandroidabsseekbar.cpp
+++ b/src/qmlandroid/widget/qqmlandroidabsseekbar.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidabsseekbar_p.h"
+#include "qqmlandroidabsseekbar_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidabsseekbar_p.h b/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h
index 5e57667..216b135 100644
--- a/src/qmlandroid/widget/qtqmlandroidabsseekbar_p.h
+++ b/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDABSSEEKBAR_P_H
 #define QQMLANDROIDABSSEEKBAR_P_H
 
-#include "qtqmlandroidprogressbar_p.h"
+#include "qqmlandroidprogressbar_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidadapterview.cpp b/src/qmlandroid/widget/qqmlandroidadapterview.cpp
index 0da8cd0..8a56563 100644
--- a/src/qmlandroid/widget/qtqmlandroidadapterview.cpp
+++ b/src/qmlandroid/widget/qqmlandroidadapterview.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidadapterview_p.h"
-#include "qtqmlandroidbaseadapter_p.h"
+#include "qqmlandroidadapterview_p.h"
+#include "qqmlandroidbaseadapter_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidadapterview_p.h b/src/qmlandroid/widget/qqmlandroidadapterview_p.h
index 7b1724e..cc055ed 100644
--- a/src/qmlandroid/widget/qtqmlandroidadapterview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidadapterview_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDADAPTERVIEW_P_H
 #define QQMLANDROIDADAPTERVIEW_P_H
 
-#include "qtqmlandroidviewgroup_p.h"
+#include "qqmlandroidviewgroup_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidarrayadapter.cpp b/src/qmlandroid/widget/qqmlandroidarrayadapter.cpp
index 12d860c..a438f4d 100644
--- a/src/qmlandroid/widget/qtqmlandroidarrayadapter.cpp
+++ b/src/qmlandroid/widget/qqmlandroidarrayadapter.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidarrayadapter_p.h"
-#include "qtqmlandroidadapterview_p.h"
+#include "qqmlandroidarrayadapter_p.h"
+#include "qqmlandroidadapterview_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidarrayadapter_p.h b/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h
index 0bb4e56..0b696db 100644
--- a/src/qmlandroid/widget/qtqmlandroidarrayadapter_p.h
+++ b/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDARRAYADAPTER_P_H
 #define QQMLANDROIDARRAYADAPTER_P_H
 
-#include "qtqmlandroidbaseadapter_p.h"
+#include "qqmlandroidbaseadapter_p.h"
 #include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidbaseadapter.cpp b/src/qmlandroid/widget/qqmlandroidbaseadapter.cpp
index 6579918..40fb2bd 100644
--- a/src/qmlandroid/widget/qtqmlandroidbaseadapter.cpp
+++ b/src/qmlandroid/widget/qqmlandroidbaseadapter.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidbaseadapter_p.h"
+#include "qqmlandroidbaseadapter_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidbaseadapter_p.h b/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h
index 26ca43e..23df899 100644
--- a/src/qmlandroid/widget/qtqmlandroidbaseadapter_p.h
+++ b/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDBASEADAPTER_P_H
 #define QQMLANDROIDBASEADAPTER_P_H
 
-#include "qtqmlandroidcontextual_p.h"
+#include "qqmlandroidcontextual_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidbutton.cpp b/src/qmlandroid/widget/qqmlandroidbutton.cpp
index f91c3e2..3bb463b 100644
--- a/src/qmlandroid/widget/qtqmlandroidbutton.cpp
+++ b/src/qmlandroid/widget/qqmlandroidbutton.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidbutton_p.h"
+#include "qqmlandroidbutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidbutton_p.h b/src/qmlandroid/widget/qqmlandroidbutton_p.h
index 7b454c5..fd1221f 100644
--- a/src/qmlandroid/widget/qtqmlandroidbutton_p.h
+++ b/src/qmlandroid/widget/qqmlandroidbutton_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDBUTTON_P_H
 #define QQMLANDROIDBUTTON_P_H
 
-#include "qtqmlandroidtextview_p.h"
+#include "qqmlandroidtextview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidcalendarview.cpp b/src/qmlandroid/widget/qqmlandroidcalendarview.cpp
index 0851577..b7d53f6 100644
--- a/src/qmlandroid/widget/qtqmlandroidcalendarview.cpp
+++ b/src/qmlandroid/widget/qqmlandroidcalendarview.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidcalendarview_p.h"
+#include "qqmlandroidcalendarview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidcalendarview_p.h b/src/qmlandroid/widget/qqmlandroidcalendarview_p.h
index f4c93a6..7eb0721 100644
--- a/src/qmlandroid/widget/qtqmlandroidcalendarview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidcalendarview_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDCALENDARVIEW_P_H
 #define QQMLANDROIDCALENDARVIEW_P_H
 
-#include "qtqmlandroidframelayout_p.h"
+#include "qqmlandroidframelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidcheckbox.cpp b/src/qmlandroid/widget/qqmlandroidcheckbox.cpp
index 46b9bb3..e94fbfa 100644
--- a/src/qmlandroid/widget/qtqmlandroidcheckbox.cpp
+++ b/src/qmlandroid/widget/qqmlandroidcheckbox.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidcheckbox_p.h"
+#include "qqmlandroidcheckbox_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidcheckbox_p.h b/src/qmlandroid/widget/qqmlandroidcheckbox_p.h
index 65277d4..73857c6 100644
--- a/src/qmlandroid/widget/qtqmlandroidcheckbox_p.h
+++ b/src/qmlandroid/widget/qqmlandroidcheckbox_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDCHECKBOX_P_H
 #define QQMLANDROIDCHECKBOX_P_H
 
-#include "qtqmlandroidcompoundbutton_p.h"
+#include "qqmlandroidcompoundbutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidcompoundbutton.cpp b/src/qmlandroid/widget/qqmlandroidcompoundbutton.cpp
index 289ef69..b51e91b 100644
--- a/src/qmlandroid/widget/qtqmlandroidcompoundbutton.cpp
+++ b/src/qmlandroid/widget/qqmlandroidcompoundbutton.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidcompoundbutton_p.h"
+#include "qqmlandroidcompoundbutton_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidcompoundbutton_p.h b/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h
index 7676913..f987fb3 100644
--- a/src/qmlandroid/widget/qtqmlandroidcompoundbutton_p.h
+++ b/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDCOMPOUNDBUTTON_P_H
 #define QQMLANDROIDCOMPOUNDBUTTON_P_H
 
-#include "qtqmlandroidbutton_p.h"
+#include "qqmlandroidbutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroiddatepicker.cpp b/src/qmlandroid/widget/qqmlandroiddatepicker.cpp
index 5bddd10..d06dc7c 100644
--- a/src/qmlandroid/widget/qtqmlandroiddatepicker.cpp
+++ b/src/qmlandroid/widget/qqmlandroiddatepicker.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroiddatepicker_p.h"
+#include "qqmlandroiddatepicker_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroiddatepicker_p.h b/src/qmlandroid/widget/qqmlandroiddatepicker_p.h
index 5242185..9ce04dd 100644
--- a/src/qmlandroid/widget/qtqmlandroiddatepicker_p.h
+++ b/src/qmlandroid/widget/qqmlandroiddatepicker_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDDATEPICKER_P_H
 #define QQMLANDROIDDATEPICKER_P_H
 
-#include "qtqmlandroidframelayout_p.h"
+#include "qqmlandroidframelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidedittext.cpp b/src/qmlandroid/widget/qqmlandroidedittext.cpp
index e2f8025..886deb8 100644
--- a/src/qmlandroid/widget/qtqmlandroidedittext.cpp
+++ b/src/qmlandroid/widget/qqmlandroidedittext.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidedittext_p.h"
+#include "qqmlandroidedittext_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidedittext_p.h b/src/qmlandroid/widget/qqmlandroidedittext_p.h
index 170b5c7..d4417f5 100644
--- a/src/qmlandroid/widget/qtqmlandroidedittext_p.h
+++ b/src/qmlandroid/widget/qqmlandroidedittext_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDEDITTEXT_P_H
 #define QQMLANDROIDEDITTEXT_P_H
 
-#include "qtqmlandroidtextview_p.h"
+#include "qqmlandroidtextview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidframelayout.cpp b/src/qmlandroid/widget/qqmlandroidframelayout.cpp
index 83853f2..e87b566 100644
--- a/src/qmlandroid/widget/qtqmlandroidframelayout.cpp
+++ b/src/qmlandroid/widget/qqmlandroidframelayout.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidframelayout_p.h"
+#include "qqmlandroidframelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidframelayout_p.h b/src/qmlandroid/widget/qqmlandroidframelayout_p.h
index 3f15b02..a2bb25f 100644
--- a/src/qmlandroid/widget/qtqmlandroidframelayout_p.h
+++ b/src/qmlandroid/widget/qqmlandroidframelayout_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDFRAMELAYOUT_P_H
 #define QQMLANDROIDFRAMELAYOUT_P_H
 
-#include "qtqmlandroidviewgroup_p.h"
-#include "qtqmlandroidframelayoutparams_p.h"
+#include "qqmlandroidviewgroup_p.h"
+#include "qqmlandroidframelayoutparams_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidframelayoutparams.cpp b/src/qmlandroid/widget/qqmlandroidframelayoutparams.cpp
index 1cbc980..2f87b78 100644
--- a/src/qmlandroid/widget/qtqmlandroidframelayoutparams.cpp
+++ b/src/qmlandroid/widget/qqmlandroidframelayoutparams.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidframelayoutparams_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidframelayoutparams_p.h"
+#include "qqmlandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidframelayoutparams_p.h b/src/qmlandroid/widget/qqmlandroidframelayoutparams_p.h
index a6dfeb4..3f43933 100644
--- a/src/qmlandroid/widget/qtqmlandroidframelayoutparams_p.h
+++ b/src/qmlandroid/widget/qqmlandroidframelayoutparams_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDFRAMELAYOUTPARAMS_P_H
 #define QQMLANDROIDFRAMELAYOUTPARAMS_P_H
 
-#include "qtqmlandroidmarginlayoutparams_p.h"
+#include "qqmlandroidmarginlayoutparams_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidimageview.cpp b/src/qmlandroid/widget/qqmlandroidimageview.cpp
index 97ce984..41f65e4 100644
--- a/src/qmlandroid/widget/qtqmlandroidimageview.cpp
+++ b/src/qmlandroid/widget/qqmlandroidimageview.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidimageview_p.h"
+#include "qqmlandroidimageview_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidimageview_p.h b/src/qmlandroid/widget/qqmlandroidimageview_p.h
index 50f1820..bd5dc33 100644
--- a/src/qmlandroid/widget/qtqmlandroidimageview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidimageview_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDIMAGEVIEW_P_H
 #define QQMLANDROIDIMAGEVIEW_P_H
 
-#include "qtqmlandroidview_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidview_p.h"
+#include "qqmlandroidoptional_p.h"
 #include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidlinearlayout.cpp b/src/qmlandroid/widget/qqmlandroidlinearlayout.cpp
index f2b9e2b..970095e 100644
--- a/src/qmlandroid/widget/qtqmlandroidlinearlayout.cpp
+++ b/src/qmlandroid/widget/qqmlandroidlinearlayout.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidlinearlayout_p.h"
+#include "qqmlandroidlinearlayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidlinearlayout_p.h b/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h
index 227c610..7a4fe2a 100644
--- a/src/qmlandroid/widget/qtqmlandroidlinearlayout_p.h
+++ b/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h
@@ -1,9 +1,9 @@
 #ifndef QQMLANDROIDLINEARLAYOUT_P_H
 #define QQMLANDROIDLINEARLAYOUT_P_H
 
-#include "qtqmlandroidviewgroup_p.h"
-#include "qtqmlandroidoptional_p.h"
-#include "qtqmlandroidlinearlayoutparams_p.h"
+#include "qqmlandroidviewgroup_p.h"
+#include "qqmlandroidoptional_p.h"
+#include "qqmlandroidlinearlayoutparams_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams.cpp b/src/qmlandroid/widget/qqmlandroidlinearlayoutparams.cpp
index 7026082..c4fc737 100644
--- a/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams.cpp
+++ b/src/qmlandroid/widget/qqmlandroidlinearlayoutparams.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidlinearlayoutparams_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidlinearlayoutparams_p.h"
+#include "qqmlandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams_p.h b/src/qmlandroid/widget/qqmlandroidlinearlayoutparams_p.h
index f5ab908..098c0ce 100644
--- a/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams_p.h
+++ b/src/qmlandroid/widget/qqmlandroidlinearlayoutparams_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDLINEARLAYOUTPARAMS_P_H
 #define QQMLANDROIDLINEARLAYOUTPARAMS_P_H
 
-#include "qtqmlandroidmarginlayoutparams_p.h"
+#include "qqmlandroidmarginlayoutparams_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidlistview.cpp b/src/qmlandroid/widget/qqmlandroidlistview.cpp
index 7719734..7679cae 100644
--- a/src/qmlandroid/widget/qtqmlandroidlistview.cpp
+++ b/src/qmlandroid/widget/qqmlandroidlistview.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidlistview_p.h"
+#include "qqmlandroidlistview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidlistview_p.h b/src/qmlandroid/widget/qqmlandroidlistview_p.h
index 29c672c..28b3b68 100644
--- a/src/qmlandroid/widget/qtqmlandroidlistview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidlistview_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDLISTVIEW_P_H
 #define QQMLANDROIDLISTVIEW_P_H
 
-#include "qtqmlandroidadapterview_p.h"
+#include "qqmlandroidadapterview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams.cpp b/src/qmlandroid/widget/qqmlandroidmarginlayoutparams.cpp
index e1fa751..7495d3d 100644
--- a/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams.cpp
+++ b/src/qmlandroid/widget/qqmlandroidmarginlayoutparams.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidmarginlayoutparams_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidmarginlayoutparams_p.h"
+#include "qqmlandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams_p.h b/src/qmlandroid/widget/qqmlandroidmarginlayoutparams_p.h
index 577dd10..6d72201 100644
--- a/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams_p.h
+++ b/src/qmlandroid/widget/qqmlandroidmarginlayoutparams_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDMARGINLAYOUTPARAMS_P_H
 #define QQMLANDROIDMARGINLAYOUTPARAMS_P_H
 
-#include "qtqmlandroidlayoutparams_p.h"
+#include "qqmlandroidlayoutparams_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidnumberpicker.cpp b/src/qmlandroid/widget/qqmlandroidnumberpicker.cpp
index d95f0c5..4b5f1b6 100644
--- a/src/qmlandroid/widget/qtqmlandroidnumberpicker.cpp
+++ b/src/qmlandroid/widget/qqmlandroidnumberpicker.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidnumberpicker_p.h"
+#include "qqmlandroidnumberpicker_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidnumberpicker_p.h b/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h
index 0eb2873..9bb62a9 100644
--- a/src/qmlandroid/widget/qtqmlandroidnumberpicker_p.h
+++ b/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDNUMBERPICKER_P_H
 #define QQMLANDROIDNUMBERPICKER_P_H
 
-#include "qtqmlandroidlinearlayout_p.h"
+#include "qqmlandroidlinearlayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidpopupmenu.cpp b/src/qmlandroid/widget/qqmlandroidpopupmenu.cpp
index 9e40d0b..2cad415 100644
--- a/src/qmlandroid/widget/qtqmlandroidpopupmenu.cpp
+++ b/src/qmlandroid/widget/qqmlandroidpopupmenu.cpp
@@ -1,8 +1,8 @@
-#include "qtqmlandroidpopupmenu_p.h"
+#include "qqmlandroidpopupmenu_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qtqmlandroidmenuitem_p.h"
-#include "qtqmlandroidcontext_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidmenuitem_p.h"
+#include "qqmlandroidcontext_p.h"
+#include "qqmlandroidview_p.h"
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidpopupmenu_p.h b/src/qmlandroid/widget/qqmlandroidpopupmenu_p.h
index 646ae85..77b5f62 100644
--- a/src/qmlandroid/widget/qtqmlandroidpopupmenu_p.h
+++ b/src/qmlandroid/widget/qqmlandroidpopupmenu_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDPOPUPMENU_P_H
 #define QQMLANDROIDPOPUPMENU_P_H
 
-#include "qtqmlandroidobject_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidobject_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidprogressbar.cpp b/src/qmlandroid/widget/qqmlandroidprogressbar.cpp
index 4c8e6df..a1ba725 100644
--- a/src/qmlandroid/widget/qtqmlandroidprogressbar.cpp
+++ b/src/qmlandroid/widget/qqmlandroidprogressbar.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidprogressbar_p.h"
+#include "qqmlandroidprogressbar_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidprogressbar_p.h b/src/qmlandroid/widget/qqmlandroidprogressbar_p.h
index d3b40be..2432ddb 100644
--- a/src/qmlandroid/widget/qtqmlandroidprogressbar_p.h
+++ b/src/qmlandroid/widget/qqmlandroidprogressbar_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDPROGRESSBAR_P_H
 #define QQMLANDROIDPROGRESSBAR_P_H
 
-#include "qtqmlandroidview_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidview_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidradiobutton.cpp b/src/qmlandroid/widget/qqmlandroidradiobutton.cpp
index 2ca0bd9..ca4ed37 100644
--- a/src/qmlandroid/widget/qtqmlandroidradiobutton.cpp
+++ b/src/qmlandroid/widget/qqmlandroidradiobutton.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidradiobutton_p.h"
+#include "qqmlandroidradiobutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidradiobutton_p.h b/src/qmlandroid/widget/qqmlandroidradiobutton_p.h
index 3850e07..6c0e723 100644
--- a/src/qmlandroid/widget/qtqmlandroidradiobutton_p.h
+++ b/src/qmlandroid/widget/qqmlandroidradiobutton_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDRADIOBUTTON_P_H
 #define QQMLANDROIDRADIOBUTTON_P_H
 
-#include "qtqmlandroidcompoundbutton_p.h"
+#include "qqmlandroidcompoundbutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidradiogroup.cpp b/src/qmlandroid/widget/qqmlandroidradiogroup.cpp
index 5cae6b2..4abf099 100644
--- a/src/qmlandroid/widget/qtqmlandroidradiogroup.cpp
+++ b/src/qmlandroid/widget/qqmlandroidradiogroup.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidradiogroup_p.h"
-#include "qtqmlandroidradiobutton_p.h"
+#include "qqmlandroidradiogroup_p.h"
+#include "qqmlandroidradiobutton_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidradiogroup_p.h b/src/qmlandroid/widget/qqmlandroidradiogroup_p.h
index b972c6d..944b561 100644
--- a/src/qmlandroid/widget/qtqmlandroidradiogroup_p.h
+++ b/src/qmlandroid/widget/qqmlandroidradiogroup_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDRADIOGROUP_P_H
 #define QQMLANDROIDRADIOGROUP_P_H
 
-#include "qtqmlandroidlinearlayout_p.h"
+#include "qqmlandroidlinearlayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidratingbar.cpp b/src/qmlandroid/widget/qqmlandroidratingbar.cpp
index d68628b..3b11b82 100644
--- a/src/qmlandroid/widget/qtqmlandroidratingbar.cpp
+++ b/src/qmlandroid/widget/qqmlandroidratingbar.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidratingbar_p.h"
+#include "qqmlandroidratingbar_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidratingbar_p.h b/src/qmlandroid/widget/qqmlandroidratingbar_p.h
index e87395a..d734282 100644
--- a/src/qmlandroid/widget/qtqmlandroidratingbar_p.h
+++ b/src/qmlandroid/widget/qqmlandroidratingbar_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDRATINGBAR_P_H
 #define QQMLANDROIDRATINGBAR_P_H
 
-#include "qtqmlandroidabsseekbar_p.h"
+#include "qqmlandroidabsseekbar_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidrelativelayout.cpp b/src/qmlandroid/widget/qqmlandroidrelativelayout.cpp
index 3637e55..8db4ade 100644
--- a/src/qmlandroid/widget/qtqmlandroidrelativelayout.cpp
+++ b/src/qmlandroid/widget/qqmlandroidrelativelayout.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidrelativelayout_p.h"
+#include "qqmlandroidrelativelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidrelativelayout_p.h b/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h
index 32491ae..a2c4ff3 100644
--- a/src/qmlandroid/widget/qtqmlandroidrelativelayout_p.h
+++ b/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDRELATIVELAYOUT_P_H
 #define QQMLANDROIDRELATIVELAYOUT_P_H
 
-#include "qtqmlandroidviewgroup_p.h"
-#include "qtqmlandroidrelativelayoutparams_p.h"
+#include "qqmlandroidviewgroup_p.h"
+#include "qqmlandroidrelativelayoutparams_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams.cpp b/src/qmlandroid/widget/qqmlandroidrelativelayoutparams.cpp
index ae86607..2f9fb4a 100644
--- a/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams.cpp
+++ b/src/qmlandroid/widget/qqmlandroidrelativelayoutparams.cpp
@@ -1,6 +1,6 @@
-#include "qtqmlandroidrelativelayoutparams_p.h"
-#include "qtqmlandroidrelativelayout_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidrelativelayoutparams_p.h"
+#include "qqmlandroidrelativelayout_p.h"
+#include "qqmlandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams_p.h b/src/qmlandroid/widget/qqmlandroidrelativelayoutparams_p.h
index f09e505..af3a41e 100644
--- a/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams_p.h
+++ b/src/qmlandroid/widget/qqmlandroidrelativelayoutparams_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDRELATIVELAYOUTPARAMS_P_H
 #define QQMLANDROIDRELATIVELAYOUTPARAMS_P_H
 
-#include "qtqmlandroidmarginlayoutparams_p.h"
+#include "qqmlandroidmarginlayoutparams_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidscrollview.cpp b/src/qmlandroid/widget/qqmlandroidscrollview.cpp
index d39e908..f3e19e2 100644
--- a/src/qmlandroid/widget/qtqmlandroidscrollview.cpp
+++ b/src/qmlandroid/widget/qqmlandroidscrollview.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidscrollview_p.h"
+#include "qqmlandroidscrollview_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidscrollview_p.h b/src/qmlandroid/widget/qqmlandroidscrollview_p.h
index 8b0f57a..7aa2f04 100644
--- a/src/qmlandroid/widget/qtqmlandroidscrollview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidscrollview_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDSCROLLVIEW_P_H
 #define QQMLANDROIDSCROLLVIEW_P_H
 
-#include "qtqmlandroidframelayout_p.h"
+#include "qqmlandroidframelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidsearchview.cpp b/src/qmlandroid/widget/qqmlandroidsearchview.cpp
index 09e60e7..630298c 100644
--- a/src/qmlandroid/widget/qtqmlandroidsearchview.cpp
+++ b/src/qmlandroid/widget/qqmlandroidsearchview.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidsearchview_p.h"
+#include "qqmlandroidsearchview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidsearchview_p.h b/src/qmlandroid/widget/qqmlandroidsearchview_p.h
index 68769f4..5a19ebc 100644
--- a/src/qmlandroid/widget/qtqmlandroidsearchview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidsearchview_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDSEARCHVIEW_P_H
 #define QQMLANDROIDSEARCHVIEW_P_H
 
-#include "qtqmlandroidlinearlayout_p.h"
+#include "qqmlandroidlinearlayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidseekbar.cpp b/src/qmlandroid/widget/qqmlandroidseekbar.cpp
index fff1c7a..074b20e 100644
--- a/src/qmlandroid/widget/qtqmlandroidseekbar.cpp
+++ b/src/qmlandroid/widget/qqmlandroidseekbar.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidseekbar_p.h"
+#include "qqmlandroidseekbar_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidseekbar_p.h b/src/qmlandroid/widget/qqmlandroidseekbar_p.h
index 7b3d130..c245987 100644
--- a/src/qmlandroid/widget/qtqmlandroidseekbar_p.h
+++ b/src/qmlandroid/widget/qqmlandroidseekbar_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDSEEKBAR_P_H
 #define QQMLANDROIDSEEKBAR_P_H
 
-#include "qtqmlandroidabsseekbar_p.h"
+#include "qqmlandroidabsseekbar_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidspace.cpp b/src/qmlandroid/widget/qqmlandroidspace.cpp
index 2afb242..fdff20c 100644
--- a/src/qmlandroid/widget/qtqmlandroidspace.cpp
+++ b/src/qmlandroid/widget/qqmlandroidspace.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidspace_p.h"
+#include "qqmlandroidspace_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidspace_p.h b/src/qmlandroid/widget/qqmlandroidspace_p.h
index d543dc8..3a1bd70 100644
--- a/src/qmlandroid/widget/qtqmlandroidspace_p.h
+++ b/src/qmlandroid/widget/qqmlandroidspace_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDSPACE_P_H
 #define QQMLANDROIDSPACE_P_H
 
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidspinner.cpp b/src/qmlandroid/widget/qqmlandroidspinner.cpp
index bdd6e8c..0e791cd 100644
--- a/src/qmlandroid/widget/qtqmlandroidspinner.cpp
+++ b/src/qmlandroid/widget/qqmlandroidspinner.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidspinner_p.h"
+#include "qqmlandroidspinner_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidspinner_p.h b/src/qmlandroid/widget/qqmlandroidspinner_p.h
index 615993a..4503b66 100644
--- a/src/qmlandroid/widget/qtqmlandroidspinner_p.h
+++ b/src/qmlandroid/widget/qqmlandroidspinner_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDSPINNER_P_H
 #define QQMLANDROIDSPINNER_P_H
 
-#include "qtqmlandroidadapterview_p.h"
+#include "qqmlandroidadapterview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidswitch.cpp b/src/qmlandroid/widget/qqmlandroidswitch.cpp
index 09e8cc4..bb173b7 100644
--- a/src/qmlandroid/widget/qtqmlandroidswitch.cpp
+++ b/src/qmlandroid/widget/qqmlandroidswitch.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidswitch_p.h"
+#include "qqmlandroidswitch_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidswitch_p.h b/src/qmlandroid/widget/qqmlandroidswitch_p.h
index bc6d27c..0180342 100644
--- a/src/qmlandroid/widget/qtqmlandroidswitch_p.h
+++ b/src/qmlandroid/widget/qqmlandroidswitch_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDSWITCH_P_H
 #define QQMLANDROIDSWITCH_P_H
 
-#include "qtqmlandroidcompoundbutton_p.h"
+#include "qqmlandroidcompoundbutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtabhost.cpp b/src/qmlandroid/widget/qqmlandroidtabhost.cpp
index ee5ee4b..94bc408 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabhost.cpp
+++ b/src/qmlandroid/widget/qqmlandroidtabhost.cpp
@@ -1,5 +1,5 @@
-#include "qtqmlandroidtabhost_p.h"
-#include "qtqmlandroidtabspec_p.h"
+#include "qqmlandroidtabhost_p.h"
+#include "qqmlandroidtabspec_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtabhost_p.h b/src/qmlandroid/widget/qqmlandroidtabhost_p.h
index 91fb9bc..914303d 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabhost_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtabhost_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDTABHOST_P_H
 #define QQMLANDROIDTABHOST_P_H
 
-#include "qtqmlandroidframelayout_p.h"
+#include "qqmlandroidframelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtabspec.cpp b/src/qmlandroid/widget/qqmlandroidtabspec.cpp
index a15a809..eaa3d1d 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabspec.cpp
+++ b/src/qmlandroid/widget/qqmlandroidtabspec.cpp
@@ -1,6 +1,6 @@
-#include "qtqmlandroidtabspec_p.h"
-#include "qtqmlandroidtabhost_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidtabspec_p.h"
+#include "qqmlandroidtabhost_p.h"
+#include "qqmlandroidview_p.h"
 #include "qtqmlandroidfunctions_p.h"
 #include <QtAndroidExtras/qandroidjniobject.h>
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtabspec_p.h b/src/qmlandroid/widget/qqmlandroidtabspec_p.h
index fcb2540..fcb2540 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabspec_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtabspec_p.h
diff --git a/src/qmlandroid/widget/qtqmlandroidtabwidget.cpp b/src/qmlandroid/widget/qqmlandroidtabwidget.cpp
index 645869e..ba32fde 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabwidget.cpp
+++ b/src/qmlandroid/widget/qqmlandroidtabwidget.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidtabwidget_p.h"
+#include "qqmlandroidtabwidget_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtabwidget_p.h b/src/qmlandroid/widget/qqmlandroidtabwidget_p.h
index eb80643..88db66f 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabwidget_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtabwidget_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDTABWIDGET_P_H
 #define QQMLANDROIDTABWIDGET_P_H
 
-#include "qtqmlandroidlinearlayout_p.h"
+#include "qqmlandroidlinearlayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtextview.cpp b/src/qmlandroid/widget/qqmlandroidtextview.cpp
index 298b5c8..c255727 100644
--- a/src/qmlandroid/widget/qtqmlandroidtextview.cpp
+++ b/src/qmlandroid/widget/qqmlandroidtextview.cpp
@@ -1,6 +1,6 @@
-#include "qtqmlandroidtextview_p.h"
+#include "qqmlandroidtextview_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qtqmlandroidcolor_p.h"
+#include "qqmlandroidcolor_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtextview_p.h b/src/qmlandroid/widget/qqmlandroidtextview_p.h
index e12b0b4..6c40ee4 100644
--- a/src/qmlandroid/widget/qtqmlandroidtextview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtextview_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDTEXTVIEW_P_H
 #define QQMLANDROIDTEXTVIEW_P_H
 
-#include "qtqmlandroidview_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidview_p.h"
+#include "qqmlandroidoptional_p.h"
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidtimepicker.cpp b/src/qmlandroid/widget/qqmlandroidtimepicker.cpp
index 179fea3..a98c99e 100644
--- a/src/qmlandroid/widget/qtqmlandroidtimepicker.cpp
+++ b/src/qmlandroid/widget/qqmlandroidtimepicker.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidtimepicker_p.h"
+#include "qqmlandroidtimepicker_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtimepicker_p.h b/src/qmlandroid/widget/qqmlandroidtimepicker_p.h
index dfea530..1f7b3c0 100644
--- a/src/qmlandroid/widget/qtqmlandroidtimepicker_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtimepicker_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDTIMEPICKER_P_H
 #define QQMLANDROIDTIMEPICKER_P_H
 
-#include "qtqmlandroidframelayout_p.h"
+#include "qqmlandroidframelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtoast.cpp b/src/qmlandroid/widget/qqmlandroidtoast.cpp
index 7582dbf..d0c1a10 100644
--- a/src/qmlandroid/widget/qtqmlandroidtoast.cpp
+++ b/src/qmlandroid/widget/qqmlandroidtoast.cpp
@@ -1,6 +1,6 @@
-#include "qtqmlandroidtoast_p.h"
+#include "qqmlandroidtoast_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qtqmlandroidview_p.h"
+#include "qqmlandroidview_p.h"
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidtoast_p.h b/src/qmlandroid/widget/qqmlandroidtoast_p.h
index f3a2e4f..3424bf7 100644
--- a/src/qmlandroid/widget/qtqmlandroidtoast_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtoast_p.h
@@ -1,8 +1,8 @@
 #ifndef QQMLANDROIDTOAST_P_H
 #define QQMLANDROIDTOAST_P_H
 
-#include "qtqmlandroidobject_p.h"
-#include "qtqmlandroidoptional_p.h"
+#include "qqmlandroidobject_p.h"
+#include "qqmlandroidoptional_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtogglebutton.cpp b/src/qmlandroid/widget/qqmlandroidtogglebutton.cpp
index 5cf6bfd..8711d1e 100644
--- a/src/qmlandroid/widget/qtqmlandroidtogglebutton.cpp
+++ b/src/qmlandroid/widget/qqmlandroidtogglebutton.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidtogglebutton_p.h"
+#include "qqmlandroidtogglebutton_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidtogglebutton_p.h b/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h
index 80d7856..81ab525 100644
--- a/src/qmlandroid/widget/qtqmlandroidtogglebutton_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDTOGGLEBUTTON_P_H
 #define QQMLANDROIDTOGGLEBUTTON_P_H
 
-#include "qtqmlandroidcompoundbutton_p.h"
+#include "qqmlandroidcompoundbutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidviewanimator.cpp b/src/qmlandroid/widget/qqmlandroidviewanimator.cpp
index 37c94b4..a53ac1a 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewanimator.cpp
+++ b/src/qmlandroid/widget/qqmlandroidviewanimator.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidviewanimator_p.h"
+#include "qqmlandroidviewanimator_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidviewanimator_p.h b/src/qmlandroid/widget/qqmlandroidviewanimator_p.h
index 5b5226f..bc650e6 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewanimator_p.h
+++ b/src/qmlandroid/widget/qqmlandroidviewanimator_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDVIEWANIMATOR_P_H
 #define QQMLANDROIDVIEWANIMATOR_P_H
 
-#include "qtqmlandroidframelayout_p.h"
+#include "qqmlandroidframelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidviewflipper.cpp b/src/qmlandroid/widget/qqmlandroidviewflipper.cpp
index f84c3c6..1e4732f 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewflipper.cpp
+++ b/src/qmlandroid/widget/qqmlandroidviewflipper.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidviewflipper_p.h"
+#include "qqmlandroidviewflipper_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidviewflipper_p.h b/src/qmlandroid/widget/qqmlandroidviewflipper_p.h
index 71bd3d3..3ce26e6 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewflipper_p.h
+++ b/src/qmlandroid/widget/qqmlandroidviewflipper_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDVIEWFLIPPER_P_H
 #define QQMLANDROIDVIEWFLIPPER_P_H
 
-#include "qtqmlandroidviewanimator_p.h"
+#include "qqmlandroidviewanimator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidviewswitcher.cpp b/src/qmlandroid/widget/qqmlandroidviewswitcher.cpp
index fe2698f..3839fee 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewswitcher.cpp
+++ b/src/qmlandroid/widget/qqmlandroidviewswitcher.cpp
@@ -1,4 +1,4 @@
-#include "qtqmlandroidviewswitcher_p.h"
+#include "qqmlandroidviewswitcher_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidviewswitcher_p.h b/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h
index b528fb8..aba64c5 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewswitcher_p.h
+++ b/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h
@@ -1,7 +1,7 @@
 #ifndef QQMLANDROIDVIEWSWITCHER_P_H
 #define QQMLANDROIDVIEWSWITCHER_P_H
 
-#include "qtqmlandroidviewanimator_p.h"
+#include "qqmlandroidviewanimator_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp b/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp
index 432ef81..d82b063 100644
--- a/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp
@@ -1,41 +1,41 @@
 #include "qtqmlandroidwidgetmodule_p.h"
 
-#include "qtqmlandroidarrayadapter_p.h"
-#include "qtqmlandroidbutton_p.h"
-#include "qtqmlandroidcalendarview_p.h"
-#include "qtqmlandroidcheckbox_p.h"
-#include "qtqmlandroiddatepicker_p.h"
-#include "qtqmlandroidedittext_p.h"
-#include "qtqmlandroidframelayout_p.h"
-#include "qtqmlandroidframelayoutparams_p.h"
-#include "qtqmlandroidimageview_p.h"
-#include "qtqmlandroidlinearlayout_p.h"
-#include "qtqmlandroidlinearlayoutparams_p.h"
-#include "qtqmlandroidlistview_p.h"
-#include "qtqmlandroidnumberpicker_p.h"
-#include "qtqmlandroidpopupmenu_p.h"
-#include "qtqmlandroidprogressbar_p.h"
-#include "qtqmlandroidradiobutton_p.h"
-#include "qtqmlandroidradiogroup_p.h"
-#include "qtqmlandroidratingbar_p.h"
-#include "qtqmlandroidrelativelayout_p.h"
-#include "qtqmlandroidrelativelayoutparams_p.h"
-#include "qtqmlandroidscrollview_p.h"
-#include "qtqmlandroidsearchview_p.h"
-#include "qtqmlandroidseekbar_p.h"
-#include "qtqmlandroidspace_p.h"
-#include "qtqmlandroidspinner_p.h"
-#include "qtqmlandroidswitch_p.h"
-#include "qtqmlandroidtabhost_p.h"
-#include "qtqmlandroidtabspec_p.h"
-#include "qtqmlandroidtabwidget_p.h"
-#include "qtqmlandroidtextview_p.h"
-#include "qtqmlandroidtimepicker_p.h"
-#include "qtqmlandroidtoast_p.h"
-#include "qtqmlandroidtogglebutton_p.h"
-#include "qtqmlandroidviewanimator_p.h"
-#include "qtqmlandroidviewflipper_p.h"
-#include "qtqmlandroidviewswitcher_p.h"
+#include "qqmlandroidarrayadapter_p.h"
+#include "qqmlandroidbutton_p.h"
+#include "qqmlandroidcalendarview_p.h"
+#include "qqmlandroidcheckbox_p.h"
+#include "qqmlandroiddatepicker_p.h"
+#include "qqmlandroidedittext_p.h"
+#include "qqmlandroidframelayout_p.h"
+#include "qqmlandroidframelayoutparams_p.h"
+#include "qqmlandroidimageview_p.h"
+#include "qqmlandroidlinearlayout_p.h"
+#include "qqmlandroidlinearlayoutparams_p.h"
+#include "qqmlandroidlistview_p.h"
+#include "qqmlandroidnumberpicker_p.h"
+#include "qqmlandroidpopupmenu_p.h"
+#include "qqmlandroidprogressbar_p.h"
+#include "qqmlandroidradiobutton_p.h"
+#include "qqmlandroidradiogroup_p.h"
+#include "qqmlandroidratingbar_p.h"
+#include "qqmlandroidrelativelayout_p.h"
+#include "qqmlandroidrelativelayoutparams_p.h"
+#include "qqmlandroidscrollview_p.h"
+#include "qqmlandroidsearchview_p.h"
+#include "qqmlandroidseekbar_p.h"
+#include "qqmlandroidspace_p.h"
+#include "qqmlandroidspinner_p.h"
+#include "qqmlandroidswitch_p.h"
+#include "qqmlandroidtabhost_p.h"
+#include "qqmlandroidtabspec_p.h"
+#include "qqmlandroidtabwidget_p.h"
+#include "qqmlandroidtextview_p.h"
+#include "qqmlandroidtimepicker_p.h"
+#include "qqmlandroidtoast_p.h"
+#include "qqmlandroidtogglebutton_p.h"
+#include "qqmlandroidviewanimator_p.h"
+#include "qqmlandroidviewflipper_p.h"
+#include "qqmlandroidviewswitcher_p.h"
 
 #include <QtQml/qqml.h>
 
diff --git a/src/qmlandroid/widget/widget.pri b/src/qmlandroid/widget/widget.pri
index 3891340..3e25b44 100644
--- a/src/qmlandroid/widget/widget.pri
+++ b/src/qmlandroid/widget/widget.pri
@@ -1,89 +1,89 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qtqmlandroidabsseekbar_p.h \
-    $$PWD/qtqmlandroidadapterview_p.h \
-    $$PWD/qtqmlandroidarrayadapter_p.h \
-    $$PWD/qtqmlandroidbaseadapter_p.h \
-    $$PWD/qtqmlandroidbutton_p.h \
-    $$PWD/qtqmlandroidcalendarview_p.h \
-    $$PWD/qtqmlandroidcheckbox_p.h \
-    $$PWD/qtqmlandroidcompoundbutton_p.h \
-    $$PWD/qtqmlandroiddatepicker_p.h \
-    $$PWD/qtqmlandroidedittext_p.h \
-    $$PWD/qtqmlandroidframelayout_p.h \
-    $$PWD/qtqmlandroidframelayoutparams_p.h \
-    $$PWD/qtqmlandroidimageview_p.h \
-    $$PWD/qtqmlandroidlinearlayout_p.h \
-    $$PWD/qtqmlandroidlinearlayoutparams_p.h \
-    $$PWD/qtqmlandroidlistview_p.h \
-    $$PWD/qtqmlandroidmarginlayoutparams_p.h \
-    $$PWD/qtqmlandroidnumberpicker_p.h \
-    $$PWD/qtqmlandroidpopupmenu_p.h \
-    $$PWD/qtqmlandroidprogressbar_p.h \
-    $$PWD/qtqmlandroidradiobutton_p.h \
-    $$PWD/qtqmlandroidradiogroup_p.h \
-    $$PWD/qtqmlandroidratingbar_p.h \
-    $$PWD/qtqmlandroidrelativelayout_p.h \
-    $$PWD/qtqmlandroidrelativelayoutparams_p.h \
-    $$PWD/qtqmlandroidscrollview_p.h \
-    $$PWD/qtqmlandroidsearchview_p.h \
-    $$PWD/qtqmlandroidseekbar_p.h \
-    $$PWD/qtqmlandroidspace_p.h \
-    $$PWD/qtqmlandroidspinner_p.h \
-    $$PWD/qtqmlandroidswitch_p.h \
-    $$PWD/qtqmlandroidtabhost_p.h \
-    $$PWD/qtqmlandroidtabspec_p.h \
-    $$PWD/qtqmlandroidtabwidget_p.h \
-    $$PWD/qtqmlandroidtextview_p.h \
-    $$PWD/qtqmlandroidtimepicker_p.h \
-    $$PWD/qtqmlandroidtoast_p.h \
-    $$PWD/qtqmlandroidtogglebutton_p.h \
-    $$PWD/qtqmlandroidviewanimator_p.h \
-    $$PWD/qtqmlandroidviewflipper_p.h \
-    $$PWD/qtqmlandroidviewswitcher_p.h \
+    $$PWD/qqmlandroidabsseekbar_p.h \
+    $$PWD/qqmlandroidadapterview_p.h \
+    $$PWD/qqmlandroidarrayadapter_p.h \
+    $$PWD/qqmlandroidbaseadapter_p.h \
+    $$PWD/qqmlandroidbutton_p.h \
+    $$PWD/qqmlandroidcalendarview_p.h \
+    $$PWD/qqmlandroidcheckbox_p.h \
+    $$PWD/qqmlandroidcompoundbutton_p.h \
+    $$PWD/qqmlandroiddatepicker_p.h \
+    $$PWD/qqmlandroidedittext_p.h \
+    $$PWD/qqmlandroidframelayout_p.h \
+    $$PWD/qqmlandroidframelayoutparams_p.h \
+    $$PWD/qqmlandroidimageview_p.h \
+    $$PWD/qqmlandroidlinearlayout_p.h \
+    $$PWD/qqmlandroidlinearlayoutparams_p.h \
+    $$PWD/qqmlandroidlistview_p.h \
+    $$PWD/qqmlandroidmarginlayoutparams_p.h \
+    $$PWD/qqmlandroidnumberpicker_p.h \
+    $$PWD/qqmlandroidpopupmenu_p.h \
+    $$PWD/qqmlandroidprogressbar_p.h \
+    $$PWD/qqmlandroidradiobutton_p.h \
+    $$PWD/qqmlandroidradiogroup_p.h \
+    $$PWD/qqmlandroidratingbar_p.h \
+    $$PWD/qqmlandroidrelativelayout_p.h \
+    $$PWD/qqmlandroidrelativelayoutparams_p.h \
+    $$PWD/qqmlandroidscrollview_p.h \
+    $$PWD/qqmlandroidsearchview_p.h \
+    $$PWD/qqmlandroidseekbar_p.h \
+    $$PWD/qqmlandroidspace_p.h \
+    $$PWD/qqmlandroidspinner_p.h \
+    $$PWD/qqmlandroidswitch_p.h \
+    $$PWD/qqmlandroidtabhost_p.h \
+    $$PWD/qqmlandroidtabspec_p.h \
+    $$PWD/qqmlandroidtabwidget_p.h \
+    $$PWD/qqmlandroidtextview_p.h \
+    $$PWD/qqmlandroidtimepicker_p.h \
+    $$PWD/qqmlandroidtoast_p.h \
+    $$PWD/qqmlandroidtogglebutton_p.h \
+    $$PWD/qqmlandroidviewanimator_p.h \
+    $$PWD/qqmlandroidviewflipper_p.h \
+    $$PWD/qqmlandroidviewswitcher_p.h \
     $$PWD/qtqmlandroidwidgetmodule_p.h
 
 SOURCES += \
-    $$PWD/qtqmlandroidabsseekbar.cpp \
-    $$PWD/qtqmlandroidadapterview.cpp \
-    $$PWD/qtqmlandroidbaseadapter.cpp \
-    $$PWD/qtqmlandroidarrayadapter.cpp \
-    $$PWD/qtqmlandroidbutton.cpp \
-    $$PWD/qtqmlandroidcalendarview.cpp \
-    $$PWD/qtqmlandroidcheckbox.cpp \
-    $$PWD/qtqmlandroidcompoundbutton.cpp \
-    $$PWD/qtqmlandroiddatepicker.cpp \
-    $$PWD/qtqmlandroidedittext.cpp \
-    $$PWD/qtqmlandroidframelayout.cpp \
-    $$PWD/qtqmlandroidframelayoutparams.cpp \
-    $$PWD/qtqmlandroidimageview.cpp \
-    $$PWD/qtqmlandroidlinearlayout.cpp \
-    $$PWD/qtqmlandroidlinearlayoutparams.cpp \
-    $$PWD/qtqmlandroidlistview.cpp \
-    $$PWD/qtqmlandroidmarginlayoutparams.cpp \
-    $$PWD/qtqmlandroidnumberpicker.cpp \
-    $$PWD/qtqmlandroidpopupmenu.cpp \
-    $$PWD/qtqmlandroidprogressbar.cpp \
-    $$PWD/qtqmlandroidradiobutton.cpp \
-    $$PWD/qtqmlandroidradiogroup.cpp \
-    $$PWD/qtqmlandroidratingbar.cpp \
-    $$PWD/qtqmlandroidrelativelayout.cpp \
-    $$PWD/qtqmlandroidrelativelayoutparams.cpp \
-    $$PWD/qtqmlandroidscrollview.cpp \
-    $$PWD/qtqmlandroidsearchview.cpp \
-    $$PWD/qtqmlandroidseekbar.cpp \
-    $$PWD/qtqmlandroidspace.cpp \
-    $$PWD/qtqmlandroidspinner.cpp \
-    $$PWD/qtqmlandroidswitch.cpp \
-    $$PWD/qtqmlandroidtabhost.cpp \
-    $$PWD/qtqmlandroidtabspec.cpp \
-    $$PWD/qtqmlandroidtabwidget.cpp \
-    $$PWD/qtqmlandroidtextview.cpp \
-    $$PWD/qtqmlandroidtimepicker.cpp \
-    $$PWD/qtqmlandroidtoast.cpp \
-    $$PWD/qtqmlandroidtogglebutton.cpp \
-    $$PWD/qtqmlandroidviewanimator.cpp \
-    $$PWD/qtqmlandroidviewflipper.cpp \
-    $$PWD/qtqmlandroidviewswitcher.cpp \
+    $$PWD/qqmlandroidabsseekbar.cpp \
+    $$PWD/qqmlandroidadapterview.cpp \
+    $$PWD/qqmlandroidbaseadapter.cpp \
+    $$PWD/qqmlandroidarrayadapter.cpp \
+    $$PWD/qqmlandroidbutton.cpp \
+    $$PWD/qqmlandroidcalendarview.cpp \
+    $$PWD/qqmlandroidcheckbox.cpp \
+    $$PWD/qqmlandroidcompoundbutton.cpp \
+    $$PWD/qqmlandroiddatepicker.cpp \
+    $$PWD/qqmlandroidedittext.cpp \
+    $$PWD/qqmlandroidframelayout.cpp \
+    $$PWD/qqmlandroidframelayoutparams.cpp \
+    $$PWD/qqmlandroidimageview.cpp \
+    $$PWD/qqmlandroidlinearlayout.cpp \
+    $$PWD/qqmlandroidlinearlayoutparams.cpp \
+    $$PWD/qqmlandroidlistview.cpp \
+    $$PWD/qqmlandroidmarginlayoutparams.cpp \
+    $$PWD/qqmlandroidnumberpicker.cpp \
+    $$PWD/qqmlandroidpopupmenu.cpp \
+    $$PWD/qqmlandroidprogressbar.cpp \
+    $$PWD/qqmlandroidradiobutton.cpp \
+    $$PWD/qqmlandroidradiogroup.cpp \
+    $$PWD/qqmlandroidratingbar.cpp \
+    $$PWD/qqmlandroidrelativelayout.cpp \
+    $$PWD/qqmlandroidrelativelayoutparams.cpp \
+    $$PWD/qqmlandroidscrollview.cpp \
+    $$PWD/qqmlandroidsearchview.cpp \
+    $$PWD/qqmlandroidseekbar.cpp \
+    $$PWD/qqmlandroidspace.cpp \
+    $$PWD/qqmlandroidspinner.cpp \
+    $$PWD/qqmlandroidswitch.cpp \
+    $$PWD/qqmlandroidtabhost.cpp \
+    $$PWD/qqmlandroidtabspec.cpp \
+    $$PWD/qqmlandroidtabwidget.cpp \
+    $$PWD/qqmlandroidtextview.cpp \
+    $$PWD/qqmlandroidtimepicker.cpp \
+    $$PWD/qqmlandroidtoast.cpp \
+    $$PWD/qqmlandroidtogglebutton.cpp \
+    $$PWD/qqmlandroidviewanimator.cpp \
+    $$PWD/qqmlandroidviewflipper.cpp \
+    $$PWD/qqmlandroidviewswitcher.cpp \
     $$PWD/qtqmlandroidwidgetmodule.cpp