diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-19 15:38:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-19 15:38:13 +0100 |
| commit | 5ca70bdcb3e76268a2e69466b403b6e4b9516afd (patch) | |
| tree | 95caf64d08ea53410f45578c3e1e2d22e415d1c3 /src/plugins/autotest/quick/quicktestparser.cpp | |
| parent | b2690664357cdb2cb6cd6380f608abedd58b0b9f (diff) | |
| parent | 9b6944086b53d34645bc81953c5f9a28ca9f3ed8 (diff) | |
| download | qt-creator-5ca70bdcb3e76268a2e69466b403b6e4b9516afd.tar.gz | |
Merge remote-tracking branch 'origin/4.14'
Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
Diffstat (limited to 'src/plugins/autotest/quick/quicktestparser.cpp')
| -rw-r--r-- | src/plugins/autotest/quick/quicktestparser.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp index 46067d14db..151d2f35c8 100644 --- a/src/plugins/autotest/quick/quicktestparser.cpp +++ b/src/plugins/autotest/quick/quicktestparser.cpp @@ -141,7 +141,7 @@ static QString quickTestName(const CPlusPlus::Document::Ptr &doc, return astVisitor.testBaseName(); } -QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QString &srcDir) const +QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QString &srcDir) { QStringList dirs(srcDir); ModelManagerInterface *qmlJsMM = QmlJSTools::Internal::ModelManager::instance(); @@ -159,7 +159,8 @@ QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QS QFileInfo fi(it.fileInfo().canonicalFilePath()); dirs.append(fi.filePath()); } - emit updateWatchPaths(dirs); + QMetaObject::invokeMethod(this, [this, dirs] { QuickTestParser::doUpdateWatchPaths(dirs); }, + Qt::QueuedConnection); QList<Document::Ptr> foundDocs; @@ -313,8 +314,6 @@ QuickTestParser::QuickTestParser(ITestFramework *framework) }); connect(&m_directoryWatcher, &QFileSystemWatcher::directoryChanged, this, &QuickTestParser::handleDirectoryChanged); - connect(this, &QuickTestParser::updateWatchPaths, - this, &QuickTestParser::doUpdateWatchPaths, Qt::QueuedConnection); } void QuickTestParser::init(const QStringList &filesToParse, bool fullParse) |