diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
commit | ef177a48f2c6c41549ef9d11a985ab2661942638 (patch) | |
tree | d6bc5aa8cbde95d9e9857ead4b509e8b04b524b9 /src/webengine/plugin | |
parent | 396ca081d7b0d9dab7de14ebaec7943c3f857a24 (diff) | |
parent | e5bc5a6dbdd915e0b19cfc43e7af17e43c1a7878 (diff) |
Merge branch '5.12' into dev
Conflicts:
src/core/compositor/compositor.cpp
src/core/compositor/compositor.h
Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e
Diffstat (limited to 'src/webengine/plugin')
-rw-r--r-- | src/webengine/plugin/qmldir | 1 | ||||
-rw-r--r-- | src/webengine/plugin/testsupport/qmldir | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/webengine/plugin/qmldir b/src/webengine/plugin/qmldir index e24f55ed9..8970dc9c1 100644 --- a/src/webengine/plugin/qmldir +++ b/src/webengine/plugin/qmldir @@ -1,3 +1,4 @@ module QtWebEngine plugin qtwebengineplugin +classname QtWebEnginePlugin typeinfo plugins.qmltypes diff --git a/src/webengine/plugin/testsupport/qmldir b/src/webengine/plugin/testsupport/qmldir index 588c9d2d4..7fff80251 100644 --- a/src/webengine/plugin/testsupport/qmldir +++ b/src/webengine/plugin/testsupport/qmldir @@ -1,3 +1,4 @@ module QtWebEngine.testsupport plugin qtwebenginetestsupportplugin +classname QtWebEngineTestSupportPlugin typeinfo plugins.qmltypes |