diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2023-06-20 16:43:35 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-20 21:41:33 +0000 |
| commit | cfc77fbd8ab84dbfaf68d8bba8121a057c911bc8 (patch) | |
| tree | 9e6dcb8e415172c72967a8de33cd4e239ac8c5eb | |
| parent | e159d211d1d33a95f1e5016b4497fce54f697edb (diff) | |
Make qvirtualkeyboardnamespace.h private
This change was made based on feedback on Qt 6.6 api review.
Since the qvirtualkeyboardnamespace.h is currently used as private API,
it makes no sense to keep it public.
[ChangeLog][Potentially Source-Incompatible Changes][VirtualKeyboard]
The qvirtualkeyboardnamespace.h header has been made private. None of
the enum types declared in that header are used in public C++ APIs.
Change-Id: I889bf71bb36d00140dcffad7e672452c93eaaa98
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 5445b9176119e11de037c3a15442e25ebbcd6a0d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/settings/qquickvirtualkeyboardsettings_p.h | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboard_namespace.h | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardnamespace_p.h (renamed from src/virtualkeyboard/qvirtualkeyboardnamespace.h) | 19 | ||||
| -rw-r--r-- | src/virtualkeyboard/settings_p.h | 2 |
6 files changed, 20 insertions, 9 deletions
diff --git a/src/settings/qquickvirtualkeyboardsettings_p.h b/src/settings/qquickvirtualkeyboardsettings_p.h index f6f53804..35f56013 100644 --- a/src/settings/qquickvirtualkeyboardsettings_p.h +++ b/src/settings/qquickvirtualkeyboardsettings_p.h @@ -15,7 +15,7 @@ // We mean it. // -#include <QtVirtualKeyboard/qvirtualkeyboardnamespace.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardnamespace_p.h> #include <QtQml/qqml.h> #include <QtCore/private/qglobal_p.h> diff --git a/src/virtualkeyboard/CMakeLists.txt b/src/virtualkeyboard/CMakeLists.txt index 9309343f..76708b8c 100644 --- a/src/virtualkeyboard/CMakeLists.txt +++ b/src/virtualkeyboard/CMakeLists.txt @@ -54,7 +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 + qvirtualkeyboardnamespace_p.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 0bac2777..84871c1a 100644 --- a/src/virtualkeyboard/qvirtualkeyboard_namespace.h +++ b/src/virtualkeyboard/qvirtualkeyboard_namespace.h @@ -8,6 +8,6 @@ # pragma qt_sync_skip_header_check #endif // TODO: Remove in Qt 7 -#include <QtVirtualKeyboard/qvirtualkeyboardnamespace.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardnamespace_p.h> #endif // QVIRTUALKEYBOARD_NAMESPACE_H diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h index c148edc5..4259aa9c 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h @@ -23,7 +23,7 @@ #include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> #include <QtVirtualKeyboard/private/shadowinputcontext_p.h> #include <QtVirtualKeyboard/qvirtualkeyboardobserver.h> -#include <QtVirtualKeyboard/qvirtualkeyboardnamespace.h> +#include <QtVirtualKeyboard/private/qvirtualkeyboardnamespace_p.h> QT_BEGIN_NAMESPACE diff --git a/src/virtualkeyboard/qvirtualkeyboardnamespace.h b/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h index 11d2dea4..14a72d72 100644 --- a/src/virtualkeyboard/qvirtualkeyboardnamespace.h +++ b/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h @@ -1,8 +1,19 @@ -// Copyright (C) 2022 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef QVIRTUALKEYBOARDNAMESPACE_H -#define QVIRTUALKEYBOARDNAMESPACE_H +#ifndef QVIRTUALKEYBOARDNAMESPACE_P_H +#define QVIRTUALKEYBOARDNAMESPACE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// #include <QtCore/qmetaobject.h> #include <QtQml/qqml.h> @@ -55,4 +66,4 @@ Q_FLAG_NS(KeyboardFunctionKeys) QT_END_NAMESPACE -#endif // QVIRTUALKEYBOARDNAMESPACE_H +#endif // QVIRTUALKEYBOARDNAMESPACE_P_H diff --git a/src/virtualkeyboard/settings_p.h b/src/virtualkeyboard/settings_p.h index b535273d..7aafe750 100644 --- a/src/virtualkeyboard/settings_p.h +++ b/src/virtualkeyboard/settings_p.h @@ -15,7 +15,7 @@ // We mean it. // -#include "qvirtualkeyboardnamespace.h" +#include "qvirtualkeyboardnamespace_p.h" #include <QObject> #include <QUrl> #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> |