diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-22 15:42:13 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-27 14:51:31 -0700 |
| commit | 6b3c6155e9dfc6a3ee32b4ced4a117ec570d7563 (patch) | |
| tree | 9e7346ad0b9a22ed951efb97dffa3ad90ecbaeab | |
| parent | 708e4ea23561e28f4032a74eda7e74998087acf2 (diff) | |
Remove qvariant_p.h
Change-Id: I3859764fed084846bcb0fffd1704480153e34973
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
| -rw-r--r-- | src/corelib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant_p.h | 27 | ||||
| -rw-r--r-- | src/gui/kernel/qguivariant.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidgetsvariant.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 1 |
6 files changed, 1 insertions, 32 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 534abce390..106a17b65f 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -151,7 +151,7 @@ qt_internal_add_module(Core kernel/qtestsupport_core.cpp kernel/qtestsupport_core.h kernel/qtimer.cpp kernel/qtimer.h kernel/qtranslator.cpp kernel/qtranslator.h kernel/qtranslator_p.h - kernel/qvariant.cpp kernel/qvariant.h kernel/qvariant_p.h + kernel/qvariant.cpp kernel/qvariant.h kernel/qvariantmap.h kernel/qvarianthash.h kernel/qvariantlist.h plugin/qfactoryinterface.cpp plugin/qfactoryinterface.h plugin/qfactoryloader.cpp plugin/qfactoryloader_p.h diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index aee2e757db..1e72321ff2 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -36,7 +36,6 @@ #include "qjsondocument.h" #include "qbytearraylist.h" #endif -#include "private/qvariant_p.h" #include "private/qlocale_p.h" #include "qmetatype_p.h" #include <qmetaobject.h> diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h deleted file mode 100644 index 40fde48a1c..0000000000 --- a/src/corelib/kernel/qvariant_p.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// Copyright (C) 2016 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#ifndef QVARIANT_P_H -#define QVARIANT_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/qglobal.h> -#include <QtCore/qvariant.h> -#include <QtCore/private/qmetatype_p.h> - -QT_BEGIN_NAMESPACE - -QT_END_NAMESPACE - -#endif // QVARIANT_P_H diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 656072c0bf..4fdc744029 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -50,7 +50,6 @@ #include <float.h> -#include "private/qvariant_p.h" #include <private/qmetatype_p.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index 5e5c932a89..f5d511abd2 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -6,7 +6,6 @@ #include "qsizepolicy.h" #include "qwidget.h" -#include "private/qvariant_p.h" #include <private/qmetatype_p.h> QT_BEGIN_NAMESPACE diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index b6fc6529dc..e5ddc16df9 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -9,7 +9,6 @@ #include <QSet> #include <qvariant.h> -#include <QtCore/private/qvariant_p.h> #include <qbitarray.h> #include <qbytearraylist.h> #include <qdatetime.h> |