summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QMetaType: un-export qMetaTypeTypeInternal()HEADdevThiago Macieira11 hours2-2/+2
| | | | | | | | | Nothing is using it that links to QtCore. The only uses are in moc, the moc copy in qscxmlc, and QMetaObject. moc is bootstrapped. Change-Id: Ib8707d2db6c3419f69e9fffde65fddfe987d19d5 Reviewed-by: Ivan Solovev <[email protected]> Reviewed-by: Ahmad Samir <[email protected]>
* QMetaType: use nothrow operator newThiago Macieira12 hours1-2/+2
| | | | | | | | | | | | | We handle the memory allocation ourselves. Using std::nothrow_t{} instead of std::nothrow to avoid referring to an empty, global variable unnecessarily just to call this function. [ChangeLog][QtCore][QMetaType] create() will return a null pointer and not throw if a memory allocation failure happens. It may still throw if the constructor of the meta type in question throws. Change-Id: I3859764fed084846bcb0fffd170396477b2b4989 Reviewed-by: Fabian Kosmale <[email protected]>
* tests: skip tst_QWindow::modalWithChildWindow() on WaylandLiang Qi17 hours1-0/+3
| | | | | | | | | | A nested window or a subsurface in wayland terms can't get focus. See also 0bd68fac97f4967f39715bf221f246c85371f3bf . Pick-to: 6.10 Task-number: QTBUG-137020 Change-Id: I563b8cfab84c136fa2a1e82f9feecafafc63d4a5 Reviewed-by: Tor Arne Vestbø <[email protected]>
* QMetaType::fromName: avoid going through the type ID middle-manThiago Macieira32 hours1-45/+35
| | | | | | | | | | | | We were calling qMetaTypeTypeImpl() and then the QMetaType(int) constructor and each of those operations required locking the registry for custom types. Now, we simply extract the interface pointer from the registry, avoiding the relocking. Pick-to: 6.10 Change-Id: I9acb47121bbf64f514d6fffda4c07e77efe3c2d8 Reviewed-by: Ivan Solovev <[email protected]> Reviewed-by: Fabian Kosmale <[email protected]>
* QMetaType::fromName: use qOffsetStringArray to store the type namesThiago Macieira32 hours1-15/+41
| | | | | | | | | | This removes one 93-107-entry array that resides in relocatable memory. We still duplicate all names quite a lot (I see 3 copies in the .o file), but this is now one fewer set. Pick-to: 6.10 Change-Id: I4a9e87d37b211f7db657fffd8c67516865039310 Reviewed-by: Ivan Solovev <[email protected]>
* QMetaType: sort top #includesThiago Macieira32 hours1-7/+9
| | | | | | Pick-to: 6.10 6.9 Change-Id: Icc9650d13a63e190b81dfffd42852acda9c7b7a7 Reviewed-by: Ahmad Samir <[email protected]>
* moc: avoid two back-to-back calls to nameToBuiltinType()Thiago Macieira32 hours1-3/+1
| | | | | | | | This is the only other place in the moc sources where this function is called, so avoid two calls into the QMetaType built-in type search. Change-Id: Ia4a554c3bc5393fdc07bfffdc6071f5b9759afe8 Reviewed-by: Ahmad Samir <[email protected]>
* moc: stop using qMetaTypeTypeInternalThiago Macieira32 hours1-14/+20
| | | | | | | | | | | | Just use QMetaType::fromName(). We bypass the id() call because anything that came from the registry is, by definition, registered. Besides, inside a bootstrapped tool, there are no custom types anyway. Drive-by static'ify the functions. Pick-to: 6.10 Change-Id: Ib8363744834da6d79046fffd0adb680219c829e0 Reviewed-by: Ahmad Samir <[email protected]>
* Add QMetaObject::normalizedSignature() benchmarkAhmad Samir38 hours1-0/+25
| | | | | Change-Id: Ib8fcf8bc8feba5579d23f21ee9325199658e49bc Reviewed-by: Thiago Macieira <[email protected]>
* QByteArray: replace(view, view): don't detach the underlying data arrayAhmad Samir38 hours3-94/+289
| | | | | | | | | | | | | | | | | | | | | | If the byte array would detach or reallocate it would copy the data over, then do the replacements; instead create a new byte array and copy the data and replacement to it as needed, then swap it with `this`. Use QVLA to hold the indices of the replacement locations into the byte array, this way we can do the replacements in one go, instead of chunks of 4096. Since we collect the indices, now there is no need to guard against `before` being part of `this`. Use qsizetype instead of size_t, so as not to convert from/to each other. Using an unsigned type to avoid negative values doesn't work, indices[size_t(-1)] could be out of bounds anyway. Task-number: QTBUG-133737 Task-number: QTBUG-106185 Change-Id: I8fe87d56227e3c4b2b39b7625659eb61c6b174d1 Reviewed-by: Thiago Macieira <[email protected]>
* Avoid using QPainter::brushOrigin() to save and restore the originChristian Ehrlicher39 hours5-12/+13
| | | | | | | | | | | Avoid QPainter::brushOrigin() since it returns a QPoint instead QPointF so it might loose precision. Use QPainterStateGuard instead to make sure the correct QPainter state is restored later on. Pick-to: 6.10 Task-number: QTBUG-137885 Change-Id: I3f49c72c0425e22ffb1246b42d926e704dc9d8dd Reviewed-by: Eirik Aavitsland <[email protected]>
* Windows11Style: draw background of item in an itemviewChristian Ehrlicher39 hours1-0/+13
| | | | | | | | | | | | | The background was not drawn within drawControl(CE_ItemViewItem) which results in wrong paintings when e.g. a QTreeWidgetItem has a custom background color. Fix it by calling proxy()->drawPrimitive(PE_PanelItemViewItem) like it's done in qcommonstyle for the other styles. Pick-to: 6.10 6.9 6.8 Fixes: QTBUG-136130 Change-Id: Ifd88b8b573c1c29ccaccd58329dcf35f76a1dc19 Reviewed-by: Volker Hilsheimer <[email protected]>
* WindowsVistaStyle: use custom icon engineChristian Ehrlicher39 hours2-106/+99
| | | | | | | | | Add a custom icon engine for SP_TitleBarMin/Max/Close/NormalButton to use the correct icons from Segoe MDL2 Asset font. Task-number: QTBUG-135785 Change-Id: I0062261a467cf728c48fefb478d837832651b196 Reviewed-by: Volker Hilsheimer <[email protected]>
* QAccessibilityHints: override QObject::event()MohammadHossein Qanbari39 hours2-0/+12
| | | | | | | | | | | | | | Provides a life-line if we have to add an event handler. We cannot, in general, add new overrides (e.g. mouseMoveEvent()) to a released class, as the new overrides may not be called by existing compiled code. By having at least event() already overridden, we are free to place new code there. Amends d8ac4cd8692e77c85ac8c6bcfa0a1556c7a72ee9. Pick-to: 6.10 Change-Id: I1cee4c0540111c54fe1d7bda851cadad99a2d240 Reviewed-by: Volker Hilsheimer <[email protected]>
* QAccessibilityHints: make dtor out-of-lineMohammadHossein Qanbari39 hours2-0/+3
| | | | | | | | | | | Pins the vtable to a single TU and prevents -Wweak-vtable warnings Amends d8ac4cd8692e77c85ac8c6bcfa0a1556c7a72ee9. Task-number: QTBUG-45582 Pick-to: 6.10 Change-Id: I735a346c6ba6b202ebcb53397300d3ad51d61d11 Reviewed-by: Volker Hilsheimer <[email protected]>
* Fix flaky tst_QProgressBar::setMinMaxRepaint on openSuSE and UbuntuFrédéric Lefebvre45 hours1-1/+7
| | | | | | | | | | Set a fixed size to the progressbar and verify it before testing minimum and maximum repaint. Remove setActiveWindow as this anti-pattern is no longer necessary for Linux environments. Remove flakiness on openSuSE 15.6 and Ubuntu 24.04 Change-Id: I7b0deea5964abbebe31c24d98cacaf7336e82157 Reviewed-by: Axel Spoerl <[email protected]>
* QIconLoader: return an exact match for svg icon theme entryChristian Ehrlicher2 days1-20/+17
| | | | | | | | | | | | | Fix an regression which was introduced with the fix for QTBUG-90634 - when a scalable svg entry or a threshold entry was found then return an exact match instead no match. This amends 7746c3ce6904d188046644ab7fafc64a8e4395d8 Task-number: QTBUG-90634 Fixes: QTBUG-137700 Pick-to: 6.10 6.9 Change-Id: I211b4a082ea8f9ec91157b02845fe272308f6a4f Reviewed-by: Volker Hilsheimer <[email protected]>
* ItemView widgets: make supportedDragActions a propertyVolker Hilsheimer2 days6-34/+19
| | | | | | | | | | | | This makes the property accessible to the Widget designer. Document it as a property. Amends 7d0017cda8fde28a1130feaeecf41010b40e3cb3 Pick-to: 6.10 Task-number: QTBUG-137478 Change-Id: I55e95e541c5c1ae162eb7c2ae78c969f9d23ea2a Reviewed-by: Christian Ehrlicher <[email protected]>
* Android: use the "draft" Material icon for generic filesVolker Hilsheimer2 days1-0/+1
| | | | | | | | | | | | | We use text-x-generic for the generic File in QAbstractFileIconProvider. Map that icon name to the symbol for "draft" in the platform icon engine. Amends 560bf5a07720eaa8cc589f424743db8ed1f1d902. Pick-to: 6.10 Task-number: QTBUG-134239 Change-Id: I4e9795a37788a073de070be322e1b66dbeb8dd46 Reviewed-by: Assam Boudjelthia <[email protected]>
* QRangeModel: documentation improvementsVolker Hilsheimer2 days2-16/+116
| | | | | | | | | | | | | | Some restructuring, and include a section on rows as values vs rows as pointers. That paragraph as written so far was confusing, even for me, and the subject matter is complex enough to require more than a single paragraph anyway. Still work in progress, esp with some pending changes to enforce the requirement that ranges of pointers cannot be passed by value. Pick-to: 6.10 Change-Id: Ie4496ffb32b2622835c3cc4662da129e34e3f8c7 Reviewed-by: Artem Dyomin <[email protected]>
* QRangeModel: fix indentation of snippetsVolker Hilsheimer2 days1-136/+134
| | | | | | | | | | qdoc will use the indent level of the //! tag to "normalize" the indentation of the code, so use that instead of using no indentation, which is hard-to-follow. Pick-to: 6.10 Change-Id: I2b273854f3b3549574d549bb2b67ee43023bbb00 Reviewed-by: Artem Dyomin <[email protected]>
* Mark QFileSelector as security criticalMatthias Rauter3 days3-0/+3
| | | | | | | | | | | | QFileSelector inspects the paths to find the corresponding files. Further there is the risk of exposing files of the resource system or choosing files outside of the resource system by accident. QUIP: 23 Pick-to: 6.10 6.9 6.8 Task-number: QTBUG-135187 Change-Id: I6e0783da8bc08102df7cc108389db33940ffa4a6 Reviewed-by: Ivan Solovev <[email protected]>
* Propagate minimum visionOS version to qmakeTor Arne Vestbø3 days3-0/+10
| | | | | | Pick-to: 6.10 6.9 6.8 Change-Id: I3dad6ba44a72399c95adbb78d186f78542a6db84 Reviewed-by: Christian Strømme <[email protected]>
* cmake: Propagate minimum visionOS version to CMAKE_OSX_DEPLOYMENT_TARGETTor Arne Vestbø3 days1-0/+2
| | | | | | | | | | | We were missing the plumbing from QT_SUPPORTED_MIN_VISIONOS_VERSION to CMAKE_OSX_DEPLOYMENT_TARGET which resulted in picking up the SDK version as the CMAKE_OSX_DEPLOYMENT_TARGET, which is not great for testing the new visionOS 26 SDK against visionOS 2.5 simulator. Pick-to: 6.10 6.9 6.8 Change-Id: Ic0bb3f4307dced463f51f1781e68c21bd8aa2e96 Reviewed-by: Christian Strømme <[email protected]>
* Bump minimum requirement for visionOS to version 2Tor Arne Vestbø3 days1-2/+2
| | | | | Change-Id: I00d001f1781e46b5a5065ff1c5455bf5d758fbf3 Reviewed-by: Christian Strømme <[email protected]>
* QAbstractItemView: fix autoscroll immediately stoppingMiika Pernu3 days2-6/+12
| | | | | | | | | | | | | | | | | | | Adjust the draggedPosition calculation to changes in QAbstractItemViewPrivate::offset(). The draggedPosition was previously first calculated by adding mouse pos and offset() value, and mouse pos was later extracted by subtracting the offset() from draggedPosition. However, the offset() value no longer remains a constant between the addition and subtraction, which makes it impossible to get the old mouse position. Store the offset and mouse position separately to make the calculations deterministic across events. Fixes: QTBUG-130978 Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I5c601ff7ca40c9d8fb7ad949ff15520d199f5c1f Reviewed-by: Volker Hilsheimer <[email protected]>
* rhi: Add missing docs for srb create functionLaszlo Agocs3 days1-0/+14
| | | | | | Pick-to: 6.10 6.9 6.8 Change-Id: I573d8b95dae7db39f968a8b55aa2adcb14a73fdc Reviewed-by: Andy Nichols <[email protected]>
* rhi: Fix up the docs for image load/store in fragment stageLaszlo Agocs3 days1-18/+3
| | | | | | | | From 6.10 on this is supported. Pick-to: 6.10 Change-Id: Icdd29c5a1fc01d1667e58691a9d689f4c9b0aef8 Reviewed-by: Andy Nichols <[email protected]>
* a11y: Move qt_accStripAmp helper to private QtGui headerMichael Weghorn3 days8-46/+89
| | | | | | | | | | | | | | | | | The qt_accStripAmp helper function takes a string that may contain an accelerator/mnemonic and escaped ampersand characters and returns a "plain text" version of this that is suitable for an accessible name of the widget/control containing that text. Move the helper function to a new private header (and source file) in QtGui in order to be able to reuse this in Qt Quick in an upcoming qtdeclarative commit. Task-number: QTBUG-134208 Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I4dfac2d179baf36101066962b6a5f542b3a6fc03 Reviewed-by: Volker Hilsheimer <[email protected]>
* QRangeModel: don't return std::nullptr_tVolker Hilsheimer3 days1-2/+2
| | | | | | | | | | | | | Make the table model implementation symmetrical to the tree model implementation by returning a pointer to (const) range_type. Addresses header review comments. Pick-to: 6.10 Task-number: QTBUG-137478 Change-Id: I6560c4a6f8e11761a12e18769b0714f8d8659375 Reviewed-by: Artem Dyomin <[email protected]> Reviewed-by: Marc Mutz <[email protected]>
* QRangeModel: use q20::cmp_less to safely compare integersVolker Hilsheimer3 days1-2/+2
| | | | | | | | | | Addresses header review comments. Pick-to: 6.10 Task-number: QTBUG-137478 Change-Id: I87b41cd559be5149b3f39c643b14fc28d884d52d Reviewed-by: Marc Mutz <[email protected]> Reviewed-by: Artem Dyomin <[email protected]>
* QRangeModel: return default QModelIndex for parent of invalid childVolker Hilsheimer3 days1-1/+1
| | | | | | | | | | | | | The child model index might be invalid for various reasons, and parent() should return a default-constructed index if there is no parent. Addresses header review comments. Pick-to: 6.10 Task-number: QTBUG-137478 Change-Id: I51094fd6615af9199fc5b7a49248af75184acdaf Reviewed-by: Marc Mutz <[email protected]> Reviewed-by: Artem Dyomin <[email protected]>
* QRangeModel: forward universal references when accessing membersVolker Hilsheimer3 days1-6/+6
| | | | | | | | | | | | | | Also, replace decltype(auto) for local variable with the slightly more intelligible auto &&, which is sufficient for capturing the return value of the function call (including lifetime extension of the temporary). Addresses header review comments. Pick-to: 6.10 Task-number: QTBUG-137478 Change-Id: I0d781a3b41e8b80d84e6d5814184a2806fa87666 Reviewed-by: Artem Dyomin <[email protected]> Reviewed-by: Marc Mutz <[email protected]>
* QRangeModel: clean up naming of constraintsVolker Hilsheimer3 days3-20/+18
| | | | | | | | | Addresses header review comments. Pick-to: 6.10 Task-number: QTBUG-137478 Change-Id: Icebd0a03533b4edb566f0b80b353530efc82444a Reviewed-by: Marc Mutz <[email protected]>
* tools: drop all references in qtpathsLiang Qi3 days1-12/+7
| | | | | | | | | | | | to avoid gcc 15 -Wdangling-reference warning. This follows 9379b95b533216593d4d37c0cbf70f91d1ce037a, 8a6750475410629741de0417c28f574c25c65338 and 18def77d27f88ce26b6af29fe56a80429fed555d. Pick-to: 6.10 6.9 6.8 6.5 Change-Id: If327439bd76e954cde4f9c5261dce7fa18c237a1 Reviewed-by: Thiago Macieira <[email protected]>
* QMultiHash/Doc: document erase() functionThiago Macieira3 days2-0/+30
| | | | | | | | | Contents are a duplicate of QHash's. Fixes: QTBUG-137838 Pick-to: 6.10 6.9 6.8 Change-Id: I9abcfeaad630a0b66e6bfffdbb318e826d7a32ef Reviewed-by: Ivan Solovev <[email protected]>
* Destroy window surface after exit transition for Qt for Android appsJani Korteniemi3 days3-23/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splash screen (or blank launch screen) is shown when exiting the Android application caused by hiding shown windows and destroying it's surface before application exit. On application exit all windows are first set to invisible then surfaces destroyed and finally removed from layout. Also window opacity change can show underlying splash screen as it is set as theme for the application. When pressing Android device's back button application either should hide current window or exit the application. When exiting current window should be visible during application exit. Add AtomicBoolean m_canBeDestroyed to QtWindow for blocking normal surface removal. Set false by default from QtActivityDelegate.addTopLevelWindow and changed from QAndroidPlatformWindow::setVisible() dependent on if there are more visible windows present. Destroy last window with delay so it can be shown during app exit. In QtActivityDelegate.setUpSplashScreen() set layout to use android device's DayNight theme colors to not show splash screen theme if window opacity is changed. Fixes: QTBUG-127705 Fixes: QTBUG-124140 Pickt-to: 6.8 6.9 6.10 Change-Id: I74adf693dac599c0b46b1f427e563683c1033565 Reviewed-by: Assam Boudjelthia <[email protected]>
* Update TIKA mimetypes from upstreamDavid Faure3 days5-18/+324
| | | | | | | | | [ChangeLog][Third-Party Code] Updated TIKA mimetypes from upstream Pick-to: 6.10 Task-number: QTBUG-137782 Change-Id: Ic8437e94eaf334feb5c4896bc2ceccb162e2fb16 Reviewed-by: Mårten Nordheim <[email protected]>
* Update bundled libjpeg-turbo to version 3.1.1Eirik Aavitsland3 days9-7/+45
| | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 3.1.1 Pick-to: 6.10 6.9 6.8 6.5 5.15 Change-Id: Ic18ec6dd91dfaa58318fa56785e6314340e39e0a Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
* Mark qwindowspipereader.cpp as security-criticalMatthias Rauter3 days1-0/+1
| | | | | | | | | | | | | | QWindowsPipeReader is a candidate for a security-critical class because it is parsing data from an external process. The parsing is trivial (e.g. searching \n in *.cpp line 243 or skipping characters) and the data should arguably come from trusted sources. We still go for the safe option and mark it as critical. QUIP: 23 Pick-to: 6.10 6.9 6.8 Task-number: QTBUG-135187 Change-Id: I79767534015370a5102929fee032b916be23d41d Reviewed-by: Ivan Solovev <[email protected]>
* QXcbWindow: Eliminate data race between hide() and deferred activationAxel Spoerl3 days1-0/+3
| | | | | | | | | | | | | | | | | | | | When hide() was called on a window that is still hidden with its activation being deferred, the hide() call could have been overridden when the deferred activation kicked in. In tst_QGraphicsScene::tabFocus_sceneWithFocusWidgets() this sometimes causes the wrong widget to be focused. Lock the mutex for m_mapped at the beginning of hide(). Cancel deferred activations when setting m_mapped to false. Can't be autotested. Flakiness of tst_QGraphicsScene::tabFocus_sceneWithFocusWidgets() will disappear. Fixes: QTBUG-123063 Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I80c3419f09a5fd98c2684c672c631c6a63d4ec48 Reviewed-by: Tor Arne Vestbø <[email protected]>
* QByteArray: replace: add tests for `after` pointing into thisAhmad Samir4 days1-0/+48
| | | | | | | | Also `before` points into this. Pick-to: 6.10 6.9 6.8 Change-Id: I0d1aa522e96c046ea26fc0948546e0625c1a83e7 Reviewed-by: Ivan Solovev <[email protected]>
* timers.qdoc: cleanup API docs wrt. QChronoTimerAhmad Samir4 days4-38/+45
| | | | | | | | | Amends 87030778969165a285af2d919d6d7293e8078b6a. Pick-to: 6.8 6.9 6.10 Fixes: QTBUG-133029 Change-Id: Ida5e0b8075222ec0d5e28d11b375dd1f2976fa1e Reviewed-by: Ivan Solovev <[email protected]>
* QStringListModel: de-pessimize guard clauses in moveRows()Marc Mutz4 days1-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The guard clauses validating the moveRows() function arguments were in some random order this author doesn't understand. Order them by increasing complexity (cheapest first): - first, check the ints - check each one in turn, grouping the LHS - then, check the relations between the ints that must hold - then, check the QModelIndexes for invalidity (list models don't have hierarchy, so both parents must be roots) - at this point, we know both arguments have to be equivalent to a default-constructed QModelIndex(), so we don't have to pass them to rowCount(), we can use the default argument instead - then, after caching the result of the rowCount() virtual call, check the ints w.r.t. their upper bounds This means we fail and (because of the cached rowCount()) succeed faster. This is in preparation for an Extract Method of these clauses for reuse in other list models. Amends da9aeb3e4ec63876e48d024772f0f0bd0b790157. Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I22f7c8e61cfa806ae88b593730b1c1979cf62c46 Reviewed-by: David Faure <[email protected]>
* QXcbWindow: Lock m_mapped, when applying state to unmapped windowAxel Spoerl4 days1-0/+1
| | | | | | | | | | | | | | | | If QXcbWindow::setNetWmStateOnUnmappedWindow() is called on a window that has already been requested to be mapped, it can be mapped before the state has been applied, leading to the window having the wrong state (e.g. requested modality not respected). Eliminate the data race by locking m_mapped with the existing mutex member. Fixes: QTBUG-120031 Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I2b142420fc155d8b465df846560d868bd87882fb Reviewed-by: Liang Qi <[email protected]> Reviewed-by: Tor Arne Vestbø <[email protected]>
* Revert "CMake: Annotate some qt_find_package calls with MODULE"Alexandru Croitor4 days28-155/+113
| | | | | | | | | | | | | | | | | | | This breaks reconfiguring Qt in various ways, one of which is CMake Error at cmake/QtTargetHelpers.cmake:1557 (message): PkgConfig::ATSPI2 is not a valid target. This happens because pkg_check_modules sets ATSPI2_FOUND to 1, so qt_find_package thinks it shouldn't find the FindATSPI2.cmake module, which ends up not creating the ATSPI2 target. This reverts commit f1a59e974f013fcf8629d8cbacab58d895523100. Pick-to: 6.10 Fixes: QTBUG-137870 Change-Id: Ica74a236c6b1bb9d7ca9af29175cb2e84a93251b Reviewed-by: Fabian Kosmale <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
* Deprecate QColormapTor Arne Vestbø4 days4-3/+23
| | | | | | | | | It serves no purpose these days. [ChangeLog] The QColormap class has been deprecated. Change-Id: I3826e0b7e2e2a517c0c0c51d2f61cf0b718fdf33 Reviewed-by: Axel Spoerl <[email protected]>
* QMainWindowLayout: Don't keep unused separator widgets aroundAxel Spoerl4 days2-18/+8
| | | | | | | | | | | | Instead of deleting QMainWindowLayout has kept unused separator widgets around for later usage. Remove this logic. Delete unused separator widgets, create new ones when needed. Pick-to: 6.10 6.9 Change-Id: Iec02154d9344ff89386c1e0a5d65b9fbab4e4896 Reviewed-by: Volker Hilsheimer <[email protected]>
* Android: auto-tests: Add missing lib to tst_qapplication Android apkKonsta Alajärvi4 days4-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | tst_qapplication is missing the modal_helper executable from the apk. Set the libmodal_helper.so as a target property for the tst_qapplication with QT_ANDROID_EXTRA_LIBS property. Change the name of qtbug_12673() test function to modalDialog(), I think this better represents what's being tested. The bug ticket representing qtbug_12673() can be found from the ticket linked to this commit. Construct a full path to the modal_helper.so and pass that to QProcess.start instead of relative path to filename when targeting Android. Add a shared utility function androidAbi() that returns the currently defined Android ABI. Change the function name in BLACKLIST file. Task-number: QTQAINFRA-6908 Pick-to: 6.8 6.9 6.10 Change-Id: I13904acda0f5608ea31df49bd95824e1412f2786 Reviewed-by: Assam Boudjelthia <[email protected]>
* Doc: Fix typo in QGraphicsSimpleTextItem class descriptionDheerendra Purohit4 days1-1/+1
| | | | | | | | | | | Removed the incorrect word "path" from the description, which mistakenly referred to the item as a "text path item". QGraphicsSimpleTextItem provides a simple text item, not a path item. Fixes: QTBUG-87180 Pick-to: 6.10 6.9 6.8 Change-Id: I977d01c667c65f5d35dc3bc60d5362e681e9b5f1 Reviewed-by: Volker Hilsheimer <[email protected]>