aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix various clang warningsFriedemann Kleint2019-06-046-24/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Use static QFileInfo::exists() - Fix else after return/break - Use Q_ENUM Change-Id: I08d5b48224e5b43c795929765b4ab4c0b137224f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Replace typedef by 'using' or QOverloadFriedemann Kleint2019-06-042-6/+5
| | | | | | | | | | | | | | | | | | | | | Fix clang warnings about typedef. Change-Id: Ife4540cd114566af7822af8f6d3d4d991d1194de Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Introduce nullptrFriedemann Kleint2019-06-0527-111/+108
| | | | | | | | | | | | | | | | | | | | | | | | Apply Fixits by Qt Creator. Introduce more member initialization. Change-Id: I81c6860188f0e1592c4df2435ff7f91500456741 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Fix clang warnings about class definitionsFriedemann Kleint2019-06-0416-45/+30
| | | | | | | | | | | | | | | | | | | | | | | | Use member initialization, add override, use "= default" for trivial constructors and destructors. Change-Id: I30f64f3d39c1656d52e21653f75935e5c41bca71 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-231-0/+20
|\| | | | | | | | | | | Change-Id: I5b42e9901f2860ae24e82c6709c1c450a4c7e9ec
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
| |\| | | | | | | | | | Change-Id: I2a50666ac8fb52c52a7c4f19c0b55375d2b3043a
| | * 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>
* | | Add a manual test for the image conversion functions.Friedemann Kleint2019-04-023-1/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a small application that converts a QImage into a HBITMAP and draws it onto a native window. Task-number: QTBUG-51124 Change-Id: I5f5de81559941cb1640ef31c4d42d9904c91662c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-300-0/+0
|\| | | | | | | | | | | Change-Id: Ib5331bce565ab89ed8ab2beae76aac8473172861
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia0585cba89bf08b3a12413f49fd65d5a63c2c34a
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: Icfca8a5b11f06a836a56ed7b4380f65ebb95122c
* | | Fix type of the out parameter "result" of the native event filtersFriedemann Kleint2019-03-254-2/+18
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-72968 Change-Id: Icd05b0c55dca2d585e93a8b2a4214f244ee6b4f4 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-191-0/+20
|\| | | | | | | | | | | Change-Id: Ib3a2529a12308b0c847270e64fd0b28f60582549
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
| |\| | | | | | | | | | Change-Id: I00b36e7f55117c211bb11f2a7d5c29a318326b94
| | * 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.13' into devQt Forward Merge Bot2019-03-051-156/+2
|\| | | | | | | | | | | Change-Id: I3411ee1a664bf8242cfd2e9c09505048f8f70a54
| * | Update plugins.qmltypes for Qt 5.13v5.13.0-beta1Kai Koehne2019-02-261-156/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: Ied9f66aec094ff51de2529c1a27f0250a06d7a0e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-263-2/+10
|\| | | | | | | | | | | Change-Id: If00e3d93c6448b8feb7df619cffb778ba136e3db
| * | Make QML import available under 1.QT_MINOR_VERSIONFriedemann Kleint2019-02-253-2/+10
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-74038 Change-Id: I7e48806bc99bbfc0a5df6db9610e1a4de831ae1f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: Ie7eb8472e13a3b23476eb16b271541bb34fe0d45
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-121-0/+20
|\| | | | | | | | | | | Change-Id: Iee3b078a7dda89bd3021c0f5e25ff71b79e9b932
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-091-0/+20
|/| | | |/ | | | | Change-Id: I9e980583d10df1d0bc7dccc123cf3a9c39c75a62
| * 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>
* | | Merge remote-tracking branch 'origin/5.12' into devv5.13.0-alpha1Qt Forward Merge Bot2019-01-301-0/+1
|\| | | | | | | | | | | Change-Id: I59bb74d2b39aaada63a364a00c1ccff31b13ca2a
| * | 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3d7d18f4dee2db6d5aa5f9afe40097cd5d88ce0d
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ | | | | | | Change-Id: I624743c0b45d7779b6955c4551d513069b07f2e9
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I310b219eedd45d40ac5df234410b870071dc2eed
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: If9b81746fd86b7a1a21bdbbcc01eb73e917f96c3
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\| | | | | | | Change-Id: Ia3a085370bd1ba93324b70f585c73b8fd124308d
| * 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' into devQt Forward Merge Bot2018-12-081-0/+24
|\| | | | | | | | | | | Change-Id: I1a77b3b993e40b489ef4f050926d1bb62418e07c
| * | 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>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-241-1/+1
|\| | | | | | | | | | | | | | | Change-Id: Id45b758597aa90a66ee816fdee314dab822e3bad
| * | | 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.12' into devQt Forward Merge Bot2018-11-171-7/+4
|\| | | | | | | | | | | | | | | Change-Id: I7c4ca827555092c690a0accac4b800db968b7e9a
| * | | 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>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-103-4/+4
|\| | | | | | | | | | | | | | | Change-Id: I3c7d7bcca17e8fd21461ab721ec8efcb0ca2e91c
| * | | 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.12' into devQt Forward Merge Bot2018-10-204-1667/+0
|\| | | | | | | | | | | Change-Id: I0b08d7fcafceabfd849ca7f640648a5c91631779
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3Qt Forward Merge Bot2018-10-164-1667/+0
| |\| | | | | | | | | | Change-Id: I76630a180cadb7bded9a6055049eade98e5b54e4