summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-0/+20
|\ | | | | | | Change-Id: I4093487f29939a2479a612a0bfae2163ddca13c8
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
| |\ | | | | | | | | | Change-Id: I7804b1942ba59e15c188b650881a6dbbf706c526
| | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 09a6b3cdbef71a56591d2fdeaa2af93199db83cf Bump version + 25017be3e97f0af3ad3882a54bb4e625762bff9c Doc: Get rid of QT_INSTALL_HEADERS in documentation config + e596e640b0eeb32739c6a04459308e1d6bb9c834 Add changes file for Qt 5.11.3 + 66aa85ede203372e3c9eba6c399379fa2f3de43f Bump version Change-Id: I0f919e1346e82703eb6ec778b168c894d7dabba4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I732e189292c5d9c7a33e75924cb5cf9ce5cb76b7
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ | | | | | | Change-Id: I17d68a8412fa4b2fc5a85539f3a00e5cf777ff46
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6d555b39fe19b936be151d1f6c599227df7fd1aa
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I4ebd852ba38bd8b4c3de4198f8c41dce80391bc5
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\| | | | | | | Change-Id: I6421f5c068807ad66d8c47787d8307e6f758a2b6
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ | | | | | | | | | Change-Id: I98fa9415f967746f8e60605067a5fa50912da171
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I77188979e52abd1cbfad1bbeea1362cf494ef571
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-191-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 09a6b3cdbef71a56591d2fdeaa2af93199db83cf Bump version Change-Id: I387564fe748dcfd0c281777793e9e06d43280d4b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-081-0/+18
|\| | | | | | | | | | | Change-Id: Id6b1c7b58de67403bb2abfa1215dfdcb40cc434c
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
| |\ \ | | | | | | | | | | | | Change-Id: I19a85114423f9e3b114421b7c36c11e512194817
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.0Antti Kokko2018-10-311-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I12d5dfe638ec463f7f796bc0e2ccce27591a2f6a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-174-9/+14
|\| | | | | | | | | | | | | | | Change-Id: Ice7fd57f472abbc3256202295c5e9dd496d79df3
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib52564c301023583c41d6a8d1311cf57b24ae6fa
| | * | Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ibe6bafdad957e2abcf68f23ae237dd82f0bdf4fb
| * | | Doc: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-144-9/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of QT_INSTALL_HEADERS caused documentation build failures in certain configurations. Use an alternative method to pass the required include paths to QDoc; add doc.pro and make 'doc' a proper subproject. Also fix the remaining documentation warnings. Task-number: QTBUG-67925 Change-Id: I68ce63bcac4ab7f70468535fe53057f51525ca2e Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-301-1/+0
|\| | | | | | | | | | | Change-Id: Ica9aa415ec119f08fe0511f65e0501113ba6888e
| * | Fix static iOS buildsFrederik Gladhorn2018-10-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The debug build breaks because of duplicate symbols. Fixes: QTBUG-67116 Change-Id: Ia0d232a9cdef60e5104dee454dbe1d50208b446a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-201-1/+0
|\| | | | | | | | | | | Change-Id: Ieda0ca6fe4619178a30235c46f61c06dbdeecb5b
| * | Revert "Blacklist tst_QTextToSpeech::volume"v5.12.0-beta3Joni Jäntti2018-10-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The now installed libspeechd-dev package should fix this problem. This reverts commit 28b0ce7144ab444e1820c41bc6deeb3f6b300d4e. Task-number: QTBUG-68869 Change-Id: I475a182a41ab226f199ba602f6245902bd0ef713 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: I242e1045c93aadefc8ce757dcae4c75e563f8d13
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\| | | | | | | | | | | Change-Id: Ibfb7a082a504fa002a999bf3fd06ba4812cde42f
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|/| | | |/ | | | | Change-Id: I2094037d987a53f17b2f94884cf92bae077ab1bf
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Id33db871d81768c36926a0bfbbf4f82de50be381
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I55d6e429f83d9b9de56f7c1ea3305717323758f0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Use override and nullptrFrederik Gladhorn2018-08-205-14/+14
| | | | | | | | | | | | Change-Id: Ica269749297b0ee842d759a7baad39e04b3e7f16 Reviewed-by: Jeremy Whiting <jpwhiting@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Remove outdated version checkFrederik Gladhorn2018-08-201-1/+0
| | | | | | | | | | | | | | | | | | Qt Speech started outside of Qt, now that it's part of it, assume we have a sensible Qt version around. Change-Id: I9d511f7e215033384c9ffd8cc77da82657fd5635 Reviewed-by: Jeremy Whiting <jpwhiting@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I784e9d38a6d724df406abe276200dec2aef85914
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I2030ebc025a3c004c028d7ce4d7b2e9ab232e58e
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-301-0/+30
|\| | | | | | | Change-Id: I95c4f7a52f4df8a2c619ad8905efd7034a0cc28a
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Liang Qi2018-06-251-0/+30
| |\ | | | | | | | | | Change-Id: I5af38c0b8c86180a0cb0359ff36aca795c3a3409
| | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-141-0/+30
| | | | | | | | | | | | | | | Change-Id: I4471a2b91fefcd8eddbe4a5ed186c02a7ff1af3f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Allow including common files through priFrederik Gladhorn2018-06-272-4/+7
| | | | | | | | | | | | | | | Change-Id: Ifb85666717f719d1310112b904adc2b70fbde2b5 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Fix volume for fliteFrederik Gladhorn2018-06-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The backend stored the volume as int, while the API uses double between 0 and 1, make it consistent, so the getter will return sensible values. Change-Id: I6a88034b3f7336eeeaf7c5af78500b15dac19c06 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-233-3/+3
|\| | | | | | | | | | | Change-Id: Id6f0fd14c58bbeae5f0ad6dd276acbb4930dcb36
| * | Doc: Add missing dots (qtspeech)Paul Wicking2018-06-193-3/+3
| |/ | | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I2ea514e4b3edf9f88bf5af6c5e6e5cc9fc87585d Reviewed-by: Jeremy Whiting <jpwhiting@kde.org> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Extend blacklisting of volume test to cover openSUSE 15.0 as wellTony Sarajärvi2018-06-201-0/+1
| | | | | | | | | | | | Task-number: QTBUG-66209 Change-Id: Iab651645eb3e2b622e81be659f9fbda1aa78208d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Blacklist tst_QTextToSpeech::volumeJoni Jantti2018-06-151-1/+1
| | | | | | | | | | | | | | | | This autotest fails on Ubuntu 18.04. Task-number: QTBUG-68869 Change-Id: I7ed6c0e8a7829caa4ceed7d15df537f1f3725845 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-040-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1b3d1c49a2a91a305fcf18c24672baa63e0e49c4
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I2bb908fe6383c0081e6023397ca8ea145c312763
* | Set minimal required Android SDK versionFredrik de Vibe2018-06-011-0/+1
| | | | | | | | | | Change-Id: Ia54e8cc0b561d0991f0f5a806958cd807fdd05c0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-1913-314/+221
|\| | | | | | | Change-Id: I8b680b1ff28851417b32ea714e9afb07f31ef5a7
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-184-53/+90
| |\ | | | | | | | | | Change-Id: Id8fdedf04bf2059526fb04a71b181c85565c3452
| | * Doc: Resolve documentation warningsv5.11.0-rc2v5.11.0-rc1v5.11.0Topi Reinio2018-04-274-53/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add missing enumeration docs to QVoice. - Fix the name of the QTextToSpeechEngine class and fix missing parameter documentation. - Add custom module header and include paths for Clang-QDoc. - Fix minor formatting issues. Task-number: QTBUG-67790 Change-Id: I18e9af9e9f47afe0b76ca973e0b304af5fe599df Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | Fix type for volume in property: double instead of intFrederik Gladhorn2018-05-084-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests works on macOS, Windows and RHEL 7 at the moment, other platforms do not have the backend or do not test. [ChangeLog] Fixed type of volume property, it has to be double, not int, to be the same as in the related functions. Task-number: QTBUG-66209 Change-Id: I547c00a726fb9b5a846fd5759fc8230dee774782 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| * | Remove legal section about FliteKai Koehne2018-04-271-253/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flite is not part of Qt source code, nor part of the Qt binaries, so documenting the Flite license inside the Qt documentation is misleading. We do optionally link against it, but we do so with heaps of other libraries ... Task-number: QTBUG-66542 Change-Id: I2e84faa11de03e15b01d1cbfdbc32d4acc4dc8f2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | qtexttospeech_sapi.h: Add missing overrideFriedemann Kleint2018-04-231-1/+1
| |/ | | | | | | | | | | | | | | | | Silence warning by clang-cl. Task-number: QTBUG-63512 Change-Id: Idd6d9dabad2ac450b358274cb531c4e98377f699 Reviewed-by: Jeremy Whiting <jpwhiting@kde.org> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta4v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1313ef6132bb784d61432355270368d821a5d725
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 21:54:55 +0000