summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version6.3.26.3.06.3Jani Heikkinen2021-09-141-1/+1
| | | | Change-Id: I999272bbd8a7e4b4b39dce6a995752763776fdbd
* Bump version6.2.46.2.36.2.26.2.16.2.06.2Jani Heikkinen2021-05-241-1/+1
| | | | Change-Id: I27bd916b216bd2a955ecefd92c2ae89449655a15
* Android: rename Android's package name for Qt 6Assam Boudjelthia2020-10-055-7/+7
| | | | | | | | | | Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Also, we include the major version number in the jar target. Task-number: QTBUG-86969 Change-Id: Ic7ef0d70fc3e3e7db780eff7d70eff64361ae677 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Wrong tts current language parsing on some Android devicesFabio Falsini2020-09-082-3/+15
| | | | | | | | | | | | | | | | | | Current implementation for getting the current tts language selected in Android gets the output of toString() to create a QLocale object. However there is no guarantee that these calls will return two-digit codes as required by the QLocale constructor. For example, a Samsung s10e device returns three-digit codes ("eng" instead of "en") which causes the instantiated QLocale object to return a generic "C" language instead of the real locale. This patch checks if the language and country code is two-digit or three-digit and, in the second case, convert the three-digit code into two-digit code to allow QLocale to be initialized correctly. Pick-to: 5.15 Change-Id: I50163ffca57a031028e75a488d2b29ea7e9cdf4f Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | | | | + b8fde373709585685125d3f417b3d646746d3236 Bump version + 615ff28f6fe9083b29df9ca3fa0d123817944e0c Add missing rate() method in java class + f02333202ab28282b4f5393e656ad83ba43ef6a0 Use nullptr instead of 0 in example + b138b48ca54d0cb6abbd4437300c2237e259108f Wrong tts language parsing on some Android devices Change-Id: I886e6859dc12831f4ed998184dc53a6a0ca322b7 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit f4601353aa9a14eacfc83e1ca650ae5b6c21283a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Wrong tts language parsing on some Android devicesFabio Falsini2020-08-162-3/+48
| | | | | | | | | | | | | | | | | | Current implementation for getting the list of supported tts languages in Android gets the output of toString() to create a QLocale object. However there is no guarantee that these calls will return two-digit codes as required by the QLocale constructor. For example, a Samsung s10e device returns three-digit codes ("eng" instead of "en") which causes the instantiated QLocale object to return a generic "C" language instead of the real locale. This patch checks if the language and country code is two-digit or three-digit and, in the second case, convert the three-digit code into two-digit code to allow QLocale to be initialized correctly. Pick-to: 5.15 Change-Id: I02ebe57b2475f7fe74f2830b80f275ddb9b42762 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Use nullptr instead of 0 in examplePaul Wicking2020-08-151-1/+1
| | | | | | | | Fixes: QTBUG-86059 Pick-to: 5.15 Change-Id: Ifffad0a0767387c92325143a94700d8b5bff5600 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Add missing rate() method in java classFabio Falsini2020-08-051-0/+5
| | | | | | | | | | | | | In the TextToSpeech android plugin, the c++ code asks through JNI for the rate value, but the corresponding rate() method in the java class is missing. An exception is then generated and a zero rate value is returned. This patch adds the missing rate() method to the java source file. Pick-to: 5.15 Change-Id: If7d1af03ed106774e33b2d50ebe84625c7bca431 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-278-10/+10
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I0eaefdd648939d83a5f5bf918a335bcb72f4b8ae Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-2622-92/+74
| | | | | | Task-number: QTBUG-84469 Change-Id: I1ceb2dffcc0437c2800869bdf7697c17e9f81266 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Add missing overrideAlexander Volkov2020-05-251-1/+1
| | | | | Change-Id: Ib3ec5e5934719c3a9d5ee216f294ee125b9c984f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I64b1d27b2773a4d69968a0539571892eae2607a7
| * Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
| |\ | | | | | | | | | Change-Id: I89ab753580fdd45be9b94005188dba916159dcf1
| | * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Qt Forward Merge Bot2020-04-222-9/+38
| | |\ | | |/ | |/| | | | Change-Id: I37cf64f8eb7653e45e8177eb157b83f2a03b759e
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + bcca555e7227a0e651dd27dcb61bb5ae0f0b9c6c Bump version + d8f4cfd515cca34cb6bcba06f59db231cebf8e09 Blacklist say_hello for openSUSE 15.1 + 6c5b8905e41dd0c90554bb222840210f12481a36 Fix blacklisting for autotest + 1b67cc563c3233df55c16ab9c23ba111233a365b Fix deprecation warnings about QHash::insertMulti Change-Id: I136b705f648a14b7482f65190b963a14a92fd3f8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\| | | | | | | | | | | Change-Id: If7e2426fa3bf7b270f9864b5cf07d0dde19a877b
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I48b02ff5854a4f6300933d7bdf0a17967e882a4b
| | * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I40166b28a187b7997af4bdca8fd1c25c735562a8
| | | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | + c47161c6c4c4b1d3252faf7f3088b526ba783513 Bump version Change-Id: I1305ded6640ad62391bd265c0b8fae2db2b2ec0f Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | | Use Q_ENUM instead of deprecated Q_ENUMSFriedemann Kleint2020-04-161-5/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I3b8bfcc5e60a0074ee05739177af5de6cc8d4832 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Friedemann Kleint2020-04-165-15/+46
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-04-165-15/+46
| |\| | | | | | | | | | | | | | | | | | Change-Id: I519dc60497f29a37782bf588a774ad203b4a2bcc
| | * | | tst_qtexttospeech: Try to stabilize testFriedemann Kleint2020-04-161-9/+18
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Give it more time - Print libspeechd version number - Add a QVERIFY around spy.wait() - Cast QTextToSpeech::State to int in QCOMPARE() so that the values are printed on failure - Use new connection syntax Task-number: QTBUG-82545 Change-Id: Ia8aa3ae2526d6ba094a38629b804f5c7543fa8b7 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * | Fix deprecation warnings about QHash::insertMultiFriedemann Kleint2020-04-142-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QMultiHash. Change-Id: I7f9fab7060306d0160d9905c7ff6570323bb1911 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * | Fix blacklisting for autotestv5.15.0-beta4Tony Sarajärvi2020-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This autotest is flaky, and the previous blacklisting commit passed while being incorrectly done, because the autotest happend to pass. Task-number: QTBUG-82545 Change-Id: I7a84eef20e3c5fbb21dc9f080e6282b063e7e3fe Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Blacklist say_hello for openSUSE 15.1v5.15.0-beta3v5.15.0-beta2Tony Sarajärvi2020-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-82545 Change-Id: Ib8d79bea92b5d048fe109a43af20a36787f0fa74 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I223487517c7e2939b99b1d353131685ee0552d15
| | | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I873751bffe474de04f7971311c5a5acbb7db4412
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| | |\| | | | | | | | | | | | | Change-Id: Iad835f8c7e6b35e22a75330cb6603cdee1ea82a6
| | | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | | |\ | | | | | | | | | | | | | | | Change-Id: I781f2933238a2bf08f9cfeb1ea2cb4dcd3265da4
| | | | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 62867033d440a7803c6c4648c0f560e9d950a7a3 Bump version Change-Id: Id41307d551f18f0bd6a094bf753225152d0e3454 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | / Update dependenciesFriedemann Kleint2020-04-162-8/+8
|/ / / | | | | | | | | | | | | | | | | | | in an attempt to fix WASM build errors. Change-Id: Ic4c99996d4115554b684508b8889dc1ea8400ff3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\| | | | | | | | | | | Change-Id: Ia048f64bfe768e249c88b41050b298903d78e847
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I15dd24f74bc97c56f71c634035b7076c2fe67f25
| | * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | | | | | Change-Id: I94559dbbceab117e45385d7efedca5cb7a2b04d9
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-171-0/+18
|\| | | | | | | | | | | Change-Id: If2e1f8f3813aa3d2a305081f1565b961c9c87e11
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
| |\| | | | | | | | | | Change-Id: I58be1bd15e396ff756963665c7b1cad83480a579
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| | |\ | | | | | | | | | | | | Change-Id: I8130ea615422e2b007a87060ac3c242a7a6085e0
| | | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0Antti Kokko2019-12-031-0/+18
| | |/ | | | | | | | | | | | | Change-Id: I4b39a2b5ba612c923b0d4d9dc1cd27cdc6d2232d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2019-12-051-3/+3
| | | | | | | | | | | | | | | Change-Id: Ife1c44ea31476cc2d214780057e664fbfbcabc67 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2019-12-041-3/+3
| | | | | | | | | | | | | | | Change-Id: I978b36170f67bff6732eed21edbd52d1eceea02b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2019-11-291-3/+3
| | | | | | | | | | | | | | | Change-Id: Ic9024110dd5df6d029c6a7d516fe4b8cde2e0fde Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2019-11-281-3/+3
| | | | | | | | | | | | | | | Change-Id: I3b542d0daf6cead381edbaa7496b67de99a831f1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2019-11-261-3/+3
| | | | | | | | | | | | | | | Change-Id: I2669ade801d12d21724786273ab2434f5afb3d4d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2019-11-251-3/+3
| | | | | | | | | | | | | | | Change-Id: I92ff86e597ca9e2785559a2368f3c0af9862a237 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2019-11-221-3/+3
| | | | | | | | | | | | | | | Change-Id: I9d01643e9d360e5cb8f9d436841e816f760df591 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-161-0/+20
|\| | | | | | | | | | | Change-Id: I8a69a6b9dff41aee5f8642acdde654669547fe7d
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-121-0/+20
| |\| | | | | | | | | | Change-Id: If7892d1afbddf442bfaaa332719e98b4fe596b13
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-rc1v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I35e3794c5643798bd62a234dc5acd2d3cc0f5c2b
| | | * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + 2f96f61fc0f3d7b7627a64a9fae839bcf9f2489e Add changes file for Qt 5.12.5 Change-Id: I280e4ff5b82ef39bae244912a52b4bec1fe67f21 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 08:08:47 +0000