summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge 5.14 into 5.14.1v5.14.15.14.1Kari Oikarinen2020-01-152-4/+1
|\ | | | | | | Change-Id: I91a981474478b244f956497347155d5c44e4fc84
| * 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>
* | 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>
* 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>
* 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>
* 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.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>
* | 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>
* | 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
| * Dialog: Update the title on the window when changing it on the dialogAndy Shaw2019-03-291-0/+2
| | | | | | | | | | | | Change-Id: Id9c60bf10bc0d4fb28ee9a027b84e395e9cb745c Fixes: QTBUG-74350 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-2/+2
|\ \ | |/ | | | | Change-Id: I3c0359e9e51bc1ee5b098d250c13c586e57b483c
| * ScrollViewStyle: Avoid division by zero in extent computationv5.12.25.12.2Benjamin Robin2019-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | If the flickableItem content is empty (contentWidth / contentHeight is equal to 0), prevent the division by zero in the computation of the extent variable. Task-number: QTBUG-73691 Change-Id: I86becca9a1fa2508d1acafe09f46dfc952e4e96d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-136-2936/+1135
| | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: I4e25e1bef8640c0afe21c82217da114e77ba0cf7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-024-6/+9
|\ \ | |/ | | | | Change-Id: Ib614fd58e4df83945017bbb3bf2cbc9d5a72df4c
| * Update the CalendarHeaderModel when changing the locale setAndy Shaw2019-02-202-2/+6
| | | | | | | | | | | | Change-Id: I8af18ebfcc77f6080cfd5f0cade5042d0cd4a9a4 Fixes: QTBUG-73765 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix progress indicator with vertical progress barJoni Poikelin2019-01-281-2/+1
| | | | | | | | | | | | Fixes: QTBUG-65209 Change-Id: I1cdd2809e4bc3f2d37421fa785c84b1fa0b9d12e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * Fix incorrect transientScrollBars binding in BasicTableViewShawn Rutledge2019-01-281-2/+2
| | | | | | | | | | | | Fixes: QTBUG-69041 Change-Id: I7ad62850c8890d7ec53678754a164ad2bcfbdb8e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Fix deprecation warningsFriedemann Kleint2019-02-062-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private/qquicktreemodeladaptor.cpp:744:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations] Private/qquicktreemodeladaptor.cpp:750:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:922:89: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] In file included from /data1/frkleint/qt-513/qtbase/include/QtGui/qfontmetrics.h:1:0, Private/qquickstyleitem.cpp:942:60: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:961:75: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:1010:52: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:1010:86: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:1469:46: warning: ‘static bool QPixmapCache::find(const QString&, QPixmap&)’ is deprecated: Use bool find(const QString &, QPixmap *) instead [-Wdeprecated-declarations] ../../../src/controls/Private/qquicktreemodeladaptor.cpp:744:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations]/data1/frkleint/qt-513/qtbase/include/QtCore/../../src/corelib/tools/qlist.h:227:10: note: declared here ../../../src/controls/Private/qquicktreemodeladaptor.cpp:750:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations] tst_qquicktreemodeladaptor.cpp:1387:39: warning: ‘QModelIndex QModelIndex::child(int, int) const’ is deprecated: Use QAbstractItemModel::index [-Wdeprecated-declarations] Change-Id: I213d7ffd2cb329b542f9273e3a566a813d1cc24f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix TableView column index when columns are insertedJoni Poikelin2019-01-282-3/+1
| | | | | | | | | | | | | | Task-number: QTBUG-63001 Change-Id: I91c3e856bba8f5a4cfe9b09574213fe6e0f5c23d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | DefaultFileDialog: Don't assign QQmlComponent* to QQuickItem*Ulf Hermann2019-01-241-2/+1
| | | | | | | | | | | | | | | | This used to work, but it's really, really evil. Change-Id: Icd214f7718737600b5c77cdbd72008aa61438729 Fixes: QTBUG-73223 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-222-20/+23
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I877a23c60889b9caddc7bbf557d74b3421002c27
| * Calendar: Ignore any time specified for a minimum and maximum dateAndy Shaw2019-01-142-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | Since Calendar only cares about the date part and not the time, we should ignore the time part when it is set as the minimum and maximum and manually set it to 0:00:00 and 23:59:59 respectively. This ensures that the day itself is still seen as valid irrespective of what time was passed to Date(). Change-Id: I57c311ffe7d3fb1ab69c59296a067a66f1007137 Fixes: QTBUG-71997 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-156-7/+65
|\ \ | |/ | | | | Change-Id: Ia98756445b50decfd50f6bdeb94a004fa90d3a05
| * Insert before next item when it existsAllan Sandfeld Jensen2018-12-101-2/+9
| | | | | | | | | | | | | | | | | | | | | | Something is off about the way the last child of previous item is calculated, but we can work-around that by just using the next element when it exist. In the case there isn't a next element, we will hit the fallback in 'last child of previous' and insert at the end anyway. Fixes: QTBUG-66062 Change-Id: Iced69d52c4587434ffdbb09b08b3441289f34eba Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Static: Register the base style qml files so they can be foundAndy Shaw2018-12-103-2/+49
| | | | | | | | | | | | | | | | | | | | | | If the files are not registered then it will look for them on the disk instead because it has no entry for them. This changed at some point in the Qt 5.12.0 release but has technically been wrong for some time as they should always be registered. Change-Id: I8246a4f5fb4d94ebc5f7ca262d1821a409eb6c9f Fixes: QTBUG-72338 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Static: Install the qmldir for the Styles moduleAndy Shaw2018-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Mention qmldir in AUX_QML_FILES to ensure that it is always copied to the build directory. qml_module.prf usually takes care of this by having QML_FILES in qmldir.files with INSTALLS += qmldir, but with CONFIG += builtin_resources (set for static) that's not the case. AUX_QML_FILES is the correct variable though. Task-number: QTBUG-67644 Change-Id: I6cf580586dec0bf7b44c89b95134d7d7f683102e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.12.0' into 5.12" into ↵Qt Forward Merge Bot2018-12-052-2/+4
| |\ | | | | | | | | | refs/staging/5.12
| | * Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-052-2/+4
| | |\ | | | | | | | | | | | | Change-Id: I253bdcb4f9847a73165196599341dab03e291fc1
| | | * Fix button menus not opening on the second attemptv5.12.0-rc2v5.12.05.12.0Mitch Curtis2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assign a parent to the QQmlComponent returned by QQuickControlSettings1::styleComponent() so that it doesn't get garbage collected by the QML engine. This was not an issue until 5.12, but it seems like a good idea regardless. Change-Id: I53265b23afab62e2276fe6e10d976a93a4f12e6f Fixes: QTBUG-71238 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | | * Doc: Ignore WinRT-specific qml files from the documentation buildv5.12.0-rc1Topi Reinio2018-11-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files contain no documentation and cause conflicts with documentation sources that actually try to document them. Task-number: QTBUG-71174 Change-Id: I7382a1e05bed2070c45a4234cc3389a02922cdbf Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | QQuickTreeModelAdaptor1: fix out of range issue in selectionForRowRangeSamuel Gaist2018-12-051-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the index of the "to" row is invalid and the one from the "from" row is good, then the method will try to access an invalid index. This patch fixes that by ensuring that if the "to" row is invalid (when, for example, the mouse cursor goes out of the view while multiple selection is activated), the "to" index used stays valid. [ChangeLog][Controls][QQuickTreeModelAdaptor1] Fixed an issue where an invalid access was done if either extended or multiple selection was in use and the mouse went out of the view on top of the model. Fixes: QTBUG-71789 Change-Id: I32d8a20ee9ffc1c40584f17c27ceb06d48b81ff0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-171-0/+11
|\ \ \ | |/ / | | | | | | Change-Id: I468c68a1a8a1ce3eaef88bf26ec8deed05a65d39
| * | TableView: Handle dynamic insertion of TableViewColumns correctlyAndy Shaw2018-11-161-0/+11
| |/ | | | | | | | | | | | | | | | | | | When inserting a TableViewColumn after the TableView is created, then it needs to be inserted into the list of columns at the specified index so that it responds correctly to things like resizeColumnsToContents() Fixes: QTBUG-58594 Change-Id: If7ff545306fe8b6616d8e016eb87e565ed40c836 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-0815-128/+131
|\ \ | |/ | | | | Change-Id: Ifa402a8e38d03d572303fed9fca71b660aa03e27
View Lorry Controller Status