summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Doc: Document Qt Quick Controls explicitly as 'version 1'Venugopal Shivashankar2018-10-2615-128/+131
| | | | | | | | | | | | | | | | | | This is to explicitly identify Qt Quick Controls as Controls 1, so that Controls 2 can be referred generally as Qt Quick Controls. Task-number: QTBUG-70333 Change-Id: I798c0354ad47ab96978575829322a254876529fb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Fix FileDialog not working with UNC pathsMiguel Costa2018-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Excluded from the Windows build a fixup for QUrl's containing too many leading '/'. The fixup was applied on calls to setFolder(const QUrl &f). It was mangling UNC (i.e. network) paths in Windows, causing QQuickFileDialog to reject them. The fixup was introduced in: 48c4c010095e851da3e58ac98514e29dff2e1262 Fixes: QTBUG-67932 Change-Id: Iaab98da9f014156c1d763a57b60ecad41be2e77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-161-0/+1
|\ \ | |/ | | | | Change-Id: Ie6366c9eedf251bd26a1901fddcb10b71777035e
| * Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3Qt Forward Merge Bot2018-10-131-0/+1
| |\ | | | | | | | | | Change-Id: I7986808ea6b61f4d500e678968e1ce706518636f
| | * Doc: Add missing documentation for styleData.role in itemDelegateAndy Shaw2018-10-121-0/+1
| | | | | | | | | | | | | | | Change-Id: Ie3f95fd97dae39bf9248898c97d0500feebf5014 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-024-34/+67
|\ \ \ | |/ / | | | | | | Change-Id: Ibb1d26d59fb131e9fbdbcdd4a9009e96f0cb10a9
| * | Fix build when filedialog feature is disabledv5.12.0-beta2v5.12.0-beta1Eskil Abrahamsen Blomfeldt2018-10-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | When the filedialog feature is disabled, we cannot include the headers for it, so we move the include into the #if block instead. Change-Id: I7b3556b570b8e7bd4aaed0ed8b1a0f4195b78975 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Menu: Provide a safe clear() functionUlf Hermann2018-09-272-22/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The menu items are generally owned by QML. Therefore we cannot delete them on clear(). The containers, however, are owned by the menu, and we have to delete them also when clearing the QQmlListProperty for a proxy menu. The QQmlListProperty, when clearing the items for a non-proxy menu, will still delete them, as that seems to be the way QML expresses its desire to get rid of them. Fixes: QTBUG-64464 Change-Id: Ied0b86496b289c2e2a83f3d6fd53d7045929beb0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | ScrollView: Defer calls to doLayout()Ulf Hermann2018-09-261-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doLayout() updates the dimensions of the scroll view, and therefore can trigger the scroll bars to be shown or hidden. That, in turn, can trigger another call to doLayout(), resulting in binding loops. Avoid those by deferring the call. The scrollview tests are broken without this change because the binding loop prevents the scrollbars from being shown or hidden in some cases. The deferring necessitates a tryVerify(), but fixes the actual tests. Change-Id: I0dac0ba380240e025237f69c4d357d764a535c3d Fixes: QTBUG-50605 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fix feature dependenciesValentin Fokin2018-08-281-0/+9
|/ / | | | | | | | | | | | | | | | | | | | | Add missing guards for header includes: 07490d56 Fix feature dependencies This also fixes build with -no-feature-action configuration. Change-Id: I2deb2dda19104bfa2c28f02617729f57da52c2d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Fix replace transition of vertical slide in the stack viewSimon Hausmann2018-07-031-1/+1
| | | | | | | | | | | | | | | | | | The replaceTransition property was on the wrong level. Thanks to Markus Weingarten for noticing :) Task-number: QTBUG-69251 Change-Id: I4b9f66721c74a29c265d07a3e70747c69b6522ce Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Dialogs: allow preventing processing of standard buttonsAlberto Mardegan2018-06-292-15/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an actionChosen() signal to DefaultDialogWrapper, allowing the developer to stop further processing of the event by setting the "accepted" field to false. This is especially useful when some validation on the dialog contents need to take place before the dialog can be accepted. [ChangeLog][Dialogs] Add a signal to the Dialog class to allow the client to intercept the button presses and optionally prevent further processing of the event. This allows performing some validation on the fields before dismissing the dialog. Task-number: QTBUG-69095 Change-Id: I19bca0bd9fcbafc72d337a5870776a96634ba748 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-2323-25/+25
|\ \ | |/ | | | | Change-Id: Ia4e23f05ee0dc32d13ad809f4021cd5f0cdff701
| * Doc: Add missing dots (qtquickcontrols)Paul Wicking2018-06-1923-25/+25
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I3731b82ecae0a43878b694e681300bef7c36ea62 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-5/+5
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I542d108313b1d1566875aed2905ed6b92b9288f0
| * Extras: fix remaining createRadialGradient() issuesMitch Curtis2018-05-292-5/+5
| | | | | | | | | | | | | | | | | | | | be4c4877b35ad1b6983cf194e61f0dad1d123af5 fixed Context2D's createRadialGradient() function, so our usage of it has to be updated accordingly. This patch produces the same visual result as it was originally. Change-Id: I4c021dcb2db9303d0a4d6ae8ca4cc606ca1f6d67 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-261-1/+1
|\ \ | |/ | | | | Change-Id: Ie706f27a0c43ec1d1136310fba196d9b41a184ed
View Lorry Controller Status