Merge remote-tracking branch 'origin/10.0' into qds/dev

Browse Source

bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7

...

This commit is contained in:

Tim Jenßen

2023-03-26 15:58:49 +02:00

parent 359ea5d55a f7639f458a

commit feabda3aa7

8349 changed files with 128327 additions and 169799 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1001

src/libs/utils/filepath.cpp

File diff suppressed because it is too large Load Diff