aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
|\
| * Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
|/| | | | | | | Change-Id: Ie1a8ba9dd51e2de03c0ad6831cb90c71e1d41d3e
| * Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-07-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | + 4a32bc040d79ff8df05f51b7e28e2b6f06a5d716 Bump version + dcae0e1072ebc04af7578953c0ff70bbf535cf64 Add changes file for Qt 5.12.4 + e0b68dfe82b350f5502e939d9cd2ff8a680f846a Fix QAndroidJniEnvironment test + 89edc161514a75b353b9efedb0a3628b62978e6e Bump version + a50f613a37acf32886ab94c0be780c1f25493d52 Bump version + ad06c63ffb6016670140d4d0ebdb347f5a222d3a Doc: Replace example file lists with links to code.qt.io Change-Id: Iae348f78f91c03ac7f862b261915163de71c2aba Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-171-1/+1
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-171-1/+1
|/| | | | | | | Change-Id: I6796a88dae9e17bafc7696abecb4bba271665241
| * Fix wrong JNI call function when calling QAndroidIntent::putExtra()Christian Strømme2019-08-151-1/+1
| | | | | | | | | | | | | | | | | | The Java function putExtra() returns an object, so it should be called with callObjectMethod() instead of callMethod(). Fixes: QTBUG-77101 Change-Id: Id6bb402c05b119257fb331db1eb4e016a94c0d52 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3ce52129ba65049a46afcc4fb2b9c8800dbff441
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Ifd7042806466af25857251274117de49e670118e
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
|/ / | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Ie2b5f498fa6f4effc27f07f3aab0061fa77e94c9 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: I30c027ac38d42ce12f91464c69d5f0dbcb93f802
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-282-3/+24
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-282-3/+24
|/| | | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I513a9d5e99c2cfb2b5225850fa89394365a8d26b
| * Fix QAndroidJniEnvironment testChristian Strømme2019-06-281-3/+4
| | | | | | | | | | | | | | | | | | | | The QAndroidJniEnvironment class does not detach when it goes out of scope. Detaching will only happen if explicitly done, or if the thread we attached on dies. Fixes: QTBUG-73570 Change-Id: Iac749c7f3bf8fcee99f70c06123eb3c88315e261 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| |/| | | | | | | | | | Change-Id: I799f60bf599c0953dbd709285c24dfbc4a97eb62
| | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | Change-Id: Ida8188045af63feb51d4f967f5e00e15c2618622 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| |/ | | | | | | Change-Id: I1cfa2db2abf207278cc78db797f8a6ff5dbd73e6
* | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
|\ \
| * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
|/| | | | | | | | | | | Change-Id: I91e3cb1ec448c253990df791ecfeccdd8e6dd319
| * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-081-0/+18
|/ / | | | | | | | | Change-Id: Ib30e60cdf0ee286064a589775a6609f44029f2b8 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Fix example to build on AndroidAlex Blasche2019-04-261-1/+1
| | | | | | | | | | | | | | Qt 5.13 raised the min SDK version for Qt for Android to v21. Change-Id: Iba9d0446f7d74301252a953caedbc83b1ecc983d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | 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.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.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>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 16:01:04 +0000