aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-231-0/+20
|\| | | | | | | | | | | Change-Id: Idbe906fed62f426979a76906cb9136b4e8597077
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
| |\| | | | | | | | | | Change-Id: Ifc5a7dba6d37772a7f9a2850cfd7479c63b8e7ba
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I77b4a679ae04cace49f5494dc3e575a80ea0ed16
| | | * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 5e920ecff160ddf7374023802918385ad699d786 Bump version Change-Id: I6e4a23bb6e21fd8cca139a3116b2830166ce6991 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-300-0/+0
|\| | | | | | | | | | | Change-Id: I4952dfd1d7635703c513c6c74de8a8e07884aa6a
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If787a0065756fffad8f30209a08f3708d1acda33
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: Ie66684179cd4709af36beaab6b006a6d979a9403
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-191-0/+20
|\| | | | | | | | | | | Change-Id: I668a7f239fab98ef13bad7c017d7ea6325b518c2
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
| |\| | | | | | | | | | Change-Id: Ie7188977a4520e563a325b87e2d87e9daf21f832
| | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I21c4a24c2f543c20bef4bad822e660c4f4c062d7
| | | * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 478d964cac7654d36ccfe5882dd09075bb85442d Fix class vs struct mismatch + 82fbed7445875678ab4b3d29fed89bbfcbf890fa Bump version + dc74de8db874c49c314a2bd475afd5955ae8f83b QtAndroidExtras depends on QtGui Change-Id: I07201cd438222b3282d0868f1db6dc019d9aaea1 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: I179247ef796888e4a11c35804e036b5e831ee0b0
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-121-0/+20
|\| | | | | | | | | | | Change-Id: Ieb2f98002b69d8358d8abba0804d654f06c720cc
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-091-0/+20
|/| | | |/ | | | | Change-Id: I955d9479f91e2343c149a8d73662646cb7a5af12
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
| |\ | | | | | | | | | Change-Id: I3ef109cd2a96f9936c23ecb62c8bd157b8942dc4
| | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-131-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + f611299f839d0af346ee202385d7c9bb0b19c1af Doc: Get rid of QT_INSTALL_HEADERS in documentation config + 16d33f91eadadc63e4a999fb175ed67b3321e9b7 Bump version + 92f9b785a97de43f53b8d521034877a3203384fa Bump version + 328418b07dd6f530095008f8a062fa50d2731fe3 QAndroidIntent::putExtra: Fix JNI return value syntax + 48256a153eefaeb772d3be97b0c19e3402e0e027 Bump version Change-Id: I11a8e7e46809fbffbc1777126d5fd171a9f76b74 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devv5.13.0-alpha1Qt Forward Merge Bot2019-01-301-0/+2
|\| | | | | | | | | | | Change-Id: I20f443b60079b97571b7ff2561e68d4ec116d80b
| * | QtAndroidExtras depends on QtGuiLiang Qi2019-01-301-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-73367 Change-Id: I0581f3a644304d82eead4e39b79340912db9b17e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Overload QtAndroid::startActivity with a callbackNicolas Fella2019-01-295-1/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | The current way of handling activity results by inheriting from QAndroidActivityResultReceiver is very un-Qt. This patch allows handling activity results by passing a std::function/lambda expression to the startActivity function. Change-Id: Ie9dc91cd02dfcdb16a9ad0cb7858387e75159815 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Add a QtAndroid::startActivity that takes a QAndroidIntentAlbert Astals Cid2019-01-222-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function simply calls the other startActivity with QAndroidIntent::handle, anyone could do that from the user code, but i think it makes sense the library to allow you doing this directly given you're supposed to pass an intent and we have a class that represents an intent Change-Id: I673cb410b07ed4fd1408a971696a3b5ae3dfd063 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I67ccafe6b1f0f637bd6cbda77754c3dd66b97797
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | | | | | Change-Id: Ifc60128046aeccdb0503a2fecc345d8633416956
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iffe069234ba9f2a29a8d25bda40e57e1923d0e06
| * | Fix class vs struct mismatchAlex Blasche2019-01-081-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In file included from qtbase/include/QtCore/5.12.0/QtCore/private/qjni_p.h:1: qtbase/include/QtCore/5.12.0/QtCore/private/../../../../../src/corelib/kernel/qjni_p.h:68:1: warning: 'QJNIEnvironmentPrivate' defined as a class here but previously declared as a struct [-Wmismatched-tags] class Q_CORE_EXPORT QJNIEnvironmentPrivate ^ jni/qandroidjnienvironment.h:50:1: note: did you mean class here? struct QJNIEnvironmentPrivate; ^~~~~~ class Change-Id: I0df1a4350c50ca920ad7f13978a62913a9702a15 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I85bf9edbb6376c2e1d7b08b5c27ccad52d6894b9
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-051-1/+1
|\| | | | | | | Change-Id: Id4e120f3ab9ea1de9a0d3c86f1687807830fc435
| * QAndroidIntent::putExtra: Fix JNI return value syntaxAlbert Astals Cid2019-01-031-1/+1
| | | | | | | | | | | | Change-Id: I8e9d534e8752466c57d79cbb136c4dec01c8695e Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-250-0/+0
|\| | | | | | | Change-Id: Ibe5c873c2f9caa75df4098c09aad975e9341813a
| * Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-12-230-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I528aa22d5604aa3ba97f11dc69fa0025966ed0ef
| | * Bump version5.11Kari Oikarinen2018-12-121-1/+1
| | | | | | | | | | | | Change-Id: I4e7839bb82da9951fb090ae5afb3f219b28ced72
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-081-0/+23
|\| | | | | | | | | | | Change-Id: I2ee44e323b77dc22c34ea015fb604775af590ea2
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+23
| |\ \ | | | | | | | | | | | | Change-Id: Id177e0690562ae5dbf037f2162662a666ffd506b
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-071-0/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: I8ef16c14151f4a5b7f8c86d3bc37cb59adc2a940 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I2449424d0f7feb693cf989b0dc4e8c4d04b8d02e
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I380b4543ef9f6fca375f61c227dc628d9a61f906
| | * | Bump versionv5.11.3Oswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: I505326cbfc5f8ace2233cf63cdc6d072e5c0e058
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-102-2/+2
|\| | | | | | | | | | | | | | | Change-Id: I3413790bf4d8475080caa7dc03634871be003f51
| * | | Doc: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-072-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The use of QT_INSTALL_HEADERS caused documentation build failures in certain configurations. Use an alternative method to pass the required include paths to QDoc. Task-number: QTBUG-67925 Change-Id: Ia8c25b0cfb950f43ec60a3768cd192588a5e5617 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-231-0/+2
|\| | | | | | | | | | | Change-Id: Ie43c24df20344cb3b84249e675aacc52429a3868
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta4v5.12.0-beta3Qt Forward Merge Bot2018-10-201-0/+2
| |\| | | | | | | | | | Change-Id: I88b7094f8b625c14f2524576e73cf7fc3f807a1d
| | * Check if the array is valid before accessing itAndy Shaw2018-10-191-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-70284 Change-Id: Ic2a0613f3f57661e8c6b4665cefbd6dc73fd37f3 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Ic2d289368ef0b43b5500caad1e829f8e2a681728
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\| | | | | | | | | | | Change-Id: I2ceddd2df3ebe455094549807f7eeee5ee211865
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
| |\| | | | | | | | | | Change-Id: Ic5109cf17a132060a59a6f25ff06e0e804ba75f5
| | * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| | |\ | | | | | | | | | | | | Change-Id: Ie87f646bcd3d14df01fd56ab4fb2cdb054270829
| | | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| | |/ | | | | | | | | | | | | Change-Id: Ic26762dd742e9a467b73fe12508e55d723cff65f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-012-0/+19
|\| | | | | | | | | | | Change-Id: I73c5694e6796273778d5ff27a16fe8ac87d1e2cb
| * | Allow users to find all classesBogDan Vatra2018-08-292-0/+19
|/ / | | | | | | | | | | | | | | | | | | | | | | QAndroidJniEnvironment::findClass is a convenient method needed to find classes in all class loaders. [ChangeLog][QtAndroid] QAndroidJniEnvironment::findClass convenient method to find classes in all class loaders. Change-Id: I23c9e8a02aa7ca02cf707be5548ce1f8bb555dd7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If16713447ac1192606cee870cd7b9e5e48db8578
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I22371e8c74312031e115808d6f209dd8727bd357
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 13:27:26 +0000