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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: I44511e06986b7df6007be7daf7051c895a10794b
This commit is contained in:
Eike Ziller
2017-04-21 15:29:27 +02:00
parent ac86b2e8dd 1891af4b07
commit dae2556d2f
49 changed files with 191 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmljstools/qmljstools_test.cpp
View File

@@ -43,12 +43,12 @@ void QmlJSToolsPlugin::test_basic()
{
ModelManagerInterface *modelManager = ModelManagerInterface::instance();
const QString welcomescreenRootPath = Core::ICore::resourcePath() + QLatin1String("/welcomescreen/welcomescreen.qml");
modelManager->updateSourceFiles(QStringList(welcomescreenRootPath), false);
const QString qmlFilePath = Core::ICore::resourcePath() + QLatin1String("/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml");
modelManager->updateSourceFiles(QStringList(qmlFilePath), false);
modelManager->joinAllThreads();
Snapshot snapshot = modelManager->snapshot();
Document::Ptr doc = snapshot.document(welcomescreenRootPath);
Document::Ptr doc = snapshot.document(qmlFilePath);
QVERIFY(doc && doc->isQmlDocument());
ContextPtr context = Link(snapshot, ViewerContext(), LibraryInfo())();