diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-10-12 17:54:00 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-01 16:52:14 +0000 |
| commit | 34d70fb6678d09b200f42c95ac95bd043439c1f6 (patch) | |
| tree | 33f83df032e359ad7820fc662e6fd38c3f4a97ba | |
| parent | 0e2b422fddef17cf9bfc8e31ed4a8f62566e27a0 (diff) | |
Fix compilation 6.3 against 6.4
Check if type registrations should be in Qt namespace.
This amends 5208245d2ccabbc07ecf6b845cfa3d971d2ed7e5.
Change-Id: I3f349a4aedac4410b1a581264d1e8877ba0bcf44
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 291082bf58fbafc2d6c2d48819d11d350749b1eb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/webenginequick/plugin.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/webenginequick/plugin.cpp b/src/webenginequick/plugin.cpp index 1f25f4f98..d64059a07 100644 --- a/src/webenginequick/plugin.cpp +++ b/src/webenginequick/plugin.cpp @@ -7,9 +7,15 @@ #include <QtWebEngineQuick/private/qquickwebenginefaviconprovider_p_p.h> #include <QtWebEngineQuick/private/qquickwebenginetouchhandleprovider_p_p.h> +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) QT_BEGIN_NAMESPACE - void Q_WEBENGINEQUICK_PRIVATE_EXPORT qml_register_types_QtWebEngine(); +QT_END_NAMESPACE +#else +void Q_WEBENGINEQUICK_PRIVATE_EXPORT qml_register_types_QtWebEngine(); +#endif + +QT_BEGIN_NAMESPACE class QtWebEnginePlugin : public QQmlExtensionPlugin { |