OSDN Git Service

QmlJS: Separate metaObjectRevision from minor version number.
authorChristian Kamm <christian.d.kamm@nokia.com>
Wed, 21 Sep 2011 10:42:27 +0000 (12:42 +0200)
committerChristian Kamm <christian.d.kamm@nokia.com>
Mon, 26 Sep 2011 10:04:16 +0000 (12:04 +0200)
commitfdd0a15ef4265a39db6e33b6353f5231966fdb5d
treeae0fa0921a29eb4f7705be96201ee74b0086e867
parent22e2c0ad2c97df2173ead3c2ab8977c8970dd4c5
QmlJS: Separate metaObjectRevision from minor version number.

They need not to be identical. Additionally:
* Rename ImportInfo::name to path, because that's what it does.
* Add ImportInfo::name, for getting the uri with the names
  separated by dots.
* Allow for exportMetaObjectRevisions in qmltypes files.
* Allow for exports with an empty type name, as generated by
  qmlRegisterRevision. They are used for associating meta object
  revisions with non-exported types.
* Rewrite the Qt 4.7 import to QtQuick 1.0 at an early stage. In
  preparation for the Qt 5 type information update, where Qt 4.7
  is gone.

Change-Id: Ia287193623d9530a56b9eb8d2481d50aabd94c3e
Reviewed-on: http://codereview.qt-project.org/5309
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
14 files changed:
src/libs/languageutils/fakemetaobject.cpp
src/libs/languageutils/fakemetaobject.h
src/libs/qmljs/qmljsbind.cpp
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/libs/qmljs/qmljslink.cpp
src/libs/qmljs/qmljsscopechain.cpp
src/libs/qmljs/qmljstypedescriptionreader.cpp
src/libs/qmljs/qmljstypedescriptionreader.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qmljseditor/qmljshoverhandler.cpp
src/plugins/qmljstools/qmljsmodelmanager.cpp