summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtscxmlHEADdevQt Submodule Update Bot3 days1-2/+2
| | | | | Change-Id: I60a8219ff24977c8d50620264b142804d0139f5b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot4 days1-2/+2
| | | | | Change-Id: I959e2bdae762c9123366247e902ffbc4c29e0f18 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot8 days1-2/+2
| | | | | Change-Id: I2c97bab0160aac14faa091e799bc725e61b0d4b0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot10 days1-2/+2
| | | | | Change-Id: I5762a32aa37d77bcc3ff24d398dc66901e79504a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot11 days1-2/+2
| | | | | Change-Id: I9ff0089e8c21b1f3a02283bcb35c5a885fd93cbb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot13 days1-2/+2
| | | | | Change-Id: I0016ed211cef75d910e02ae993df3afbf42c5ae1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-261-2/+2
| | | | | Change-Id: I80724349e7debeebc92d2fc764eb3242f2489280 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-241-2/+2
| | | | | Change-Id: I6f677d8eae347d2f44a42a4f136558aebc5975c2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-221-2/+2
| | | | | Change-Id: I00bcf230cb4c1f8de68268dad973fbdd187a7616 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-211-2/+2
| | | | | Change-Id: Id0bfbcb11b1f833e02ab07125706da8e87bce05c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-181-2/+2
| | | | | Change-Id: Ia5fdb764aa67bb7e8c0c251d2e326e29d2b3b1cd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-171-2/+2
| | | | | Change-Id: I6c6df542aff5699fb0701e368a4c3555d58a5413 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-171-2/+2
| | | | | Change-Id: I06f907229e55822e722fa87d8ffcede4c1750745 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-161-1/+1
| | | | | Change-Id: Ia911e388ca0b20976585dd154661f7a1f6d987cd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-161-2/+2
| | | | | Change-Id: I4ba3ecaa14498906e90a3f2b184a6a305e871371 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-151-2/+2
| | | | | Change-Id: I6ba50a2219a60d9a628c83b41148ddcc9c3b93f9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-141-2/+2
| | | | | Change-Id: I01207d7d6f74d4bb9e0406d2488c92382e60c341 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-131-2/+2
| | | | | Change-Id: I5f0dba127996041ce7c4b1282c06094e6ae28b0f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-101-2/+2
| | | | | Change-Id: Ib4ddaab8e7e2af8322c581efa1d5d7743dfde31e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-081-2/+2
| | | | | Change-Id: Id2fdbbec9bfa06e796355fb42ee9f2d179c2d32a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2019-10-041-0/+7
| | | | | Change-Id: Ied2a086791986a352db17e2dc164ec784384dc77 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-046-57/+58
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1a52012a6e2c438a795222d687c33df6189962d2
| * Fix Qt6 buildwip/qt6Alexandru Croitor2019-08-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | Modify all the qmlRegisterModule calls to use minor version 15 because minor version zero from 6.0.0 would make tests fail. This is similar to what was done in qtdeclarative in c147b20a2c1299b2d659fe7c9472ae3866b6a425. Change-Id: I78545def8964be32a39a5e15723cc0f026c1c91d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Bump Qt version to Qt 6Alexandru Croitor2019-07-105-55/+55
| | | | | | | | | | | | | | | | Also fix usages of text stream operators. Change-Id: I53cf87bb4bb055d56f2332d7737f205ec9560774 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-011-1/+1
|\ \ | | | | | | | | | Change-Id: Ib7615aa15c40e423cf1d940bbf8f347b66d0472c
| * \ Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-281-1/+1
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-281-1/+1
| | |\ \ | |/ / / | | | | | | | | Change-Id: I889683006f27e374d39cf0de7981f7cb65a89312
| | * | Update plugins.qmltypes for 5.14v5.14.0-beta2v5.14.0-beta1Kai Koehne2019-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I70a6fb91a3d0a20a6861048b0622a2a9c5103266 Reviewed-by: Ulf Hermann <ulf.hermann@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: Iacc04aae9fbb4f2a171645526cfa2b7af6388b04
| * | | 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: I9e4a16519f86120ab9db38eeb01769d9798d9f7c
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.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: I884315e1cf3eb6da408a895215b4d9d482273b38
| | * | 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: Ic9f0c3c1b882f1fb35df057ad83e31997669b933
| | | * | 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: Iffee408270a4f433041c73ce34c2d0a9b8a6c7d2
| | | | * | Merge "Add changes file for Qt 5.12.5"v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| | | | |\ \ | | | |/ / /
| | | | * | Add changes file for Qt 5.12.5Antti Kokko2019-08-231-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + db44c53e73479ee8ea98f911078b387735906f38 Bump version Change-Id: Ia6fca6da6bf2dcd0bdd7d18899e3b84a3e3fe07d 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: I5d6b7b8cbde8053c07cf874a194e5f32fba47b4a
| | | * | | | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-08-131-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 4836860343de35124ecf98008ffd548419918ee7 Bump version + 6ac734ef6e940a2d601b9d26195132d0973dc902 Add changes file for Qt 5.12.4 + a368b5fdf4d33361e03a2f05b6f159566dd06e9d Fix warnings about fall through + 8be5e49379fa8c0f1e1e41ff4bce91e30699b352 qscxmlc: Don't compress the templates + d3ed5bcb3e1a4175d31333db71dbd52443b727c9 Bump version + db44c53e73479ee8ea98f911078b387735906f38 Bump version + fa25eb34fba4db8333d16ba7fc125860e3d0712a Doc: Replace example file lists with links to code.qt.io Change-Id: Ia4d35ddf3e896e01ce6f02e6cb5af1aebe3843ef Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | | | | Merge "Merge dev into 5.14 (delayed final downmerge)"Kari Oikarinen2019-09-040-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-040-0/+0
| | |\ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: I9351e5817364a7897d8521074cbae8cfe138deb3
| * | | | | | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-08-281-4/+4
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-281-4/+4
| | |\ \ \ \ \ \ \ | |/ / / / / / / / | | | | _ / / / / | | | | / / / / Change-Id: I01a0d131bbce22e2fe67b39886cdc0fcfbea87ee
* | | | | | | | Bump versionKari Oikarinen2019-08-271-1/+1
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Change-Id: Idd981abe532628fb54e6be1ba801f11b1935dbd1
* | | | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-241-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-241-4/+4
| |\ \ \ \ \ \ |/ / / / / / / | | _ / / / / | | / / / / Change-Id: I6a15cb588b39ea63856b24fb6d4870b3ea4ace41