summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate projectswip/cmakeAlexandru Croitor2019-11-1513-32/+26
| | | | | | Change-Id: I8f779c41390e242634e32ff94d13041a8559f272 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-158-15/+58
|\ | | | | | | | | | | Removed dependencies.yaml. Change-Id: I7d1b06564b6b5c71882fe058f094894af7cb3efc
| * 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
| * \ 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.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.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
| | * | | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-201-4/+4
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-201-4/+4
| | |/| | | | | | | |/ / / | | | | | | | | | | | | Change-Id: I58544f3833ea4a0d08408795dfd4f146db70377d
| | | * / / Fix shadow buildSamuli Piippo2019-08-191-4/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't write to source directory when using shadow build. This stops working with Qt 5.14.0. Change-Id: Ica83b9c810e2a937aab75af131484f5f91570453 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | | Eradicate the last Q_FOREACHs and mark the module cleanMarc Mutz2019-07-182-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... of Q_FOREACH, Java-style iterators, and QLinkedList use. Change-Id: Iec6c576e8c7aba81594e3d3e6c4d1e1cc487fbdf Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-161-0/+1
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
| |/| | | | | | |/ / / | | | | | | | | | | Change-Id: Ib0e7bdb66fc3e8d0cf5eeca900e93703c76f1cae
| | * | | 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: I72c1322203a9f5bbeba52098ba412d210ed8eb59
| | | | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie78264de8c4b2ff1b455cb0290f8bbd9b7c7f724
| | * | | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Iddf20afd4fe0289079afc91fe43c14fd7ebbb5ab Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | | | Fix compilation with explicit QChar(*int*) ctorsMarc Mutz2019-07-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QChar ctors from integral non-char types are under consideration for adding explicit. Fix users of these ctors ahead of the change. Change-Id: I3f3480336ba30a368034bb15b67ada854115e374 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
| |/| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifdabe76e9d0643c188fbf0d664f0a6d36f15011f
| | * | | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0b247408f83afb75b9f04a6ff4c784ce73268aa8
* | | | | Regenerate before mergeAlexandru Croitor2019-10-1523-26/+40
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib78bff1d61ee9526b9e3373dbf109ae4d2dd81dc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Port QtScxml to CMakeJoerg Bornemann2019-09-2647-11/+1912
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Change-Id: I227f18b6a9825b6974eab6ba9feaf62bd0934133 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 19:27:14 +0000