summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgpl5.15Tarja Sundqvist2023-03-231-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I666c514e902418d241dbe243607fb3d1161e4802
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I19d1ab37c4ebfff7d4489aafa41939af89aa6ae6
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I86f0ac84fa013e2e7a019e48aec2ab51566a57a6
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I9784fcd0e6506e016a45400d1054cbba6015025e
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I2f0c761f56d2b73dc167a0b8b0a531f41df32aa8
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-161-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I6b1ced8d575a9752c8c42ef2ed90c221f8a205ea
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I780d13f9ffd590d899d94cc8fe6ab9388493cbdb
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-072-2/+4
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I8be9575ca0e35109fbe59fa9a3660aaf2da6c70b
| * Document the qaxserver_no_register configurationFriedemann Kleint2021-04-061-1/+3
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-92237 Change-Id: I9b93e557b67f8bd1ac2a5ea34ebb3f4c375b7f9e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 363068f57525e808aa20cb8dbcffdc13f6712df1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: Ida8bdb9874ecfaf4b322182e2063ec5d34786e56
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2354-1242/+1242
|/ | | | | | | | | | | This reverts commit 29b16574937cf974ecca55fae6686316db4566ae. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Icf0f85998ee5e75392d9c3240fca7c30a53923ef Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-2754-1242/+1242
| | | | | | | | | | | | | | | | | | Update header.COMM to the files in tqtc-qtactiveqt. Examples, documentation files or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4156 Change-Id: Icb54effee172b88f9d7fd71caed7b8bc4e630eca Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+31
| | | | | | | | | | | | | - 03d370854d38dfc6ebdf2f9c921909f0e027ec3f Add changes file for Qt 5.15.1 + 415bc38612bc4fa18af4f5921bc8e845c86374b0 Bump dependency version and fix compile errors + 792046651cf904590d2e6a57253380d4b129b070 dumpcpp: Check 64 bit registry keys for 64bit builds + 7d5b1ca45eaa49388ef5dc1b61aff4c6fc741997 Bump version + 87e97562466b76fd757ebdfff8978b34c167a6ae Add changes file for Qt 5.12.10 Change-Id: I93c44ad368f5451ccc1d8c4fd44f07ad35a5e0a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 0c62d8262fb2a4779e05e95d112f08125031b640) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I9df98f4b64bd69ada06c8e67746cb3a23e97454e
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: Iff7625ff8c09c96c8fc74da7e970d9df690db49a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit d09457fadc277388667f2f3755b2abd418743e69) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: Ia7731e057359e797bd610ba34044b76d24090670
* dumpcpp: Check 64 bit registry keys for 64bit buildsFriedemann Kleint2020-09-151-3/+14
| | | | | | | | | | Add a check depending on pointer size. Fixes: QTBUG-86666 Change-Id: I6bb39e94e677e9f9c72b15949e7b463e1f4776d2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 782710f23604b7437417540c2d44aec06c42f3ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump dependency version and fix compile errorsFriedemann Kleint2020-09-103-8/+8
| | | | | | | | | | | | - Adapt to explicit constructor of QUuid - QString changes - Renamed Qt::MidButton to Qt::MiddleButton - QMetaType-related deprecations Change-Id: Icdea2b300c3f33bec3a4ad010ee3150a3b2156de Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 15744be7b78e300dc92c06c37b59dbbb5a12f915) Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-261-0/+20
| | | | | | | | | | | | + 72215e4c7c6a42723b138ac97a603af011bd81d2 Compile with QT_NO_CAST_TO_ASCII + cddd08a9ed92aff9f86b0fde86cfac980bec52ea Fix deprecated/removed code + e9ee58208f5eea55e5225513f1403a27dbdd2d60 Print warning message when we can't get type information + 2535f7d0034c03500dd279e735f97941d4d051f4 Bump version Change-Id: I8bfe829629dd5e32b65641d79ff762298b33537a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 560c588e59b7788643307368816fa83b7b2cf3ee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I3c465d70c69a626a64306178e797777e4c456837
* Print warning message when we can't get type informationVolker Hilsheimer2020-07-141-2/+5
| | | | | | | | | Task-number: QTBUG-85467 Change-Id: I47920180626ea3ecbda3ea8e59600bf2f653f7fe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 88b4ca5ea5b7a20cb4d44d45eb4cb0b777bb9201) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix deprecated/removed codeFriedemann Kleint2020-05-204-7/+7
| | | | | | | | | | - Port away from QDesktopWidget - Use QFontMetrics::horizontalAdvance() instead of width() Change-Id: I5d721fa574356a27e414545d6b9b2d28d400080b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 55b91dc4714d36d457fbfa32bc6b412415362430) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Compile with QT_NO_CAST_TO_ASCIIFriedemann Kleint2020-05-186-24/+31
| | | | | | | Task-number: QTBUG-78167 Change-Id: I628df5c4db8b072fa34a14890b031429b550b51a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 7a6472a6d6c600698858de59e3f1dd1424ca32dd)
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I870be7e9ad3a4b053f1d345ab8e1f36619bb68ea
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: I1465a6baa057a736af4176170de890af0c7a5082
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: Ib0a488304d6cf03e89153f4fd42051b7bd5ad3fb
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I6b3ef1c4834a9e962baa0906ea8334965bb1df4c
| | * | Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | + 2bb2080ddc9c45b425f1e38f21c737932a3768ce Add per-user registration support to IDC tool + 974bead30f32a832180126944973c82f5bc6f6e2 Workaround for Application.WordBasic.DisableAutoMacros not working + 6ae4d9b39285d84dad731893444f7027945900fb Bump version Change-Id: Ibc9a55d5dd50e464da533e6fb9faa88e5bef3d2b Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 855c01603e19a78cb73421d4a5c2410c4ad31c3e Bump version + 4606e00679ba2c11661ce099fa6bcb489b239bae Reduce QList usage + 1fca42ec752d9ff594f90a319456379196150b19 Fix clang warnings left over from last purge + 13363248cfb0bab60e4d25f4bc2da692a9b51a50 Avoid initializing QFlags with 0 or nullptr + e3c06beffd3ccf59c5266dd2c9620c499561e26f Fix Qt6 build + 927a76c9246109f14b51bd9a3cf224d6f987e10d Fix broken IDL version handling in DumpIDL + f29b73d0026db64d7b2d1ca049461b784c98cecc axviewer test: Add a metaobject dump + 52c02908abecbb9fd4afcb0de6a0b50b3ae85827 testcon: Adapt to renamed signal of QComboBox + 1fb1936afb00a408799c3f8a4755da21450289b8 OpenGL example: Port to QOpenGLWidget + a9ba05936f9f78bd2e6294f356fe1ae37042ef33 OpenGL example: Use double in GL functions + 8ca337213f1e79abca96a70a17f771f322c58319 OpenGL example: Polish a bit + cdd58e2c155063f9b52b69a47f45c2430214e3a4 Add a manual test for dumpcpp Change-Id: I13ca04fb103a9ee92b82757b38439b317abb94b1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Add a manual test for dumpcppv5.15.0-beta4Friedemann Kleint2020-04-0810-193/+468
| | | | | | | | | | | | | | | | Let it generate code for the WebBrowser and display the meta object. Factor out useful code from axviewer. Change-Id: Ib250c749459836e2145f83f4f68fa0caee2a2ad9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | OpenGL example: Polish a bitv5.15.0-beta3Friedemann Kleint2020-03-301-3/+6
| | | | | | | | | | | | | | Remove ugly C-style cast and add Q_UNUSED(). Change-Id: Ia6ec8202ef2a5ad44a05c4f4bb68ed5936381f53 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | OpenGL example: Use double in GL functionsFriedemann Kleint2020-03-302-35/+27
| | | | | | | | | | | | | | | | This eliminates warnings about float truncation and increases readibility of the code. Change-Id: I9fcae5a556128a31a508613289772128a908a3bb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | OpenGL example: Port to QOpenGLWidgetFriedemann Kleint2020-03-305-14/+17
| | | | | | | | | | Change-Id: I81b1b2b251a3ffca2f925d5d61f88ac71728ca2b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | testcon: Adapt to renamed signal of QComboBoxFriedemann Kleint2020-03-302-3/+3
| | | | | | | | | | | | Task-number: QTBUG-80906 Change-Id: Id18ae4adea182291ccd8b367e055afb894c97bb5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | axviewer test: Add a metaobject dumpFriedemann Kleint2020-03-271-1/+220
| | | | | | | | | | | | Task-number: QTBUG-82945 Change-Id: If9c84743779acdd199fd67ec2c2f4fc72f58129a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Fix broken IDL version handling in DumpIDLFredrik Orderud2020-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IDL versions are limited to "major.minor" format, where each number can range from 0 to 65k. Patch and build numbers are not supported. The current implementation just removes extra dots, converting a "10.20.30.40" version string into "10.203040", which seem odd to me. It also causes the following failure when the concatenated "<minor><patch><build>" string exceed 65k: MIDL2152: [version] format is incorrect Change-Id: I915e70a5480f69caa3822ec9b41fc6edc7fe4cfa Fixes: QTBUG-82883 Reference: https://docs.microsoft.com/en-us/windows/win32/midl/compiler-errors Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-051-0/+6
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib32f4a8475ca9c0cd487ce2dadf0e3a4c94a05da
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I4c8522c91301ebd3df13358055e9289b9bddcc32
| * Workaround for Application.WordBasic.DisableAutoMacros not workingFriedemann Kleint2020-01-301-0/+6
| | | | | | | | | | | | | | | | | | Invoke() only works for this method when pVarResult is 0. Fix as contributed on report. Fixes: QTBUG-81543 Change-Id: I8163bccc9c69ef9c5bffb5270d2779e94e587c7e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\ \ | |/ | | | | Change-Id: I5b6bca7361a5ca5d72fac483f32d3e2ef342b803
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I9e7e66de2e8bcb13bb2425a7d692b966a7028005
| | * Merge 5.14 into 5.14.1v5.14.15.14.1Kari Oikarinen2020-01-151-1/+1
| | |\ | | | | | | | | | | | | Change-Id: Ifdc883e859924f743dafd0a9093e9d571917b5fb
| | * | Add changes file for Qt 5.14.1Antti Kokko2020-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + 95304102ce905cf3661f5669428bc4e5b9a418a4 Bump version Change-Id: I90d2da1b0743574a760c074daa0af934565745e3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-182-30/+78
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I58798072e9c8201ad807757949f6e600fed6dcd0
| * | | Add per-user registration support to IDC toolFredrik Orderud2020-01-161-29/+77
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Done to re-enable COM registration from IDC without requiring administrative privileges by passing "/regserverperuser" from the command-line. This functionality was accidentally broken in f2b9781e4dab88b191d73378deedfa7fb0d5ae02. Task-number: QTBUG-76269 Change-Id: I671d1993c022a1fef550528fc1e42e5bd05ebded Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | QAxServerBase: Initialize member "exception"Friedemann Kleint2020-01-141-1/+1
| |/ | | | | | | | | | | | | | | Fix an oversight of 20f6c67635240865d33a370230a156de0f051d07. Fixes: QTBUG-81367 Change-Id: Ia16e11713a3909b35532e0653fedbdec59109b5a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibfabe0671596bf6ba3ef5fe8bcfbcc1e02cbf1ab
View Lorry Controller Status