summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Android: use the correct path to DefaultWindowDecoration.qmlAssam Boudjelthia2020-08-111-1/+1
| | | | | | | | | | | | | | Regression caused by 7a806347167607172ee38c60d30808b298224a8b. The file DefaultWindowDecoration.qml is installed under "qml/QtQuick/Dialogs/qml/" but the path used assumes it's under "qml/QtQuick/Dialogs/". Fixes: QTBUG-85434 Change-Id: I536e3d805896815ae63c43c25b60c0e810dc3cab Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 7aeaa7aa1ef38ed337b41ea785852c72e48d6f22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Return QPersistentModelIndex which is stored when calling mapRowToIndexAndy Shaw2020-07-182-2/+2
| | | | | | | | | | | | Since the index is stored as a QPersistentModelIndex then this is what should be returned since a QModelIndex can become invalid and to prevent issues with views that may store this index we should keep it as a QPersistentModelIndex so that it is updated if the model changes it. Pick-to: 5.12 Fixes: QTBUG-84853 Change-Id: I0cf8014b386a2a5156f6c2d4f8b6feea823fbe26 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add missing overrideAlexander Volkov2020-05-2539-103/+104
| | | | | | | Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit a2f9eaf552b58a258beb25d29691fff97276e198) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: State correct default wrap mode in TextAreaDaniel Smith2020-05-181-2/+2
| | | | | | | | | Fixes: QTBUG-84048 Change-Id: I91ec44a5556f5906771642ca947f2e5bb1cd0721 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit c7e7fe1f56852863217e052224e80464c9c0fdb8) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Change the fsType of icons.ttf to allow installing the icon fontShawn Rutledge2020-05-111-0/+0
| | | | | | | | | | | Used https://metacpan.org/pod/distribution/Font-TTF-Scripts/scripts/hackos2 to change the fsType from 8 to 0 in the OS/2 table. /usr/bin/site_perl/hackos2 -t0 src/dialogs/qml/icons.ttf icons.ttf Fixes: QTBUG-84086 Change-Id: Idc72ca04d5c71bb049c7d6d2c0cd9b40739c2321 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Android: use new Connections formatAssam Boudjelthia2020-04-221-1/+1
| | | | | Change-Id: I799d3b22950131c91b6cfe2bf12fc6c1968ab15c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Docs: recommend to use QtQuickControls 2 Dialog on Androidv5.15.0-beta4v5.15.0-beta3Assam Boudjelthia2020-03-201-0/+2
| | | | | | Fixes: QTBUG-82781 Change-Id: I98bb77d9118d05b16235cc1107d6e7a74b70fc65 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-182-3/+9
|\ | | | | | | Change-Id: I3022d2eabeef6d387135427b553de8a6d80dff13
| * TreeView: update currentIndex on model changesAlberto Mardegan2020-03-101-1/+7
| | | | | | | | | | | | | | | | | | | | | | The previous binding was not getting re-evaluated when the model was being reset or when rows were been inserted or removed. Here we use a counter variable, whose value change will force the evaluation of the binding. Fixes: QTBUG-53097 Change-Id: I76afebbda78ab477cf65631337a8bad51ca5428d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix deprecationwarning macro callKai Koehne2020-03-091-2/+2
| | | | | | | | | | | | | | This amends 52e5dc73b3f61e Change-Id: I671bf2577e845064413a2390366d147aba72d605 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix incomplete QPainterPathv5.15.0-beta2Allan Sandfeld Jensen2020-03-101-0/+1
| | | | | | | | | | | | Fixes: QTBUG-82787 Change-Id: Ib481c9f8454ccc1b7398e2c03b1db16c310ec7e2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Fix build after header shuffling in qtbaseSimon Hausmann2020-03-101-0/+2
| | | | | | | | | | | | Fixes: QTBUG-82787 Change-Id: I3f3f1537f1f6c8b27306aedcd38d056e0fa984b2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-273-69/+59
| | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: Ia4f49f7923d266e669d257d14319f3537105a1ac Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Combine repeated logic to get Dialogs QML files into one functionv5.15.0-beta1Assam Boudjelthia2020-02-171-46/+20
| | | | | | | | | | | | | | Add fileLocation() function to return the path of each dialog type. Change-Id: I7213e8cd09f61eca000f481b1cae58e9e5b3405e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-282-4/+25
|\ \ | |/ | | | | Change-Id: Ifafbb9982454f62dcf1ccc1c5ed8661138dd01f8
| * Merge 5.14 into 5.14.1v5.14.15.14.1Kari Oikarinen2020-01-152-4/+1
| |\ | | | | | | | | | Change-Id: I91a981474478b244f956497347155d5c44e4fc84
| * | Android: Look in the correct location for the supporting QML filesAndy Shaw2020-01-152-4/+25
| | | | | | | | | | | | | | | Change-Id: I99db8554f88d39a2e9376b50bb1a6f8a334cf461 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-112-4/+1
|\ \ \ | | |/ | |/| | | | Change-Id: Ia4ce71363671afd3f3a6ae8ff4740388c007f7f3
| * | Doc: Remove \internal command from a \qmlabstract typeTopi Reinio2020-01-102-4/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Even though the type is private, other types inheriting from it must also inherit the property documentation. \qmlabstract handles this, but only if the abstract type is not \internal. Remove incorrect links that were trying to fix the issue previously. Fixes: QTBUG-79469 Change-Id: I9b9bb0af84abf44c5cbe9e1770659cff24834dd6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-077-0/+37
|\ \ | |/ | | | | Change-Id: Ided88edd678ef05c3f69cfa374b8a79e64f5c812
| * Doc: Add a note about the deprecated controls 1Venugopal Shivashankar2019-12-057-0/+37
| | | | | | | | | | | | | | | | | | This will help readers who will end up on the Controls 1 pages through a web search. Change-Id: I9c40f6c66c72e5a456dd903485133c64cb386f8f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix warnings about providing function for DESIGNABLE in property declarationFriedemann Kleint2019-11-261-1/+1
| | | | | | | | | | | | | | | | Set them to be designable by default, fixing: qquickaction_p.h:65: Warning: Providing a function for DESIGNABLE in a property declaration is deprecated and will not be supported in Qt 6 anymore. Change-Id: I411f71062d78facb5a8ed311d324cbbf083e2efd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Fix deprecation warning about qmlRegisterType()Friedemann Kleint2019-11-261-1/+1
| | | | | | | | | | | | | | | | Use qmlRegisterAnonymousType() instead, fixing: plugin.cpp:199:53: warning: 'int qmlRegisterType() [with T = QQuickControlsPrivate1Attached]' is deprecated: Use qmlRegisterAnonymousType instead [-Wdeprecated-declarations] Change-Id: I23e7559798c461fa9c3a3608b5a816d334fdd021 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-251-5/+5
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I9dbd2c23e122161cf7216303c65c25678c472545 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-1918-58/+65
|\ \ | |/ | | | | Change-Id: I4c1a5d2aa625740a57325276098b82727b7925bd
| * Doc: Fix documentation warningsTopi Reinio2019-11-1418-58/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All warnings in qtquickcontrols were related to \qmlmethod or \qmlsignal parameters, except for the missing dependency to qtcore in Qt Quick Extras. There's some inconsistencies with how QDoc parses QML method parameters, especially for qml signals - in some cases the \a command is replaced with \e to clear the warning, even though the parameter name referenced with \a does exist. This commit brings the current warning count to zero. Fixes: QTBUG-79828 Change-Id: I3d3d02583498c5a579f6476273e10e75680d940c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-124-0/+4
|\ \ | |/ | | | | Change-Id: I1d6fd78aa3b9ef7899a14c95c5e06b2d44458d80
| * Add missing depends entry for QtQmlAndy Shaw2019-11-064-0/+4
| | | | | | | | | | | | | | Fixes: QTBUG-79794 Change-Id: I1095563250cf872080843670ad1d92b896db38a3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-052-34/+168
|\ \ | |/ | | | | Change-Id: I1ddb1de98d15c70274040984d2e685a72827dc05
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-042-34/+168
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ide73d291e885a0455765263716ea2b972d7ae62b
| | * QQuickTreeModelAdaptor1: fix updating of ModelIndex roleAlberto Mardegan2019-10-292-34/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision to store the original QModelIndex as a role has the unfortunate consequence that we need to emit the dataChanged() signal whenever its value change. The previous implementation of the "move rows" operation failed in delivering this update in most cases. While addressing that, this commit also fixes some similar issues with the HasChildren role not being notified in certain scenarios. Also, when the last child of an expanded item gets moved away and later placed back in the original position, the item should not remember its expanded state, but rather accept the children while staying collapsed. Last but not least, it's important that the endMoveRows() protected method is called *after* the original tree model has completed its movement, because otherwise its elements might be accessed while in the wrong state. Similarly, we don't want the dataChanged() signals to be emitted while rows are moved or removed; we queue up these events and fire them only after the item indexes have settled. Fixes: QTBUG-59606 Change-Id: Ib981c912ea19908e1283cc463331c3053d4d6e7d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-264-715/+714
|\ \ \ | |/ / | | | | | | Change-Id: Ib3ca61bf2e6506242f62f4add82f0162f0a0f123
| * | Update plugins.qmltypes for 5.14Kai Koehne2019-10-234-715/+714
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I3d6c4c3239107b25731d8e355c774a6b8b70a601 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Adapt to new Connections syntaxUlf Hermann2019-10-2022-68/+76
|/ / | | | | | | | | | | Change-Id: I299baf89f2530250a333736bb31f4ae470610176 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Make restoreMode on all Binding elements explicitUlf Hermann2019-10-0422-54/+225
| | | | | | | | | | | | | | The default is going to change in 5.15. Change-Id: Ib17500791476bd45ed2c7c3736186897fb63d7a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Android: Always load qml files from resourcesv5.14.0-beta1BogDan Vatra2019-10-013-10/+19
| | | | | | | | | | | | | | | | | | | | | | The QML files on Android are now available in :/android_rcc_bundle/qml folder, this way we don't need to extract them at very first start up. [ChangeLog][Android] Always load qml files from resources (:/android_rcc_bundle/qml) Change-Id: Ib905e5d5e1577d99bb89e7e0d237fa8b24a1e95f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-281-1/+1
|\ \ | |/ | | | | Change-Id: I5c3215469c4b5f45943e8937e8b1eb309c6aed92
| * Only calculate the height of the ListView when there are model entriesAndy Shaw2019-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | When it tries to calculate the height of the listview then it depends on the model having entries. If there is no model or no entries in it then it will cause a warning to be outputted indicating that the model size is less than 0. This prevents it from occurring as a result. Fixes: QTBUG-72543 Change-Id: I7155a3a240fdcdf93caddfce332f0cc6bb0f0ec0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Guard against flickableItem being null when scrollingUlf Hermann2019-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes error from qmlplugindump: ScrollViewHelper.qml:147: TypeError: Cannot read property 'originX' of null Change-Id: I1bef74acda8fb4e1850967c4d684ece7d458699b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-163-0/+3
|\ \ | |/ | | | | Change-Id: I69f231e99be0cc9a5600d95d1f53f70f5d55593e
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-093-0/+3
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: If30143e106fec5a8694c47ab2376aeda36faf8e1 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Remove usages of deprecated QLatin1LiteralSona Kurazyan2019-06-251-1/+1
|/ | | | | | Task-number: QTBUG-76491 Change-Id: I7cde087044916a8f434c04182be34caa8ca37b17 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-081-1/+1
|\ | | | | | | Change-Id: I8c71c934d005841d9512b29bd6d5285f966033f1
| * Exclude the resources when building statically as qmake will handle thisAndy Shaw2019-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As qmake will combine all the QML files etc together for us in static mode then we should not include those added to the resources explicitly in the pro file otherwise we will end up with an extra copy. Additionally, if qrc:/ was added to the import path list it would end trying to load the files from there and not from the qrc:/qt-project.org/imports location as a result. Change-Id: Icbaea7c6103074f9468914365b099be4589bee37 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-281-1/+1
|\ \ | |/ | | | | Change-Id: Idc2e5ad567f83eb85d51d1e21c38bcd96436a24f
| * Don't specify null to indicate an invalid QModelIndexAndy Shaw2019-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since this call is done on the C++ side, there is no means to equate null as being the same as QModelIndex(). As that is the default value when calling index(), we can just drop the argument in this case. Change-Id: I97b80064978b7af01f0606ed6f3778349adc4277 Fixes: QTBUG-74523 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-203-11/+8
|\ \ | |/ | | | | Change-Id: I4bb2b57f7f091074b0c4d17cad4748843e806dd0
| * Create the decoration component when it is neededAndy Shaw2019-04-163-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple QQmlEngines are created and use a Dialog, initalizeEngine will be called more than once and therefore recreates the QQuickAbstractDialog::m_decorationComponent without deleting the original. Therefore we keep the decoration component url instead, and create the decoration component on demand. This ensures that it keeps the component relevant for the QQmlEngine and stops the memory leak from before as well. Fixes: QTBUG-75149 Change-Id: Ic79103f42d092d39b46868a45b4099ddc6edf9db Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Fix scroll position after resizev5.13.0-beta3v5.13.0-beta2Allan Sandfeld Jensen2019-04-081-1/+6
| | | | | | | | | | | | | | | | We didn't update the position if it ended up with an invalid value. Fixes: QTBUG-63437 Change-Id: Idc4d3b0cb43fd63bdb0ff10b4162dfabe49455df Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-061-0/+2
|\ \ | |/ | | | | Change-Id: Ica2ac2d9c26eadad16509d0512817665566d829c
View Lorry Controller Status