summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a property to QSFPM to show children of accepted itemsGiulio Camuffo2020-05-263-8/+112
| | | | | | | | [ChangeLog][QtCore][QSortFilterProxyModel] Add a 'autoAcceptChildRows' property to always show children rows of accepted rows. Change-Id: I2402469ece438179d0f19888b9775cc27cf5c749 Reviewed-by: David Faure <david.faure@kdab.com>
* Fix QTabBar crash with offscreen platform pluginFilipe Azevedo2020-05-261-0/+2
| | | | | | | | | The offscreen implementation does not have a QPlatformNativeInterface implementation. Pick-to: 5.15 Change-Id: Ife4f296f52c307a2fab90de2cdc1ef0cc7796385 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* CMake: Write QT.XXX.depends entries into module pri filesJoerg Bornemann2020-05-251-7/+66
| | | | | | | | | | | | | | | | | Qt module targets now export the "_qt_config_module_name" property, which contains the module's name in qmake land. This can be different from the lower case target name (e.g. Test vs testlib). This exported property is used when retrieving the dependencies of a module outside of qtbase. The property's name is a bit odd and lower case, because we want to be able to set it on INTERFACE_LIBRARY targets, for instance header modules. This CMake pecularity is described in https://gitlab.kitware.com/cmake/cmake/issues/19261 Fixes: QTBUG-84287 Change-Id: I4a75af3ebeabebc56a0f77d464e45ab7fd81eafa Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix deprecation warning by not going through QCharVolker Hilsheimer2020-05-251-2/+2
| | | | | | | | | mValue is a QByteArray, so no need to expand data to UTF16 just to compare it to a Latin1 character. Change-Id: Ib3c8770867cd5509bb4c2ac5e45aabca577b3bba Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fix hellowindow exampleMichal Klocek2020-05-252-59/+30
| | | | | | | | | | | | | | | | | | | | It seems this example never worked as expected. It has a 'multiple' option which should show extra windows with rendering taking place in different thread, however although render is moved to other thread render() function was never called in that thread. Fix following things: * make rendering in other thread * stop requestUpdate if nothing is exposed * add timer so animation works at the same speed despite of number of windows (renderer B renders two windows) * wait for render to finish before triggering requestUdpate * remove mutex where not needed Pick-to: 5.15 Change-Id: I420436bd28d0357534332dd55b088d634d906c14 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix typo in documentation of QPlatformWindowMichal Klocek2020-05-251-2/+2
| | | | | | | | | QOpenGLWidget has backing store and does not really fit into doc's context. Change it QOpenGLWindow. Change-Id: I7f92e49497b8cc35d322b607c865c2914672ace3 Pick-to: 5.15 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* RHI: Introduce QRhiTexture::RG8VaL Doroshchuk2020-05-256-0/+41
| | | | | | Change-Id: I58f35b2629bd6464f08cba66e852215472fcbe2a Fixes: QTBUG-84384 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix RHI-GL mapping of DXT3/5 compressed texture format identifiersEirik Aavitsland2020-05-251-2/+2
| | | | | | | | DXT1 is BC1, but DXT3 is BC2 and DXT5 is BC3. Change-Id: Icb0ea4cc9efeab2453343753e9fda7f825c9b8d1 Pick-to: 5.15 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Remove last remainings of Qt Quick 1 importsKai Koehne2020-05-254-8/+0
| | | | | | | amends e1fd6074935cd0be0 Change-Id: I4587ae287635bc9718325a24bee728f1c1938978 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* xcb: Fix comments' indentationAlexander Volkov2020-05-253-3/+3
| | | | | Change-Id: Ic0a3e65dd1abc907f1941590ab042f785d90d91c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* allow definition of SP_LineEditClearButton in cssMartin Koller2020-05-252-0/+6
| | | | | | | Added the new css property lineedit-clear-button-icon Change-Id: I4596b923eb34325a73d0a80b72d963fd6204ea26 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Change QString::toIntegral_helper to use QStringViewLars Knoll2020-05-252-26/+25
| | | | | | | This implicitly makes it use qsizetype for the length. Change-Id: Ib39a5a8dd71e48b45179079f7c7fe5e4edbdb5eb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Cleanup header fileLars Knoll2020-05-251-104/+0
| | | | | | | | | Remove dead code Change-Id: I315f9ae2f098b1a7b72d7cd24161325822c62edd Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QVncScreen: fix crash on disconnect client did not request cursorRolf Eike Beer2020-05-251-0/+3
| | | | | | Change-Id: I758c79d87bd239b6fde9bae4e97c5b31450fa813 Pick-to: 5.15 5.12 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Remove qxmlstream from qmake compileLars Knoll2020-05-254-16/+1
| | | | | | | It's not used at all. Change-Id: Ia30befd497cc337221dfad89c201822b5bb7fd7c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* wasm: set status codes from network operationLorn Potter2020-05-252-9/+20
| | | | | | | Pick-to: 5.15 Fixes: QTBUG-83991 Change-Id: Ie1e88189bee8b6a9dc6cb2a721777a5e1032307a Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* wasm: fix heap crash when making multiple network callsLorn Potter2020-05-252-20/+23
| | | | | | | Pick-to: 5.15 Task-number: QTBUG-83991 Change-Id: I354934b53799f3eeb958395932bed18289b1e279 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Windows: Fix wrong DPI used in font size after changing scalingFriedemann Kleint2020-05-253-12/+15
| | | | | | | | | | | | | | | | | QWindowsFontDatabase::defaultVerticalDPI(), which was used for converting the point sizes was missing an updating logic for scaling changes. When implementing it, it turned out that the value obtained from GetDC(0) does not adapt to scaling changes. Remove the function and set it from the screen manager directly to the DPI of the primary screen. Pick-to: 5.15 Task-number: QTBUG-82267 Change-Id: If05ebc893fe78a9461500aba97f2dc127cdf4406 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Blacklist imageAtRightAlignedTab in CentOSHeikki Halmet2020-05-251-0/+1
| | | | | | Task-number: QTBUG-46206 Change-Id: I98add304d052f3fc5c0ab80077ba66e8e159748e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* BLACKLIST test_Gestures tests for new platformsHeikki Halmet2020-05-251-1/+11
| | | | | | Task-number: QTBUG-84258 Change-Id: I4722444ffd8a9b1ebc262a424778a19704881832 Reviewed-by: Liang Qi <liang.qi@qt.io>
* BLACKLIST QWidget tests for CentOSHeikki Halmet2020-05-251-0/+2
| | | | | | | | | Tests focusProxyAndInputMethods and multipleToplevelFocusCheck will be blacklisted Task-number: QTBUG-84259 Change-Id: I7d5baf1e700192eed3c7c8dcfe671e247f11b8c7 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Blacklist tst_QTimer::zeroTimer on Ubuntu 20.04Tony Sarajärvi2020-05-251-0/+2
| | | | | | Task-number: QTBUG-84291 Change-Id: I198cfe813617a5bb65b0e1059a43b6933d610720 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Blacklist tst_qfont tests on new platformsTony Sarajärvi2020-05-251-0/+6
| | | | | | Task-number: QTBUG-84248 Change-Id: I5285a12a9f1feaf748fc1734f122473c02d115e5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Remove references to deleted file shift-jis.txtKari Oikarinen2020-05-242-2/+0
| | | | | | | Amends 33bb695a2895fb7199b256a4fd76923c32a8587a. Change-Id: I7a7d90dc406ffbf015e760a7c41534564bfbe13e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QItemSelectionModel: simplify QItemSelectionRangeChristian Ehrlicher2020-05-232-31/+1
| | | | | | | | Simplify QItemSelectionRange by removing the unneeded user-defined functions - the compiler can generate them by it's own. Change-Id: I49c00f937df98bb1ad18057b7bae7a0e06919909 Reviewed-by: David Faure <david.faure@kdab.com>
* QListWidget: remove unused memberChristian Ehrlicher2020-05-231-1/+0
| | | | | | | Remove the 'dummy' member - it's not needed since ages. Change-Id: I4869cf9153c892ea065340335ff7accd529a79c6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Models: remove version check for clearItemData()Christian Ehrlicher2020-05-236-24/+1
| | | | | | | The version checks for clearItemData() are no longer needed now. Change-Id: I5052188fb96cf637128662f3442d339820f0f41d Reviewed-by: David Faure <david.faure@kdab.com>
* Examples/RegularExpressionDialog: remove deprecated optionsChristian Ehrlicher2020-05-232-13/+0
| | | | | | | | | Remove the two deprecated (and non-functional) options OptimizeOnFirstUsageOption and DontAutomaticallyOptimizeOption. Change-Id: Id5191cee84bf7b1ae65f828a981f93d98db23f53 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Android: Fix RESOURCES for Android MultiAbIBogDan Vatra2020-05-221-1/+1
| | | | | | Pick-to: 5.15 Change-Id: I57560f51115ae560e3133096f402c6c9735f15a6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* QSslCertificate: overhaul ASN.1 datetime parsingGiuseppe D'Angelo2020-05-223-45/+66
| | | | | | | | | | Instead of manual string splitting (EW!), use QDateTime parsing. Moreover, X.509 certificates *must* have a valid start/end date. In case of parsing failure, reject the certificate. An autotest for this last case is coming in a separate patch. Change-Id: I934bf9e6a4a92e4befdb3b0f9450f76f67bad067 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Move QtVulkanSupport into QtGui and QtOpenGLTor Arne Vestbø2020-05-2232-126/+34
| | | | | | Task-number: QTBUG-83255 Change-Id: Ib021cecebda89fa2ab9332752124a8cec0a51a10 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Licenses: Remove reference to change in Qt 5.4Kai Koehne2020-05-2210-30/+20
| | | | | | | Qt 5.4 is not documented anymore since quite some time. Change-Id: I6811ead502178f7acbed8cf450e42d7fd33ae29b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* RHI: facilitate compressed atlas textures in gles2 backendEirik Aavitsland2020-05-224-5/+29
| | | | | | | | | | | | | | | Since glCompressedTexImage2D() does not allow zero data, it could not be executed during texture build. Instead it would be done during the first subresource upload. This made atlasing clumsy, since one had to introduce a fake upload of the full texture size before the subtexture uploads. This commits lets the gles2 backend deal with that instead. Introduces the UsedAsCompressedAtlas QRhiTexture::Flag for opting in to this behavior. Task-number: QTBUG-78582 Change-Id: Ib6e4ea637c62cc8a51bd9a4a06e59882f335f2a7 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* RHI: Store texture handle as 64-bit intEskil Abrahamsen Blomfeldt2020-05-228-35/+27
| | | | | | | | | | | | | | | | | | When storing a void* pointer to the texture handle, we had to ensure that the variable would exist until the build phase, which is error prone and caused errors in QQuickWidget because we copied the texture ID from the FBO into a local variable before passing it into QQuickWindow::setRenderTarget(). The reason for using a void* was that we cannot know the width of the handles in the different backends, but we do know that they are 64-bit at maximum, so instead of storing potentially dangling pointers, we just make it a 64-bit integer and cast it back and forth in the backends. Task-number: QTBUG-78638 Change-Id: I7951e24351ddb209045ab6197d81eb1290b4da67 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Windows QPA: Fix deprecated QString::fromUtf16(ushort*) callFriedemann Kleint2020-05-221-1/+1
| | | | | | | Amends 23849826b490c07d9ba656bcb4ac46edd3040c0a. Change-Id: Iefd29bd4c19aaf7c4444b2913bd143dc11c03d3c Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Move QRasterBackingStore to QtGuiTor Arne Vestbø2020-05-2116-53/+16
| | | | | | Task-number: QTBUG-83255 Change-Id: I339173de6e109c5a9b9572972ba894c15053c034 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Adjust resize() behavior of QString and QByteArray to match Qt 5Lars Knoll2020-05-214-27/+13
| | | | | | | | | | | | | resize() to a smaller size does not reallocate in Qt 5 if the container is not shared. Match this here. As a drive-by also fix resize calls on raw data strings to ensure they are null terminated after the resize. Change-Id: Ic4d8830e86ed3f247020d7ece3217cebd344ae96 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Move QMacInternalPasteboardMime to QtGuiTor Arne Vestbø2020-05-2119-64/+30
| | | | | | Task-number: QTBUG-83255 Change-Id: I00fda24479ad2c04781c5fefaa15fac1118033a8 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Add missing overrideAlexander Volkov2020-05-2112-87/+87
| | | | | | Change-Id: I88000e82ecbdc55e621dc8e22aff5e8f55cf9d0e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QSslSocket::addCaCertificates - do not duplicate certsTimur Pocheptsov2020-05-201-2/+2
| | | | | | | | | If we already know the certificate, there is no need in adding it again. This function is deprecated, but will stay forever in 5.15. Pick-to: 5.15 Change-Id: I760f5bcffea78ac02c5643ee1112725edd32f15a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Make OpenSSL back-end work with 3.0 alphaTimur Pocheptsov2020-05-206-20/+112
| | | | | | | | | | | | | | DSA/DH/etc _bits functions were first deprecated, then un-deprecated, so we don't worry about them for now. SSL_CTX_load_verify_location was deprecated and two new functions were introduced instead (one using file, the second - path). It's unfortunately 3.0 only, so we have to check OpenSSL version. DH_check is deprecated and we have to use EVP_PKEY_param_check with tons of a boilerplate code around. Fixes: QTBUG-83733 Pick-to: 5.15 Change-Id: Icd401ab6aad30c23c37443c7bc82c702fb843640 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Revert "CMake: Don't create *Depends header for header-only modules"Joerg Bornemann2020-05-202-9/+3
| | | | | | | | | | | | This reverts commit e875f458055d6a7b54d2d853590ccc2495ab145b. Reason for revert: syncqt creates a master header that includes the *Depends header. Therefore we must always create the *Depends header. Ignore for now that *Depends headers are empty and pointless for module headers. Change-Id: I1dcc836788b3d46c4f1b504d2d64e9eb67b66206 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Hot fix for Ninja Multi-Config with MSVC and OpenSSLJoerg Bornemann2020-05-201-1/+6
| | | | | | | | | | | For now, we have to turn off the 3rdparty lib generation code for qt_lib_XXX.pri files, because it's broken for NMC if the 3rdparty libraries have different binaries per config. The actual fix is more involved. Task-number: QTBUG-84348 Change-Id: I863e69085b68c0dbbb3f6c415111bc255799e155 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Move qt_lib_XXX.pri generation to module finalizerJoerg Bornemann2020-05-201-18/+21
| | | | | | | | | | | | Introduce a qt_finalize_module function that is called as a CMakeLists.txt finalizer and call qt_generate_module_pri from there. This is done in preparation for writing the QT.XXX.depends entries to the module pri files, because we must do this after all dependencies have been added. Change-Id: Ia61db73383541651389fd647523ef535792874d4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Extend QTypeInfoMerger to more than four argumentsMarc Mutz2020-05-191-15/+11
| | | | | | | | | | | Use template argument pack and C++17 fold expressions. Because MSVC doesn't grok fold expressions in enumerator-definition contexts, use static constexpr bool variables. Change-Id: I13a676d9be687679ef41f7b003e50116c4cd533c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Sweep Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 -> Q_DECLARE_SHAREDMarc Mutz2020-05-1921-24/+24
| | | | | | | | | | | | This is Qt 6, so Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 is the same as Q_DECLARE_SHARED. Let's hope we'll collectively get better at detecting missing Q_DECLARE_SHARED so we won't need a Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT7 in the future. Change-Id: I3da9faff4c66b64a3b257309012a2a10a6c6d027 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Android: Only have one valid QMimeData object kept aroundAndy Shaw2020-05-192-4/+13
| | | | | | | | | | | | Once the clipboard data is queried then we can clean up the previous QMimeData object created. So rather than keeping on to it and cleaning up when the clipboard is created we can delete it at that point. This means it is not necessary to make it a QObject subclass, so we can save in that respect too. Pick-to: 5.15 Change-Id: I152ca6ea5c713abe25f75ca2016759c0e3152bfb Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: Clear the m_selectedFile variable when showing againAndy Shaw2020-05-191-0/+2
| | | | | | | | | | Since the helper is being reused then the m_selectedFile variable should be cleared, otherwise it ends up appending the new result to the old one. Change-Id: I72c24409dc91f91bad55a7da2772605f03fb4623 Pick-to: 5.15 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Fuzzing: Add fuzz target for QImage::loadFromDataRobert Loehning2020-05-192-0/+55
| | | | | | | Pick-to: 5.15 Change-Id: Ie67eb9be80fe42d463c566c728c73c9c92c2081b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* CMake: Use provided OUTPUT_DIRECTORY for manual tests and benchmarksAlexandru Croitor2020-05-191-2/+10
| | | | | | | | If an OUTPUT_DIRECTORY option is provided, it should be used instead of discarding it. Change-Id: Ie53b56616f16589f7c05ff9378d7ba2e2ba34726 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 13:23:40 +0000