aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
|\ | | | | | | Change-Id: I66f90eb5788cdb48e41896a67d60d7ca2b9958a2
| * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | Change-Id: Ic8674ba221ff148a876896fae810dfd3c29b6544 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Bump versionFrederik Gladhorn2019-05-231-1/+1
|/ | | | Change-Id: I2f56174e0b1b4ec0a4987d67f3dd62a5c7fc0820
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
|\ | | | | | | Change-Id: Id5205f25b172660e04948460dc303df0354ae78d
| * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+20
|/ | | | | | | + 4e5f9b48b1d828bd15c32cd98d9878b0ed892dd9 Bump version Change-Id: Ie89482f1c84c11b1e543227a15022c8cea204232 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: Icfca8a5b11f06a836a56ed7b4380f65ebb95122c
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
|\ | | | | | | Change-Id: Iaec14f1a6c952e0951efee2e6c42f49072b2835f
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
|/ | | | | | | | + 92720ed84d88d5cf96b958ae4e6ad134421804d0 Bump version + aab65a4b855553a906f566d34e4e1d1b41cd0b8c QtWinExtras depends on QtGui Change-Id: Id0f18157245988ac95d1430e777ffed0eba7b6ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
|\ | | | | | | Change-Id: I6dc7504b79bc3926f33258fcc07893dfe243c2eb
| * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | + e61770d28488f98a754a7b33813fbbdf9a1c8293 Fix MinGW compiler warnings + 55be074d7f40ae2d0ebed21b36192b18f7edf5b5 Doc: Get rid of QT_INSTALL_HEADERS in documentation config + b1429b32ad3d687f43d7e528cadb95cc4e6f0c57 Bump version + 71a4a624fcdc2768d19619fa5a0bc583e2cc2a11 Fix jumplist example documentation snippet + 537d8b04e002b5e47df9a60cb4f9b888311c61d8 Add changes file for Qt 5.11.3 + 0a0c4f76383683ec799344bb57bc44954231c265 Remove wince check as it is not supported + fac73fd06ec6084c41190e80df59a66bc72f7fdb Bump version Change-Id: I1461dca6441f103a0ddbb1ee5bca134d7eecc93c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | QtWinExtras depends on QtGuiLiang Qi2019-01-301-0/+1
| | | | | | | | | | | | Task-number: QTBUG-72931 Change-Id: I9d8bff699e482d61f4a03e2b0177bdfb3e6cc084 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Bump versionKari Oikarinen2019-01-141-1/+1
|/ | | | Change-Id: I624743c0b45d7779b6955c4551d513069b07f2e9
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: If9b81746fd86b7a1a21bdbbcc01eb73e917f96c3
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ | | | | | | Change-Id: If737907012f3323519bfc37146393789c20bd4c7
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: I89f5a15f2af9d28081da05eccfde979252d80ca2
| | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-161-0/+20
| |/ | | | | | | | | | | | | | | + f072c959a055b6140297c1bb8deba746ce8c6b72 Remove unused license files + b1429b32ad3d687f43d7e528cadb95cc4e6f0c57 Bump version Change-Id: Icecf6d9995b7c1ebae62606bcbbf20f3db9f74f8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+24
|\ \ | | | | | | | | | Change-Id: I5511920b4c01fdc3cff14d0242957c2d269ba7ee
| * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.0Antti Kokko2018-10-311-0/+24
| | | | | | | | | | | | | | | | | | Change-Id: I419488e42977d62c748643b5bb59211f6e0359ac Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Remove wince check as it is not supportedOliver Wolff2018-11-221-1/+1
| | | | | | | | | | | | | | | Change-Id: I8ba795eaa9a92e7df3995ab2d2961a8d0a253a80 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I16a85230a5e0437e9d50109fe0077a2dcffcff5e
| * | Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I5c4e43a8d61c0dfcd410dd5bb6d496018677d703
* | | Fix jumplist example documentation snippetFriedemann Kleint2018-11-131-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update API. Fixes: QTBUG-71709 Change-Id: I21d5a78a0a9c124308b2341a61cb1e12bf689a4a Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Doc: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Task-number: QTBUG-67925 Change-Id: Iaad02ec87ec08babb04a1fffe034bf42d32c1d58 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Fix MinGW compiler warningsFriedemann Kleint2018-11-071-2/+2
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Change internal functions to be inline, fixing: qwinfunctions_p.h:75:17: warning: 'void QtDwmApiDll::setBooleanWindowAttribute(HWND, DWORD, bool)' defined but not used [-Wunused-function] static void setBooleanWindowAttribute(HWND hwnd, DWORD attribute, bool value) qwinfunctions_p.h:72:17: warning: 'bool QtDwmApiDll::booleanWindowAttribute(HWND, DWORD)' defined but not used [-Wunused-function] static bool booleanWindowAttribute(HWND hwnd, DWORD attribute) Change-Id: If61d35df92aa449c394f80b7a8ff722a10aa1fe8 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3Qt Forward Merge Bot2018-10-164-1667/+0
|\| | | | | | | Change-Id: I76630a180cadb7bded9a6055049eade98e5b54e4
| * Remove unused license filesKai Koehne2018-10-155-1689/+0
| | | | | | | | | | | | | | | | They got replaced by newer variants, and all the references to them in source code have been updated. Change-Id: Iaecad73f11816d3876d20082fdaf247cf8c35ec8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | 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: I3b0a5ea5dcf38fcd759ac6d694948c3818702b3c
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Ib952199289742fdc510790b3d6a7c8a4ed5c5c8a
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: Ie415303a0cd1fc930f6d81ff9d46d6600d321e73 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | 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>