aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove module and add note about current status in Qt 6HEADdevTor Arne Vestbø2021-06-07248-20875/+30
| | | | | | | | | | | | | | See QTBUG-89564 for overview and replacements for the APIs. The Qt 6 porting guide will be updated to explain how to move away from the removed module. The 5.15 branch is still available for anyone wanting to look at or incorporate code in their own projects. Task-number: QTBUG-89564 Change-Id: I1f0afc5ba3e694623fbbb51f10967321e81f32c9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Bump versionJani Heikkinen2021-05-242-2/+2
| | | | Change-Id: Id3b8b489729f9843aac2142cbd5f0f40facd9c65
* Remove deprecated functionsYuhang Zhao2020-11-3019-195/+18
| | | | | | | | | | | | | | | | | According to Microsoft's documentation, DwmIsCompositionEnabled() will always return true since Windows 8 [1]. And the DWM composition can't be disabled programmatically since Windows 8 as well [2]. Since Qt 6 will only support Windows 10, it's apparently these two functions and their usages are totally useless. [1] https://docs.microsoft.com/en-us/windows/win32/api/dwmapi/nf-dwmapi-dwmiscompositionenabled [2] https://docs.microsoft.com/en-us/windows/win32/api/dwmapi/nf-dwmapi-dwmenablecomposition Change-Id: Ia4040118b719fa8edd8504f9112fbe7e3844e0fa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix deprecation warningYuhang Zhao2020-11-273-4/+4
| | | | | | | | Use QMetaType instead of QVariant to silence deprecation warnings. Change-Id: I6628db7215601b1bd14915a5db970fa86e9234a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove some of deprecated QVariant::TypeFriedemann Kleint2020-11-202-19/+20
| | | | | Change-Id: If3bf95e1c5359c50aa64c9174e12166f23d9d24b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependenciesFriedemann Kleint2020-11-197-14/+20
| | | | | | | Adapt to changed parameters of QQmlListProperty. Change-Id: I122993334981f137968f8f9260e456058f1e4ab1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependenciesFriedemann Kleint2020-11-023-5/+5
| | | | | | | Fix deprecation warnings about QKeySequence. Change-Id: I37d40ee3e5e12a6ade0ccc6317c17ba56ef8b6c7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix compilation with -no-qml-networkFriedemann Kleint2020-10-202-14/+27
| | | | | | | | | Add some #ifdefs, rearrange includes. Pick-to: 5.15 Fixes: QTBUG-87694 Change-Id: Id66b3e62e75873472a3fb7cf57457ace55c18961 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update dependenciesFriedemann Kleint2020-10-201-2/+2
| | | | | Change-Id: I944b891a12a66bfb58d1ebe71b18594764af9361 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* CMake: Add missing .cmake.conf fileAlexandru Croitor2020-09-071-0/+1
| | | | | | | | | Amends a25e455017fefef310642c6f33da4b8fd9ece4d2 Task-number: QTBUG-86454 Change-Id: Ia7bd45c1b8034ce3d42e09f8b7a5055113da7eb1 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | + ed12055dcc8c089bfe88b08842d2f16dd266545c Bump version Change-Id: I44bae61ed0aaed4452438f969c6d5a430cc742d9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 922750e68d1a5967b4bdfef7072779f8c375eafa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the CMakeList.txt of the manual testsFriedemann Kleint2020-08-178-4/+82
| | | | | | | | Amends a25e455017fefef310642c6f33da4b8fd9ece4d2. Task-number: QTBUG-78164 Change-Id: I85c6215b07f13fe621d544c8fc8c926cc78332ec Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Enable enforcing CI testsAlexandru Croitor2020-08-131-9/+8
| | | | | | | | | Any failing tests in CMake configurations will now prevent integrations to go through in this repository. Task-number: QTBUG-84886 Change-Id: I48614c2cfff615542866367b979b76a6d9e4d585 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove QWinMimeFriedemann Kleint2020-07-289-422/+3
| | | | | | | | | | | QWinMime extends the newly added QWindowsMime by the functionality to register/unregister automatically in the constructor, destructor. There is no good way of porting though since it would inherit from a so-far private class. Remove it instead. Task-number: QTBUG-83252 Change-Id: I2d43ad3c29bea328cee5274ea9c87f593695e346 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Update CMakeLists.txtFriedemann Kleint2020-07-2815-41/+35
| | | | | | Task-number: QTBUG-78164 Change-Id: I05e099c3bb42ee8b3016473e73277db330832b99 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Merge remote-tracking branch 'origin/wip/cmake' into devFriedemann Kleint2020-07-2829-0/+613
|\ | | | | | | | | | | Task-number: QTBUG-83252 Task-number: QTBUG-78164 Change-Id: I0adb9c5ae6b125772ad495aadaf5e7e51da8aa88
| * Regenerate projectswip/cmakeAlexandru Croitor2019-11-1517-28/+22
| | | | | | | | | | | | Change-Id: Ib0291161ac908669b3add762a62df188f3f1b826 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Port qtwinextras to CMakeFriedemann Kleint2019-10-0229-0/+619
| | | | | | | | | | | | | | | | Task-number: QTBUG-78164 Change-Id: I78109822b52f36a97d0a968ca5e7fb02c2b7eb28 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix compilation after moving the QRegion conversion functionsFriedemann Kleint2020-07-242-41/+12
| | | | | | | | | | | | | | | | Temporarily remove Multimedia. Task-number: QTBUG-81876 Change-Id: Ic701110cae007fc87dd00ce7bb6dfff7dd8ab057 Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* | Add a function to change non-client area rendering policyYuhang Zhao2020-07-2310-15/+252
| | | | | | | | | | | | | | Documentation and a manual test are added at the same time. Change-Id: I1e70e9b01fb13d0e67559024531f9ad015849032 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Use QList instead of QVectorJarek Kobus2020-06-2920-44/+43
| | | | | | | | | | | | Task-number: QTBUG-84469 Change-Id: I458409460d6b3009e3e846d0472af91a039f042d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-141-0/+18
|\ \ | | | | | | | | | Change-Id: I5d8aee4935e66f8eac35b57ed56c9b659b574d81
| * \ Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
| |\ \ | | | | | | | | | | | | Change-Id: Ieccdad81ad056f271529e437c53f012774f6579e
| | * \ 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: I9eff3b10be0b1cd6b62d08b4039e6390a8048a13
| | * | Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 23fb8fa7d3894d5f93ec5d51461e1366274a0c0b Bump version + 98fea3ae261313b88cb3f67c7f9d3368e635cd51 Reduce QList usage + c23dcca0a0d768f87c1fa164380f1028ce1ee43d Use UTF-16 literals where possible + ed91358ec20bb96fe2eff1b9dfaf772c9b1dba5d Use QNetworkReply::networkError() instead of deprecated error() + d5310efd2fbbe9786a4257f3ada78381cb54da23 Revert "Use QNetworkReply::networkError() instead of deprecated error()" Change-Id: I8237732432111f4594e0ae4252e732fe91d863e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\| | | | | | | | | | | | | | | Change-Id: Id2351076789345c96adad4a1f03dd8194a3a24d0
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ \ | | |/ / | |/| | | | | | Change-Id: Ia7342226c20223daf89ec3691a2c62c046ecb2a5
| | * | Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I8188351860e4b355ce4acbef55ae3e76466c195c
| | | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 9beac3cc9bcb1806ad1f8118a70467c122b9e938 Bump version + 0d5ce87e1aeaed361c8d034e8329c0ceca62e42a Remove confusing documentation Change-Id: I2e62e1d75750adeb18f06e44d3e26ab5de487ff2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-042-3/+23
|\| | | | | | | | | | | | | | | Change-Id: I23708710d36138da8b3eb67619cb456015639050
| * | | Revert "Use QNetworkReply::networkError() instead of deprecated error()"v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Timur Pocheptsov2020-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ed91358ec20bb96fe2eff1b9dfaf772c9b1dba5d. Naming in QProcess is considered to be the correct one and the rule. Change-Id: Iaca8e2661454ace9f73b0fbbae0bf429153f0268 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-181-3/+3
| |\| | | | | | | | | | | | | | Change-Id: Ib98519d9d455d072e47c85cabd60d2e20cb28325
| | * | Remove confusing documentationYuhang Zhao2020-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWin::extendFrameIntoClientArea: You should set Qt::WA_NoSystemBackground for it to work QtWin::resetExtendedFrame: You must unset Qt::WA_NoSystemBackground for it to work Actual result: Set Qt::WA_NoSystemBackground and then call QtWin::extendFrameIntoClientArea results in a black window. So the documentation of QtWin::resetExtendedFrame is correct. Fixes: QTBUG-81831 Change-Id: I0fafb7049d65fa22eeb1b167a6227042f2fefe73 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I00344b079aeeeac0528f1206ec22a206e482015b
| | * | Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I57c95c00c9e1a2f8e1ce8f34dd863bc4060f6472
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| |\| | | | | | | | | | | | | | Change-Id: Ifc7ee2e0a9c4d2587286c0e850b70788b2d980e2
| | * | Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I8162b398fcdb68875dfafb7416a5120b263238e3
| | | * | Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | + f2dde34d7d97616e027d7e37c7d6ef098723c2a1 Bump version Change-Id: I7441a4780e7546529c16f5b769bd3d900f627122 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Use QNetworkReply::networkError() instead of deprecated error()Timur Pocheptsov2020-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-80369 Change-Id: I9bd16bd0a1bd7a306622db03e012eb408e4bc6ea Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | | Update dependenciesVolker Hilsheimer2020-03-314-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix includes for QAction and QShortcut after move in qtbase, and fix unrelated build issues. Change-Id: Iec6d80e689358cc8fb2b6fe3c1302c58970d8920 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\| | | | | | | | | | | | | | | Change-Id: Ic6db0dd1e38de2dd4fdacda0f353ffc807f500d2
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I257eab9474deaac5fec271bbd28fe9cc4ded7d72
| | * | Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | | | | | | | | | Change-Id: Id1549cff6ee954aff96f7f92116e612dd1c0ca83
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-171-0/+18
|\| | | | | | | | | | | | | | | Change-Id: I7bd55f34f3bba326b77c2f26b3ebe167e815dcc1
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
| |\| | | | | | | | | | | | | | Change-Id: Ie8658751efc8bd9426eb98ac8b6a4ea2c4f1f230
| | * | Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| | |\ \ | | | | | | | | | | | | | | | Change-Id: If54b6799b82707813d3eabcf0ec69964f6c4da31
| | | * | Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-261-0/+18
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I979210b94548cd9ccc95ae9ade9fa3e420f9413a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | Update dependencies on 'dev' in qt/qtwinextrasQt Submodule Update Bot2019-12-051-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I676b1fae16b78b07c9296fd33bc3b3beca7e7ad0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtwinextrasQt Submodule Update Bot2019-12-041-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I5fee22ee58342562f5f5bdd3b79779c41528ebda Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-038-21/+21
|\| | | | | | | | | | | | | | | Change-Id: I8c87a5531b4af802206ee21bf65bb14897c86534