diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-03-30 13:34:12 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-03-30 13:30:42 +0000 |
| commit | adb664f52128b3c28323a5d4dccedc204dec8b34 (patch) | |
| tree | 5bc4573e921a37f7ba46d73eba16c6f08db37da4 /doc/qtdesignstudio/images/studio-timeline-keyframe-track-colors.webp | |
| parent | 6f765181c9b9e716f3ae746183cdeac2459ac194 (diff) | |
| parent | 5b28748554b3f97c4e163606208878d573f2a655 (diff) | |
| download | qt-creator-adb664f52128b3c28323a5d4dccedc204dec8b34.tar.gz | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/libs/utils/filepath.cpp
src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
tests/unit/unittest/CMakeLists.txt
Change-Id: I017a6075db41a5233487ac855ffe23de2b2bb0ee
Diffstat (limited to 'doc/qtdesignstudio/images/studio-timeline-keyframe-track-colors.webp')
| -rw-r--r-- | doc/qtdesignstudio/images/studio-timeline-keyframe-track-colors.webp | bin | 0 -> 11086 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/qtdesignstudio/images/studio-timeline-keyframe-track-colors.webp b/doc/qtdesignstudio/images/studio-timeline-keyframe-track-colors.webp Binary files differnew file mode 100644 index 0000000000..f8734e98de --- /dev/null +++ b/doc/qtdesignstudio/images/studio-timeline-keyframe-track-colors.webp |