summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* tracegen: Add common prologueAntti Määttä2023-04-265-0/+15
| | | | | | | | | | | Add common prologue and add error message when tracing is used in a module that doesn't have Q_TRACEPOINT enabled, but tracing is enabled. Change-Id: I64ca074942f6e89b4f5b5e3b6048b2b713c06df8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> (cherry picked from commit 257b3161c5c5e46cd040371da77cb6a06987cf50) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Create unique names for QSize and QRect types for lttngAntti Määttä2023-04-261-12/+12
| | | | | | | | | Task-number: QTBUG-113161 Change-Id: Icc47af16b73dd9ad4e203c3bd55833587435be5c Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> (cherry picked from commit 346dcc696bb2b1431a3a38f8d830d030334f1924) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_QCoreApplication: ensure that theMainThread has expected statesThiago Macieira2023-04-262-3/+38
| | | | | | | | | | | | | | | | | | | The expected states are: - nothing sets theMainThread before main() - theMainThread is reset when the last QObject (the QCoreApplication in the test) is destroyed The GUI version of this test appears to leak a lot of QObjects. By the time this function runs, theMainThread's QThreadData still has a refcount of 66 on Linux/XCB. The Windows non-GUI version also failed. Neither situation was investigated to see why objects are getting leaked. Change-Id: Idd5e1bb52be047d7b4fffffd17507d9e6ef08743 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b9394b48c1b42e0ef834315ca4f89161a5c12ae7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add Qt icon library for examplesKimmo Leppälä2023-04-26157-0/+214
| | | | | | | | | | | | | Icon library for file and text operations. This is private library to be used with Qt examples. Instructions on usage found in README file. Task-number: QTBUG-110428 Change-Id: I762503c74aecc3a8efbf25877628cb8e85efe414 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 9c0e0e39f0a8a32feacd4bed4b006cadbeadb2b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QProcess/Unix: don't overwrite openChannels() error messageThiago Macieira2023-04-261-2/+6
| | | | | | | | Change-Id: Icfe44ecf285a480fafe4fffd174d0fa4701b0076 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 956b2495285251e4840ec32885ffa2cfbb7bd79c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QCommandLineParser: fix some narrowing conversion warningsAhmad Samir2023-04-251-15/+15
| | | | | | | | Drive-by change: use auto for iterator types. Change-Id: I463f24890ee58a97e585a0596aed55543285b0a0 Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit 39c191d003b2665337f562fd902499e7053cf92c)
* QEvent: fix a narrowing conversion warningAhmad Samir2023-04-251-8/+15
| | | | | | | | | By using an iterator-based for loop. Change-Id: I9ae12f16bc2a5c2d74c8557a0324438102fec5b1 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 0d26db57375d0f2819a4999890f61d66d733b879)
* Misc.: Fix some narrowing integral conversion warningsAhmad Samir2023-04-2518-41/+38
| | | | | | | | Drive-by change: use QByteArrayView instead of allocating a QByteArray. Change-Id: Iaf7acbbdb4efbb101b73b30061ce38dd1fa99ca3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 4538bbf4a68a80f09cad8749a2b05bfb8ce4290c)
* QEventDispatcherGlib: fix some narrowing conversion warningsAhmad Samir2023-04-251-3/+2
| | | | | | | | | "notifier->socket()" returns qint64, but sockfd should be int, because pollfd.fd is a gint (aka int). Change-Id: If6618aa5e652d4284b989352d61a28b605106d09 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit d8a688adf01e2750fd4012de4b8966901630f574)
* wasm: rework local font supportMorten Sørvig2023-04-252-94/+127
| | | | | | | | | | | | | | | Populate a subset of the font families at startup if the local fonts access API is supported, and the access permission has been given. Since this code runs at app startup there is no opportunity to request font access. That should be done in response to user action, for example by having a "load local fonts" button in the application. Change-Id: Ib6826deeec06ee3def0e793dd1462977710462be Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io> Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io> (cherry picked from commit 15dab565d071455ef08d6bf4ad4980f726df1cfa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Support float_type arrays when using lttngHatem ElKharashy2023-04-251-2/+13
| | | | | | | | | | | | | | lttng ctf_array does not support float types which causes compilation error when a float type is passed to the function. A solution is to pass the array elements one by one to TP_FIELDS. Fixes: QTBUG-112761 Change-Id: I30e7049d9eda1141298145897df372213145c1b4 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> (cherry picked from commit c10c66e552e3ab19758709e84bac187cda27962c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove an unnecessary None definitionAmir Masoud Abdol2023-04-251-9/+2
| | | | | | | | | | We should be able to just pass `0L` and avoid defining a None macro. Change-Id: I513d726120454523627a1e66515a5a533c0238b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit eec5a016d35197726ba34fc759ab2e24bdbd37f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Windows QPA: Fix restore geometry after dragging from maximisedTimothée Keller2023-04-253-0/+26
| | | | | | | | | | | | | | Start tracking the window geometry before a mouse drag, so that we can revert back to that geometry when we restore from maximised. Previously, when dragging from maximised to maximised, the restore geometry would end up being the final drag place before snapping to maximised, instead of where the window was before the first maximised. Fixes: QTBUG-112814 Change-Id: Ic2ddf29d6c4abdc9e8b0c5161b17aa6ee9474ea3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 21e411687428d05655b8db2634466384fa35cc03) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Exclude files from unity build"Thiago Macieira2023-04-251-8/+0
| | | | | | | | | | | | | | | | This reverts commit e0cec08480ab6a453e62b76666d5e24bef4f2ab0. Reason for revert: this can't possibly be the correct solution. It set properties in headers (not .cpp sources) and headers can't cause a build issue because they aren't built. Moreover, the problems were seen in another module, so the properties set in those files shouldn't even be visible to CMake. Change-Id: I8473bb819e768bd203f89034d18132186da0371c Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 0198611fd4505c617c004a418a75b17a44adeb00) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Copy memory to buffer when saving files on wasm with threading onMikolaj Boc2023-04-251-4/+28
| | | | | | | | | | | | | | | | wasm heap uses a shared array buffer, which cannot be fed to FileSystemWritableFileStream.write due to security limitations. Heap memory has to be copied to a temporary buffer for the operation to succeed. This is only done if __EMSCRIPTEN_SHARED_MEMORY__ is on to optimize the non-threading path. Fixes: QTBUG-112881 Change-Id: I0d117a8703caf4c17abc67b30df5248a53406d5f Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit d09855ae7b347aaaebb4e9dc5a78ecef6d8fd62e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Tune textures example to work with wasm and update docsLaszlo Agocs2023-04-252-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Old examples inherited from Qt 4 tend to set some state, such as enabling the depth test or culling, in initializeGL(). Newer examples tend not to do this; they rather set the necessary state in paintGL(). This mattered little (or not at all) in the past, but with WebAssembly and WebGL there are limitations in the GL context management in the wasm platform plugin. Under certain conditions, esp. when QOffscreenSurface is involved, it looks like the same native context gets reused, which means there is a chance of unexpected changes to the current state between calls to initializeGL() and paintGL(). (and also between paintGL() calls) See QWasmOpenGLContext for details. Update the textures example the same way we did for the cube one. Add a note to the QOpenGLWidget docs about this problem. Task-number: QTBUG-111304 Change-Id: I29d2b2cdeb07bcecc5dc915d79c12b4323ca9ab3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Inho Lee <inho.lee@qt.io> (cherry picked from commit 5ebb9a8bf357b435a9d9cf56ae018f552c96d03c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix issues in CMake command docsLeena Miettinen2023-04-256-29/+30
| | | | | | | | | | | | | - qt_finalize_target missed a reference to qt_add_plugin() - qt_generate_deploy_app_script is also supported on Linux - Use simplers examples for QT_DEPLOY_SUPPORT and qt_standard_project_setup() Task-number: QTBUG-113116 Change-Id: If6bfd01b9615a73ab1bafddee350e49f6902a6c0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ab4125685ab60b3c061ec9e796133ee3ef268332) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* gl: Check for image validity in readbackLaszlo Agocs2023-04-251-6/+12
| | | | | | | | | | | | Returning a null QImage is preferable over passing a null bits() to glReadPixels. (matters when QImage's malloc() gives null, thus 'd' is null -> isNull() == true) Fixes: QTBUG-113127 Change-Id: Ieca4d91eefdea47da5251dabe77cc31b48eb0e28 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 11209cfde68e9b8b8722859c690e57c7d6e8a338) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Windows QPA: Handle DPI induced geometry change for frameless windowsTimothée Keller2023-04-251-0/+5
| | | | | | | | | | | | Make a manual call to the geometry change handling function after a WM_DPICHANGED event if the window is frameless, since WM_SIZE and WM_MOVE will not be called. Fixes: QTBUG-109429 Change-Id: I79b9f386fe120ee3d06d6490d3f31a7a5d7121b0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit e86fcae22144236258ad5d82eeb6b20b557e3981) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qxmlstream: remove dependency on QtXmlMarc Mutz2023-04-251-1/+0
| | | | | | | | | | | | QtXml is only DOM and SAX, not QXmlStreamReader/Writer (those are in QtCore). Change-Id: I8454d7db90303d347d5b4be94c9f21401d1e273f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io> (cherry picked from commit efd9e3a02b6dea99d09d563c080d0873619ed792) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Exclude licensing header when including a .qdocincTopi Reinio2023-04-253-2/+4
| | | | | | | | | | | | | | The \include command includes the source in its entirety when the second parameter is omitted. This pulled in also the license header which was visible in the generated documentation. Add snippet tags and use them to extract only the content we need. Fixes: QTBUG-113138 Change-Id: Ie3fe2fede1e81d08201ec4353352ef069aebc388 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 4fc3f0c159dac617e9e32367127332de19a84026) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change to darkmode is prevented at runtine in VistastyleWladimir Leuschner2023-04-251-2/+1
| | | | | | | | | | Task-number: QTBUG-112965 Task-number: QTBUG-113036 Change-Id: I0049e68bbd8e83025f9f576dcd712d03206859d0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 787038bb1d282b4d6c5c040d8e902ccac9befb41) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Introduce the qt_internal_project_setup macroAlexey Edelev2023-04-257-2/+18
| | | | | | | | | | | | | The macro sets the required CMake variables and policies and should be called right after the find_package(Qt6 COMPONENTS BuildInternals... call to make sure that the subsequent code adopt all the required policies. Task-number: QTBUG-112685 Change-Id: I9f93f728ee4d8ae7743db9fffafa26025c76dcf2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit f3c10280f59d35fbf0862e6e353602e7aa8ef901) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve style drawing under DPR scaling furtherDavid Schulz2023-04-251-8/+8
| | | | | | | | | | | | Rounding distances up can result in coordinates outside of the clip rect. So stick to always round distances down when we multiply a scaling. Fixes: QTBUG-109640 Change-Id: I784b7c90da9b6e7f5a925d4275eb67497616001d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit c818acda97a7dc9f184e96fac4a0adbc56e1359e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QCss:: namespace when accessing Value on IntegrityAmir Masoud Abdol2023-04-252-31/+31
| | | | | | | | | | | | | | There seems to be a Value already defined in Integrity, and we `#undef` it here: `text/qcssparser_p.h:39` to avoid symbol confusion. However, this is not robust during the unity build where we might not necessary end up with the preferred ordered of things. Task-number: QTBUG-109394 Change-Id: Ide37ab2035f0aa482a1d53d8e1511e0ab0109b3a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit c11cfc2d8d5ee5692a309bf5461f3b346f325118) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude files from unity buildAmir Masoud Abdol2023-04-251-0/+8
| | | | | | | | | | | | If not excluded, some of the macros in X11.h and Xlib.h conflicts with symbols defined in `UrlFormattingOption` and `Type` in `qurl.h` and `qjsonvalue.h`. Task-number: QTBUG-109394 Change-Id: Ic1b056f0bcd6643394401bca464f751b3489202d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e0cec08480ab6a453e62b76666d5e24bef4f2ab0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Show correct headerfile for StringLiteralsPaul Wicking2023-04-251-0/+2
| | | | | | | | | | | | | The automatically generated `#include` statement for the `Qt::Literals::StringLiterals` namespace contains the wrong header file name. Use QDoc's `\headerfile` command to ensure QDoc generates the correct `#include` statement. Fixes: QTBUG-112884 Change-Id: I825402dc9d8d451fecc120697486d4bf81e468d3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit ab636a95c3020365c4c841cd52c4a36909374246) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Silence MSVC warning on constructing QList from initializer_listEdward Welbourne2023-04-241-3/+3
| | | | | | | | | | | | | | | MSVC complains because we call Data::allocate(args.size()) and, of course, initializer_list::size() returns unsigned std::size_type, while the relevant Data::allocate() overload takes a signed qsizetype. The constructor from iterators potentially has the same problem, if the iterator type's difference_type is unsigned, so make the type-conversion overt there, too. Change-Id: I521eca26a48aed570855b13242bf2df8bfa38f96 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 3fd7086878ea03861fc82348fc5b4e77f76b2a86) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDomDocument: no longer drop a provided 'standalone' attribute if 'no'Axel Spoerl2023-04-244-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Definition of 'standalone' attribute: An XML declaration containing the attribute 'standalone' with its value set to 'yes', tells the parser to ignore markup declarations in the DTD and to use them only for validation. The declaration attribute is optional and defaults to 'no'. - Behavior Qt5 In qt5, DOM documents contained the standalone attribute, regardless of whether or not it was explicitly specified. - Behavior Qt6 In Qt6, the standalone attribute was only contained in a DOM document, if its value was 'yes'. If it was explicitly declared with the value being 'no', it was dropped in the DOM document. - Expected behavior If the source specified it overtly, then the generated XML should contain the attribute, even when it takes its default value. - Code base QXmlStreamReader provides a public bool getter isStandaloneDocument(). This says whether the document is standalone or not. The information whether the attribute was actually specified gets lost. In consequence, the attribute was always dropped on non-standalone documents. - Fix This patch makes hasStandalone a member of QXmlStreamReaderPrivate, to record whether the attribute has been explicitly specified. QDomParser is modified to retain the standalone attribute, if QXmlStreamReaderPrivate::hasStandalone is true. - Test The patch adds a test function in tst_QDom. Fixes: QTBUG-111200 Change-Id: I06a0f230a2d69597dd6453f8fd3b036943d08735 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from commit 11f14c3b0dee239644097b3eddbbf464e4d69600) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Handle parent being a child's focus proxy in QWidget::setFocusProxyAxel Spoerl2023-04-242-20/+143
| | | | | | | | | | | | | | | | | | | When a parent became a new child's focus proxy in an existing focus chain, the child was appended at the end of the chain. That leads to broken tab order, e.g. with a QComboBox which became editable after a focus chain has been set. This patch captures the case and insertes the new child after its parent in the focus chain. A corresponding test function is added in tst_QWidget. Fixes: QTBUG-111978 Change-Id: I3a426c0560fa830b7b7ffead54f26dd0adef499f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b1802a164b8682ed9e8956a5a19a90ade65c25d0) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* QPA:EGLFS - ignore scissor and stencil when drawing the cursorInho Lee2023-04-221-7/+11
| | | | | | | | | | | | In QEglFSCursor::draw, There are two missing pipeline states SCISSOR and STENCIL. Fixes: QTBUG-110080 Change-Id: Ifb2495de2685b7a2f80f8d39ab57d5985fe0eec1 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 544464c3d173246e58d39351599b0ffa87ec43df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QStandardPaths: de-duplicate some unittests codeAhmad Samir2023-04-221-28/+28
| | | | | | | | | Shorter lines, easier to read. Change-Id: Ifd83974cce2dd03bf05bcf032da2e459f1d3f798 Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit 18f5dc3746b7362c3741ef7e0332fa18d85a3d80) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QStandardPaths/Unix: fix writableLocation() when test mode is enabledAhmad Samir2023-04-222-32/+101
| | | | | | | | | | | | | In commit 482a75fef9643 the code was changed to return early, but that missed appending the organization and app names while test mode is enabled. Issue spotted by Edward. Change-Id: Ifd220f8990874a173413dcf71d105c04b605c800 Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit a7555c33060a2f5e9d0d0f2220286c38f31d436f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QStandardPaths/Unix: restore org and app names in unittestsAhmad Samir2023-04-221-7/+11
| | | | | | | | | | | Some unittests set a custom Organization and Application names and then clears them. Instead used init() method to "reset" those two names to the original values before each unittest is run. Change-Id: I359f3911dd50a2aecfd8dde22e2d591adc6e224e Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit e320280f6183cea519b213d2fd35146db920b29b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: add setting type to BlobLorn Potter2023-04-202-3/+9
| | | | | | | | | | | Blobs can be any mime type, add function that sets up mime type This allows Safari to play videos that are Blobs Change-Id: Ide63851934058935d94f42721b246d832e3bcb85 Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io> (cherry picked from commit 589c6d066f84833a7c3dda1638037f4b2e91b7aa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QSet: fix a qdoc warning about method signatureAhmad Samir2023-04-201-1/+1
| | | | | | | Change-Id: I34d73e588e95603579a05bd13fc55d1eab5004f8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 79b36f3bc24ebcd649e8b7683b51bd70c08477c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Don't add dummy empty.lproj localization to macOS bundlesTor Arne Vestbø2023-04-201-1/+0
| | | | | | | | | | | | | | | | | The original change from 2008 mentions that this was needed for preventing a crash when searching the native file dialog, but this has since been fixed. Nor is the file needed to get localized native file dialogs, as this is controlled by the combination of the app's supported localization or CFBundleAllowMixedLocalizations. And we don't do this for CMake projects. Change-Id: I3c9e5aee4707c019f733920eb088f8d84f8e4ee1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit f2b59f313857ef4834835976645b083e51cd15d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Windeployqt: Add a check for LLVM-MinGW runtimesTimothée Keller2023-04-201-20/+36
| | | | | | | | | | | | | | | | The compilerRuntimeLibs now pays attention to if the user is running MinGW, or LLVM-MinGW, before deploying the corresponding runtimes from the Qt binary folder, or from the path if it cannot find any in the Qt binaries. [ChangeLog][QtTools][Windeployqt] Windeployqt now supports LLVM-MingGW runtimes. Change-Id: I9c464cdb933795e491992f5d1adb18bcc7d69f02 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Yuhang Zhao <yuhangzhao@deepin.org> (cherry picked from commit 3d0fb2cea9c4e392497f9067d21b194124de9333) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Refix printing of dpr>1 images on WindowsEirik Aavitsland2023-04-201-1/+1
| | | | | | | | | | | This modifies 9e453dacc3855bafd3d7b692d76699c3bf07b9c6 to make sure that QPainter uses the adjusted DPR when doing the tile copying. Fixes: QTBUG-99990 Change-Id: Id9c7b5576d5036e20bb399f3c8b82d4a467dc70f Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit daa77824b3fca656db14663c798370e221610c34) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qnetworkreply: Don't try using ftp servers while ftp is missingMårten Nordheim2023-04-201-43/+51
| | | | | | | Change-Id: I979e2bbb51f7bf8ec2247a4dd8975663fc80e1cf Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit f19147d16441ceb4ecda05a2f55507d11f822d8d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Network tests: drop testing ftp proxy serverMårten Nordheim2023-04-203-3/+14
| | | | | | | | | | It's quite flaky, and since we currently don't have FTP support there's no point in making sure it works Change-Id: Ice01e8d36f2b7830813119da3513cc01ec005c46 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 34d82aab78320aab51ab79e06bbd304ed0a287b0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Split multi-file Files entries in qt_attribution.json as listsEdward Welbourne2023-04-205-6/+18
| | | | | | | | | | | | This is now the official format for Files, when there's more than one, rather than using space-joined lists. Change-Id: I4a6247fff0ece8ece2944178af38894fd5a2e1e2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 970841235baa5ef4e723b5b1656f3702e4c78556) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Deploy Comment fields in qt_attribution.json filesEdward Welbourne2023-04-2012-17/+21
| | | | | | | | | | | | | | | Replace the old abuse of other fields as comments, to be overwritten by a later setting to a proper value, with actual Comment fields, now that we have them. Added a new comment to the valgrind files to say where they come from in the upstream. Change-Id: I2edcfa2949fa9e59f3f67d3e578d8e5009854cf6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit ce8839e056abb1ca3151c88f370b38bca8f60e3b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update the list of CLDR-based filesEdward Welbourne2023-04-201-1/+1
| | | | | | | | | | The corelib/text/qt_attribution.json didn't mention the time/q*calendar_data_p.h files which are also generated from CLDR. Change-Id: I768555d4623204245006897c45af58635761bfa1 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 1bf1aec7902113e14e30d52429378ce7e50ad38d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* FontDatabase[win/freetype] implement population of aliasesMårten Nordheim2023-04-202-0/+18
| | | | | | | | | | | | | | | We rely on this function discovering extra fonts if we cannot find any or only find poor matches for our font request. Whether that be because we had only partially populated the fonts of a given family or because the user specified a font using a localized name. It's a copy-paste of the implementation in qwindowsfontdatabase Fixes: QTBUG-111854 Change-Id: I0dd97b68d84417a26ce82a46f39804b36602ed67 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 7a92304040c375fe867f71c1b04bc3e6b2c32b6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve QTimeZone's documentation about territoriesEdward Welbourne2023-04-201-16/+28
| | | | | | | | | | | | | | Clarify that a zone whose territory() is AnyTerritory may simply not have a known association, or cover several territories. Added more \sa links to territory(), where relevant. Fix some surviving uses of country for territory. Split some long lines. Change-Id: I9196f785afed9bc185a459608c5d9361127401cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 455abef6c659b370bb84dbc686373f830198a330) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QWidgetTextControl: emit cursorPositionChanged() when select allLiang Qi2023-04-202-0/+8
| | | | | | | | | Fixes: QTBUG-91643 Change-Id: I31745a3106321da0be4074a33768da8b84a8ae3f Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit fed79b873eb1d8b14fd9314abeb937f268d75b64) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* cube example: always set required state in paintGLLaszlo Agocs2023-04-201-8/+8
| | | | | | | | | | | ...instead of expecting whatever was set in initializeGL will persist. Task-number: QTBUG-111304 Change-Id: Ifcf75a3df9bed6a45d2e9264a5e3f32504b42313 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com> (cherry picked from commit 25fcded977e5283ff0e33e0465abbb544a41f30e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QGtk3Theme: Improve fixed font deliveryAxel Spoerl2023-04-201-2/+21
| | | | | | | | | | | | | | | | | | | | | The gtk_fixed widget was used as a reference to obtain a fixed font and HeaderViewFont. This is a mistake, because the gtk_fixed widget is a container for other widgets with fixed geometries and no layouting. This patch makes the default style being used for a fixed font and, as a drive-by, the combo box as a reference for a header view font. A monospace based css provider as explicitly added to the style context, in case a fixed font is requested. The provider is removed afterwards. Task-number: QTBUG-112896 Change-Id: I6bfb2ee9e7befdd2102bdcc6e53ced954a024034 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 034a071bdac62e7e5cb4e44f7b19eb628b64d095) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: QOpenGLWidget: ensure depth write is enabled when calling paintGLLaszlo Agocs2023-04-201-0/+4
| | | | | | | | | Task-number: QTBUG-111304 Change-Id: Ibe9f886b12c89fad7431b77b55c259b15d83559b Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 84f9293ea2a769e419a9320e5309ce0c5971502e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
View Lorry Controller Status