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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/clangcodemodel/clangdclient.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/include/modelnode.h
	src/plugins/qmldesigner/designercore/model/modelnode.cpp
	src/plugins/qmldesigner/designercore/model/rewriterview.cpp

Change-Id: I93c57879b79f27325321bfc045ca618bd835af93
This commit is contained in:
Eike Ziller
2022-08-26 08:40:23 +02:00
parent c10f23a5c6 70343084ba
commit c6c92ec096
57 changed files with 379 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/qmljs/qmljsmodelmanagerinterface.h
View File

@@ -41,6 +41,7 @@
#include <QObject>
#include <QPointer>
#include <QStringList>
#include <QThreadPool>
QT_FORWARD_DECLARE_CLASS(QTimer)
@@ -133,6 +134,7 @@ public:
QmlJS::Snapshot snapshot() const;
QmlJS::Snapshot newestSnapshot() const;
QThreadPool *threadPool();
void activateScan();
void updateSourceFiles(const QList<Utils::FilePath> &files, bool emitDocumentOnDiskChanged);
@@ -292,6 +294,7 @@ private:
Utils::FutureSynchronizer m_futureSynchronizer;
bool m_indexerDisabled = false;
QThreadPool m_threadPool;
};
} // namespace QmlJS