diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-18 12:30:02 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-18 11:39:40 +0000 |
commit | 5ca905786e5c6308988e3c77187820ee327624db (patch) | |
tree | d57f7c1bd2f24ddf603daf62ad4b768d607ad2cf | |
parent | 5f4aad3ed2797e1287a269f97009550f35c0e2ca (diff) |
QtQmlAndroid -> QtNativeAndroid
Change-Id: Ic1f9ac872b8e70764472690ab07ad5392ca2dc01
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
131 files changed, 210 insertions, 209 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0ac9600..95748dc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,5 @@ load(qt_build_config) MODULE_PREFIX = $$PWD MODULE_VERSION = 5.9.0 -MODULE_CONFIG = qmlandroid + +android: MODULE_CONFIG = nativeandroid @@ -24,7 +24,7 @@ Build and install like any Qt module. Link to the library, and deploy the desired Android packages in the application .pro file: - QT += qmlandroid + QT += nativeandroid A minimal QML example that can replace the main.qml when using the Qt Quick Application template in Qt Creator. The rest can diff --git a/examples/examples.pro b/examples/examples.pro index cfd3c75..b502eae 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS += \ - qmlandroid/catalog + nativeandroid/catalog diff --git a/examples/qmlandroid/catalog/android/AndroidManifest.xml b/examples/nativeandroid/catalog/android/AndroidManifest.xml index 94433bd..94433bd 100644 --- a/examples/qmlandroid/catalog/android/AndroidManifest.xml +++ b/examples/nativeandroid/catalog/android/AndroidManifest.xml diff --git a/examples/qmlandroid/catalog/android/assets/awesome.png b/examples/nativeandroid/catalog/android/assets/awesome.png Binary files differindex 99a8c13..99a8c13 100644 --- a/examples/qmlandroid/catalog/android/assets/awesome.png +++ b/examples/nativeandroid/catalog/android/assets/awesome.png diff --git a/examples/qmlandroid/catalog/android/build.gradle b/examples/nativeandroid/catalog/android/build.gradle index 80dcc74..80dcc74 100644 --- a/examples/qmlandroid/catalog/android/build.gradle +++ b/examples/nativeandroid/catalog/android/build.gradle diff --git a/examples/qmlandroid/catalog/android/gradle/wrapper/gradle-wrapper.properties b/examples/nativeandroid/catalog/android/gradle/wrapper/gradle-wrapper.properties index 1e61d1f..1e61d1f 100644 --- a/examples/qmlandroid/catalog/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/nativeandroid/catalog/android/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/qmlandroid/catalog/android/res/anim/awesome.xml b/examples/nativeandroid/catalog/android/res/anim/awesome.xml index ee6d387..ee6d387 100644 --- a/examples/qmlandroid/catalog/android/res/anim/awesome.xml +++ b/examples/nativeandroid/catalog/android/res/anim/awesome.xml diff --git a/examples/qmlandroid/catalog/android/res/drawable/awesome.png b/examples/nativeandroid/catalog/android/res/drawable/awesome.png Binary files differindex 99a8c13..99a8c13 100644 --- a/examples/qmlandroid/catalog/android/res/drawable/awesome.png +++ b/examples/nativeandroid/catalog/android/res/drawable/awesome.png diff --git a/examples/qmlandroid/catalog/android/res/drawable/logo.png b/examples/nativeandroid/catalog/android/res/drawable/logo.png Binary files differindex f3d4a5e..f3d4a5e 100644 --- a/examples/qmlandroid/catalog/android/res/drawable/logo.png +++ b/examples/nativeandroid/catalog/android/res/drawable/logo.png diff --git a/examples/qmlandroid/catalog/catalog.pro b/examples/nativeandroid/catalog/catalog.pro index a79f092..0e2db2d 100644 --- a/examples/qmlandroid/catalog/catalog.pro +++ b/examples/nativeandroid/catalog/catalog.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = catalog -QT += qml qmlandroid +QT += qml nativeandroid SOURCES += \ main.cpp @@ -24,5 +24,5 @@ DISTFILES += \ ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android ANDROID_SUPPORT = v4 v7 -target.path = $$[QT_INSTALL_EXAMPLES]/qmlandroid/catalog +target.path = $$[QT_INSTALL_EXAMPLES]/nativeandroid/catalog INSTALLS += target diff --git a/examples/qmlandroid/catalog/catalog.qrc b/examples/nativeandroid/catalog/catalog.qrc index 9521232..9521232 100644 --- a/examples/qmlandroid/catalog/catalog.qrc +++ b/examples/nativeandroid/catalog/catalog.qrc diff --git a/examples/qmlandroid/catalog/main.cpp b/examples/nativeandroid/catalog/main.cpp index b500232..b500232 100644 --- a/examples/qmlandroid/catalog/main.cpp +++ b/examples/nativeandroid/catalog/main.cpp diff --git a/examples/qmlandroid/catalog/qml/AwesomeView.qml b/examples/nativeandroid/catalog/qml/AwesomeView.qml index 7f4bf23..7f4bf23 100644 --- a/examples/qmlandroid/catalog/qml/AwesomeView.qml +++ b/examples/nativeandroid/catalog/qml/AwesomeView.qml diff --git a/examples/qmlandroid/catalog/qml/ButtonView.qml b/examples/nativeandroid/catalog/qml/ButtonView.qml index b316da5..b316da5 100644 --- a/examples/qmlandroid/catalog/qml/ButtonView.qml +++ b/examples/nativeandroid/catalog/qml/ButtonView.qml diff --git a/examples/qmlandroid/catalog/qml/InputView.qml b/examples/nativeandroid/catalog/qml/InputView.qml index cf0f1f1..cf0f1f1 100644 --- a/examples/qmlandroid/catalog/qml/InputView.qml +++ b/examples/nativeandroid/catalog/qml/InputView.qml diff --git a/examples/qmlandroid/catalog/qml/ModelView.qml b/examples/nativeandroid/catalog/qml/ModelView.qml index cfeb8f4..cfeb8f4 100644 --- a/examples/qmlandroid/catalog/qml/ModelView.qml +++ b/examples/nativeandroid/catalog/qml/ModelView.qml diff --git a/examples/qmlandroid/catalog/qml/PickerView.qml b/examples/nativeandroid/catalog/qml/PickerView.qml index 765a42f..765a42f 100644 --- a/examples/qmlandroid/catalog/qml/PickerView.qml +++ b/examples/nativeandroid/catalog/qml/PickerView.qml diff --git a/examples/qmlandroid/catalog/qml/ProgressView.qml b/examples/nativeandroid/catalog/qml/ProgressView.qml index b47dd1b..b47dd1b 100644 --- a/examples/qmlandroid/catalog/qml/ProgressView.qml +++ b/examples/nativeandroid/catalog/qml/ProgressView.qml diff --git a/examples/qmlandroid/catalog/qml/main.qml b/examples/nativeandroid/catalog/qml/main.qml index 5f72d36..5f72d36 100644 --- a/examples/qmlandroid/catalog/qml/main.qml +++ b/examples/nativeandroid/catalog/qml/main.qml diff --git a/features/qmlandroid.prf b/features/nativeandroid.prf index 2a4d7c6..2a4d7c6 100644 --- a/features/qmlandroid.prf +++ b/features/nativeandroid.prf diff --git a/src/android/android.pro b/src/android/android.pro index 673e066..c4adf00 100644 --- a/src/android/android.pro +++ b/src/android/android.pro @@ -1,5 +1,5 @@ -TARGET = QtQmlAndroid -MODULE = qmlandroid +TARGET = QtNativeAndroid +MODULE = nativeandroid QT += androidextras qml QT += core-private # qjnihelpers @@ -7,7 +7,7 @@ QT += core-private # qjnihelpers CONFIG += c++11 CONFIG -= create_cmake -features.files = $$MODULE_PREFIX/features/qmlandroid.prf +features.files = $$MODULE_PREFIX/features/nativeandroid.prf features.path = $$[QT_HOST_DATA]/mkspecs/features !prefix_build: COPIES += features INSTALLS += features diff --git a/src/android/app/qnativeandroidactionbar_p.h b/src/android/app/qnativeandroidactionbar_p.h index 974a8d5..09298d7 100644 --- a/src/android/app/qnativeandroidactionbar_p.h +++ b/src/android/app/qnativeandroidactionbar_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidobject_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidobject_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/app/qnativeandroidactivity_p.h b/src/android/app/qnativeandroidactivity_p.h index 20ae6bf..38db4a3 100644 --- a/src/android/app/qnativeandroidactivity_p.h +++ b/src/android/app/qnativeandroidactivity_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextwrapper_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextwrapper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/app/qnativeandroidalertdialog_p.h b/src/android/app/qnativeandroidalertdialog_p.h index 0ccce96..8f239ce 100644 --- a/src/android/app/qnativeandroidalertdialog_p.h +++ b/src/android/app/qnativeandroidalertdialog_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroiddialog_p.h> +#include <QtNativeAndroid/private/qnativeandroiddialog_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/app/qnativeandroiddialog_p.h b/src/android/app/qnativeandroiddialog_p.h index 21b9ed8..c7e6f22 100644 --- a/src/android/app/qnativeandroiddialog_p.h +++ b/src/android/app/qnativeandroiddialog_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextual_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/app/qnativeandroidservice_p.h b/src/android/app/qnativeandroidservice_p.h index 161e770..520e1d6 100644 --- a/src/android/app/qnativeandroidservice_p.h +++ b/src/android/app/qnativeandroidservice_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextwrapper_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextwrapper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/content/qnativeandroidcontext_p.h b/src/android/content/qnativeandroidcontext_p.h index b0e409f..e881763 100644 --- a/src/android/content/qnativeandroidcontext_p.h +++ b/src/android/content/qnativeandroidcontext_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextual_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/content/qnativeandroidcontextual_p.h b/src/android/content/qnativeandroidcontextual_p.h index 432dd39..c2aa5f6 100644 --- a/src/android/content/qnativeandroidcontextual_p.h +++ b/src/android/content/qnativeandroidcontextual_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidobject_p.h> +#include <QtNativeAndroid/private/qnativeandroidobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/content/qnativeandroidcontextwrapper_p.h b/src/android/content/qnativeandroidcontextwrapper_p.h index 75e5f39..81be30f 100644 --- a/src/android/content/qnativeandroidcontextwrapper_p.h +++ b/src/android/content/qnativeandroidcontextwrapper_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontext_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontext_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/core/qnativeandroidobject_p.h b/src/android/core/qnativeandroidobject_p.h index fe7ef1c..aae6805 100644 --- a/src/android/core/qnativeandroidobject_p.h +++ b/src/android/core/qnativeandroidobject_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h> +#include <QtNativeAndroid/private/qtnativeandroidglobal_p.h> #include <QtCore/qobject.h> #include <QtCore/qreadwritelock.h> diff --git a/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h b/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h index e49b866..8f83ba2 100644 --- a/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h +++ b/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroiddrawable_p.h> +#include <QtNativeAndroid/private/qnativeandroiddrawable_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/graphics/drawable/qnativeandroiddrawable_p.h b/src/android/graphics/drawable/qnativeandroiddrawable_p.h index 31e1065..2324a75 100644 --- a/src/android/graphics/drawable/qnativeandroiddrawable_p.h +++ b/src/android/graphics/drawable/qnativeandroiddrawable_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidobject_p.h> +#include <QtNativeAndroid/private/qnativeandroidobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/graphics/qnativeandroidcolor_p.h b/src/android/graphics/qnativeandroidcolor_p.h index 10b7669..71fd33d 100644 --- a/src/android/graphics/qnativeandroidcolor_p.h +++ b/src/android/graphics/qnativeandroidcolor_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h> +#include <QtNativeAndroid/private/qtnativeandroidglobal_p.h> #include <QtCore/qobject.h> #include <QtQml/qqmlengine.h> diff --git a/src/android/qnativeandroidr_p.h b/src/android/qnativeandroidr_p.h index b65cd82..ce3678c 100644 --- a/src/android/qnativeandroidr_p.h +++ b/src/android/qnativeandroidr_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h> +#include <QtNativeAndroid/private/qtnativeandroidglobal_p.h> #include <QtCore/qobject.h> #include <QtQml/qqmlpropertymap.h> diff --git a/src/android/qtnativeandroidglobal_p.h b/src/android/qtnativeandroidglobal_p.h index abb251f..dcf3d1b 100644 --- a/src/android/qtnativeandroidglobal_p.h +++ b/src/android/qtnativeandroidglobal_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_STATIC -# if defined(QT_BUILD_QMLANDROID_LIB) +# if defined(QT_BUILD_NATIVEANDROID_LIB) # define Q_QMLANDROID_EXPORT Q_DECL_EXPORT # else # define Q_QMLANDROID_EXPORT Q_DECL_IMPORT diff --git a/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h b/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h index def9a63..ee25ccd 100644 --- a/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h +++ b/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h> -#include <QtQmlAndroid/private/qnativeandroiddrawerlayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewgroup_p.h> +#include <QtNativeAndroid/private/qnativeandroiddrawerlayoutparams_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h b/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h index 5c1c650..4f9a382 100644 --- a/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h +++ b/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidmarginlayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidmarginlayoutparams_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h index cb872ff..7879109 100644 --- a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h +++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewgroup_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h b/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h index f693575..e83458b 100644 --- a/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h +++ b/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidobject_p.h> +#include <QtNativeAndroid/private/qnativeandroidobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/support/v7/widget/qnativeandroidcardview_p.h b/src/android/support/v7/widget/qnativeandroidcardview_p.h index f0e4136..3afc70c 100644 --- a/src/android/support/v7/widget/qnativeandroidcardview_p.h +++ b/src/android/support/v7/widget/qnativeandroidcardview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h b/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h index 5b72a57..a00ace6 100644 --- a/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h +++ b/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextual_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h b/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h index ec174cc..6026d76 100644 --- a/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h +++ b/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewgroup_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h index e65ad64..54bb1c8 100644 --- a/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h @@ -48,9 +48,9 @@ // We mean it. // -#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qtnativeandroidglobal_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> #include <QtAndroidExtras/qandroidjniobject.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h b/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h index 9522d4f..049e09c 100644 --- a/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidalphaanimation_p.h b/src/android/view/animation/qnativeandroidalphaanimation_p.h index 2c1d97f..009cf46 100644 --- a/src/android/view/animation/qnativeandroidalphaanimation_p.h +++ b/src/android/view/animation/qnativeandroidalphaanimation_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidanimation_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidanimation_p.h b/src/android/view/animation/qnativeandroidanimation_p.h index 8b3029e..a3329ac 100644 --- a/src/android/view/animation/qnativeandroidanimation_p.h +++ b/src/android/view/animation/qnativeandroidanimation_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextual_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidanimationset_p.h b/src/android/view/animation/qnativeandroidanimationset_p.h index 2f3603c..d111b97 100644 --- a/src/android/view/animation/qnativeandroidanimationset_p.h +++ b/src/android/view/animation/qnativeandroidanimationset_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidanimation_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h b/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h index eda2348..5fd0261 100644 --- a/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h b/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h index a25bb24..caef6d6 100644 --- a/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidbounceinterpolator_p.h b/src/android/view/animation/qnativeandroidbounceinterpolator_p.h index 92f3ac2..9be47bd 100644 --- a/src/android/view/animation/qnativeandroidbounceinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidbounceinterpolator_p.h @@ -48,9 +48,9 @@ // We mean it. // -#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qtnativeandroidglobal_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> #include <QtAndroidExtras/qandroidjniobject.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidcycleinterpolator_p.h b/src/android/view/animation/qnativeandroidcycleinterpolator_p.h index 6bea402..1d48c74 100644 --- a/src/android/view/animation/qnativeandroidcycleinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidcycleinterpolator_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h b/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h index 153baa8..5f7b0cb 100644 --- a/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h +++ b/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidinterpolator_p.h b/src/android/view/animation/qnativeandroidinterpolator_p.h index 5c9446a..6922345 100644 --- a/src/android/view/animation/qnativeandroidinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidinterpolator_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidobject_p.h> +#include <QtNativeAndroid/private/qnativeandroidobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidlinearinterpolator_p.h b/src/android/view/animation/qnativeandroidlinearinterpolator_p.h index 8a138e0..73f3934 100644 --- a/src/android/view/animation/qnativeandroidlinearinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidlinearinterpolator_p.h @@ -48,9 +48,9 @@ // We mean it. // -#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qtnativeandroidglobal_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> #include <QtAndroidExtras/qandroidjniobject.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidovershootinterpolator_p.h b/src/android/view/animation/qnativeandroidovershootinterpolator_p.h index e3d4300..bb345b3 100644 --- a/src/android/view/animation/qnativeandroidovershootinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidovershootinterpolator_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidpathinterpolator_p.h b/src/android/view/animation/qnativeandroidpathinterpolator_p.h index 07f2d6d..836a33a 100644 --- a/src/android/view/animation/qnativeandroidpathinterpolator_p.h +++ b/src/android/view/animation/qnativeandroidpathinterpolator_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidrotateanimation_p.h b/src/android/view/animation/qnativeandroidrotateanimation_p.h index b9d194b..7e366f9 100644 --- a/src/android/view/animation/qnativeandroidrotateanimation_p.h +++ b/src/android/view/animation/qnativeandroidrotateanimation_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidanimation_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidscaleanimation_p.h b/src/android/view/animation/qnativeandroidscaleanimation_p.h index f8bf4e5..48e97b9 100644 --- a/src/android/view/animation/qnativeandroidscaleanimation_p.h +++ b/src/android/view/animation/qnativeandroidscaleanimation_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidanimation_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/animation/qnativeandroidtranslateanimation_p.h b/src/android/view/animation/qnativeandroidtranslateanimation_p.h index fc2f4c8..ec89fc5 100644 --- a/src/android/view/animation/qnativeandroidtranslateanimation_p.h +++ b/src/android/view/animation/qnativeandroidtranslateanimation_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidanimation_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/qnativeandroidgravity_p.h b/src/android/view/qnativeandroidgravity_p.h index 9d064fd..1edfb8c 100644 --- a/src/android/view/qnativeandroidgravity_p.h +++ b/src/android/view/qnativeandroidgravity_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h> +#include <QtNativeAndroid/private/qtnativeandroidglobal_p.h> #include <QtCore/qobject.h> diff --git a/src/android/view/qnativeandroidlayoutparams_p.h b/src/android/view/qnativeandroidlayoutparams_p.h index a9c9bc4..7da8242 100644 --- a/src/android/view/qnativeandroidlayoutparams_p.h +++ b/src/android/view/qnativeandroidlayoutparams_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidobject_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidobject_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> #include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/qnativeandroidmenu_p.h b/src/android/view/qnativeandroidmenu_p.h index 0c33c83..8329885 100644 --- a/src/android/view/qnativeandroidmenu_p.h +++ b/src/android/view/qnativeandroidmenu_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextual_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/qnativeandroidmenuitem_p.h b/src/android/view/qnativeandroidmenuitem_p.h index 58d4d8b..70c84c7 100644 --- a/src/android/view/qnativeandroidmenuitem_p.h +++ b/src/android/view/qnativeandroidmenuitem_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextual_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/qnativeandroidview_p.h b/src/android/view/qnativeandroidview_p.h index a44c655..e906bc9 100644 --- a/src/android/view/qnativeandroidview_p.h +++ b/src/android/view/qnativeandroidview_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextual_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> #include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/qnativeandroidviewgroup_p.h b/src/android/view/qnativeandroidviewgroup_p.h index 6535eb6..a906ffc 100644 --- a/src/android/view/qnativeandroidviewgroup_p.h +++ b/src/android/view/qnativeandroidviewgroup_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidview_p.h> +#include <QtNativeAndroid/private/qnativeandroidview_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/view/qnativeandroidwindow_p.h b/src/android/view/qnativeandroidwindow_p.h index b3640b0..5ca7b75 100644 --- a/src/android/view/qnativeandroidwindow_p.h +++ b/src/android/view/qnativeandroidwindow_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextual_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidabsseekbar_p.h b/src/android/widget/qnativeandroidabsseekbar_p.h index 39d1962..eb57d15 100644 --- a/src/android/widget/qnativeandroidabsseekbar_p.h +++ b/src/android/widget/qnativeandroidabsseekbar_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidprogressbar_p.h> +#include <QtNativeAndroid/private/qnativeandroidprogressbar_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidadapterview_p.h b/src/android/widget/qnativeandroidadapterview_p.h index 76645cc..2637596 100644 --- a/src/android/widget/qnativeandroidadapterview_p.h +++ b/src/android/widget/qnativeandroidadapterview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewgroup_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidarrayadapter_p.h b/src/android/widget/qnativeandroidarrayadapter_p.h index 265a1d4..b89085b 100644 --- a/src/android/widget/qnativeandroidarrayadapter_p.h +++ b/src/android/widget/qnativeandroidarrayadapter_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidbaseadapter_p.h> +#include <QtNativeAndroid/private/qnativeandroidbaseadapter_p.h> #include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidbaseadapter_p.h b/src/android/widget/qnativeandroidbaseadapter_p.h index bf16ce2..9bbdf0c 100644 --- a/src/android/widget/qnativeandroidbaseadapter_p.h +++ b/src/android/widget/qnativeandroidbaseadapter_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontextual_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidbutton_p.h b/src/android/widget/qnativeandroidbutton_p.h index 15e30ed..59264e6 100644 --- a/src/android/widget/qnativeandroidbutton_p.h +++ b/src/android/widget/qnativeandroidbutton_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidtextview_p.h> +#include <QtNativeAndroid/private/qnativeandroidtextview_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidcalendarview_p.h b/src/android/widget/qnativeandroidcalendarview_p.h index f5d7296..b6c4276 100644 --- a/src/android/widget/qnativeandroidcalendarview_p.h +++ b/src/android/widget/qnativeandroidcalendarview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidcheckbox_p.h b/src/android/widget/qnativeandroidcheckbox_p.h index 4124d4d..fef5619 100644 --- a/src/android/widget/qnativeandroidcheckbox_p.h +++ b/src/android/widget/qnativeandroidcheckbox_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcompoundbutton_p.h> +#include <QtNativeAndroid/private/qnativeandroidcompoundbutton_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidcompoundbutton_p.h b/src/android/widget/qnativeandroidcompoundbutton_p.h index 2c60353..afac7dd 100644 --- a/src/android/widget/qnativeandroidcompoundbutton_p.h +++ b/src/android/widget/qnativeandroidcompoundbutton_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidbutton_p.h> +#include <QtNativeAndroid/private/qnativeandroidbutton_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroiddatepicker_p.h b/src/android/widget/qnativeandroiddatepicker_p.h index e566117..5859420 100644 --- a/src/android/widget/qnativeandroiddatepicker_p.h +++ b/src/android/widget/qnativeandroiddatepicker_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidedittext_p.h b/src/android/widget/qnativeandroidedittext_p.h index 21e4bfc..1dbd6b8 100644 --- a/src/android/widget/qnativeandroidedittext_p.h +++ b/src/android/widget/qnativeandroidedittext_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidtextview_p.h> +#include <QtNativeAndroid/private/qnativeandroidtextview_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidframelayout_p.h b/src/android/widget/qnativeandroidframelayout_p.h index 908e3ff..3d388e2 100644 --- a/src/android/widget/qnativeandroidframelayout_p.h +++ b/src/android/widget/qnativeandroidframelayout_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h> -#include <QtQmlAndroid/private/qnativeandroidframelayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewgroup_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayoutparams_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidframelayoutparams_p.h b/src/android/widget/qnativeandroidframelayoutparams_p.h index 679a89c..854fae3 100644 --- a/src/android/widget/qnativeandroidframelayoutparams_p.h +++ b/src/android/widget/qnativeandroidframelayoutparams_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidmarginlayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidmarginlayoutparams_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidimageview_p.h b/src/android/widget/qnativeandroidimageview_p.h index 3c1f41d..c4e00e9 100644 --- a/src/android/widget/qnativeandroidimageview_p.h +++ b/src/android/widget/qnativeandroidimageview_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidview_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidview_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> #include <QtCore/qurl.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidlinearlayout_p.h b/src/android/widget/qnativeandroidlinearlayout_p.h index 666c7bd..20185b9 100644 --- a/src/android/widget/qnativeandroidlinearlayout_p.h +++ b/src/android/widget/qnativeandroidlinearlayout_p.h @@ -48,9 +48,9 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> -#include <QtQmlAndroid/private/qnativeandroidlinearlayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewgroup_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidlinearlayoutparams_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidlinearlayoutparams_p.h b/src/android/widget/qnativeandroidlinearlayoutparams_p.h index 7ca26da..35a9091 100644 --- a/src/android/widget/qnativeandroidlinearlayoutparams_p.h +++ b/src/android/widget/qnativeandroidlinearlayoutparams_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidmarginlayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidmarginlayoutparams_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidlistview_p.h b/src/android/widget/qnativeandroidlistview_p.h index f319e37..b7f4f04 100644 --- a/src/android/widget/qnativeandroidlistview_p.h +++ b/src/android/widget/qnativeandroidlistview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidadapterview_p.h> +#include <QtNativeAndroid/private/qnativeandroidadapterview_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidmarginlayoutparams_p.h b/src/android/widget/qnativeandroidmarginlayoutparams_p.h index db2bfa7..5392f7a 100644 --- a/src/android/widget/qnativeandroidmarginlayoutparams_p.h +++ b/src/android/widget/qnativeandroidmarginlayoutparams_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidlayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidlayoutparams_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidnumberpicker_p.h b/src/android/widget/qnativeandroidnumberpicker_p.h index 7bc2d35..afb946f 100644 --- a/src/android/widget/qnativeandroidnumberpicker_p.h +++ b/src/android/widget/qnativeandroidnumberpicker_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidlinearlayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidpopupmenu_p.h b/src/android/widget/qnativeandroidpopupmenu_p.h index 9010bf3..dc326d5 100644 --- a/src/android/widget/qnativeandroidpopupmenu_p.h +++ b/src/android/widget/qnativeandroidpopupmenu_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidobject_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidobject_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidprogressbar_p.h b/src/android/widget/qnativeandroidprogressbar_p.h index 394dbb7..a7328de 100644 --- a/src/android/widget/qnativeandroidprogressbar_p.h +++ b/src/android/widget/qnativeandroidprogressbar_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidview_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidview_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidradiobutton_p.h b/src/android/widget/qnativeandroidradiobutton_p.h index 1ffc493..b0ce177 100644 --- a/src/android/widget/qnativeandroidradiobutton_p.h +++ b/src/android/widget/qnativeandroidradiobutton_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcompoundbutton_p.h> +#include <QtNativeAndroid/private/qnativeandroidcompoundbutton_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidradiogroup_p.h b/src/android/widget/qnativeandroidradiogroup_p.h index a4c2466..498239c 100644 --- a/src/android/widget/qnativeandroidradiogroup_p.h +++ b/src/android/widget/qnativeandroidradiogroup_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidlinearlayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidratingbar_p.h b/src/android/widget/qnativeandroidratingbar_p.h index da5321a..479b17e 100644 --- a/src/android/widget/qnativeandroidratingbar_p.h +++ b/src/android/widget/qnativeandroidratingbar_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidabsseekbar_p.h> +#include <QtNativeAndroid/private/qnativeandroidabsseekbar_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidrelativelayout_p.h b/src/android/widget/qnativeandroidrelativelayout_p.h index aafeb54..c867120 100644 --- a/src/android/widget/qnativeandroidrelativelayout_p.h +++ b/src/android/widget/qnativeandroidrelativelayout_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h> -#include <QtQmlAndroid/private/qnativeandroidrelativelayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewgroup_p.h> +#include <QtNativeAndroid/private/qnativeandroidrelativelayoutparams_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidrelativelayoutparams_p.h b/src/android/widget/qnativeandroidrelativelayoutparams_p.h index 9607559..0677486 100644 --- a/src/android/widget/qnativeandroidrelativelayoutparams_p.h +++ b/src/android/widget/qnativeandroidrelativelayoutparams_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidmarginlayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidmarginlayoutparams_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidscrollview_p.h b/src/android/widget/qnativeandroidscrollview_p.h index 13e6763..dbbc7f2 100644 --- a/src/android/widget/qnativeandroidscrollview_p.h +++ b/src/android/widget/qnativeandroidscrollview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidsearchview_p.h b/src/android/widget/qnativeandroidsearchview_p.h index 2609eae..eccc647 100644 --- a/src/android/widget/qnativeandroidsearchview_p.h +++ b/src/android/widget/qnativeandroidsearchview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidlinearlayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidseekbar_p.h b/src/android/widget/qnativeandroidseekbar_p.h index 54f9bd0..731c7ff 100644 --- a/src/android/widget/qnativeandroidseekbar_p.h +++ b/src/android/widget/qnativeandroidseekbar_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidabsseekbar_p.h> +#include <QtNativeAndroid/private/qnativeandroidabsseekbar_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidspace_p.h b/src/android/widget/qnativeandroidspace_p.h index f2b049a..c2604e2 100644 --- a/src/android/widget/qnativeandroidspace_p.h +++ b/src/android/widget/qnativeandroidspace_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidview_p.h> +#include <QtNativeAndroid/private/qnativeandroidview_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidspinner_p.h b/src/android/widget/qnativeandroidspinner_p.h index a7c2a08..5681733 100644 --- a/src/android/widget/qnativeandroidspinner_p.h +++ b/src/android/widget/qnativeandroidspinner_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidadapterview_p.h> +#include <QtNativeAndroid/private/qnativeandroidadapterview_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidswitch_p.h b/src/android/widget/qnativeandroidswitch_p.h index d454968..93fefb8 100644 --- a/src/android/widget/qnativeandroidswitch_p.h +++ b/src/android/widget/qnativeandroidswitch_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcompoundbutton_p.h> +#include <QtNativeAndroid/private/qnativeandroidcompoundbutton_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidtabhost_p.h b/src/android/widget/qnativeandroidtabhost_p.h index fc41fb2..a21f4a5 100644 --- a/src/android/widget/qnativeandroidtabhost_p.h +++ b/src/android/widget/qnativeandroidtabhost_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidtabspec_p.h b/src/android/widget/qnativeandroidtabspec_p.h index 4b3b895..11e01b8 100644 --- a/src/android/widget/qnativeandroidtabspec_p.h +++ b/src/android/widget/qnativeandroidtabspec_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h> +#include <QtNativeAndroid/private/qtnativeandroidglobal_p.h> #include <QtCore/qobject.h> #include <QtAndroidExtras/qandroidjniobject.h> diff --git a/src/android/widget/qnativeandroidtabwidget_p.h b/src/android/widget/qnativeandroidtabwidget_p.h index b936872..5b158e5 100644 --- a/src/android/widget/qnativeandroidtabwidget_p.h +++ b/src/android/widget/qnativeandroidtabwidget_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidlinearlayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidtextview_p.h b/src/android/widget/qnativeandroidtextview_p.h index 51f0348..a360f42 100644 --- a/src/android/widget/qnativeandroidtextview_p.h +++ b/src/android/widget/qnativeandroidtextview_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidview_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidview_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> #include <QtGui/qcolor.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidtimepicker_p.h b/src/android/widget/qnativeandroidtimepicker_p.h index 47d9d2e..539b426 100644 --- a/src/android/widget/qnativeandroidtimepicker_p.h +++ b/src/android/widget/qnativeandroidtimepicker_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidtoast_p.h b/src/android/widget/qnativeandroidtoast_p.h index 289779a..aa3baf8 100644 --- a/src/android/widget/qnativeandroidtoast_p.h +++ b/src/android/widget/qnativeandroidtoast_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidobject_p.h> -#include <QtQmlAndroid/private/qnativeandroidoptional_p.h> +#include <QtNativeAndroid/private/qnativeandroidobject_p.h> +#include <QtNativeAndroid/private/qnativeandroidoptional_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidtogglebutton_p.h b/src/android/widget/qnativeandroidtogglebutton_p.h index f70a385..6e5741f 100644 --- a/src/android/widget/qnativeandroidtogglebutton_p.h +++ b/src/android/widget/qnativeandroidtogglebutton_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidcompoundbutton_p.h> +#include <QtNativeAndroid/private/qnativeandroidcompoundbutton_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidviewanimator_p.h b/src/android/widget/qnativeandroidviewanimator_p.h index 22df1f1..f55f392 100644 --- a/src/android/widget/qnativeandroidviewanimator_p.h +++ b/src/android/widget/qnativeandroidviewanimator_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidviewflipper_p.h b/src/android/widget/qnativeandroidviewflipper_p.h index 4ef3bbe..2d1b43b 100644 --- a/src/android/widget/qnativeandroidviewflipper_p.h +++ b/src/android/widget/qnativeandroidviewflipper_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidviewanimator_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewanimator_p.h> QT_BEGIN_NAMESPACE diff --git a/src/android/widget/qnativeandroidviewswitcher_p.h b/src/android/widget/qnativeandroidviewswitcher_p.h index 29e6d50..b9b9c92 100644 --- a/src/android/widget/qnativeandroidviewswitcher_p.h +++ b/src/android/widget/qnativeandroidviewswitcher_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQmlAndroid/private/qnativeandroidviewanimator_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewanimator_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/android/android.pro b/src/imports/android/android.pro index 07bf0b1..bb9c75d 100644 --- a/src/imports/android/android.pro +++ b/src/imports/android/android.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidplugin TARGETPATH = android IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidplugin.cpp diff --git a/src/imports/android/qtqmlandroidplugin.cpp b/src/imports/android/qtqmlandroidplugin.cpp index 05fedbe..383eef5 100644 --- a/src/imports/android/qtqmlandroidplugin.cpp +++ b/src/imports/android/qtqmlandroidplugin.cpp @@ -37,7 +37,7 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidr_p.h> +#include <QtNativeAndroid/private/qnativeandroidr_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/app/app.pro b/src/imports/app/app.pro index 43ba7dd..99a9e6a 100644 --- a/src/imports/app/app.pro +++ b/src/imports/app/app.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidappplugin TARGETPATH = android/app IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidappplugin.cpp diff --git a/src/imports/app/qtqmlandroidappplugin.cpp b/src/imports/app/qtqmlandroidappplugin.cpp index 54d3861..a430188 100644 --- a/src/imports/app/qtqmlandroidappplugin.cpp +++ b/src/imports/app/qtqmlandroidappplugin.cpp @@ -37,11 +37,11 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidactionbar_p.h> -#include <QtQmlAndroid/private/qnativeandroidactivity_p.h> -#include <QtQmlAndroid/private/qnativeandroidalertdialog_p.h> -#include <QtQmlAndroid/private/qnativeandroiddialog_p.h> -#include <QtQmlAndroid/private/qnativeandroidservice_p.h> +#include <QtNativeAndroid/private/qnativeandroidactionbar_p.h> +#include <QtNativeAndroid/private/qnativeandroidactivity_p.h> +#include <QtNativeAndroid/private/qnativeandroidalertdialog_p.h> +#include <QtNativeAndroid/private/qnativeandroiddialog_p.h> +#include <QtNativeAndroid/private/qnativeandroidservice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/content/content.pro b/src/imports/content/content.pro index 4ef0547..cb83204 100644 --- a/src/imports/content/content.pro +++ b/src/imports/content/content.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidcontentplugin TARGETPATH = android/content IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidcontentplugin.cpp diff --git a/src/imports/content/qtqmlandroidcontentplugin.cpp b/src/imports/content/qtqmlandroidcontentplugin.cpp index 4d68f4a..26cf3c3 100644 --- a/src/imports/content/qtqmlandroidcontentplugin.cpp +++ b/src/imports/content/qtqmlandroidcontentplugin.cpp @@ -37,7 +37,7 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidcontext_p.h> +#include <QtNativeAndroid/private/qnativeandroidcontext_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/graphics/drawable/drawable.pro b/src/imports/graphics/drawable/drawable.pro index d53cec2..5a20bc2 100644 --- a/src/imports/graphics/drawable/drawable.pro +++ b/src/imports/graphics/drawable/drawable.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroiddrawableplugin TARGETPATH = android/graphics/drawable IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroiddrawableplugin.cpp diff --git a/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp b/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp index 8127e05..020b048 100644 --- a/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp +++ b/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp @@ -37,8 +37,8 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidcolordrawable_p.h> -#include <QtQmlAndroid/private/qnativeandroiddrawable_p.h> +#include <QtNativeAndroid/private/qnativeandroidcolordrawable_p.h> +#include <QtNativeAndroid/private/qnativeandroiddrawable_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/graphics/graphics.pro b/src/imports/graphics/graphics.pro index ad358c3..d08a732 100644 --- a/src/imports/graphics/graphics.pro +++ b/src/imports/graphics/graphics.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidgraphicsplugin TARGETPATH = android/graphics IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidgraphicsplugin.cpp diff --git a/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp b/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp index 952b4ad..4cfc6f4 100644 --- a/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp +++ b/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp @@ -37,7 +37,7 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidcolor_p.h> +#include <QtNativeAndroid/private/qnativeandroidcolor_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp b/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp index 6b9f59b..9096620 100644 --- a/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp +++ b/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp @@ -37,8 +37,8 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroiddrawerlayout_p.h> -#include <QtQmlAndroid/private/qnativeandroidswiperefreshlayout_p.h> +#include <QtNativeAndroid/private/qnativeandroiddrawerlayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidswiperefreshlayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/support/v4/widget/widget.pro b/src/imports/support/v4/widget/widget.pro index 8814bea..65c9283 100644 --- a/src/imports/support/v4/widget/widget.pro +++ b/src/imports/support/v4/widget/widget.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidsupportv4widgetplugin TARGETPATH = android/support/v4/widget IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidsupportv4widgetplugin.cpp diff --git a/src/imports/support/v7/app/app.pro b/src/imports/support/v7/app/app.pro index 3f08997..056346b 100644 --- a/src/imports/support/v7/app/app.pro +++ b/src/imports/support/v7/app/app.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidsupportv7appplugin TARGETPATH = android/support/v7/app IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidsupportv7appplugin.cpp diff --git a/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp b/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp index 85d68bb..c5aafbc 100644 --- a/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp +++ b/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp @@ -37,7 +37,7 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidactionbardrawertoggle_p.h> +#include <QtNativeAndroid/private/qnativeandroidactionbardrawertoggle_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp b/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp index 2b90bc8..63e988c 100644 --- a/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp +++ b/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp @@ -37,9 +37,9 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidcardview_p.h> -#include <QtQmlAndroid/private/qnativeandroidrecycleradapter_p.h> -#include <QtQmlAndroid/private/qnativeandroidrecyclerview_p.h> +#include <QtNativeAndroid/private/qnativeandroidcardview_p.h> +#include <QtNativeAndroid/private/qnativeandroidrecycleradapter_p.h> +#include <QtNativeAndroid/private/qnativeandroidrecyclerview_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/support/v7/widget/widget.pro b/src/imports/support/v7/widget/widget.pro index a319c26..a150e0e 100644 --- a/src/imports/support/v7/widget/widget.pro +++ b/src/imports/support/v7/widget/widget.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidsupportv7widgetplugin TARGETPATH = android/support/v7/widget IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidsupportv7widgetplugin.cpp diff --git a/src/imports/view/animation/animation.pro b/src/imports/view/animation/animation.pro index 8ebc811..ab5252f 100644 --- a/src/imports/view/animation/animation.pro +++ b/src/imports/view/animation/animation.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidanimationplugin TARGETPATH = android/view/animation IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidanimationplugin.cpp diff --git a/src/imports/view/animation/qtqmlandroidanimationplugin.cpp b/src/imports/view/animation/qtqmlandroidanimationplugin.cpp index 284ff68..747be40 100644 --- a/src/imports/view/animation/qtqmlandroidanimationplugin.cpp +++ b/src/imports/view/animation/qtqmlandroidanimationplugin.cpp @@ -37,22 +37,22 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidacceleratedecelerateinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidaccelerateinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidalphaanimation_p.h> -#include <QtQmlAndroid/private/qnativeandroidanimation_p.h> -#include <QtQmlAndroid/private/qnativeandroidanimationset_p.h> -#include <QtQmlAndroid/private/qnativeandroidanticipateinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidanticipateovershootinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidbounceinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidcycleinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroiddecelerateinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidlinearinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidovershootinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidpathinterpolator_p.h> -#include <QtQmlAndroid/private/qnativeandroidrotateanimation_p.h> -#include <QtQmlAndroid/private/qnativeandroidscaleanimation_p.h> -#include <QtQmlAndroid/private/qnativeandroidtranslateanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidacceleratedecelerateinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidaccelerateinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidalphaanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidanimationset_p.h> +#include <QtNativeAndroid/private/qnativeandroidanticipateinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidanticipateovershootinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidbounceinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidcycleinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroiddecelerateinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidlinearinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidovershootinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidpathinterpolator_p.h> +#include <QtNativeAndroid/private/qnativeandroidrotateanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidscaleanimation_p.h> +#include <QtNativeAndroid/private/qnativeandroidtranslateanimation_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/view/qtqmlandroidviewplugin.cpp b/src/imports/view/qtqmlandroidviewplugin.cpp index f9da7ec..17851de 100644 --- a/src/imports/view/qtqmlandroidviewplugin.cpp +++ b/src/imports/view/qtqmlandroidviewplugin.cpp @@ -37,13 +37,13 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidgravity_p.h> -#include <QtQmlAndroid/private/qnativeandroidlayoutparams_p.h> -#include <QtQmlAndroid/private/qnativeandroidmenu_p.h> -#include <QtQmlAndroid/private/qnativeandroidmenuitem_p.h> -#include <QtQmlAndroid/private/qnativeandroidview_p.h> -#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h> -#include <QtQmlAndroid/private/qnativeandroidwindow_p.h> +#include <QtNativeAndroid/private/qnativeandroidgravity_p.h> +#include <QtNativeAndroid/private/qnativeandroidlayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidmenu_p.h> +#include <QtNativeAndroid/private/qnativeandroidmenuitem_p.h> +#include <QtNativeAndroid/private/qnativeandroidview_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewgroup_p.h> +#include <QtNativeAndroid/private/qnativeandroidwindow_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/view/view.pro b/src/imports/view/view.pro index d38553f..1cbddf2 100644 --- a/src/imports/view/view.pro +++ b/src/imports/view/view.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidviewplugin TARGETPATH = android/view IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidviewplugin.cpp diff --git a/src/imports/widget/qtqmlandroidwidgetplugin.cpp b/src/imports/widget/qtqmlandroidwidgetplugin.cpp index bd581e2..0d31fc0 100644 --- a/src/imports/widget/qtqmlandroidwidgetplugin.cpp +++ b/src/imports/widget/qtqmlandroidwidgetplugin.cpp @@ -37,42 +37,42 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> -#include <QtQmlAndroid/private/qnativeandroidarrayadapter_p.h> -#include <QtQmlAndroid/private/qnativeandroidbutton_p.h> -#include <QtQmlAndroid/private/qnativeandroidcalendarview_p.h> -#include <QtQmlAndroid/private/qnativeandroidcheckbox_p.h> -#include <QtQmlAndroid/private/qnativeandroiddatepicker_p.h> -#include <QtQmlAndroid/private/qnativeandroidedittext_p.h> -#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h> -#include <QtQmlAndroid/private/qnativeandroidframelayoutparams_p.h> -#include <QtQmlAndroid/private/qnativeandroidimageview_p.h> -#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h> -#include <QtQmlAndroid/private/qnativeandroidlinearlayoutparams_p.h> -#include <QtQmlAndroid/private/qnativeandroidlistview_p.h> -#include <QtQmlAndroid/private/qnativeandroidnumberpicker_p.h> -#include <QtQmlAndroid/private/qnativeandroidpopupmenu_p.h> -#include <QtQmlAndroid/private/qnativeandroidprogressbar_p.h> -#include <QtQmlAndroid/private/qnativeandroidradiobutton_p.h> -#include <QtQmlAndroid/private/qnativeandroidradiogroup_p.h> -#include <QtQmlAndroid/private/qnativeandroidratingbar_p.h> -#include <QtQmlAndroid/private/qnativeandroidrelativelayout_p.h> -#include <QtQmlAndroid/private/qnativeandroidrelativelayoutparams_p.h> -#include <QtQmlAndroid/private/qnativeandroidscrollview_p.h> -#include <QtQmlAndroid/private/qnativeandroidsearchview_p.h> -#include <QtQmlAndroid/private/qnativeandroidseekbar_p.h> -#include <QtQmlAndroid/private/qnativeandroidspace_p.h> -#include <QtQmlAndroid/private/qnativeandroidspinner_p.h> -#include <QtQmlAndroid/private/qnativeandroidswitch_p.h> -#include <QtQmlAndroid/private/qnativeandroidtabhost_p.h> -#include <QtQmlAndroid/private/qnativeandroidtabspec_p.h> -#include <QtQmlAndroid/private/qnativeandroidtabwidget_p.h> -#include <QtQmlAndroid/private/qnativeandroidtextview_p.h> -#include <QtQmlAndroid/private/qnativeandroidtimepicker_p.h> -#include <QtQmlAndroid/private/qnativeandroidtoast_p.h> -#include <QtQmlAndroid/private/qnativeandroidtogglebutton_p.h> -#include <QtQmlAndroid/private/qnativeandroidviewanimator_p.h> -#include <QtQmlAndroid/private/qnativeandroidviewflipper_p.h> -#include <QtQmlAndroid/private/qnativeandroidviewswitcher_p.h> +#include <QtNativeAndroid/private/qnativeandroidarrayadapter_p.h> +#include <QtNativeAndroid/private/qnativeandroidbutton_p.h> +#include <QtNativeAndroid/private/qnativeandroidcalendarview_p.h> +#include <QtNativeAndroid/private/qnativeandroidcheckbox_p.h> +#include <QtNativeAndroid/private/qnativeandroiddatepicker_p.h> +#include <QtNativeAndroid/private/qnativeandroidedittext_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidframelayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidimageview_p.h> +#include <QtNativeAndroid/private/qnativeandroidlinearlayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidlinearlayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidlistview_p.h> +#include <QtNativeAndroid/private/qnativeandroidnumberpicker_p.h> +#include <QtNativeAndroid/private/qnativeandroidpopupmenu_p.h> +#include <QtNativeAndroid/private/qnativeandroidprogressbar_p.h> +#include <QtNativeAndroid/private/qnativeandroidradiobutton_p.h> +#include <QtNativeAndroid/private/qnativeandroidradiogroup_p.h> +#include <QtNativeAndroid/private/qnativeandroidratingbar_p.h> +#include <QtNativeAndroid/private/qnativeandroidrelativelayout_p.h> +#include <QtNativeAndroid/private/qnativeandroidrelativelayoutparams_p.h> +#include <QtNativeAndroid/private/qnativeandroidscrollview_p.h> +#include <QtNativeAndroid/private/qnativeandroidsearchview_p.h> +#include <QtNativeAndroid/private/qnativeandroidseekbar_p.h> +#include <QtNativeAndroid/private/qnativeandroidspace_p.h> +#include <QtNativeAndroid/private/qnativeandroidspinner_p.h> +#include <QtNativeAndroid/private/qnativeandroidswitch_p.h> +#include <QtNativeAndroid/private/qnativeandroidtabhost_p.h> +#include <QtNativeAndroid/private/qnativeandroidtabspec_p.h> +#include <QtNativeAndroid/private/qnativeandroidtabwidget_p.h> +#include <QtNativeAndroid/private/qnativeandroidtextview_p.h> +#include <QtNativeAndroid/private/qnativeandroidtimepicker_p.h> +#include <QtNativeAndroid/private/qnativeandroidtoast_p.h> +#include <QtNativeAndroid/private/qnativeandroidtogglebutton_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewanimator_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewflipper_p.h> +#include <QtNativeAndroid/private/qnativeandroidviewswitcher_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/widget/widget.pro b/src/imports/widget/widget.pro index 3feee1b..25dec8d 100644 --- a/src/imports/widget/widget.pro +++ b/src/imports/widget/widget.pro @@ -2,7 +2,7 @@ TARGET = qtqmlandroidwidgetplugin TARGETPATH = android/widget IMPORT_VERSION = 0.21 -QT += qmlandroid-private +QT += nativeandroid-private SOURCES += \ $$PWD/qtqmlandroidwidgetplugin.cpp diff --git a/sync.profile b/sync.profile index 83ecd90..80d192e 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,5 @@ %modules = ( # path to module name map - "QtQmlAndroid" => "$basedir/src/android", + "QtNativeAndroid" => "$basedir/src/android", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); |