Merge branch 'qtquick2'

Conflicts:
	demos/declarative/flickr/common/Progress.qml
	demos/declarative/flickr/common/RssModel.qml
	demos/declarative/flickr/common/ScrollBar.qml
	demos/declarative/flickr/common/Slider.qml
	demos/declarative/flickr/mobile/Button.qml
	demos/declarative/flickr/mobile/GridDelegate.qml
	demos/declarative/flickr/mobile/ImageDetails.qml
	demos/declarative/flickr/mobile/ListDelegate.qml
	demos/declarative/flickr/mobile/TitleBar.qml
	demos/declarative/flickr/mobile/ToolBar.qml
	demos/declarative/webbrowser/content/Button.qml
	demos/declarative/webbrowser/content/FlickableWebView.qml
	demos/declarative/webbrowser/content/Header.qml
	demos/declarative/webbrowser/content/ScrollBar.qml
	demos/declarative/webbrowser/content/UrlInput.qml
	demos/declarative/webbrowser/webbrowser.qml
	doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
	examples/declarative/modelviews/webview/newwindows/qml/alerts.html
	examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html
	examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png
	examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png
	examples/declarative/modelviews/webview/newwindows/qml/newwindows.html
	src/declarative/graphicsitems/qdeclarativetextinput.cpp
	src/declarative/qml/qdeclarativecompiledbindings.cpp
	src/declarative/qml/qdeclarativecompiledbindings_p.h
	src/declarative/qml/qdeclarativedom.cpp
	src/declarative/qml/qdeclarativedom_p.h
	src/declarative/qml/qdeclarativedom_p_p.h
	src/declarative/qml/qdeclarativeengine.cpp
	src/declarative/qml/qdeclarativetypeloader.cpp
	src/imports/particles/particles.cpp
	tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
	tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png
	tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png
	tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png
	tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png
	tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp

Change-Id: I40df8a9403a58a6c03a0f1734f16a5cbed6c85ff

1 files changed, 92 insertions, 4 deletions

diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 50c6907b70..73ed23ba9d 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -88,6 +88,7 @@ QT_BEGIN_NAMESPACE
 
 struct QDeclarativeMetaTypeData
 {
+    QDeclarativeMetaTypeData();
     ~QDeclarativeMetaTypeData();
     QList<QDeclarativeType *> types;
     typedef QHash<int, QDeclarativeType *> Ids;
@@ -98,6 +99,14 @@ struct QDeclarativeMetaTypeData
     MetaObjects metaObjectToType;
     typedef QHash<int, QDeclarativeMetaType::StringConverter> StringConverters;
     StringConverters stringConverters;
+    struct ModuleApiList {
+        ModuleApiList() : sorted(true) {}
+        QList<QDeclarativeMetaType::ModuleApi> moduleApis;
+        bool sorted;
+    };
+    typedef QHash<QByteArray, ModuleApiList> ModuleApis;
+    ModuleApis moduleApis;
+    int moduleApiCount;
 
     struct ModuleInfo {
         ModuleInfo(int major, int minor)
@@ -119,6 +128,11 @@ struct QDeclarativeMetaTypeData
 Q_GLOBAL_STATIC(QDeclarativeMetaTypeData, metaTypeData)
 Q_GLOBAL_STATIC(QReadWriteLock, metaTypeDataLock)
 
+QDeclarativeMetaTypeData::QDeclarativeMetaTypeData()
+: moduleApiCount(0)
+{
+}
+
 QDeclarativeMetaTypeData::~QDeclarativeMetaTypeData()
 {
     for (int i = 0; i < types.count(); ++i)
@@ -664,6 +678,34 @@ int registerType(const QDeclarativePrivate::RegisterType &type)
     return index;
 }
 
+int registerModuleApi(const QDeclarativePrivate::RegisterModuleApi &api)
+{
+    QWriteLocker lock(metaTypeDataLock());
+
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    QByteArray uri(api.uri);
+    QDeclarativeMetaType::ModuleApi import;
+    import.major = api.versionMajor;
+    import.minor = api.versionMinor;
+    import.script = api.scriptApi;
+    import.qobject = api.qobjectApi;
+
+    int index = data->moduleApiCount++;
+
+    QDeclarativeMetaTypeData::ModuleApis::Iterator iter = data->moduleApis.find(uri);
+    if (iter == data->moduleApis.end()) {
+        QDeclarativeMetaTypeData::ModuleApiList apis;
+        apis.moduleApis << import;
+        data->moduleApis.insert(uri, apis);
+    } else {
+        iter->moduleApis << import;
+        iter->sorted = false;
+    }
+
+    return index;
+}
+
+
 /*
 This method is "over generalized" to allow us to (potentially) register more types of things in
 the future without adding exported symbols.
@@ -676,13 +718,16 @@ int QDeclarativePrivate::qmlregister(RegistrationType type, void *data)
         return registerInterface(*reinterpret_cast<RegisterInterface *>(data));
     } else if (type == AutoParentRegistration) {
         return registerAutoParentFunction(*reinterpret_cast<RegisterAutoParent *>(data));
+    } else if (type == ModuleApiRegistration) {
+        return registerModuleApi(*reinterpret_cast<RegisterModuleApi *>(data));
     }
     return -1;
 }
 
 /*
-    Have any types been registered for \a module with at least versionMajor.versionMinor, and types
-    for \a module with at most versionMajor.versionMinor.
+    Returns true if any type or API has been registered for the given \a module with at least
+    versionMajor.versionMinor, or if types have been registered for \a module with at most
+    versionMajor.versionMinor.
 
     So if only 4.7 and 4.9 have been registered, 4.7,4.8, and 4.9 are valid, but not 4.6 nor 4.10.
 
@@ -691,13 +736,27 @@ int QDeclarativePrivate::qmlregister(RegistrationType type, void *data)
 bool QDeclarativeMetaType::isModule(const QByteArray &module, int versionMajor, int versionMinor)
 {
     QDeclarativeMetaTypeData *data = metaTypeData();
+
+    // first, check Types
     QDeclarativeMetaTypeData::ModuleInfoHash::Iterator it = data->modules.find(module);
-    return it != data->modules.end()
+    if (it != data->modules.end()
         && ((versionMajor<0 && versionMinor<0) ||
                 (((*it).vmajor_max > versionMajor ||
                     ((*it).vmajor_max == versionMajor && (*it).vminor_max >= versionMinor))
                 && ((*it).vmajor_min < versionMajor ||
-                    ((*it).vmajor_min == versionMajor && (*it).vminor_min <= versionMinor))));
+                    ((*it).vmajor_min == versionMajor && (*it).vminor_min <= versionMinor))))) {
+        return true;
+    }
+
+    // then, check ModuleApis
+    foreach (const QDeclarativeMetaType::ModuleApi &mApi, data->moduleApis.value(module).moduleApis) {
+        if ((versionMajor<0 && versionMinor<0)
+                || (mApi.major == versionMajor && mApi.minor == versionMinor)) {
+            return true;
+        }
+    }
+
+    return false;
 }
 
 QList<QDeclarativePrivate::AutoParentFunction> QDeclarativeMetaType::parentFunctions()
@@ -707,6 +766,35 @@ QList<QDeclarativePrivate::AutoParentFunction> QDeclarativeMetaType::parentFunct
     return data->parentFunctions;
 }
 
+static bool operator<(const QDeclarativeMetaType::ModuleApi &lhs, const QDeclarativeMetaType::ModuleApi &rhs)
+{
+    return lhs.major < rhs.major || (lhs.major == rhs.major && lhs.minor < rhs.minor);
+}
+
+QDeclarativeMetaType::ModuleApi
+QDeclarativeMetaType::moduleApi(const QByteArray &uri, int versionMajor, int versionMinor)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+
+    QDeclarativeMetaTypeData::ModuleApis::Iterator iter = data->moduleApis.find(uri);
+    if (iter == data->moduleApis.end())
+        return ModuleApi();
+
+    if (iter->sorted == false) {
+        qSort(iter->moduleApis.begin(), iter->moduleApis.end());
+        iter->sorted = true;
+    }
+
+    for (int ii = iter->moduleApis.count() - 1; ii >= 0; --ii) {
+        const ModuleApi &import = iter->moduleApis.at(ii);
+        if (import.major == versionMajor && import.minor <= versionMinor)
+            return import;
+    }
+
+    return ModuleApi();
+}
+
 QObject *QDeclarativeMetaType::toQObject(const QVariant &v, bool *ok)
 {
     if (!isQObject(v.userType())) {