summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix the imports structure for AndroidHEADmasterJ-P Nurmi2016-12-1935-22/+25
| | | | | Change-Id: I9bfa6783fa6b25ad80f3388f7b5b447b2024e724 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix compile warningsJ-P Nurmi2016-12-193-1/+3
| | | | | Change-Id: I1b4a30f23363ef3caeb8e7b18237a90a94aecf4a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify support classesJ-P Nurmi2016-12-1911-63/+119
| | | | | Change-Id: Idf7d58d67e1c8b5956f3bcc54929629b1b9ca16d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify QNativeAndroidRJ-P Nurmi2016-12-192-113/+124
| | | | | Change-Id: I0ccfcdacb86848defdc0ee40bd66811410e4965d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify widget classesJ-P Nurmi2016-12-1974-333/+1339
| | | | | Change-Id: I52a071208fa8824f4044a8947be494d6695c13ea Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify layout params classesJ-P Nurmi2016-12-1910-182/+330
| | | | | Change-Id: I110a6bcefdda5609574898ebc03641706832cbee Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify drawable classesJ-P Nurmi2016-12-196-12/+104
| | | | | Change-Id: If1413ec32b2fcb7c247467dde6fb8920af42596d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify interpolator classesJ-P Nurmi2016-12-1824-122/+283
| | | | | Change-Id: I8f866a0b54923fbac1695e3e28977ccca7461eae Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify the animation classesJ-P Nurmi2016-12-1814-199/+400
| | | | | Change-Id: I3f7d50ad7f7fe8377fbd20e71569fdc70997ce76 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify the view classesJ-P Nurmi2016-12-1814-82/+353
| | | | | Change-Id: I4d6e1440f797a91e9280523d58a1a64440cf3f39 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify QNativeAndroidViewJ-P Nurmi2016-12-184-245/+404
| | | | | Change-Id: Ief555bd992884ec392e02d121f29b63925cc797a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify the app classesJ-P Nurmi2016-12-1812-98/+246
| | | | | Change-Id: I34f74faa28e7869fa43e08dbcb16a41dffb16320 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Pimplify the core/context/content classesJ-P Nurmi2016-12-1814-34/+373
| | | | | Change-Id: I6a4721335cf06fc5bd4a1223fa59eb7afa6a3dca Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* qtqmlandroid.pro -> qtnative.proJ-P Nurmi2016-12-181-0/+0
| | | | | Change-Id: I0ce692be3637fa010f50040d535a1b588d4c8f89 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Q_QMLANDROID_EXPORT -> Q_NATIVEANDROID_EXPORTJ-P Nurmi2016-12-1886-88/+88
| | | | | Change-Id: I00a6fee0d971851b60858a26f636c379c22cdf6e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QtQmlAndroid -> QtNativeAndroidJ-P Nurmi2016-12-18131-209/+210
| | | | | Change-Id: Ic1f9ac872b8e70764472690ab07ad5392ca2dc01 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QMLANDROID_PREFIX -> MODULE_PREFIXJ-P Nurmi2016-12-183-6/+6
| | | | | Change-Id: I94693758d084347100b2a74822ac8c498dddd850 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* namespace QtQmlAndroid -> QtNativeAndroidJ-P Nurmi2016-12-1833-117/+117
| | | | | Change-Id: I2b7a363631e2ce8ab227483d47b9985fb048f992 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* qtqmlandroidfunctions.* -> qtnativeandroidfunctions.*J-P Nurmi2016-12-1835-38/+38
| | | | | Change-Id: I948102f06fd3ab61ff6d52e908d9f726be339749 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* qtqmlandroidglobal_p.h -> qtnativeandroidglobal_p.hJ-P Nurmi2016-12-1811-13/+13
| | | | | Change-Id: If5cc8742adcc94ed5fe97435f7a427ff3c49e0b3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* android.pro: add missing MODULEJ-P Nurmi2016-12-181-0/+1
| | | | | | | | Must be explicitly specified since the name of the module does no longer match with the name of the .pro file. Change-Id: I1abdce18f22d3bfc003e2a48eaa9d6c36e383247 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add Activity::start()J-P Nurmi2016-12-152-8/+15
| | | | | | | | | | | | | | | | | | | | | | | #include <QGuiApplication> #include <QQmlApplicationEngine> #include <QtQmlAndroid/private/qnativeandroidactivity_p.h> #include <QtQmlAndroid/private/qnativeandroidbutton_p.h> int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); QNativeAndroidActivity activity; QNativeAndroidButton button(&activity); button.setText("Button"); activity.setContentView(&button); activity.start(); return app.exec(); } Change-Id: I3b1da906f17d8623d7ad68ea2f4a0fba81f966ba Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Deploy the built-in Android modules by defaultJ-P Nurmi2016-12-1535-72/+71
| | | | | | | | | | | | | | | | | | | | | | Only require explicitly enabling the support packages, which must be also linked to in the gradle build script. .pro: ANDROID_SUPPORT = v4 v7 build.gradle: dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:21.0.+' compile 'com.android.support:cardview-v7:21.0.+' compile 'com.android.support:recyclerview-v7:21.0.+' compile 'com.android.support:support-v4:21.0.+' } Change-Id: I2ac122fd383b3c7bfa6c3ec3569cd7f7f13ff971 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix qmlandroid.prfJ-P Nurmi2016-12-151-8/+3
| | | | | Change-Id: Iaaf64d458197b9b7be0370211a023ec694c3fdfb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Rename .java filesJ-P Nurmi2016-12-1533-89/+89
| | | | | Change-Id: I6d7e324e746d9ea934d6630cc865adaa08c4cc3c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Move .java filesJ-P Nurmi2016-12-1518-17/+18
| | | | | Change-Id: I686663b3d203dcaa58bbbad97e4fb9176d95e52e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QNativeAndroidView: make ctor take a contextJ-P Nurmi2016-12-1477-117/+117
| | | | | | | Reflecting the API of native Android View. Change-Id: Ibb1f5fff1fda58a741a5d845a900990cc38d10f7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Rename QQmlAndroidFoo to QNativeAndroidFooJ-P Nurmi2016-12-14206-3016/+3016
| | | | | Change-Id: Ia4fcc35a984ec2587bfea4e212afd30ff388c240 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* RestructureJ-P Nurmi2016-12-14193-26/+20
| | | | | Change-Id: I63af251b05686f78daf441b1ed7a999bf6685bf6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Remove ancJ-P Nurmi2016-12-145-550/+0
| | | | | Change-Id: Ie901c1ca5202d9c535ffa1b7ea8b4ce25661c53f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Cleanup the .json filesJ-P Nurmi2016-12-144-28/+0
| | | | | Change-Id: I8561b6dc61ccbefca47e828204ce36e851996e80 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Q_DECL_OVERRIDE -> overrideJ-P Nurmi2016-12-1477-147/+147
| | | | | Change-Id: Ib46f35685a411be1546e3e93b626f41796eafa67 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Use nullptrJ-P Nurmi2016-12-1476-82/+82
| | | | | Change-Id: I1643f2a16ddc02a561704465953487115d24fdac Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Move QML type registration to the QML pluginsJ-P Nurmi2016-12-1438-1285/+245
| | | | | Change-Id: I4decb535e35b888a091cbb1999ac6874da6cb470 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add export macrosJ-P Nurmi2016-12-1482-82/+90
| | | | | Change-Id: Ib24a17a3004f5c06274335ef8c7e4fdfe3d66cf4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Bump up MODULE_VERSIONJ-P Nurmi2016-12-141-1/+1
| | | | | Change-Id: Ia812d0266cb985688d8b6d201cc2ce8b798e3bf1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update READMEJ-P Nurmi2016-12-141-3/+28
| | | | | Change-Id: Iaef86df486df310c6338f441b58937acaa158a09 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Sort out install/copy rules for the .prf and .java filesJ-P Nurmi2016-12-1422-33/+33
| | | | | | | | | | | | | | | NOTE: We must NOT install the .java files to $$[QT_INSTALL_PREFIX]/src/android/java/src because the whole tree is copied into the android-build dir and unconditionally compiled during application packaging. Thus, we use $$[QT_INSTALL_PREFIX]/src/android/java/qml as an installation location so that we can conditionally copy the desired .java files to the application build directory. Change-Id: I7d154a1df8fc9307d6588fc84c5f967c6dc42e06 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add View::alphaJ-P Nurmi2016-12-132-0/+25
| | | | | Change-Id: I315732ac5f0938e2d3f158ca62f7b8485832899a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Implement View::setX() and setY()J-P Nurmi2016-12-132-4/+21
| | | | | Change-Id: Ifa4c9ff73686b4bca7157f68a4d2df5f25047109 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add View::z and View::elevationJ-P Nurmi2016-12-132-0/+41
| | | | | Change-Id: I3e0c7fe9a45cd2a35353060997a4288bb04bf443 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* View: add support for transformationsJ-P Nurmi2016-12-132-0/+241
| | | | | | | | | | - scaleX, scaleY - pivotX, pivotY - rotation, rotationX, rotationY - translationX, translationY, translationZ Change-Id: I96f0ab64806eb2a1b590019c0fab892e3e2bd7d8 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Catalog example: don't extract unnecessary Android style assetsJ-P Nurmi2016-12-091-0/+4
| | | | | Change-Id: I1f151ebcb02ffdef692cd7a6da1e7e41fb613301 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add missing license headers to pass tst_licensesJ-P Nurmi2016-12-09229-24/+9462
| | | | | Change-Id: Id4763c5a2f52de8213543eccf289348eb7856de4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Export QQmlAndroidObject, Contextual, and ViewJ-P Nurmi2016-12-093-3/+3
| | | | | | | This allows subclassing them in a QML plugin. Change-Id: I7951b96ebeed4abfb4d11d2e1348578bb3f46f7c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix header includesJ-P Nurmi2016-12-0981-109/+109
| | | | | Change-Id: I63f2905c3290bc00b42efc3849ccb464a694aa32 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update SDK versionsJ-P Nurmi2016-12-011-1/+1
| | | | | Change-Id: I5661c43391ade00d244acffd02b395d918c6ddeb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Make qmake happy with the examples structure and install targetsJ-P Nurmi2016-12-0118-1/+4
| | | | | Change-Id: I5616e41e62a787693a7e1efb1be924c38b651cae Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add private header warnings to avoid tons of warningsJ-P Nurmi2016-12-0197-0/+1067
| | | | | | | QtQmlAndroid: WARNING: qqmlandroidxxx_p.h does not have the "We mean it." warning Change-Id: If71959edeed0afed0de5a808b7a09a7384a60a51 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Rename the Java classes: QtFoo.java -> QmlFoo.javaJ-P Nurmi2015-04-2332-91/+91
| | | | | | | | It's hopefully less confusing with a bit of distinction to the built-in Qt Java classes such as QtActivity... Change-Id: If4cce06952fcd6a317aad77bb5aa113a086325f3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>