summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.15.1v5.15.15.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | | + 0f6ea3515260438b3a51bc6e4d4e4480261484ff tst_qscriptengine: Skip test failing with MinGW + e74e5985da8ad849116c0b99aca3a603e501c9e2 Bump version + dec80d8bf7b03218f7593e800f88dd3adf4617f9 Add binary compatibility files added for 5.15 for QtScript Pick-to: dev 5.15 Change-Id: Ib2862a56fed94fa0dc1e3e0ff7f0ab2438f98c48 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add binary compatibility files added for 5.15 for QtScriptMilla Pohjanheimo2020-08-172-0/+10279
| | | | | | | Binary compatibility files added. Change-Id: I68f3800235b3e95561a5c6e0fa56ae4d63cd8a2b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I561a33c90d0acba78c028ae2c07f3098fe4a2dc5
* tst_qscriptengine: Skip test failing with MinGWFriedemann Kleint2020-05-261-0/+5
| | | | | | | Task-number: QTBUG-74542 Change-Id: I5af144ab1b49b09d5ba7c77a115a718e797f4d24 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: Ifd631f0ac65e8384241f7afe3582d4d55c4a6264
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: I8b883b50d472ebfd902b0fb55f9871c8f71a7d43
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: I47c7de18dd9dccd07d08d2b515a663b1c43b4953
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I55bd4f2727acf776122cea9590a4ca5964c81d81
| | * | Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | + 5eedef9953db0859cf9d13b618ea51a071febe39 Bump version + bfaadab30cb804204e90498437c360b037cc0b8d Fix license headers in src/script Change-Id: Id4ab88c40e9a573750c2ea3d09127e76fd9ae8cb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| |/ |/| | | | | | | | | | | | | | | | | | | | | + 19a5026113c88ed1be83ed7c18f56c19daeea8da Bump version + 97f194cfabf9d8ab186241760a29bae1f4811184 Fix crash in QScriptEngine::reportAdditionalMemoryCost + 3c20a81bf02902cd57c7a188555cd33359b27f27 Fix failing ES test for Georgian script upper-case + ee32a6b5a0ba187606b9ad3cdfcf73cbbc1ce02f Avoid initializing QFlags with 0 or nullptr + b9168439a185755ef9110ffb898ab14f4e19cfcb Don't use deprecated QMatrix class anymore + 36300dd06bb8191800ec93ca5a408f39b1f221eb Use Qt::SplitBehavior in preference to QString::SplitBehavior Change-Id: I5758ccc31e2b07cc3f4204ff6eed5c8e61d70ade Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Edward Welbourne2020-03-023-3/+3
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I10d928ac4368e07a52a92ef92bf501ba28d9b667 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-1566-533/+1589
|\ \ | |/ | | | | Change-Id: Ib26f2a7d33bc1823f13765dda22ef574f4fd55df
| * Fix license headers in src/scriptKai Koehne2020-02-1266-533/+1589
| | | | | | | | | | | | | | | | | | | | | | The LGPL-ONLY header is outdated, and the referenced LICENSE.LGPL file does not exist anymore. Anyhow, the module is documented to be available under Commercial/LGPLv3/GPLv2; that the JavaScriptCore dependency is LGPLv2.1 or later is separate. Fixes: QTBUG-80883 Change-Id: Ic76c127a7643fb90ebd99b6472f84c81a7dc2eee Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib3ee85223340245188b575a7f1ee83f60024e5fc
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I9ca719afb1325fd67eea7b86afdbd99a799e19a3
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\ \ | |/ | | | | Change-Id: I344b3e84c1cd8fa702a7844cd5812b5f32492842
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: Id0bf41ba81e2e666fa27da1a186b31e751134c04
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | | | | | | | + 958152b5dabb5fdd370869f49d0d45804b16e399 Add binary compatibility files for qtscript 5.14 branch + 5841084b4fac22343bdea2b41f4ba493dcfad469 Bump version Change-Id: I7408a4492ae466513784aabfbb9778c9ef237976 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Don't use deprecated QMatrix class anymoreJarek Kobus2020-01-102-4/+4
| | | | | | | | | | | | Task-number: QTBUG-46653 Change-Id: I938b17f82bf0eaba7b222fc758e08e6b6eed4748 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I65cd2fcba2496b2d4b20e2990050ebea18c90be7
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: Iec8b63623a783664d5bf276bdfa86bc289a5b452
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-143-0/+10277
|\ \ | |/ | | | | Change-Id: I96856187418295b7b5ecc0bd9a66aaee650dcef2
| * Add binary compatibility files for qtscript 5.14 branchMilla Pohjanheimo2019-12-132-0/+10259
| | | | | | | | | | | | | | BC files built against 5.14.0 added. Change-Id: Ia0452543fd1864b6196f1d88e93457a468928e8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: I71405635c337f074ddd3eedc3b3bb3398ba719fb
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-251-0/+18
| |/ | | | | | | | | Change-Id: I69daed1029d179171c876c74bf519f2b4ef8d345 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-2623-54/+55
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I772c028967f3c986674081992f569bd7bbba81a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\ \ | |/ | | | | Change-Id: I3f156e2ca80a76ee578a766bb49ea5dde8fefc17
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5be204b7c11e8622a062fd4518931c825fbe47ac
| | * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | + 590a5ffcb76157f4278e2778135d8d17bc815295 Binary compatibility files for Qt5.13.0 for QtScript + 1701681e4f8ee3b17ca39f563a24065ee43b3a52 Add changes file for Qt 5.12.5 + 16d347e4b31cc6a59d920d91b877f0b721c12a0b Fix build with -no-feature-tooltip Change-Id: Ief19db3774c83f66929219fb2a81bfb499d4ab73 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I871015dea9ed922f8ef8711b5ec349a379e89990
* | | 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>
* | | 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>
* | | Fix crash in QScriptEngine::reportAdditionalMemoryCostLars Knoll2019-10-081-1/+3
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-76176 Change-Id: Id48e21b7e2617f34e4ae3e9d09e56641d1d1654a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | 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.55.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.15.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
|\ \ \ \
View Lorry Controller Status