summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* dbus: Put the qWarnings in qdbusintegrator.cpp into its own categoryHEADdevAleix Pol5 hours1-36/+58
| | | | | | | | We already have a category for the integrator debug information, we might as well start using it for all warnings. Change-Id: I13239035a334a03036611ccac49cb8c2bf9233b7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* tst_QStringApiSymmetry: add checks for QByteArrayViewMarc Mutz14 hours1-5/+100
| | | | | | | | | | | | | | | ... where checks for QByteArray existed before. The checks we can't add are - left/right/mid (legacy APIs not implemented in QBAV) - several relational operators, d/t ambiguities. Created QTBUG-108805 to track these. Task-number: QTBUG-108805 Pick-to: 6.4 6.2 Change-Id: I30cc9b29a228d69d32af51234f2c28221478a75c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* [docs] QList: fix history of clear() semantics changeMarc Mutz14 hours1-10/+7
| | | | | | | | | | | | The description was copied from QVector, and doesn't exactly fit QList. For QList, the behavior changed in Qt 6.0 when QList became QVector, not in Qt 5.7, as indicated. Be more precise. Pick-to: 6.4 6.2 Change-Id: I4029d83128ec205f628125d78394e8ee79cc221f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* tst_QString: check empty regex can replace in empty/null stringMarc Mutz14 hours1-0/+3
| | | | | | | | | It's not intuitive, so check lest people break it. Pick-to: 6.4 6.2 Change-Id: I2435cd69be7b77a6ae59cdc7b5fb99658cfc42fd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Introduce QT_NO_AS_CONST and mark QtBase free of itMarc Mutz14 hours4-3/+8
| | | | | Change-Id: I680086e767fe6d5c69eb7103b26150293c69b175 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Set simplePalette on staticWidget in tst_QWidget::optimizedResizeMoveAxel Spoerl14 hours1-0/+1
| | | | | | | | | | | It was forgotten to assign a simple palette to this object in 1576f827214cca8a2233f3c81e7d0e3d89eb8007 This patch adds the missing line. Pick-to: 6.4 Change-Id: I0acf765d9646ecc8d49791d96b5ea910e11997fe Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* moc: Output the "cloned" flag for methodsUlf Hermann18 hours5-0/+59
| | | | | | | | | We will need it in QML to determine which signal out of a number of "overloads" to generate handlers for. Task-number: QTBUG-108762 Change-Id: Ib73eeb59dbf037bd03faf0d841860d9ebc9e7032 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QSystemLocale[Win]: Catch potential WinRT exceptionsVladimir Belyavsky22 hours1-3/+7
| | | | | | | | | | Some Windows SDKs seem to throw an exception from winrt::check_hresult() We need to handle this accordingly. Fixes: QTBUG-108605 Pick-to: 6.2 6.4 Change-Id: I14ad3b6dbd9b5fdf0120f9d3336a4d922167d169 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Check if fontEngine is valid in QStaticTextInho Lee35 hours1-0/+2
| | | | | | | | | | | | When QuickWindow is set as setPersistentGraphics(false) and setPersistentSceneGraph(false), texItems' fontEngines can become invalid with hiding and showing. In this case, a new font engine is created but not used. Pick-to: 6.4 6.2 Fixes: QTBUG-108300 Change-Id: I2bd759724d78cecd62666beb6fb4a01f6063cae1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Windows: Reevaluate dark frames if the application palette changesVolker Hilsheimer40 hours1-9/+14
| | | | | | | | | | | | | | | | | | | Since 5ea7e3a8111b2939f0c91b750aa1c62ab16ab715 we are using dark window frames if the default palette is dark, unless applications explicitly override dark frame support. If the palette changes during runtime, we didn't reevaluate that setting. Do that by handling ApplicationPaletteChange events in QWindowsWindow. We still have to respect an explicit opt-out. Simplify the code at the call sites of setDarkBorder(), we don't need to check all the time whether the application has opted out of dark frame support. Pick-to: 6.4 Task-number: QTBUG-72028 Change-Id: I94e7d33cd21f9656ca210b43e775f487abc25b54 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QGraphicsView: fix jumping graphic items when dragging out of viewTaras Kachmaryk40 hours2-22/+137
| | | | | | | | | | | | | | | | | | | | | The algorithms for calculating the scene's position within the view did not compensate for scrollbars showing. The scrollbars should be ignored when positioning hte scene within the view, as alignment only cares about the positioning of the scene when the view is larger than the scene anyway. Add a test case that verifies that items don't jump up or down when dragging horizontally, and not left or right when dragging vertically. Mark variables in the modified function as const where applicable to make it easier to follow the code. Done-with: Volker Hilsheimer <volker.hilsheimer@qt.io> Fixes: QTBUG-46757 Change-Id: If205637dfe124e0034f68201b23f174d6863084d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Let styles indicate that they support dark modeSanthosh Kumar40 hours6-0/+17
| | | | | | | | | | Add a style hint that allows styles to indicate that they support dark mode. The macOS and Fusion styles support dark mode, the other styles, in particular the Windows Vista style, do not. Task-number: QTBUG-72028 Change-Id: I02cac2e19a21898663f50f09a4ef419a613a73ec Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QObject: stronger warning about isSignalConnected and threadsVolker Hilsheimer40 hours1-13/+20
| | | | | | | | | | | | | | Document explicitly that it is not allowed to call isSignalConnected from (dis)connectNotify overrides, and add the respective warning from the disconnectNotify documentation also to the connectNotify documentation (with some light editing). Pick-to: 6.4 6.2 Fixes: QTBUG-106025 Change-Id: I41e8a9d3e6ce697cb2943d55a7c853eeec9c1dbe Reviewed-by: Lars Knoll <lars@knoll.priv.no> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* QWindowsMimeConverter: Fix forward-declaration of foreign structsMårten Nordheim40 hours1-5/+6
| | | | | | | It was inside the Qt namespace so it would try to use it as such. Change-Id: I8c8960e5f4758e945bef95b52247211e8f86efad Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QStandardItemPrivate: remove const from return type in itemDataAnton Kudryavtsev43 hours2-6/+5
| | | | | | | While touching code, port iterator-based loop to range-based for. Change-Id: I108ab4fa1e56c50f424a58984873906d37923d3d Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Fix the assert in QWasmClipboard::writeToClipboardApiMikolaj Boc43 hours1-1/+1
| | | | | | | The assert condition should be negated. Change-Id: I901b61012ffaf893744dfb9f762b009f267b629d Reviewed-by: David Skoland <david.skoland@qt.io>
* Use the browser compositor for drawing windows on WASMMikolaj Boc43 hours28-974/+940
| | | | | | | | | | | | | | | | Make the browser compositor draw the window non-client area (using css + html). Get rid of OpenGL usage in non-OpenGL windows and use canvas 2d context instead to blit the texture (QImage). Also, as part of the change, remove the deprecated canvas element support in QScreen. Fixes: QTBUG-107116 Fixes: QTBUG-107219 Change-Id: I65f0d91831c806315685ca681ac0e416673f5cd5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io> Reviewed-by: David Skoland <david.skoland@qt.io>
* Fix a mistake in the documentation of qt_internal_read_repo_dependenciesAmir Masoud Abdol43 hours1-2/+2
| | | | | | | | If I understood the function correctly, then the example was not quite right. Change-Id: I6b6a4845c5ded2a058050dfbecf5db158d32d12a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Add simple palette to tst_QWidgetAxel Spoerl47 hours1-0/+47
| | | | | | | | | | | | | | When a widget's palette has different active / inactive colors, multiple paint events can occur. This makes tst_QWidget functions fail when they expect a spcific amount of paint events and the platform theme provides a palette with active / inactive differences. This patch adds a function to populate test widgets with a simple palette, to prevent multiple paint events. Pick-to: 6.4 Change-Id: If9b2faedcc5ca87ba24991cedd5e4ac927b02644 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* IBus: Use portal in snapIlya Fedin2 days1-3/+4
| | | | | | | | Snap supports the IBus portal for two years, but Qt applications don't take its advantage in snap without setting IBUS_USE_PORTAL Change-Id: I26a044d657c4b7040a21a8510116c0c7af7aaa52 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* dbus: Include some debug messages when failing to connectAleix Pol2 days3-17/+37
| | | | | | | | | | | | | | When using dbus, there's a number of cases where resolution happens at runtime. It's useful to see dbus complain when connects don't work, because otherwise the system doesn't work but we don't know what is happening. Added this to debug such an issue, already helped me address other cases that had gone unnoticed elsewhere, so this is something that benefits from being in QtDBus. Change-Id: I5eefb94fcf775182edf1ad0c24e8a6692f84b15f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* qnsview_drag: only ignore key modifier while dragging 'within the application'Timur Pocheptsov3 days2-3/+10
| | | | | | | | | | | | We return a mask containing several supported DND operations and if modifiers were ignored, an external application can select a 'wrong' operation (not the one we wanted when pressing a modifier). Saying that, the old logic of ignoring still applies if we are dragging 'within the application'. Fixes: QTBUG-99471 Change-Id: I67c9a656960e95d6d2298f4b3bdd2052faedb263 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Android: Fix incorrect dimensions - part 2Samuel Mira3 days1-18/+15
| | | | | | | | | | | | The previous fix worked for lower API levels but failed to work properly on some devices (Devices with > 29 API levels). This patch fixes that issue. Task-number: QTBUG-107604 Task-number: QTBUG-107923 Pick-to: 6.2 6.4 5.15 Change-Id: I8fd3601225026ea5c370a8a1a1aab317558432b5 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* tests: Add project files of highdpi both for qmake and cmakeLiang Qi3 days7-64/+51
| | | | | | Pick-to: 6.4 6.2 Change-Id: I5525536674a64ccd14106dc6727b5578c0ab7f16 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Fix typo in documentation for QVariant::nameToTypeNicolas Fella3 days1-1/+1
| | | | | | | | Pick-to: 6.4 6.2 Change-Id: I69742b9e597012329de5f5f742d4972ea7575775 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix out-of-bounds assert in winIso639LangName()Edward Welbourne3 days1-1/+1
| | | | | | | | | | | | | | | QByteArray doesn't allow accessing, with operator[], the '\0' byte it stores at index size(). Previously we accessed it indirectly by dereferencing a pointer offset from its data() instead of indexing; my recent change converted the return of an endptr to the return of its index, so used operator[]. This is a follow-up to commit 6c435e5dd41177308f22ba4b55931b2c463cb0d8 Change-Id: I9faf9dfa3dcc8df1e841e5538e452afef9ba610c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QPalette: always increase serial number when modifyingVolker Hilsheimer3 days2-1/+11
| | | | | | | | | | | | | | | | | | | After 109e088c7c5d0c9325966e88d55fd9f7a58f67ea, cache keys were unique for palettes with different private or data instances, but the key did not change when a palette without any shared copies was modified, as that does not create new private data structures. To fix this, always increase the counter for the private data structure, also when not detaching from shared copies. Augment test case with scenario that broke. Pick-to: 6.4 Fixes: QTBUG-108709 Change-Id: I606abfb8b1a03e515e46b10dc840a631eb31d496 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: JiDe Zhang <zhangjide@uniontech.com> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Update Gradle to 7.5.1 and Android Gradle Plug-in (AGP) to 7.3.1Rami Potinkara3 days3-4/+4
| | | | | | | | | Gradle 7.5.1 and AGP 7.3.1 versions are the latest at the moment. Fixes: QTBUG-105510 Change-Id: Ie2229e8929a82d60836a5fe7b3a879459995f63e Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* QLocale: Have qstrntod() return end of parsed string also on underflowUlf Hermann3 days2-1/+9
| | | | | | | | | Underflows should be treated the same as overflows. Fixes: QTBUG-108628 Change-Id: I23aa7bbe1d103778cefca08bd3e584e72f306583 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* ibus: check object validity before honoring `inputMethodAccepted()`Phan Quang Minh3 days1-1/+1
| | | | | | | | | | | | | | | | | | | | | `inputMethodAccepted()` always return false if there is no current focus object. This means QIBusPlatformInputContext will fail to send the necessary `FocusOut` request to the input context, causing IBus to not send the appropriate content type information to the panel service when the application regains focus and issue a `FocusIn` request. This results in issues like https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5346, which can happen when a Qt application is in foreground as the IBus daemon fails to propagate the content type information to GNOME Shell, which acts as the panel service on GNOME systems. Fix this by checking for the validity of `object` before honoring the result of `inputMethodAccepted()`. Pick-to: 5.15 6.2 6.4 Change-Id: I6b79ffc7c5f03ffc05527c29e52a0859f3594bfa Reviewed-by: Liang Qi <liang.qi@qt.io>
* macdeployqt: Fix QtMultimedia plugins deploymentVladimir Belyavsky3 days1-1/+1
| | | | | | | | | | | | | It was not updated accordingly after QtMultimedia redesign in Qt 6. This wasn't a real problem because multimedia plugins were eliminated in principle. But it was true only until Qt 6.4, where plugins system for multimedia backends has been reintroduced. Fixes: QTBUG-108742 Fixes: QTBUG-107057 Pick-to: 6.4 Change-Id: I31be5fc20e5bdf8050c04a30492e80d96eb437fb Reviewed-by: Lars Knoll <lars@knoll.priv.no>
* forkfd/linux: add support for LoongArchWANG Xuerui3 days1-1/+2
| | | | | | | | | | This architecture is not CLONE_BACKWARDS in any way. Matching OpenDCDiag PR: https://github.com/opendcdiag/opendcdiag/pull/169 Pick-to: 6.4 6.2 5.15 Change-Id: Ibceccfd20d270b30302a936885d12e4c55cdd833 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Proper clearing of WinRT factory cache in QWindowsThemeYuhang Zhao3 days1-0/+1
| | | | | | | | | | | | I've checked the whole qtbase code base, this is the only one that's left from the previous commit. Amends commit ffb9dee1b0954e4d4f9e9791175609a80ecafc31 Task-number: QTBUG-103611 Pick-to: 6.4 6.2 Change-Id: I76a9130654819d1336c27dac350f5ad56915ad81 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* wasm: fix build of wasm accessibilityLorn Potter3 days1-0/+1
| | | | | | | Some platforms need extra help finding includes Change-Id: I4f18b183cea780067dd9269e07dfb7db75606406 Reviewed-by: David Skoland <david.skoland@qt.io>
* Finish the undeprecation of the QColor(string) constructorsEirik Aavitsland3 days1-2/+0
| | | | | | | Fixes: QTBUG-108743 Pick-to: 6.4 Change-Id: I826ae98a542516a5cf9a4e556d5e8830f9c47a86 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Handle multiple paint events in tst_QWidgetRepaintManagerAxel Spoerl3 days1-2/+22
| | | | | | | | | | | | | | | | | The helper function TestWidget::waitForPainted returned after the test widget had consumed the first paint event. In case of multiple paint events, QRegion paintedRegions did not match the entire region that was supposed to be painted. The test function children() failed/flaked due to that. This patch extends the helper function. After consumption of the first paint event, it processes events until the painted regions no longer change. Pick-to: 6.4 Fixes: QTBUG-108764 Change-Id: I54e14bb07725dd1f602cc93085da13836e3b7494 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Documentation: Fix information on how to iterate over listsFriedemann Kleint3 days3-52/+2
| | | | | | | | | | | | Remove the outdated code used for QStringList and point QStringList and QList to the containers page. Pick-to: 6.4 6.2 Task-number: QTBUG-108687 Change-Id: I6fae6410ca759f91da85832ddb9f24e8a0ce202b Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Documentation: Expand documentation on how to iterate Qt containersFriedemann Kleint3 days2-4/+48
| | | | | | | | | | Introduce a section on iteration and add range-based for and index. Pick-to: 6.4 6.2 Task-number: QTBUG-108687 Change-Id: Icb1ff55049361769f7c0b042d42f70148dd07c2e Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Documentation: Modernize the Qt container doc snippetsFriedemann Kleint3 days1-23/+15
| | | | | | | | | | | Use auto and initializer lists. Avoid repeated instantiations of end(). Pick-to: 6.4 6.2 Task-number: QTBUG-108687 Change-Id: I8482638cda63e21feaa7ca21370e7947dfb4b606 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* wasm: Enable asyncify for testsDavid Skoland3 days2-1/+5
| | | | | | | | | Since a good number of tests use exec and friends, we want to use asyncify for them. Asyncify is still possible to enable universally with device options. Change-Id: I0916f55328c98f2ba179cda3757eeee9d27f3e47 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* wasm: Enable batch tests by default on wasmDavid Skoland3 days1-2/+12
| | | | | | | | Batched tests is the default supported test mode of wasm and should be enabled without explicitly passing a command line argument. Change-Id: I79424384e4e8ca6f670de1cb056f4713740a584f Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Add permission backend for WASMTor Arne Vestbø4 days3-1/+285
| | | | | | | | | | | The only permissions we support so far are camera, microphone, and location. The permission API works even for browsers that don't provide the Web Permission API, as we plumb the individual permission requests for media and geolocation back to our API. Change-Id: I7f5fc2266afee9ada78f2015614a8224e28afa59 Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Set up a manual test for qt loaderMikolaj Boc4 days5-0/+170
| | | | | | | | Skeleton tests included. Run the test with run.sh. Fixes: QTBUG-107744 Change-Id: Ic2734e24025f8edc0f8e710d981367aa321f9066 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Restore end-of-parse reporting to qstrntod()Edward Welbourne4 days11-67/+80
| | | | | | | | | | | | | | | | | | Rework QSimpleParsedNumber to store a qsizetype whose sign serves as ok flag (positive is ok, zero and negative are not) and magnitude is the number of characters used. This replaces an endptr that was set to null to indicate !ok, but that deprived us of end-of-parse information, which is needed for number-parsing. In particular, JS's parsing of numbers accepts overflow (where qstrntod() flags it as invalid) as infinity; so qstrntod() does need to say how long the overflowing (but JS-valid, none the less) number-text was. Modify all callers of functions using this (recently-introduced) type and add tests that fail without this fix. Fixes: QTBUG-108628 Change-Id: I416cd213e1fb8101b1af5a6d43615b970a5db9b4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Disable ASAN leaks check for cmake testsAlexey Edelev4 days1-1/+3
| | | | | | | | | | | | CMake tests have own workflow and way they run. Most of binaries produced by these tests are either no-op or check if build was successful. It doesn't make much sense to check these binaries for memory leaks, so disabling ASAN leak check. Fixes: QTBUG-108817 Change-Id: I95984e1049d6bfd691ff854e15bdf98c71c921db Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
* Blacklist tst_QOpenGLWidget on Ubuntu, RHEL and OpenSuSEAxel Spoerl4 days1-0/+5
| | | | | | | | | | | tst_QOpenGLWidget fails on Linux when other windows on the desktop grab focus. That can happen on CI VMs. This patch blacklists the test on Linux as a temporary solution Task-number: COIN-966 Change-Id: Ibdd7e626f92d2da692bd7c44741e0ca4c9dbd1a8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Blacklist tst_gestures on OpenSuSEAxel Spoerl4 days1-0/+3
| | | | | | | | | | | | | | | tst_gestures flakes in MacOS arm and Linux when delivering a gesture to a screen. The problem cannot be narrowed down to specific test functions. When two test functions with gesture delivery to a screen are called, the second fails. This patch temporarily blacklists OpenSuSE for tst_gestures. Task-number: QTBUG-104496 Task-number: QTBUG-106244 Change-Id: I3bc3c9b82567478784a84006d27f5cbed39d9c9a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QFlatMap: make nested mock_object SCARYMarc Mutz8 days1-15/+19
| | | | | | | | | | | | | Swap the definition of the nested mock_object out of the QFlatMap body into a namespace scope and replace it with a template alias. This way, there's _one_ mock_object<U> for every U, not one for every QFlatMap<K, V, Comp, KeyC, ValueC>::mock_object<U> ("SCARY"). Should reduce compile times, but I didn't measure. Change-Id: I37f7413a49d0424e06ef4e78d65dea5962599e79 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qNN headers: only promise what we can keepMarc Mutz8 days5-15/+15
| | | | | | | | | | | | | | | | In general, we can't make the qNN types behave exactly like their C++NN std counter-parts, because their exact semantics and implementation may depend on C++NN language features, while qNN are back-ports to C++ standards older than NN. Adjust the warning message accordingly. Thanks to Eddy for noticing. Pick-to: 6.4 Change-Id: I8533214549f2140a99e2216e3bcd979263fe100c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* QTextLayout: fix maximumWidth() for a text containing line separatorVladimir Belyavsky9 days4-6/+30
| | | | | | | | | | | | | | | | | This is improved version of previous fix 013c346a8dcbd618febb07884c64c740daf9754d that was reverted because it broke some tests for Quick Text. The problem was that it did not work correctly in the case the text was wrapped to a fixed width. To deal with this we'll accumulate current line full width (as if it hadn't been wrapped) in layout data (layoutData->currentMaxWidth). Then when the next line is explicitly wrapped by line or paragraph separator, this accumulated width will be used to adjust layout's maximum width. Change-Id: Iad7119d9808e1db15fe1fbc5db049c3db928529f Fixes: QTBUG-89557 Fixes: QTBUG-104986 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>