summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| | | | | | | + efbc554c260f15b5c6dc23759eff96c106997a55 Bump version Change-Id: Ib576a42320d0fea9151d6c61953e730381ad273e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: I7a3cfacbaa17bba92f2b8490a0160148f7b6241d
* 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: I90598c490c543edcaa6d6e78b9703627768aee80
| * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | Change-Id: Iccca090d9947b7a71b0afdaa072a771b4d94417a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Bump versionFrederik Gladhorn2019-05-231-1/+1
|/ | | | Change-Id: If962a1d44f5edf08d31e513fd983f89c5c5ee793
* Fix thisObject() of QScriptable argument for String(), etcAlexandra Cherdantseva2019-04-174-3/+48
| | | | | | | | | | When `String(object)` is evaluated, and `object` is a QObject or some custom object with native prototype, then `object.toString()` will be called with incorrect `this`. This also applies for Number(), Boolean() and other built-in constructors. Change-Id: I0219f0e119c1e29d80e4c0f856421352715e9e6e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
|\ | | | | | | Change-Id: Ia9c6d912749e3e2fb5e989970f09b3ce148a4a46
| * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
|/ | | | | | | | | | + 4749a3ec61859e324f14add3008c41f92e6c2793 Android: Use -marm instead of -mthumb for armv7 to avoid a crash + a122caecff790a82f707894fa9db72afe91fcb7e Rename VERSION to VERSION.TXT + 6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b Bump version + 2379c9b93792feb97d6cb871082aed0f7cbcbad8 Make the deprecation notice more visible Change-Id: I6d5b01283720be2b39fe5e7b1ca1fb0554c91239 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Make the deprecation notice more visibleMitch Curtis2019-03-273-4/+6
| | | | | | | | Add it to the index page, which is what users see first when they search for the module. Change-Id: I0824306f0ba3ec615e996dbaa834b4f13909b9b9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: Ib5a10645acf3f265420731b508757f4b85a502a4
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
|\ | | | | | | Change-Id: I882638bff51f39cd09e9a95b9c74f9efb874eeab
| * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-251-0/+20
| | | | | | | | | | | | | | | | + 66f1a94aead9c9b3dacbf91ef763edcda217e56e Bump version + 97ec1d1882a83c23c91f0f7daea48e05858d8c32 Fix build with GCC 8.3 Change-Id: Ia823012bdedff4b1a41079a08806e0db96777fcd Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Rename VERSION to VERSION.TXTEskil Abrahamsen Blomfeldt2019-03-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On case-insensitive file systems, this causes an issue with recent versions of the Android NDK, because, since Android NDK r19, the libc++ header "cstddef" contains #include <version> which will resolve to this file instead of the intended header due to the ordering of the search paths. The simplest solution is just to give this a suffix so that it can be differentiated from the headers. Task-number: QTQAINFRA-2568 Change-Id: Ic1502e65de3dba912ed079d406a65ebf9b935694 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Android: Use -marm instead of -mthumb for armv7 to avoid a crashAndy Shaw2019-02-261-0/+11
|/ | | | | | | | | | | | | Since the Android toolchain has problems with using -mthumb for QtScript then we switch it to using -marm instead in order to prevent problems from occurring as a result. Since this is only a problem for the armv7 architecture then we only do this for that architecture. Change-Id: Ia621f066b8336bb12a2ec1aa99e3a9f9afca186d Done-with: Markus Maier <markus.maier.sw@gmail.com> Fixes: QTBUG-67936 Reviewed-by: Markus Maier <markus.maier.sw@gmail.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
|\ | | | | | | Change-Id: Ie8b50860bd0ecad55b1ae8d2830e6732a58ad5d9
| * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | | | + ebe11c8e867bb65ad7cb1424fe4c096935741089 Bump version + cf09bc7285793d81a9755bf7e807c9d51d47d980 Add changes file for Qt 5.11.3 + 3e1692bebdf2e4c69adb2a23718ad230a74992dd [android] Fix compile with unified headers + b65a9693f730f625cda95684acfaefd21538a5da Enable JavaScriptCore to compile for MSVC arm64 + 520fb9177a3e86cb7c27b752e5a4c3798dc4b4f9 Bump version Change-Id: I32119acaa6c2e024e93ab5b559dc051a493d34c9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Fix build with GCC 8.3Thiago Macieira2019-01-281-24/+24
| | | | | | | | | | | | | | | | | | Qualifiers in the asm statement are not allowed in the global scope. I thought they were necessary for LTO, but I the commit to this file that added them predates my work on setting up LTO for GCC. Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Bump versionKari Oikarinen2019-01-141-1/+1
|/ | | | Change-Id: I13fe2b7e71701accf3a76f0761777e08e72ff6bf
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: I88ea4d6cc6c172dd492c8004682db7ecfbcf1f29
* Enable JavaScriptCore to compile for MSVC arm64Thomas Miller2018-12-212-2/+2
| | | | | | Change-Id: I2a735a5bfa8eb417cb2824ebd8e008676f403e35 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ | | | | | | Change-Id: Idb3d2791412fabeae0f115030fb416f608de2404
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: I86136b2066da64b74892f1a99dda108b87cbe2ff
| | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-161-0/+20
| | | | | | | | | | | | | | | | | | | | | + ebe11c8e867bb65ad7cb1424fe4c096935741089 Bump version Change-Id: I7461df0b80fd23f1df52f5229357aea78f94cf14 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
|\ \ \ | | | | | | | | | | | | Change-Id: I80ab7405ff9dc2e57606e5f9a8dd8f436d382449
| * | | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.05.12.0Antti Kokko2018-11-121-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I9a6cca0ad2e7d7e2c538ea707061b7774b8ed0e0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-044-1/+31
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: Iccc9e012e446c72292d5c8ef4a45a735a4e88025
| * | | [android] Fix compile with unified headersBogDan Vatra2018-11-304-1/+31
| | |/ | |/| | | | | | | | | | | | | | | | | | | Latest Android NDKs are using unified headers which don't have asm/procinfo.h anymore but they provide asm/hwcap.h. Change-Id: Ibd599952d5b22e5e6955958bed33773032ad8a28 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: .qmake.conf Change-Id: I8e35e2a263c2b595bdb1c3298ef63dd33308eacc
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: I3f07c620b26caa78b90954061f3de91fb23f5f35
* | Never call an object with a this ptr that is nullv5.12.0-beta4v5.12.0-beta3Lars Knoll2018-10-152-7/+14
| | | | | | | | | | | | Task-number: QTBUG-67936 Change-Id: Ie12c87f8aef30ebca887ad357393c86417d7d742 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | 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: I55333f0c79e50e48f0bc87277610766d13e3f1ba
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: I4607bb687882aeee262840f209a5047b6a2d211d
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I506d187978c501c5034fc5e33471020d1ad43e1d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I94fcf57af10329d571ccb9e413ec00f449bbd551
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I9a3a459a2526fd28181e7504a1e2cae8daf9dce2
* | 3rdparty/javascriptcore: Add RISC-V supportAlistair Francis2018-07-261-2/+12
| | | | | | | | | | | | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-241-1/+2
|\ \ | |/ | | | | Change-Id: I76185a8b4e55514c54b285b0362ef8609bc0fce5
| * JavaScriptCore: Document snapshot dateKai Koehne2018-07-231-1/+2
| | | | | | | | | | | | Task-number: QTBUG-69276 Change-Id: I25394bc639d0b802d18f61ace678d4cfe6935861 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Replace use of deprecated function QTest::qWaitForWindowShownTor Arne Vestbø2018-07-181-1/+1
| | | | | | | | | | Change-Id: I7d92cb2be817eccd72232aa4bc16a41286ffdb44 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-301-1/+1
|\ \ | |/ | | | | Change-Id: Id34b2bc7a517d3d847b16c3c064593d4cf34f26e
| * Fix xml output to have valid UTF-8Jan Arve Sæther2018-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Some datatags had characters outside the ASCII range. (This is discouraged). And when dumping the datatag to xml output we dumped the binary content of the data tag without encoding it from latin1 to utf-8. This meant that all characters in the range 0x80-0xff produced invalid utf-8 sequences. The solution is to encode the data tag as UTF-8. Change-Id: Iaaecc992b756836845bfb98429f20f1fb5e2b291 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-234-43/+52
|\ \ | |/ | | | | Change-Id: Ieea89c3b8d092df29750074df133480e1b5d95d4
| * Remove dead test - compilerwarningsLiang Qi2018-06-221-43/+0
| | | | | | | | | | | | | | A follow-up of 9d078c8f147ea875e862360b0d7480201fbbcff7 in qtqa repo. Change-Id: I9e0a0564dabd468affd9fb5b5ac216eb54303dab Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Document licensesKai Koehne2018-06-192-0/+23
| | | | | | | | | | Change-Id: Iff237d048ead8e525ef79727fcaabb3043e8db65 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+29
| |\ | | | | | | | | | Change-Id: I1d6e64e9dad38c82dc2be5a2f71e8de7ae955a7f
| | * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-131-0/+29
| |/ | | | | | | | | Change-Id: I348df8100219d958e74a382e2caa3f514900a09a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-122-0/+9311
|\ \ | |/ | | | | Change-Id: I01847ec8c11954f0d6d4bc8279c259424bc6e1c4
| * Add binary compatibility files for 5.11 for QtScriptMilla Pohjanheimo2018-06-052-0/+9311
| | | | | | | | | | | | | | Binary compatibility files for bic test added. Change-Id: Iffb27b08eddbccfb8519f1b4f4881ead5737a56a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9e509f7c6a1e9577eee2869fe69981738473361f
View Lorry Controller Status