diff options
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index ab32bac7b2..875c335c9a 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -158,7 +158,7 @@ protected: // Callbacks made in load thread virtual void dataReceived(const SourceCodeData &) = 0; - virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) = 0; + virtual void initializeFromCachedUnit(const QV4::CompiledData::Unit*) = 0; virtual void done(); #if QT_CONFIG(qml_network) virtual void networkError(QNetworkReply::NetworkError); @@ -318,19 +318,19 @@ public: void load(QQmlDataBlob *, Mode = PreferSynchronous); void loadWithStaticData(QQmlDataBlob *, const QByteArray &, Mode = PreferSynchronous); - void loadWithCachedUnit(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit, Mode mode = PreferSynchronous); + void loadWithCachedUnit(QQmlDataBlob *blob, const QV4::CompiledData::Unit *unit, Mode mode = PreferSynchronous); QQmlEngine *engine() const; void initializeEngine(QQmlExtensionInterface *, const char *); void invalidate(); -#ifdef QT_NO_QML_DEBUGGER +#if !QT_CONFIG(qml_debug) quintptr profiler() const { return 0; } void setProfiler(quintptr) {} #else QQmlProfiler *profiler() const { return m_profiler.data(); } void setProfiler(QQmlProfiler *profiler); -#endif // QT_NO_QML_DEBUGGER +#endif // QT_CONFIG(qml_debug) private: @@ -344,7 +344,7 @@ private: void loadThread(QQmlDataBlob *); void loadWithStaticDataThread(QQmlDataBlob *, const QByteArray &); - void loadWithCachedUnitThread(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit); + void loadWithCachedUnitThread(QQmlDataBlob *blob, const QV4::CompiledData::Unit *unit); #if QT_CONFIG(qml_network) void networkReplyFinished(QNetworkReply *); void networkReplyProgress(QNetworkReply *, qint64, qint64); @@ -355,7 +355,7 @@ private: void setData(QQmlDataBlob *, const QByteArray &); void setData(QQmlDataBlob *, const QString &fileName); void setData(QQmlDataBlob *, const QQmlDataBlob::SourceCodeData &); - void setCachedUnit(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit); + void setCachedUnit(QQmlDataBlob *blob, const QV4::CompiledData::Unit *unit); template<typename T> struct TypedCallback @@ -382,7 +382,7 @@ private: QQmlEngine *m_engine; QQmlTypeLoaderThread *m_thread; -#ifndef QT_NO_QML_DEBUGGER +#if QT_CONFIG(qml_debug) QScopedPointer<QQmlProfiler> m_profiler; #endif @@ -457,7 +457,7 @@ protected: void done() override; void completed() override; void dataReceived(const SourceCodeData &) override; - void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override; + void initializeFromCachedUnit(const QV4::CompiledData::Unit *unit) override; void allDependenciesDone() override; void downloadProgressChanged(qreal) override; @@ -570,14 +570,14 @@ public: protected: void dataReceived(const SourceCodeData &) override; - void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override; + void initializeFromCachedUnit(const QV4::CompiledData::Unit *unit) override; void done() override; QString stringAt(int index) const override; private: void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace) override; - void initializeFromCompilationUnit(QV4::CompiledData::CompilationUnit *unit); + void initializeFromCompilationUnit(const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &unit); QList<ScriptReference> m_scripts; QQmlScriptData *m_scriptData; @@ -601,7 +601,7 @@ public: protected: void dataReceived(const SourceCodeData &) override; - void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) override; + void initializeFromCachedUnit(const QV4::CompiledData::Unit *) override; private: QString m_content; |