aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2015-11-26 15:36:49 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-01-12 18:00:53 +0000
commit1c5dd75ee6ef233aeb9b72596effced77d2a748a (patch)
tree6674673cd0f27e66fb6558c9b670d29222cccd78 /src/qml
parent258638f3726f63b308b6275090b1dad596f4fb56 (diff)
Remove debugChangesHash from QQmlEngine
Since the inspector doesn't use it anymore we can drop it. Change-Id: I9c4ffc3988bcd9937a4a473d5de287c7a5eda13e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml')
-rw-r--r--src/qml/qml/qqmlengine_p.h17
-rw-r--r--src/qml/qml/qqmltypeloader.cpp14
2 files changed, 0 insertions, 31 deletions
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index 26ee3bd655..8976a3b10d 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -217,9 +217,6 @@ public:
bool isTypeLoaded(const QUrl &url) const;
bool isScriptLoaded(const QUrl &url) const;
- inline void setDebugChangesCache(const QHash<QUrl, QByteArray> &changes);
- inline QHash<QUrl, QByteArray> debugChangesCache();
-
void sendQuit();
void warning(const QQmlError &);
void warning(const QList<QQmlError> &);
@@ -259,7 +256,6 @@ private:
QHash<QPair<QQmlType *, int>, QQmlPropertyCache *> typePropertyCache;
QHash<int, int> m_qmlLists;
QHash<int, QQmlCompiledData *> m_compositeTypes;
- QHash<QUrl, QByteArray> debugChangesHash;
static bool s_designerMode;
// These members is protected by the full QQmlEnginePrivate::mutex mutex
@@ -404,19 +400,6 @@ QQmlEnginePrivate *QQmlEnginePrivate::get(QV4::ExecutionEngine *e)
return get(qmlEngine);
}
-void QQmlEnginePrivate::setDebugChangesCache(const QHash<QUrl, QByteArray> &changes)
-{
- Locker locker(this);
- foreach (const QUrl &key, changes.keys())
- debugChangesHash.insert(key, changes.value(key));
-}
-
-QHash<QUrl, QByteArray> QQmlEnginePrivate::debugChangesCache()
-{
- Locker locker(this);
- return debugChangesHash;
-}
-
QT_END_NAMESPACE
#endif // QQMLENGINE_P_H
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 98c4341e06..10be80ed0c 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -1057,20 +1057,6 @@ void QQmlTypeLoader::loadThread(QQmlDataBlob *blob)
}
QML_MEMORY_SCOPE_URL(blob->m_url);
- QQmlEnginePrivate *engine_d = QQmlEnginePrivate::get(m_engine);
- QHash<QUrl, QByteArray> debugCache = engine_d->debugChangesCache();
-
- if (!debugCache.isEmpty()) {
- foreach (const QUrl &url, debugCache.keys()) {
- if (blob->m_url == blob->m_url.resolved(url)) {
- blob->m_data.setProgress(0xFF);
- if (blob->m_data.isAsync())
- m_thread->callDownloadProgressChanged(blob, 1.);
- setData(blob, debugCache.value(url, QByteArray()));
- return;
- }
- }
- }
if (QQmlFile::isSynchronous(blob->m_url)) {
QQmlFile file(m_engine, blob->m_url);