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

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

Browse Source 
Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
  src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp

Change-Id: Ieda6242b845387100022b08251283891fb0fbda7
This commit is contained in:
Tim Jenssen
2022-12-14 15:29:20 +01:00
parent a3fe24d192 249c3561cb
commit 7f234ed768
255 changed files with 7612 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -281,7 +281,7 @@ void ModelManager::delayedInitialization()
ViewerContext qbsVContext;
qbsVContext.language = Dialect::QmlQbs;
qbsVContext.paths.append(ICore::resourcePath("qbs"));
qbsVContext.paths.insert(ICore::resourcePath("qbs"));
setDefaultVContext(qbsVContext);
}