aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qmljs/qmljstypedescriptionreader.h
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-09-21 12:42:27 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2011-09-26 12:04:16 +0200
commitfdd0a15ef4265a39db6e33b6353f5231966fdb5d (patch)
treeae0fa0921a29eb4f7705be96201ee74b0086e867 /src/libs/qmljs/qmljstypedescriptionreader.h
parent22e2c0ad2c97df2173ead3c2ab8977c8970dd4c5 (diff)
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>
Diffstat (limited to 'src/libs/qmljs/qmljstypedescriptionreader.h')
-rw-r--r--src/libs/qmljs/qmljstypedescriptionreader.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljstypedescriptionreader.h b/src/libs/qmljs/qmljstypedescriptionreader.h
index 2d33376d868..f8e5366e9d2 100644
--- a/src/libs/qmljs/qmljstypedescriptionreader.h
+++ b/src/libs/qmljs/qmljstypedescriptionreader.h
@@ -78,6 +78,7 @@ private:
double readNumericBinding(AST::UiScriptBinding *ast);
int readIntBinding(AST::UiScriptBinding *ast);
void readExports(AST::UiScriptBinding *ast, LanguageUtils::FakeMetaObject::Ptr fmo);
+ void readMetaObjectRevisions(AST::UiScriptBinding *ast, LanguageUtils::FakeMetaObject::Ptr fmo);
void readEnumValues(AST::UiScriptBinding *ast, LanguageUtils::FakeMetaEnum *fme);
void addError(const AST::SourceLocation &loc, const QString &message);