summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.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.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.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
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: Id0e5119f3af2b9c65d4b5a2e061c0a293e53cc43
* | Fix Qt6 buildAlexandru Croitor2019-12-193-387/+387
| | | | | | | | | | | | | | Change-Id: Iaaa644cfe6777b0ffbe3fb5850fb58b323715fd2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 62ed66bce6e6602d82f9474a8589a7dabd7bc9ca) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+27
|\| | | | | | | Change-Id: Id8455c86f38aa119c757d9aa7da1bf2adbb3e9b1
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+27
| |\ | | | | | | | | | Change-Id: I1795273e21e35353c2d5a5be0ef248c4b72f5cbf
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-251-0/+27
| |/ | | | | | | | | | | Change-Id: I45b74ad1fd28622a62d7b90fc2381666902240aa Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-221-2/+2
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I976030e99b35a1cd15ca42210b7e40fde39df9ff Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-161-0/+2
|\| | | | | | | Change-Id: I9ff8a008c16c049a794fbe9a3fc8b975abd560d4
| * Doc: Fix missing return type documentationTopi Reinio2019-11-131-0/+2
| | | | | | | | | | | | Fixes: QTBUG-79829 Change-Id: I5501a2e6f58635ecf0901a34e46f922c31682cbf Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Fix clang warnings left over from last purgeFriedemann Kleint2019-11-153-9/+8
| | | | | | | | | | | | | | | | | | | | | | - Use static QFileInfo::exists() - Use nullptr - Fix mixing of const/non-const iterators - Fallthrough - C-style casts Change-Id: I98b79d5abe24a1e2c890846a853a968b353956b6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Reduce QList usageFriedemann Kleint2019-11-1416-89/+85
| | | | | | | | | | | | | | | | Prepare for migration to Qt 6 by using QVector where possible. Otherwise, use auto or typedefs like QVariantList. Change-Id: I6d385efe1a45a0519cf4bb06a1f6d1ea869e890e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\| | | | | | | Change-Id: Ib0741d55fec23d9c73582d19abaa7c61ff06c6a2
| * 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: If8a71c8ea8ad961a5cbb4b0cb9497ab86904d92a
| | * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | + a6f9475d48e62a47cf20be47f20500e20a0f0c26 Add changes file for Qt 5.12.5 Change-Id: Ib63f2de6a2ca71b168a7ab573d485087f12d3327 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I5c604446fbbc29ba073c0d68ade5fff9b811ee17
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-121-2/+5
|\| | | | | | | | | | | Change-Id: Ic7e7a9d0a50e9f2c61d24189cec8a537115ac3df
| * | Document that it's usually sufficient to run dumpcpp manuallyv5.14.0-beta2Volker Hilsheimer2019-10-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type libraries are like system libraries, so they rarely change. The dependency generated by qmake for all object files to the generated output can be overkill, even though that output should really not change that much automatically. Fixes: QTBUG-66924 Change-Id: Iab2777b63ddb9d16aac7eb8bec634572be8de418 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | 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: Iebb341ebfa97202621783b759dca647346f24c00
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta1v5.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: Ia62440bbb3112a5602944365f0686728f82df873
| | * 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: I566c602fd2922ccd158c3e59615d28ad2621e503
| | | * 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: I2da027e548a878083ced95e5bb213fc6b0cbdebd
| | | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 62a802cbccc18330b010d7197a739d35ba9ae3c7 Bump version Change-Id: I1e8c078a1b31449f18431986f2448ae2521a7e7f 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: I672e6466663758904d374d6fde4584c82997c5a4
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 22:11:09 +0000