aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix build without features.imageformat-xpmTasuku Suzuki2021-04-261-0/+2
| | | | | Change-Id: Ib125517f87be0dac22eaeba059a6cdfd18abb7b7 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix build without features.quicktemplates2-hoverTasuku Suzuki2021-04-261-1/+1
| | | | | Change-Id: I02096558d480dcef456f9cd1e86c7c843179758c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* ScrollView: fix crash when scrolling with zero-sized itemMitch Curtis2021-04-232-1/+10
| | | | | | | | | | | Check if a Flickable type was actually set as the contentItem before accessing the pointer. Also warn that using a type other than Flickable is not supported. Fixes: QTBUG-93039 Pick-to: 6.1 6.0 5.15 Change-Id: I1470766c6de02b7b601edf1375791d3147f26ab5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Native style: fix statically built apps that links to both widgets and controlsRichard Moe Gustavsen2021-04-222-4/+24
| | | | | | | | | | | | | | | | | | | | | | The c++ symbols are already namespaced into QQC2. But since there is no namespace concept in obj-c, we use QT_MANGLE_NAMESPACE to wrap those symbols into a "fake" namespace by concatinating symbol name and namespace name together. The problem is that QT_MANGLE_NAMESPACE only take the QT_NAMESPACE into account, and not the additional QQC2 namespace. The result is that the application will fail linking because of duplicate obj-c symbols when you combine widgets and controls in a statically linked application. This patch will redefine the affected macros locally in qquickmacstyle_mac, so that both the Qt namespace and the controls namespace are taken into account. Pick-to: 6.0 6.1 6.1.0 Fixes: QTBUG-92883 Change-Id: Ic2f84ad9c0005fdd2553729d897cee113a4ff24d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* QmlDesigner: Fix RangeSliderSpecifics snap modeHenning Gruendl2021-04-211-1/+1
| | | | | | | Task-number: QDS-4212 Pick-to: 6.1 6.0 5.15 Change-Id: I82d524960a34e9307ddf9b154a326d8fadc7387c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* controlsimpl: Add QtQuick dependencyMaximilian Goldstein2021-04-211-0/+2
| | | | | | | | Since most Impl elements are QtQuick based we need to add it as a dependency or else the compiler and linter will get confused. Change-Id: Id7532d254b6d9b305342ab85cc6466e1bde26b65 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* CMake: Add missing qt_cmdline.cmake filesAlexandru Croitor2021-04-162-0/+6
| | | | | | | | Generated with configurejson2cmake.py Change-Id: Ib07d883b94462f6e132f36c24e763b31309aaeed Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Fix qml module version to use the repo project versionAlexandru Croitor2021-04-1519-19/+19
| | | | | | | | | | | Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the repo project version is used in a top-level build, rather than the version of the qt5 project. Pick-to: 6.1 6.0 Task-number: QTBUG-92861 Change-Id: Ifd12d6309f358b9b72372a5c069141ecb7322bc7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Ninepatch: keep resetNode status to not lose track of ↵Laszlo Agocs2021-03-311-1/+6
| | | | | | | | | | | | ImageNode->NinePatchNode changes Basically does what 788865b805bc91151ac8fe18bf7b92b1212ee07d did, but on the other branch. Pick-to: 6.1 6.0 5.15 Fixes: QTBUG-87236 Change-Id: Ie8371de8a9d49054c888e4bffb7e89392a6d7c07 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Include qquickpalette_p.h from qquickcontrol_p.hUlf Hermann2021-03-261-0/+1
| | | | | | | | The QML_FOREIGN declaration for QQuickPalette is not very useful if including it doesn't actually get you the type. Change-Id: Ia5face462112f9cccff4622e2bc6fd369ce204c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Adjust to QV4Engine::toVariant signature changeFabian Kosmale2021-03-262-2/+2
| | | | | Change-Id: I82aa23bf35cb611978939fcbda8baf9520fc2f32 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Doc: Use \qmldefault instead of \defaultPaul Wicking2021-03-2311-11/+11
| | | | | | Task-number: QTBUG-81525 Change-Id: I1b79fde191bfe0ac11778baf352409ace4cd5a56 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Handle directly-delivered mouse events in SwipeDelegateShawn Rutledge2021-03-233-21/+130
| | | | | | | | | | | | | | | | | Delivery order has changed to be the same as the z-axis stacking order (since qtdeclarative 3ff11ceca37dcc4b6f0420332fa7f6aa007be7f3). Since QQuickSwipeDelegate puts its children under itself by setting negative z-values, it can now receive mouse events before those negative-z children, directly rather than via childMouseEventFilter(). It doesn't seem to be enough to ignore() the events and let them propagate: we now need to explicitly forward them to interactive child items, and to child items' Attached objects, if any. Pick-to: 6.0 6.1 Fixes: QTBUG-87018 Fixes: QTBUG-87789 Change-Id: I1e02ceddad7c3221fb09a33046941d654bfa8a4b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Consistently check for nullptrVolker Hilsheimer2021-03-191-1/+1
| | | | | | | | | | | | Since delegateItem might be nullptr after the qobject_cast, it might still be nullptr even if d->tumbler is set. Don't dereference it without checking first. Fixes static analzyer warning 97aff83b6782555664df70d92f65e7dd. Pick-to: 6.1 Change-Id: I70f4e27eaa5e26538884ead19ae12da7bacbd76b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove references to Q_QML_PRIVATE_API_VERSIONFabian Kosmale2021-03-192-12/+0
| | | | | | Change-Id: I476fd6dc9bb87dc95265bd92dbb6beeb684644f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Generate and install qmltypes for all pluginsMaximilian Goldstein2021-03-186-1/+7
| | | | | | | Pick-to: 6.1 Change-Id: Ib6f0aa7d2fe663f8d1ba090d2c62d57e0073a526 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Port from QScopedPointer to std::unique_ptrVolker Hilsheimer2021-03-172-3/+3
| | | | | | | Fix compiler warning about deprecated QScopedPointer::take. Change-Id: I7300e0a4eab5fca101b8b3127abf12e88359a5ca Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Change section titles that cause bad linksPaul Wicking2021-03-111-3/+3
| | | | | | | | | | | Section titles are valid targets for QDoc's autolinker. When they are identical to other valid link targets, such as for example a class, these sections may cause invalid links. Pick-to: 6.0 6.1 Task-number: QTBUG-91141 Change-Id: I466b2d21be030cd34b2a734d5126c45ff763127b Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix static buildJoni Poikelin2021-03-091-1/+1
| | | | | | | | | | Function with the same name is exported from QtQuick which leads to multiple definition linker error. Marking this function as static avoids the issue. Pick-to: 5.15 6.0 6.1 Change-Id: I29f3923ee55b5181e9b76b91e49d9f753f54ed8f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove redundant qmldir filesAlexey Edelev2021-02-2317-754/+0
| | | | | | | | | | qmldir files to be generated by the cmake build procedure and don't need to be stored in the source tree. Task-number: QTBUG-88263 Change-Id: Idff2800b5b2b6cb74d79a2f42fff717522c10ade Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix namespaced Qt buildKarsten Heimrich2021-02-171-3/+3
| | | | | | Pick-to: 6.1 Change-Id: I688bdd73c939304f572d0e162e7aa09499bf737f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* ComboBox: don't focus TextField when clicking on indicatorBartlomiej Moskal2021-02-161-1/+5
| | | | | | | | | | | | | | | | Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove QMake project filesJoerg Bornemann2021-02-1134-2551/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I4247294258629c92e80914518e9208019090c815 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* a11y: Fix ordering on header, content item and footer in PageJan Arve Sæther2021-01-298-2/+230
| | | | | | | | | | | | | | | Because of the previous behavior, the footer could be read aloud by the screen reader before the content item. And even worse, the footer could be read aloud even before the header in some cases. This made it hard for visually impaired people to use the application. The Page type was used by the Dialog type, so it also affected that. Fixes: QTBUG-75042 Pick-to: 5.15 6.0 Change-Id: Ic3e8ec3f7dcf18af9262b1d35c986835c8da6900 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Combobox: Fix initial set of inputMethodHintsBartlomiej Moskal2021-01-281-6/+15
| | | | | | | | | | | | | | | Fix for setting up initial inputMethodHints to Qt::ImhNoPredictiveText for Combobox. Before this change, Qt::ImhNoPredictiveText was never set for Combobox. As inputMethodHints() by default returns Qt::ImhNoPredictiveText value, setInputMethodHints didn't allow to set this value correctly. Task-number: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: Ie4ec0d32fff7586bc3a8bd055b752000c0330fad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Adapt to hover on disabled itemsAllan Sandfeld Jensen2021-01-283-4/+4
| | | | | | | | Only react to hovered on enabled items. Fixes: QTBUG-90580 Change-Id: I955033f391e6cd592e3d75b79b9242019db9fcfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix initial currentIndex in Tumbler when wrap is set to falseAlexey Edelev2021-01-141-2/+3
| | | | | | | | | | | | | | | syncCurrentIndex () function assumes that PathView is used as view for, Tumbler component, and states that actualViewIndex should be 0 while initialization. This statement is not correct when Tumbler is in non-wrap mode and uses ListView as view, where currentIndex is set to -1 by default. Fix actualViewIndex condition according to ListView logic. Fixes: QTBUG-84426 Pick-to: 5.15 Pick-to: 6.0 Change-Id: I4ef1e7b45399bf748968490f44b8909f3218d9bc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix MSVC warnings about precision loss when converting double to floatFriedemann Kleint2021-01-144-4/+4
| | | | | | | The warnings appeared after porting QCcolor to float. Change-Id: I248f15a7a403281e849f030e412c159f9732261e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* SwipeDelegate: ensure background and contentItem are resizedMitch Curtis2021-01-143-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the geometry of a control changes, this code is called: void QQuickControl::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickControl); QQuickItem::geometryChange(newGeometry, oldGeometry); d->resizeBackground(); d->resizeContent(); if (!qFuzzyCompare(newGeometry.width(), oldGeometry.width())) emit availableWidthChanged(); if (!qFuzzyCompare(newGeometry.height(), oldGeometry.height())) emit availableHeightChanged(); } SwipeDelegate works by moving the background and contentItem together when it is swiped to expose the various delegates. Because this involves setting the position of the background, the check for background's x position being 0 in QQuickControlPrivate::resizeBackground() would fail and the background would not be resized at all. Fix this by making resizeBackground() virtual and don't check the x when checking if we should set the width. Similarly, in QQuickSwipeDelegatePrivate::resizeContent(), we should set the contentItem's width instead of just repositioning and resizing it vertically. Fixes: QTBUG-85770 Pick-to: 5.15 6.0 Change-Id: I36684bf2797719db87fe93063cc7685efe594eea Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QQuickStyleItem: add debug flag 'SaveImage'Richard Moe Gustavsen2021-01-132-0/+12
| | | | | Change-Id: Ifbaadd993924022b1351927aaf3987cb94c74df8 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Windows: add 9p margins to scrollbarRichard Moe Gustavsen2021-01-132-0/+28
| | | | | | Pick-to: 6.0 Change-Id: I8d56f7b7071c51d4dfc88e12864bc3e0e7c5ab10 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* ScrollView: let flickable have pixelAligned set to trueRichard Moe Gustavsen2021-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | A ScrollView will typically contain other controls. And if we're using a dpr with a fraction (e.g 1.25), the position of the controls will sometimes jitter as you scroll. The result is that if e.g a Frame is wrapped tight around around a Rectangle, the frame will sometimes be outside the rectangle, and other times on top. This is because of rounding issues when drawing the Frame vs the Rectangle. So let the default flickable used by a ScrollView have pixelAligned set to true. This will give the best cross-platform "out of the box" experience. The developer can always choose to use his own Flickable for ScrollView, and tweak it, if such default behavior is not wanted. Pick-to: 6.0 Change-Id: I7dc7b0b390dbf055f35cca2a6c15a6075e33c0a4 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Ensure the ninepatch image is detachedLaszlo Agocs2021-01-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some more contrived usages of nine patch images can uncover an issue with the nine patch node implementation when used together with the threaded render loop of Qt Quick: pixmapChanged generates a QImage that references external data, which then gets passed to the scenegraph in updatePaintNode during the scenegraph's sychronization phase. This pattern (QSGTexture from non-data-owning QImage) should be avoided in general, because when the gui thread gets unblocked and continues after the sync phase, it could invalidate the data the QImage points to. If now the independently running render thread happens to try accessing the data (still the QImage that got passed in in the sync phase), bad things may happen. While it can be difficult to reproduce an actual crash (without ASAN and such), logging with the specially crafted example code shows that the logic is problematic if non-owning QImages are involved: (the pointers are the QImage's constBits) - pixmapChange 0x1f1053a5954 [gui thread] - updatePaintNode 0x1f1053a5954 [render thread, gui blocked] - beforeRendering [render thread] - pixmapChange 0x1f1053e7424 [gui thread] - QSGPlainTexture bind/update 0x1f1053a5954 [render thread] // but 0x1f1053a5954 may be invalid at this point if not owned by the QImage passed to createTextureFromImage - frameSwapped [render thread] Pick-to: 6.0 5.15 Fixes: QTBUG-88162 Change-Id: Id83d04fce668a3e05d150c086abdecc9d59e51e8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix popups with exit transitions blocking mouse events when destroyedMitch Curtis2021-01-131-4/+19
| | | | | | | | | | | | | | | | | | | | | | If a popup had an exit transition set and was destroyed upon e.g. being rejected, it would not destroy its modal dimmer, and so events would not go through to popups that were beneath it even after it was destroyed. QQuickPopup's destructor does indirectly attempt to call finalizeExitTransition() through a setParentItem(nullptr) call, but prepareExitTransition() returns false if it sees that the exit transition is already running, and so transitionExit() never calls finished(). This patch fixes the problem by explicitly calling finalizeExitTransition() in QQuickPopup's destructor if the exit transition is running. Fixes: QTBUG-89673 Pick-to: 5.15 6.0 Change-Id: I468fae52f6a83ac314877c67d062028634bb7e17 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Ensure that C++ Qt Quick tests are run with all applicable stylesMitch Curtis2021-01-132-0/+17
| | | | | | | | | | | | | Since 8b534487044dfb3b464431ecb91ef4e0864af4ed, the C++ tests were only being run with the default style for the platform that they were run on. Fix this by keeping track of whether a default style is in use and checking it in the tests. Pick-to: 6.0 Change-Id: I4ddd90aba12ede83fff0d3d1002534e79fce8c87 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Use CMAKE_PROJECT_VERSION for VERSION of QML modulesMitch Curtis2021-01-1310-10/+10
| | | | | | | | | | This ensures that the modules provide versions matching the current Qt version. Change-Id: I164b54af60de3b2b6ca6f54c417eb58b1eafd1e5 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQuickStyleItem: use correct enum numberRichard Moe Gustavsen2021-01-111-1/+1
| | | | | | | | | | It should of course be 4, not 3. The result of it being 3 is that we would always also print info when debugging imagerect. Pick-to: 6.0 Change-Id: I257159b25b8aad1848d82af9855ecd194e7360a0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Doc: Fix typo in \sa statementNico Vertriest2021-01-081-1/+1
| | | | | | Pick-to: 6.0 Change-Id: I3461744b8e784d9c3c775f06bffe8f7b3965073c Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Reset the opacity and scale properties after the exit transitionAndy Shaw2021-01-063-4/+26
| | | | | | | | | | | | | | | By resetting the opacity and scale properties after an exit transition we are ensuring that it does not lose the original values that the user may have set. [ChangeLog][Important Behavior Changes][Popup] After the exit transition is finished, then the opacity and scale properties will be reset to their values before the enter transition is started. Pick-to: 5.15 Fixes: QTBUG-87283 Change-Id: I2b192c96eaea2906d968341255e80cd19be177e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Document that styles must be explicitly imported for static buildsMitch Curtis2021-01-052-1/+4
| | | | | | | Task-number: QTBUG-52466 Pick-to: 6.0 Change-Id: Ibf5c6f4079381c5ac507812f97439dbb49ada074 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Only connect to the items window signals if it has a windowJan Arve Sæther2020-12-162-2/+15
| | | | | | | | | | | | | | | | | If the styleitem was created in a control without a window, it failed to connect to the activeChanged() signal of QQuickWindow. It would consequently warn about invalid null parameter to QObject::connect() If the control was added to a window at a later point, it would also not connect to the activeChanged() signal of QQuickWindow. This could cause that the control was rendered as it would be rendered in an inactive window, even if the window actually was active. Task-number: QTBUG-88553 Pick-to: 6.0 Change-Id: I3aa5948e150f0f4baa204943ec43ea8922421e75 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Do not crash because of missing context on the indicator buttonsJan Arve Sæther2020-12-112-4/+27
| | | | | | | | | | This now follows the same pattern as QQuickSpinBox does it for it's own indicator buttons. a11y::ScrollBar crashed because of this Change-Id: I5669fa2bf130b37ad46573aae5c6bebd8e0d0434 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add support for ScrollBar arrow buttonsJan Arve Sæther2020-12-1015-213/+559
| | | | | | | | | | | In order to achieve this, it separates out QQuickSpinButton into a separate file (and renames it since it's not only purposed for SpinBox anymore). This allows it to be also used by QQuickScrollBar. Fixes: QTBUG-88115 Pick-to: 6.0 Change-Id: I2dea42b29750b7bc619031f40a43717fc10c177b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Do not crash in deferred execution of there is no context yetJan Arve Sæther2020-12-101-1/+1
| | | | | | Change-Id: Ib7ffbb263856f1ed97693eee10097f8cc2f8fb12 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Fix nativestyle qmldir dependenciesAlexandru Croitor2020-12-102-4/+4
| | | | | | | | | | | | | | | pro2cmake chokes on converting the nativestyle project, because it expects to find a second argument after the depends clause. Add an 'auto', and regenerate the project. Amends a3253c37903e95706f011bc03093160236b57bdc Pick-to: 6.0 Task-number: QTBUG-88492 Change-Id: I4c9114780e17f5bc21a43511e75207eaef5e7550 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Allow style to be set to "Default" for compatibilityMitch Curtis2020-12-091-2/+5
| | | | | | | | | | | | | | | This unbreaks Qt 5 applications that weren't specifying a style or were specifying Default. [ChangeLog][Important Behavior Changes] Setting the style to "Default" now behaves the same way as not specifying a style; a relevant style will be chosen based on the platform. To use the style previously known as "Default", use "Basic". Task-number: QTBUG-85984 Pick-to: 6.0 Change-Id: I8e5533f9c6834765610773e46f97fbd56a242039 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Ensure that Fusion style is used by default on LinuxMitch Curtis2020-12-091-1/+1
| | | | | | | | Fix typo in qquickstyle. Pick-to: 6.0 Change-Id: Id567f7359ae7aa346b38f94ae1add29aeb73039a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Drop documentation dependencies to removed modulesVolker Hilsheimer2020-12-041-1/+1
| | | | | | | | | Silences qdoc warnings about unlocatable index files, doesn't introduce any new warnings from missing link targets. Pick-to: 6.0 Change-Id: I36fe481d57e631389c485aa41c1a6fac5d997680 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add qtqmlmodels as a documentation dependencyVolker Hilsheimer2020-12-031-1/+1
| | | | | | | | | QQuickPlatformMenu links to the Instantiator type from this module. Pick-to: 6.0 Change-Id: If59f6a64ac0144a7e6697b45e970c9f091bbb2e8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Use explicit linkage with target_link_librariesKai Koehne2020-12-031-1/+1
| | | | | | | | | | | | | | | The Professional CMake book suggests always using explicit linkage with target_link_libraries, so let's use that. Whether to use PUBLIC or PRIVATE depends on the context. But let's be conservative and advise on using PRIVATE by default. Also prefer the versioned target name over the unversioned one. Task-number: QTBUG-88935 Pick-to: 6.0 Change-Id: Icf96616e2229b48cd3304a84d45314e69b1e40a9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 12:41:06 +0000