aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qmljs/qmljsvalueowner.cpp
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-09-16 13:55:10 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2011-09-19 13:52:26 +0200
commit6c925cf0fc4f0c6494e5e5639e84970d67ea248b (patch)
tree81d2e75cd1567bf08f8cd0eadbeea8bb91e63739 /src/libs/qmljs/qmljsvalueowner.cpp
parent793031c7ba64ca7ba67c6a555bbab49ae2ec0b85 (diff)
QmlJS: Rework exported C++ type registry.
The problem was that if you exported A 1.0, A 1.1 and B 1.0 where A is the prototype of B the code model had not enough information to know that, depending on the import, B 1.0's prototype should be A 1.1 or A 1.0. To solve this problem QmlObjectValues now store the import's version as well as the local component version. In the example above B 1.0 would have import version 1.1 if the 1.1 module was imported and thus be able to choose the right prototype. Change-Id: I7ef33f12ca5a528c62b2a8240f4b5720b0ebd4c3 Reviewed-on: http://codereview.qt-project.org/5129 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsvalueowner.cpp')
-rw-r--r--src/libs/qmljs/qmljsvalueowner.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljsvalueowner.cpp b/src/libs/qmljs/qmljsvalueowner.cpp
index 2f0764c0d7..c6ef8fd52c 100644
--- a/src/libs/qmljs/qmljsvalueowner.cpp
+++ b/src/libs/qmljs/qmljsvalueowner.cpp
@@ -271,7 +271,8 @@ ValueOwner::ValueOwner()
_qmlVector3DObject(0),
_convertToNumber(this),
_convertToString(this),
- _convertToObject(this)
+ _convertToObject(this),
+ _cppQmlTypes(this)
{
initializePrototypes();
}