diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-04 12:52:05 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-04 12:58:47 +0200 |
commit | 31cce3c4efbff8584b0a8907e985e2c01a8408e7 (patch) | |
tree | 3ac50378c1c1e84df6c2eb9a8bc036242b43d145 /src | |
parent | 6ee460f2145d52cec508e23b21b833c92ba4fa53 (diff) | |
parent | 794ce0cfb14a8000be76d927520f594b3c79b1d5 (diff) |
Merge 1.7 into 1.8
Change-Id: I98b4595eba11bf78d047a61a4830e83116b61d44
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/corelib/language/scriptengine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/language/scriptengine.h b/src/lib/corelib/language/scriptengine.h index 45b21f167..323237d88 100644 --- a/src/lib/corelib/language/scriptengine.h +++ b/src/lib/corelib/language/scriptengine.h @@ -204,9 +204,9 @@ private: PropertyCacheKey(const QString &moduleName, const QString &propertyName, const PropertyMapConstPtr &propertyMap); private: - const QString &m_moduleName; - const QString &m_propertyName; - const PropertyMapConstPtr &m_propertyMap; + const QString m_moduleName; + const QString m_propertyName; + const PropertyMapConstPtr m_propertyMap; friend bool operator==(const PropertyCacheKey &lhs, const PropertyCacheKey &rhs); friend uint qHash(const ScriptEngine::PropertyCacheKey &k, uint seed); |