Static plugins: support loading static plugins from several engines
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>
Tue, 11 Mar 2014 11:51:15 +0000 (12:51 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 13 Mar 2014 09:21:42 +0000 (10:21 +0100)
commit6e1851de9595d7e7abe9acdc8c473e792d24c4c2
tree9c5e4d2b6b36208b52e2bf7219c870d1c156fcee
parentb244fc002d4fb97abb8647ed07f6e927cf3de789
Static plugins: support loading static plugins from several engines

When loading dynamic plugins, we register them as loaded so that
we don't try to register their types several times if using several
engines. The same was not done for static plugins. This patch
will ensure that we follow the same logic also for static
plugins.

Task-number: QTBUG-36532
Change-Id: Icc1e089ae5d682c38b2d36bf4808f1c753c122a4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlimport.cpp
src/qml/qml/qqmlimport_p.h