diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-08 15:51:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-09 10:07:23 +0100 |
| commit | e04822f3c2a6b69b7d75e2039256aa2433c59dd2 (patch) | |
| tree | 1f455738570461e4313371c133964bfb276adfbe /src | |
| parent | 3228864f7b9ea20f307beedd1fd7e56fb3216654 (diff) | |
Cleanup: Remove unused code
isConcurrent is not virtual and always returns true, so we can remove
it and remove the if() on the caller side.
Change-Id: Ie750fdeddaf8c339e1fcab99ebd967e3446bd975
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlengine_p.h | 6 | ||||
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h index c9e429c7bb..3df249a667 100644 --- a/src/qml/qml/qqmlengine_p.h +++ b/src/qml/qml/qqmlengine_p.h @@ -334,10 +334,8 @@ void QQmlEnginePrivate::Locker::unlock() void QQmlEnginePrivate::Locker::relock() { Q_ASSERT(!m_locked); - if (m_ep->typeLoader.isConcurrent()) { - m_ep->mutex.lock(); - m_locked = true; - } + m_ep->mutex.lock(); + m_locked = true; } /*! diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index fecb3c1764..02adf09eed 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -313,8 +313,6 @@ public: void lock(); void unlock(); - bool isConcurrent() const { return true; } - void load(QQmlDataBlob *, Mode = PreferSynchronous); void loadWithStaticData(QQmlDataBlob *, const QByteArray &, Mode = PreferSynchronous); void loadWithCachedUnit(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit, Mode mode = PreferSynchronous); |