forked from qt-creator/qt-creator
Move qrc parser from QmlJS to Utils
We'd like to make use of it in a more general context, and it's not directly related to QML. Change-Id: I025ec67829f85544667684cdb8c99d1ee4c18197 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -28,11 +28,11 @@
|
||||
#include "qmljs_global.h"
|
||||
#include "qmljsbundle.h"
|
||||
#include "qmljsdocument.h"
|
||||
#include "qmljsqrcparser.h"
|
||||
#include "qmljsdialect.h"
|
||||
|
||||
#include <cplusplus/CppDocument.h>
|
||||
#include <utils/environment.h>
|
||||
#include <utils/qrcparser.h>
|
||||
|
||||
#include <QFuture>
|
||||
#include <QHash>
|
||||
@@ -255,7 +255,7 @@ private:
|
||||
void cleanupFutures();
|
||||
void iterateQrcFiles(ProjectExplorer::Project *project,
|
||||
QrcResourceSelector resources,
|
||||
std::function<void(QrcParser::ConstPtr)> callback);
|
||||
std::function<void(Utils::QrcParser::ConstPtr)> callback);
|
||||
|
||||
mutable QMutex m_mutex;
|
||||
QmlJS::Snapshot m_validSnapshot;
|
||||
@@ -272,7 +272,7 @@ private:
|
||||
QTimer *m_asyncResetTimer = nullptr;
|
||||
QHash<QString, QPair<CPlusPlus::Document::Ptr, bool> > m_queuedCppDocuments;
|
||||
QFuture<void> m_cppQmlTypesUpdater;
|
||||
QrcCache m_qrcCache;
|
||||
Utils::QrcCache m_qrcCache;
|
||||
QHash<QString, QString> m_qrcContents;
|
||||
|
||||
CppDataHash m_cppDataHash;
|
||||
|
||||
Reference in New Issue
Block a user