summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie657c3cef2b06d04f1b744fffdd9c550b57bfe69
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ | | | | | | Change-Id: I13fe2b7e71701accf3a76f0761777e08e72ff6bf
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib6d9c61dca6ef1f452adec9e7764dc0622aadf08
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I88ea4d6cc6c172dd492c8004682db7ecfbcf1f29
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-252-2/+2
|\ \ | |/ | | | | Change-Id: I5b83e1baec75279396171433aedf4b94267e805f
| * 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.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\ \ | |/ | | | | Change-Id: Ibcd516f81377f9878ceac59cccc6a77a8a219ca8
| * 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' into devQt Forward Merge Bot2018-12-085-1/+49
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I81a3361580e025ea2a5984d2e7c552de96cbcf87
| * | | 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.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ia12b58e1d70fc503f14ad3b14242c54a7ba5ede6
| * | | 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
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-162-7/+14
|\ \ \ | |/ / | | | | | | Change-Id: I0098fde03c223474fff97ba794f06318fd9b3e04
| * | 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>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: I841f88924839d16e6f3cd59dd7f6365731d3f352
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\ \ \ | |/ / | | | | | | Change-Id: I7ed138a8c87680d9c07a492e3bd03b709da8633f
| * | 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
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: Iaec858829405048c794eaea22734c8c7292448f0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit bc1c3fb95cee0ee525642bd308abbff21572505e) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: I03394be1e63628cec625b3386b88253943949e64 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit b67dcb4883e762269a49606b58ba0f77fdb25008) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: Icc8a1d0727a9495ebb6cb07f1b38cdf74ccebf8a
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-261-4/+12
|\ \ | |/ | | | | Change-Id: I26d9146145cff1290913ca60ca16a2fc244b50ef
| * Fix QtScript on 64-bit systems with gcc 8Simon Hausmann2018-05-231-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to commit 92836d052efb6d8073136e8507083f93fb60bb80 in qtdeclarative, we must use memcpy to do a bit-wise conversion from the JSCell *m_ptr to an intptr_t for JSValue tag operations. This fixes the referenced task and all the failing auto-tests. The most visible result was that if ((jsvalue.immediateValue() & 0xffff000000000000ll) == 0xffff000000000000ll) return static_cast<int32_t>(jsvalue.immediateValue()); was "optimized" to "return 0", breaking QScriptValue::toNumber() for integer encoded values. [ChangeLog][QtScript] Fix incorrect script evaluations on 64-bit systems with gcc 8. Change-Id: I525b6b66d0e3c5163ad7e338fd0e866cdf620dad Task-number: QTBUG-68367 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\ \ | |/ | | | | Change-Id: Ie77814f897522052bbb7c9c4bc323ce3838a85f5
View Lorry Controller Status