aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I70fe649d43480b38930d04490aa74c4c842fc4cd
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Ic1e59826893a7c385121b3847316936cc34a9b0c
* | Fix some clang-tidy warningsFriedemann Kleint2018-07-257-42/+26
| | | | | | | | | | | | | | | | | | | | | | - Fix 'if (foo) delete foo' to 'delete foo' - Use ' = default' for trivial constructors/destructors - Use range based for where possible - Fix invocations of static methods - Replace some reinterpret_cast by static_cast Change-Id: I998572f370f3e8a1fc39e6c763e941d5a2f598b0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-232-1/+25
|\| | | | | | | Change-Id: I41c0c4a1c401f7a11dfb092177e0e633f838dd69
| * Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into ↵Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | refs/staging/5.11
| | * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I3c8d723c6dfe8a6ef565246b4fbec95581237835
| | | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-121-0/+24
| | |/ | | | | | | | | | | | | Change-Id: I992f64f01c4073531ab911608d0e63ba1eaf38d6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * / Doc: Add missing dots (qtwinextras)Paul Wicking2018-06-191-1/+1
| |/ | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I9d12df49ffea1b96981021a00834eaba0e527983 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6f14ad2c7c0669b69e40fdc90749580e4ca7fbd1
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | Change-Id: I438c1d1b894c4c9f905f786c3206e280b71d6580 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 0f6fab0d89fdcf1868f9f5d2d2f75801a4c6eaa1)
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | Change-Id: Ibe94e72bc79d8abdcc5bc0a15a0de7b036d52d38 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 7ab2f46b93e0c3216c60419cfd6a800756dd1a97)
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: If18fb7585f4363cb910a19fe81d586e8a16ca0df
* | Remove LGPL_EXCEPTION.txtEdward Welbourne2018-05-311-22/+0
| | | | | | | | | | | | | | | | It became obsolete when we switched to LGPL3, as discussed on the developer mailing list in April 2017. Change-Id: Id2ec3b76ce279bf82d700d2d18df36bdb84cad9c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix Qt include statementsFriedemann Kleint2018-05-2216-52/+51
| | | | | | | | | | | | | | | | | | | | | | Change #include <QtCore/QDebug>, #include <QDebug> to #include <QtCore/qdebug.h> according to the coding style. Change-Id: I45fa5e55222e6913972d743908c47480b23cd92c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\| | | | | | | Change-Id: I7387ceed0cd19594142961e5dee077ba0486f634
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: Ia21bf2032c1652053e19496ecd432ce7bde3f72e
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-251-0/+22
| |/ | | | | | | | | Change-Id: I9428bd6905506893aa7c18d00ecc26f73ec2e427 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I9c47e29e336efac47e41a583bb1ba4368f3170fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Add imageToHBITMAP(), imageFromHBITMAP()Friedemann Kleint2018-04-183-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | Add new functions for image conversions wrapping their QtGui equivalents. [ChangeLog][QtWin] Added functions imageToHBITMAP() and imageFromHBITMAP() for conversion between QImage and HBITMAP, preserving the format where possible. Task-number: QTBUG-51124 Change-Id: I212b2dff182dce3a9b08753b6435d01b75bb5434 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-144-0/+37
|\| | | | | | | Change-Id: I9e0b2a584a1b507fc36386a79bc1f6aaf1b5afbe
| * Doc: Clear rest of the documentation warningsv5.11.0-beta4Topi Reinio2018-04-122-1/+5
| | | | | | | | | | | | | | | | | | Declare more windows-specific types for QDoc (Clang), and add Qt include path for the documentation build. This resolves the remaining documentation warnings. Change-Id: Ibdf23826a5e751b32ba21e762e7316d020a5e2dc Reviewed-by: Martin Smith <martin.smith@qt.io>
| * Doc: Fix documentation warnings related to Clang-enabled QDocTopi Reinio2018-04-114-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 5.11, QDoc uses Clang to parse C++ documentation. On platforms where Qt Windows Extras does not build, we still need to be able to build the documentation. To enable this, create a custom module header and include paths for Clang-QDoc, used only in documentation builds, and add dummy typedefs for Windows-specific types for Clang to see. Change-Id: I641570c80b6cc948c92c404d8d90ad1a3045925c Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-271-0/+26
|\| | | | | | | Change-Id: I01727cab593ed26487ef711ee8740cdf242cfe69
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I695d66803723e27d3007437cf7cc1ca6a10e6404
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: I330df7f1dc19ec8c0b70f2e71a593210fa6d66ee
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: Ibfc4cab1cd49304e27bd56fb2184172d814a1865
| | * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I049afbab170ec1eaa1f7f75c7645884a66f082f7 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: If0a3f86acbad5fabd7a381436d947174c8453a37
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-202-0/+49
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifaea4b7b8b24e66c08dba1fe36cd29c576f535fc
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I220c733e82fc1735216689cb53f4342a67b18d42
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I17f0ec09edced31945b01a099e9b9f405ddcf06a
| | | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| | |/ | | | | | | | | | | | | Change-Id: I33707e60def8cb4372d1a631a27baec3a2ee621b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I61fb8f964993004818c564cac98bd07bdce5500e
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I6d640cccdbea9d5cb3f2838789623e81b42e5fa7
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ibc3420d95abf8715064e3dac453607e28f0d96f0
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ib1c40dc50242a18e74d4e1daaee8fe7a3bc39d57
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
| |/| | | | | | |/ | | |/| | | | | Change-Id: Ib1ab493309cd25cdc7ca7cadf246e794c30c07b8
| | * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-081-0/+24
| | |/ | | | | | | | | | | | | Change-Id: Ibcd6fe8f4b813c257646d8b0f0b817dc24601923 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Raise minimum supported MSVC version to 2015Friedemann Kleint2018-01-052-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove code for older versions and streamline #ifdefs. Task-number: QTBUG-51673 Change-Id: Id16d53d4342691e1e01913c2aec3a252dddbdadb Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Port away from QRegion::rects()Marc Mutz2017-12-041-6/+6
| | | | | | | | | | | | | | | | | | | | | Use begin()/end() instead. Change-Id: I626d803be52087c3f3afd287cce121040222d90c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2024-37/+237
|\| | | | | | | | | | | Change-Id: I74a06808463f12488fe19b3e9ec7d1c20ac529b4
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-131-0/+22
| | | | | | | | | | | | | | | Change-Id: Ib1863b84d90c868472951c9a220bec39627d9e50 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3023-37/+215
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5a19f702cce4bd518f873140c4cbe0c7e53d6bce
| | * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I2e671b99d2c599bbb9a1f7fe6d3171edf7bf54ea
| | | * Add changes file for Qt 5.9.2v5.9.2Jani Heikkinen2017-09-251-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-62747 Change-Id: I63178458ffb4324a275372097507a25e45a1ad48 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | | | | | Change-Id: I5ff43c439fa201e15e8689acd4630ad57d3de2e9
| | * | Fix outdated BSD license headerKai Koehne2017-09-2913-13/+143
| | | | | | | | | | | | | | | | | | | | Change-Id: I93fe6c2f2008867eab0127bd0eb1b4e9fc968fdd Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * | Fix outdated FDL license headerKai Koehne2017-09-298-24/+24
| | |/ | | | | | | | | | | | | Change-Id: Ic862ca99a27ff61d2654001ff4d9c17eceade472 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * Add changelog for Qt 5.6.3 releaseFriedemann Kleint2017-08-241-0/+24
| | | | | | | | | | | | | | | Change-Id: Icf7d3ca3e63d2366a3092e79d1ec90d67790cd3e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Revamp Qt Windows Extras examplesAndre de la Rocha2017-11-015-39/+56
| | | | | | | | | | | | | | | | | | | | | | | | Use nullptr, member initialization, new connect syntax, QStringLiteral, etc. Change-Id: I1404701fcc227f8133bc22548ea1cee02eab4ed9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 20:56:11 +0000