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

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

Browse Source 
Change-Id: I09a0e8514c8ad7badaa7af6d101c71d5c96b5465
This commit is contained in:
Tim Jenssen
2024-01-31 20:25:34 +01:00
parent 05d7070178 a4d8348432
commit a3a69d83f3
208 changed files with 1726 additions and 2189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/qml2puppet/qml2puppet/runner/qmlruntime.cpp
View File

@@ -32,7 +32,7 @@ static void registerFonts(const QDir &projectDir)
static QDir findProjectFolder(const QDir &currentDir, int ret = 0)
{
if (ret > 2)
QDir::current();
return QDir::current();
QDirIterator it{currentDir.absolutePath(),
{"*.qmlproject"},