summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: I9ca719afb1325fd67eea7b86afdbd99a799e19a3
* 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>
* Bump versionDaniel Smith2019-12-161-1/+1
| | | | Change-Id: Iec8b63623a783664d5bf276bdfa86bc289a5b452
* 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>
* 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
* | 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>
* | 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>
* | | | 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
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devEdward Welbourne2019-07-112-0/+2
| |\ \ \ \ |/ / / / / | | _ / / | | / / | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I64aacde81bbfde91037b5c4d88c5ac8daba8f5f4
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-092-0/+2
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I92a9d8aba6396ddd77e04450760e03cadbd8c46a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I6bdc9730803f9172c2de359590db05415e0b8c20
* | | Mark the module free of Java-style iterators and QLinkedListMarc Mutz2019-07-111-1/+1
| | | | | | | | | | | | | | | Change-Id: I1b205e18a94afdc04bebeff45aa66d6564175532 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-291-0/+20
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-0/+20
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I969b8b9e4402eb3b0a75580ebc52b3951343d42d
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| | |\ \ | |/ / / | | | _ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9b5d1f08da050c04b3d54e50a19bc5728281ebe6
| | * 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
* | | Remove usages of qVariantFromValueSona Kurazyan2019-06-285-44/+44
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: Iabb97fe7cb168a421b690bc71e826e1b90b955f9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | | Remove usages of deprecated APIs from QDateTimeSona Kurazyan2019-06-272-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the deprecated QDateTime::toTime_t() with QDateTime::toSecsSinceEpoch(). Task-number: QTBUG-76491 Change-Id: If5ae11025e083f37b1d5c4b10d45de735ec0f84c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-221-0/+18
|\ \ \
View Lorry Controller Status