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

QmlDesigner: Fix QmlTypesParser

Browse Source 
Change-Id: I826e1a37747a51602f3f7a8ea675320787080272
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2023-04-25 18:57:07 +02:00
parent 5cd83aa2a7
commit b929cbfd64
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp
View File

@@ -4,11 +4,10 @@
#include "qmltypesparser.h" #include "qmltypesparser.h"
#include "projectstorage.h" #include "projectstorage.h"
#include "sourcepathcache.h"
#include <sqlitedatabase.h> #include <sqlitedatabase.h>
#ifdef QDS_HAS_QMLPRIVATE #ifdef HasQQmlJSTypeDescriptionReader
#include <private/qqmldomtop_p.h> #include <private/qqmldomtop_p.h>
#include <private/qqmljstypedescriptionreader_p.h> #include <private/qqmljstypedescriptionreader_p.h>
#endif #endif
@@ -20,7 +19,7 @@
namespace QmlDesigner { namespace QmlDesigner {
#if defined(QDS_HAS_QMLPRIVATE) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #ifdef HasQQmlJSTypeDescriptionReader
namespace QmlDom = QQmlJS::Dom; namespace QmlDom = QQmlJS::Dom;

19
src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
View File

@@ -10,6 +10,10 @@ namespace Sqlite {
class Database; class Database;
} }
#if defined(QDS_HAS_QMLPRIVATE) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
#define HasQQmlJSTypeDescriptionReader
#endif
namespace QmlDesigner { namespace QmlDesigner {
template<typename Database> template<typename Database>
@@ -22,16 +26,13 @@ class QmlTypesParser : public QmlTypesParserInterface
{ {
public: public:
using ProjectStorage = QmlDesigner::ProjectStorage<Sqlite::Database>; using ProjectStorage = QmlDesigner::ProjectStorage<Sqlite::Database>;
using PathCache = QmlDesigner::SourcePathCache<ProjectStorage, NonLockingMutex>;
#ifdef QDS_HAS_QMLPRIVATE #ifdef HasQQmlJSTypeDescriptionReader
QmlTypesParser(PathCache &pathCache, ProjectStorage &storage) QmlTypesParser(ProjectStorage &storage)
: m_pathCache{pathCache} : m_storage{storage}
, m_storage{storage}
{} {}
#else #else
QmlTypesParser(PathCache &, ProjectStorage &) QmlTypesParser(ProjectStorage &) {}
{}
#endif #endif
void parse(const QString &sourceContent, void parse(const QString &sourceContent,
@@ -40,9 +41,7 @@ public:
const Storage::Synchronization::ProjectData &projectData) override; const Storage::Synchronization::ProjectData &projectData) override;
private: private:
// m_pathCache and m_storage are only used when compiled for QDS #ifdef HasQQmlJSTypeDescriptionReader
#ifdef QDS_HAS_QMLPRIVATE
PathCache &m_pathCache;
ProjectStorage &m_storage; ProjectStorage &m_storage;
#endif #endif
}; };

2
src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
View File

@@ -185,7 +185,7 @@ public:
FileSystem fileSystem{pathCache}; FileSystem fileSystem{pathCache};
FileStatusCache fileStatusCache{fileSystem}; FileStatusCache fileStatusCache{fileSystem};
QmlDocumentParser qmlDocumentParser{storage, pathCache}; QmlDocumentParser qmlDocumentParser{storage, pathCache};
QmlTypesParser qmlTypesParser{pathCache, storage}; QmlTypesParser qmlTypesParser{storage};
ProjectStoragePathWatcher<QFileSystemWatcher, QTimer, ProjectStorageUpdater::PathCache> ProjectStoragePathWatcher<QFileSystemWatcher, QTimer, ProjectStorageUpdater::PathCache>
pathWatcher{pathCache, fileSystem, &updater}; pathWatcher{pathCache, fileSystem, &updater};
ProjectPartId projectPartId; ProjectPartId projectPartId;

2
tests/unit/unittest/qmltypesparser-test.cpp
View File

@@ -149,7 +149,7 @@ protected:
QmlDesigner::ProjectStorage<Sqlite::Database> storage{database, database.isInitialized()}; QmlDesigner::ProjectStorage<Sqlite::Database> storage{database, database.isInitialized()};
QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage<Sqlite::Database>> sourcePathCache{ QmlDesigner::SourcePathCache<QmlDesigner::ProjectStorage<Sqlite::Database>> sourcePathCache{
storage}; storage};
QmlDesigner::QmlTypesParser parser{sourcePathCache, storage}; QmlDesigner::QmlTypesParser parser{storage};
Storage::Imports imports; Storage::Imports imports;
Storage::Types types; Storage::Types types;
SourceId qmltypesFileSourceId{sourcePathCache.sourceId("path/to/types.qmltypes")}; SourceId qmltypesFileSourceId{sourcePathCache.sourceId("path/to/types.qmltypes")};