projects / platform / upstream / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a2aa470) | patch
Add enum values from related types
authorMatthew Vogt <matthew.vogt@nokia.com>
Fri, 22 Jun 2012 05:32:46 +0000 (15:32 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 27 Jun 2012 00:28:40 +0000 (02:28 +0200)
commita93c2608d69fa385c675a6b49e4d4bfb97f83ed2
tree88b9bc5b459600d85c6519995367669396787568tree | snapshot
parenta2aa4705702256c15aaaf64e08b90c4749233f9dcommit | diff
Add enum values from related types

If moc marks a type as being related to another type (by using that
type's enums or properties), then include the enum values exported
by the related type in those exposed by the dependent type.

Task-number: QTBUG-22675
Change-Id: I78e72791a4f470200a9ba986a865ffac6c873725
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
13 files changed:
src/qml/qml/qqmlcompiler.cpp diff | blob | history
src/qml/qml/qqmlmetatype.cpp diff | blob | history
src/qml/qml/qqmlmetatype_p.h diff | blob | history
src/qml/qml/v8/qv8typewrapper.cpp diff | blob | history
tests/auto/qml/qqmlecmascript/data/assignBasicTypes.2.qml diff | blob | history
tests/auto/qml/qqmlecmascript/data/assignBasicTypes.qml diff | blob | history
tests/auto/qml/qqmlecmascript/data/enums.1.qml diff | blob | history
tests/auto/qml/qqmlecmascript/data/enums.3.qml diff | blob | history
tests/auto/qml/qqmlecmascript/testtypes.h diff | blob | history
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp diff | blob | history
tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml diff | blob | history
tests/auto/qml/qqmllanguage/testtypes.h diff | blob | history
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp diff | blob | history
Domain: UI Framework / Qt;