Add new header qvirtualkeyboardnamespace.h

Replace qvirtualkeyboard_namespace.h by new header without underscore,
but keep old code working by making qvirtualkeyboard_namespace.h a
forwarding header. This header could be removed in Qt 7.

This fixes an issue with the QVirtualKeyboard module header that is
generated by syncqt. Because of the underscore in the name, syncqt does
_not_ include qvirtualkeyboard_namespace.h, which is unexpected for end
users, and also did prevent qdoc from properly documenting the content.

Pick-to: 6.4
Change-Id: I5097aa1ee7ada6ac9cd6e12568063426e3e510d3
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>

3 files changed, 52 insertions, 41 deletions

diff --git a/src/virtualkeyboard/CMakeLists.txt b/src/virtualkeyboard/CMakeLists.txt
index 3b1c91c8..8ffd2509 100644
--- a/src/virtualkeyboard/CMakeLists.txt
+++ b/src/virtualkeyboard/CMakeLists.txt
@@ -54,6 +54,7 @@ qt_internal_add_qml_module(VirtualKeyboard
         qvirtualkeyboardfeatures_namespace_p.h
         qvirtualkeyboardinputcontext.cpp qvirtualkeyboardinputcontext.h qvirtualkeyboardinputcontext_p.cpp qvirtualkeyboardinputcontext_p.h
         qvirtualkeyboardinputengine.cpp qvirtualkeyboardinputengine.h
+        qvirtualkeyboardnamespace.h
         qvirtualkeyboardobserver.cpp qvirtualkeyboardobserver.h
         qvirtualkeyboardselectionlistmodel.cpp qvirtualkeyboardselectionlistmodel.h
         qvirtualkeyboardtrace.cpp qvirtualkeyboardtrace.h
diff --git a/src/virtualkeyboard/qvirtualkeyboard_namespace.h b/src/virtualkeyboard/qvirtualkeyboard_namespace.h
index 1c0f6024..ea3f3c8f 100644
--- a/src/virtualkeyboard/qvirtualkeyboard_namespace.h
+++ b/src/virtualkeyboard/qvirtualkeyboard_namespace.h
@@ -1,48 +1,10 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #ifndef QVIRTUALKEYBOARD_NAMESPACE_H
 #define QVIRTUALKEYBOARD_NAMESPACE_H
 
-#include <QMetaEnum>
-#include <QtQml/qqml.h>
-#include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtVirtualKeyboard {
-
-Q_VIRTUALKEYBOARD_EXPORT Q_NAMESPACE
-QML_NAMED_ELEMENT(QtVirtualKeyboard)
-
-enum class KeyType {
-    BaseKey,
-    BackspaceKey,
-    ChangeLanguageKey,
-    EnterKey,
-    FillerKey,
-    HandwritingModeKey,
-    HideKeyboardKey,
-    InputModeKey,
-    Key,
-    ModeKey,
-    NumberKey,
-    ShiftKey,
-    SpaceKey,
-    SymbolModeKey,
-    FlickKey,
-};
-Q_ENUM_NS(KeyType)
-
-enum class KeyboardFunction {
-    HideInputPanel,
-    ChangeLanguage,
-    ToggleHandwritingMode,
-};
-Q_ENUM_NS(KeyboardFunction)
-
-} // namespace QtVirtualKeyboard
-
-QT_END_NAMESPACE
+// TODO: Remove in Qt 7
+#include <QtVirtualKeyboard/qvirtualkeyboardnamespace.h>
 
 #endif // QVIRTUALKEYBOARD_NAMESPACE_H
diff --git a/src/virtualkeyboard/qvirtualkeyboardnamespace.h b/src/virtualkeyboard/qvirtualkeyboardnamespace.h
new file mode 100644
index 00000000..00fc0b2c
--- /dev/null
+++ b/src/virtualkeyboard/qvirtualkeyboardnamespace.h
@@ -0,0 +1,48 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#ifndef QVIRTUALKEYBOARDNAMESPACE_H
+#define QVIRTUALKEYBOARDNAMESPACE_H
+
+#include <QtCore/qmetaobject.h>
+#include <QtQml/qqml.h>
+#include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace QtVirtualKeyboard {
+
+Q_VIRTUALKEYBOARD_EXPORT Q_NAMESPACE
+QML_NAMED_ELEMENT(QtVirtualKeyboard)
+
+enum class KeyType {
+    BaseKey,
+    BackspaceKey,
+    ChangeLanguageKey,
+    EnterKey,
+    FillerKey,
+    HandwritingModeKey,
+    HideKeyboardKey,
+    InputModeKey,
+    Key,
+    ModeKey,
+    NumberKey,
+    ShiftKey,
+    SpaceKey,
+    SymbolModeKey,
+    FlickKey,
+};
+Q_ENUM_NS(KeyType)
+
+enum class KeyboardFunction {
+    HideInputPanel,
+    ChangeLanguage,
+    ToggleHandwritingMode,
+};
+Q_ENUM_NS(KeyboardFunction)
+
+} // namespace QtVirtualKeyboard
+
+QT_END_NAMESPACE
+
+#endif // QVIRTUALKEYBOARDNAMESPACE_H