summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix failing ES test for Georgian script upper-caseEdward Welbourne2019-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unicode 11 added upper-case letters for Georgian, which didn't exist when this test was written. Consequently, the test fails now that we've updated past Unicode 11. The upstream ES test repository has commented out the test. Narrowed the test to the block on which it does work, commented on the two other characters for which it works. Fixes: QTBUG-79682 Change-Id: I8dd388317cabd62fc5d33487aeb5266d8b9b132d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-312-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix build issue for QList == QVector change in Qt Core. Change-Id: I9785bad72e608ecf353653f944b8804f3ed745c1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia8d16f21e5a4c40fcd437fffc399c9586bcfc777 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1e8b4a8f4cf3febbb24a21eb8dbedef466a92965 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I0a370f735b75585a3fb2cc66abf0ce7433846218 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia86653f8348286e63d8ee5f9885ab79b15743bbc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic0d9639a3e387e4dfc467ba0d18f0420f2338360 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-191-0/+2
|\| | | | | | | | | | | | | | | Change-Id: Ie112fce6a13098f0baee5f06d4dbeafb0daca2e1
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-151-0/+2
| |\| | | | | | | | | | | | | | Change-Id: Ibbbb491c8a532376eae3879ac3a545180e1728ff
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Qt Forward Merge Bot2019-10-121-0/+2
| | |\| | | | | | | | | | | | | Change-Id: Ib3471490e7ddb8d7adaf81245d45cd1f8ec178f0
| | | * Fix build with -no-feature-tooltipJoerg Bornemann2019-10-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-79048 Change-Id: I287c580785b8b22c877e7a6b885402fbe1bff249 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib35426c45216235046d91b0663ebaacd2fc41c04 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibed808c9d18a48d9eaaa6a38d20ce5d24418c0ee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifb6a7added5f0b0b72ab0619b69b7c950851ce01 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9917abcf1bdbcb3d8e51b20ee904845792965cbf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib8463e218ca16b89bcea08badae4f10de482d6fd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I36e2926098651fcb245c1136e372ef30ae26460f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-121-1/+3
|\| | | | | | | | | | | | | | | Change-Id: I494c2ac3ccc3b5673592d5775dd9990d7a0c2f58
| * | | Fix crash in QScriptEngine::reportAdditionalMemoryCostLars Knoll2019-10-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-76176 Change-Id: Id48e21b7e2617f34e4ae3e9d09e56641d1d1654a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifa1f50244532720116efd5540eca4e474430f9e1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Iab18f213ac2fdf5b9d5897f5cf9c5e4f89a2ecc6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-041-0/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibd429bee45bd9e84fe6d0a89392d44c998cbf070 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-049-18/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5568b3f8f2834f30e3ffa43f50c2f47ac9b66036
| * | | | Fix Qt6 buildAlexandru Croitor2019-08-013-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ee69b3c834c159b994f9a83f7ef36e650b09451 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Bump Qt version to Qt 6Alexandru Croitor2019-07-116-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And also fix usages of removed API. Change-Id: Ifbbe08a202ed19b5969781f66240174ef816269e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-242-0/+40
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-242-0/+40
|/| | | | | | | |/ / / | |/| | | | | | | | Change-Id: Ibca508b2e0a866f36715b384997972bcc6c082f4
| * | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
|/| | | |
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
|/| | | | | | |/ / | |/| | | | | | Change-Id: I6fd7dedd64db718eb8292ab3f7864f7d83d5a92d
| * | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| |/| | | | | | |/ | | |/| | | | | Change-Id: Ia0e6aeacf35f50d18d8f20bb59b678541239769e
| | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | |/| | | | | | | | | | | | | | | | | Change-Id: I665230fff3d93993a2afdeb1ff8b9dc48445daf2
| | | * | Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | | |\ \
| | | | * | Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I33b1c2d9caf5b2839c9e254e8f341c2382415373
| | | | * | Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+20
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + efbc554c260f15b5c6dc23759eff96c106997a55 Bump version Change-Id: Ib576a42320d0fea9151d6c61953e730381ad273e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | | 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: I80fa0ec917c908a3e95dfe84377710b62070834d
| | | * | | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-07-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + d7c60f5072fddf7a46f614b12062cedfde26c997 Bump version + a3d8a431aaed65ee49cc9405f4f1ebd9e268a008 Add changes file for Qt 5.12.4 + 32a1422c1e7614f77b951d77340d134222a31c60 Bump version + efbc554c260f15b5c6dc23759eff96c106997a55 Bump version + b6323ec944aa4d786426a767a9aa767da1a1ebc1 Doc: Replace example file lists with links to code.qt.io Change-Id: I8279752c0e50aeecba315f0faa736a6a6ddd0c8f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | | | Bump versionKari Oikarinen2019-08-271-1/+1
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I66613b7114ac1218d2f86f0dc562165e110ae111
* | | | | Remove usages of deprecated APIsSona Kurazyan2019-08-2312-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced: QLayout::setMargin -> QLayout::setContentsMargins Qt::ItemDataRole::TextColorRole -> Qt::ItemDataRole::ForegroundRole Change-Id: I3bae804d593835f1bc96a8c654fcfa77106bc91c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-132-0/+10181
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-132-0/+10181
|/| | | | | | |/ / / / | | | | | | | | | | Change-Id: I32d3fdb4afe18f51df782fbd4306725c4f01b5f4
| * / / / Binary compatibility files for Qt5.13.0 for QtScriptMilla Pohjanheimo2019-08-122-0/+10181
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility files added. Change-Id: Idfe1569381b978daeb97e32295e167bc49a5544f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-200-0/+0
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-200-0/+0
|/| | | | | |/ / / | | | | | | | | Change-Id: I0980992b1f746fbe864d9b1b596082d3136188cd
| * | | 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: I9fa944073748f3bf83265d7502b0e06e8b04927f
| | | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7a3cfacbaa17bba92f2b8490a0160148f7b6241d
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Edward Welbourne2019-07-112-0/+2
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 21:58:49 +0000