| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: Ica2ac2d9c26eadad16509d0512817665566d829c
|
| |
| |
| |
| |
| |
| | |
Change-Id: Id9c60bf10bc0d4fb28ee9a027b84e395e9cb745c
Fixes: QTBUG-74350
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I3c0359e9e51bc1ee5b098d250c13c586e57b483c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-73739
Change-Id: I4e25e1bef8640c0afe21c82217da114e77ba0cf7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: Ib614fd58e4df83945017bbb3bf2cbc9d5a72df4c
|
| |
| |
| |
| |
| |
| | |
Change-Id: I8af18ebfcc77f6080cfd5f0cade5042d0cd4a9a4
Fixes: QTBUG-73765
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-65209
Change-Id: I1cdd2809e4bc3f2d37421fa785c84b1fa0b9d12e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-69041
Change-Id: I7ad62850c8890d7ec53678754a164ad2bcfbdb8e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63001
Change-Id: I91c3e856bba8f5a4cfe9b09574213fe6e0f5c23d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This used to work, but it's really, really evil.
Change-Id: Icd214f7718737600b5c77cdbd72008aa61438729
Fixes: QTBUG-73223
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I877a23c60889b9caddc7bbf557d74b3421002c27
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: Ia98756445b50decfd50f6bdeb94a004fa90d3a05
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\
| | |
| | |
| | | |
refs/staging/5.12
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I253bdcb4f9847a73165196599341dab03e291fc1
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: I468c68a1a8a1ce3eaef88bf26ec8deed05a65d39
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: Ifa402a8e38d03d572303fed9fca71b660aa03e27
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: Ie6366c9eedf251bd26a1901fddcb10b71777035e
|
| |\
| | |
| | |
| | | |
Change-Id: I7986808ea6b61f4d500e678968e1ce706518636f
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ie3f95fd97dae39bf9248898c97d0500feebf5014
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: Ibb1d26d59fb131e9fbdbcdd4a9009e96f0cb10a9
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: Ia4e23f05ee0dc32d13ad809f4021cd5f0cdff701
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-68933
Change-Id: I3731b82ecae0a43878b694e681300bef7c36ea62
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I542d108313b1d1566875aed2905ed6b92b9288f0
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: Ie706f27a0c43ec1d1136310fba196d9b41a184ed
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
be4c4877b35ad1b6983cf194e61f0dad1d123af5 fixed Context2D's
createRadialGradient() function, so our usage of it has to be updated
accordingly. This patch results in the same visual result as it was
originally (before the auto test failure).
Task-number: QTBUG-68301
Change-Id: Ibd8aa24e84ceecccf25d7656350738a38cd03e24
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is
not needed anymore. Instead the resource system injects the plugin entry
point with a reference to all resources.
Change-Id: Ieb67edec480eba18cdad29f39b262cfb8839bf8a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I00b66b03717563bb700f8a73c3bc295a55ac8c6a
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When the wheel was used it could cause any binding on value to be broken
since it was updated directly. Going via range.position ensures this is
not the case.
Change-Id: Ic041ea911cee68de34f5c4e184cf8460f5e002da
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ibc95b14faaa77f200cf6ea5e05cb227e6a3628ca
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I24c265698d118544a470ac91c54d57895544a5ac
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|