summaryrefslogtreecommitdiffstats
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: I9206b5a8fb38442800aa9870a091c16ce48f68d1
| * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
|/ | | | | | | + 2ac294443a72799c021dcf3513c83fb628f3c193 Bump version Change-Id: I6e31159f1278156aa32f300d90fb379f97e5c304 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Doc: Fix highlighting of QML importKai Koehne2020-03-061-2/+2
| | | | | Change-Id: I852154d4c876c16e6aca6c77e864c8d84f031b39 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: I4e4daf8b59a6ace1b150ddaba74f4eca6e4e7455
* Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
|\ | | | | | | Change-Id: I8719285d1f644d3e69d1483fdea802f6ac048455
| * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
|/ | | | | | | | + 70a3d70b16c5902d3d9afca97029821d36ce31bb Bump version + a36ee0bd14f528238c8761265d934e29268e2dbe Use "QtQuick.Window 2.2" in calculator-qml Change-Id: Ic55c159da040d3d27a960354f6aeb48645f34f36 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Use "QtQuick.Window 2.2" in calculator-qmlAssam Boudjelthia2019-12-181-1/+1
| | | | | | | | With version 2.0 the layout is not correct on Android, version 2.2 works well. Change-Id: I7df2d8ecd0e623fe437d9a47e24b8557651f1e1e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Bump versionDaniel Smith2019-12-161-1/+1
| | | | Change-Id: I4483d950c278b8a37f8d4470b4f86d5e828c1748
* Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
|\ | | | | | | Change-Id: Ie6fdccdf5a2845d6b6a2338f9d38ed86ccd8ffeb
| * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-251-0/+18
|/ | | | | Change-Id: If5a393dd6b4cfa424436398a939e11357bb0f2af Reviewed-by: Ulf Hermann <ulf.hermann@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: Ibdd725d5e420065a5e4a74887f15f30e22299551
| * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | + 9bba89da77b73f016f22bc5d3f195d9c0212c7bc Fix shadow build + a1be55be7596f04e57a2f8f9d45bbf304e98ed9a Add changes file for Qt 5.12.5 Change-Id: Ic83dbf3b97ddad043853aa809d4c0f90123fe0f1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | Change-Id: Ie19713b42177c36c817be728228c8dd380c98557
* | 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.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 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.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
| * | | | 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
* | | 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: I638b5166296b4034310c75f5bc08245def618884
| * | 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: I4c54e2034e810a8a33107544e00f8b5669c8a86d
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 16:22:42 +0000