feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Conflicts:
  doc/qtdesignstudio/src/views/qtquick-designer.qdoc
  src/plugins/studiowelcome/stylemodel.cpp

Change-Id: I13c9e4e9404619d7ba649eae160774aafc042610
This commit is contained in:
Tim Jenssen
2023-07-20 22:18:47 +02:00
parent ec4c5a9a08 6603c247d6
commit 8cde647972
133 changed files with 2711 additions and 2322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/sdktool/sdkpersistentsettings.cpp
View File

@@ -130,7 +130,7 @@ static QString resolveSymlinks(QString current)
while (links--) {
const QFileInfo info(current);
if (!info.isSymLink())
return {};
return current;
current = info.symLinkTarget();
}
return current;