diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2024-04-23 14:36:48 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2024-04-23 16:05:55 +0200 |
| commit | ef0ee52bf92739bc5b32d70c01ff1eadd752d813 (patch) | |
| tree | 0f3b2f546af088b86f21452622d77be43386cd5f /share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png | |
| parent | d9c8590c5fd10b1feceb389c142ec244909739a2 (diff) | |
| parent | 7dfa7469207f899e347dc6f2bf0c3011140a9b23 (diff) | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
src/plugins/remotelinux/linuxdevicetester.cpp
Change-Id: I3683c1799df05209d05413383456b285a2daf96e
Diffstat (limited to 'share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png')
| -rw-r--r-- | share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png | bin | 0 -> 116 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png Binary files differnew file mode 100644 index 0000000000..f8ca7a3685 --- /dev/null +++ b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png |