diff options
Diffstat (limited to 'src/android')
87 files changed, 117 insertions, 117 deletions
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 |