diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-02-27 11:34:30 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-03-07 11:54:16 +0000 |
| commit | 45b7c5ac293a297ff1c6c7e64b24d662ec29b7b2 (patch) | |
| tree | c95b2c4d42459d28464340a44fa5b3e4900499a6 /src/plugins/cpptools/cppmodelmanager_test.cpp | |
| parent | 95f78f6c8002aa95affe13b4c528a147e40240b1 (diff) | |
| download | qt-creator-45b7c5ac293a297ff1c6c7e64b24d662ec29b7b2.tar.gz | |
Revert "CppTools: Do not put configuration document into global snapshot and working copy"
This reverts commit 05942b63f8bad6d6787fea10c31f10458cdccd06 because it
breaks refactoring, e.g. Q_PROPERTY generators.
Change-Id: I9a14b912ba72663f08ea99e7e066d824b18da4b0
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 79ce311dbc..35f9931f21 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -618,7 +618,7 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() CppModelManager *mm = CppModelManager::instance(); WorkingCopy workingCopy = mm->workingCopy(); - QCOMPARE(workingCopy.size(), 1); + QCOMPARE(workingCopy.size(), 2); // mm->configurationFileName() and "ui_*.h" QStringList fileNamesInWorkinCopy; QHashIterator<Utils::FileName, QPair<QByteArray, unsigned> > it = workingCopy.iterator(); @@ -628,7 +628,8 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() } fileNamesInWorkinCopy.sort(); const QString expectedUiHeaderFileName = _("ui_mainwindow.h"); - QCOMPARE(fileNamesInWorkinCopy.at(0), expectedUiHeaderFileName); + QCOMPARE(fileNamesInWorkinCopy.at(0), mm->configurationFileName()); + QCOMPARE(fileNamesInWorkinCopy.at(1), expectedUiHeaderFileName); // Check CppSourceProcessor / includes. // The CppSourceProcessor is expected to find the ui_* file in the working copy. @@ -777,7 +778,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project() pi.appendProjectPart(part2); helper.updateProjectInfo(pi); - QCOMPARE(mm->snapshot().size(), 3); + QCOMPARE(mm->snapshot().size(), 4); // Open a file in the editor QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); @@ -845,7 +846,7 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() pi.appendProjectPart(part2); helper.updateProjectInfo(pi); - QCOMPARE(mm->snapshot().size(), 3); + QCOMPARE(mm->snapshot().size(), 4); // Open a file in the editor QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); @@ -925,7 +926,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor() helper.updateProjectInfo(pi); - QCOMPARE(mm->snapshot().size(), 3); + QCOMPARE(mm->snapshot().size(), 4); // Open a file in the editor QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); |