diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-09 16:03:09 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-09 16:04:02 +0200 |
| commit | b697f511ab226079c161ea68c18ac85c5533d3cc (patch) | |
| tree | 707be29e37af5cbcc1c12d0a3d1cf67078e79b5f /src | |
| parent | 1484039a77d86504901e82b18582d908648b8d35 (diff) | |
| parent | 6f59c91c51edd7207635c3fa2f0b2b1179e7aa6e (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.7
Change-Id: I6648a0ce49e0fd2b0881444bd38b9a10c093dc18
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 514e7beef8..072ce46273 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -893,7 +893,7 @@ bool QQmlImportsPrivate::populatePluginPairVector(QVector<StaticPluginPair> &res // To avoid traversing all static plugins for all imports, we cut down // the list the first time called to only contain QML plugins: foreach (const QStaticPlugin &plugin, QPluginLoader::staticPlugins()) { - if (plugin.metaData().value(QStringLiteral("IID")).toString() == QLatin1String(QQmlExtensionInterface_iid)) + if (qobject_cast<QQmlExtensionPlugin *>(plugin.instance())) plugins.append(plugin); } } diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 38d070831c..0edbcd8780 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2645,7 +2645,7 @@ void QQuickItem::setParentItem(QQuickItem *parentItem) QQuickItem *scopeItem = 0; - if (hasFocus()) + if (hasFocus() || op->subFocusItem == this) scopeFocusedItem = this; else if (!isFocusScope() && d->subFocusItem) scopeFocusedItem = d->subFocusItem; |