Exclude q*_data_p.h files from the generated include/
They exist to separate generated data under the Unicode license from our own sources and avoid bloating our *.cpp files. They are only *.h files because #include is how we pull them into the translation units that need them. They don't define API, not even internal API, only data. Removing them from CMake's SOURCE list suffices to do this and exclude them from syncqt's scrutiny (also needed). Change their header comments, also, to reflect their anomalous nature and remove some spurious #include entries. Tidy up header guards in the process: * Persian calendar one's name didn't match its filename; * some were missing a comment on their distant #endif Task-number: QTBUG-128930 Change-Id: I5a3034f5615d1c09a89bb6a29719ecdadaba2133 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
parent
a127aea57b
commit
ad857e09e5
@ -224,7 +224,6 @@ qt_internal_add_module(Core
|
|||||||
text/qlatin1stringmatcher.cpp text/qlatin1stringmatcher.h
|
text/qlatin1stringmatcher.cpp text/qlatin1stringmatcher.h
|
||||||
text/qlatin1stringview.h
|
text/qlatin1stringview.h
|
||||||
text/qlocale.cpp text/qlocale.h text/qlocale_p.h
|
text/qlocale.cpp text/qlocale.h text/qlocale_p.h
|
||||||
text/qlocale_data_p.h
|
|
||||||
text/qlocale_tools.cpp text/qlocale_tools_p.h
|
text/qlocale_tools.cpp text/qlocale_tools_p.h
|
||||||
text/qstaticlatin1stringmatcher.h
|
text/qstaticlatin1stringmatcher.h
|
||||||
text/qstring.cpp text/qstring.h
|
text/qstring.cpp text/qstring.h
|
||||||
@ -267,7 +266,6 @@ qt_internal_add_module(Core
|
|||||||
time/qlocaltime.cpp time/qlocaltime_p.h
|
time/qlocaltime.cpp time/qlocaltime_p.h
|
||||||
time/qmilankoviccalendar.cpp time/qmilankoviccalendar_p.h
|
time/qmilankoviccalendar.cpp time/qmilankoviccalendar_p.h
|
||||||
time/qromancalendar.cpp time/qromancalendar_p.h
|
time/qromancalendar.cpp time/qromancalendar_p.h
|
||||||
time/qromancalendar_data_p.h
|
|
||||||
time/qtimezone.cpp time/qtimezone.h
|
time/qtimezone.cpp time/qtimezone.h
|
||||||
tools/qalgorithms.h
|
tools/qalgorithms.h
|
||||||
tools/qarraydata.cpp tools/qarraydata.h
|
tools/qarraydata.cpp tools/qarraydata.h
|
||||||
@ -905,7 +903,6 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_openssl_hash
|
|||||||
qt_internal_extend_target(Core CONDITION QT_FEATURE_hijricalendar
|
qt_internal_extend_target(Core CONDITION QT_FEATURE_hijricalendar
|
||||||
SOURCES
|
SOURCES
|
||||||
time/qhijricalendar.cpp time/qhijricalendar_p.h
|
time/qhijricalendar.cpp time/qhijricalendar_p.h
|
||||||
time/qhijricalendar_data_p.h
|
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
|
qt_internal_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
|
||||||
@ -916,13 +913,11 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
|
|||||||
qt_internal_extend_target(Core CONDITION QT_FEATURE_jalalicalendar
|
qt_internal_extend_target(Core CONDITION QT_FEATURE_jalalicalendar
|
||||||
SOURCES
|
SOURCES
|
||||||
time/qjalalicalendar.cpp time/qjalalicalendar_p.h
|
time/qjalalicalendar.cpp time/qjalalicalendar_p.h
|
||||||
time/qjalalicalendar_data_p.h
|
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone
|
qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone
|
||||||
SOURCES
|
SOURCES
|
||||||
time/qtimezoneprivate.cpp time/qtimezoneprivate_p.h
|
time/qtimezoneprivate.cpp time/qtimezoneprivate_p.h
|
||||||
time/qtimezoneprivate_data_p.h
|
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(Core
|
qt_internal_extend_target(Core
|
||||||
@ -979,13 +974,6 @@ qt_internal_extend_target(Core
|
|||||||
time/qtimezonelocale.cpp time/qtimezonelocale_p.h
|
time/qtimezonelocale.cpp time/qtimezonelocale_p.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(Core
|
|
||||||
CONDITION
|
|
||||||
QT_FEATURE_timezone_locale AND NOT QT_FEATURE_icu
|
|
||||||
SOURCES
|
|
||||||
time/qtimezonelocale_data_p.h
|
|
||||||
)
|
|
||||||
|
|
||||||
qt_internal_extend_target(Core CONDITION QT_FEATURE_datetimeparser
|
qt_internal_extend_target(Core CONDITION QT_FEATURE_datetimeparser
|
||||||
SOURCES
|
SOURCES
|
||||||
time/qdatetimeparser.cpp time/qdatetimeparser_p.h
|
time/qdatetimeparser.cpp time/qdatetimeparser_p.h
|
||||||
|
@ -9,14 +9,13 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists for the convenience
|
// This file is not a normal header file.
|
||||||
// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
|
// It defines data tables for internal use by QLocale and related classes.
|
||||||
// file may change from version to version without notice, or even be removed.
|
// It may change incompatibly between versions, or even be removed.
|
||||||
//
|
//
|
||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qendian.h>
|
|
||||||
#include <QtCore/private/qlocale_p.h>
|
#include <QtCore/private/qlocale_p.h>
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
@ -8493,4 +8492,4 @@ static inline constexpr unsigned char territory_code_list[] =
|
|||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#endif
|
#endif // QLOCALE_DATA_P_H
|
||||||
|
@ -9,16 +9,13 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists for the convenience
|
// This file is not a normal header file.
|
||||||
// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
|
// It defines data tables for internal use by QHijriCalendar.
|
||||||
// file may change from version to version without notice, or even be removed.
|
// It may change incompatibly between versions, or even be removed.
|
||||||
//
|
//
|
||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/private/qglobal_p.h>
|
|
||||||
#include <QtCore/private/qcalendarbackend_p.h>
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
namespace QtPrivate::Hijri {
|
namespace QtPrivate::Hijri {
|
||||||
|
@ -2,23 +2,20 @@
|
|||||||
// Copyright © 2004-2023 Unicode, Inc.
|
// Copyright © 2004-2023 Unicode, Inc.
|
||||||
// SPDX-License-Identifier: Unicode-3.0
|
// SPDX-License-Identifier: Unicode-3.0
|
||||||
|
|
||||||
#ifndef QPERSIANCALENDAR_DATA_P_H
|
#ifndef QJALALICALENDAR_DATA_P_H
|
||||||
#define QPERSIANCALENDAR_DATA_P_H
|
#define QJALALICALENDAR_DATA_P_H
|
||||||
|
|
||||||
//
|
//
|
||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists for the convenience
|
// This file is not a normal header file.
|
||||||
// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
|
// It defines data tables for internal use by QJalaliCalendar.
|
||||||
// file may change from version to version without notice, or even be removed.
|
// It may change incompatibly between versions, or even be removed.
|
||||||
//
|
//
|
||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/private/qglobal_p.h>
|
|
||||||
#include <QtCore/private/qcalendarbackend_p.h>
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
namespace QtPrivate::Jalali {
|
namespace QtPrivate::Jalali {
|
||||||
@ -1170,4 +1167,4 @@ static inline constexpr char16_t months_data[] = {
|
|||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#endif
|
#endif // QJALALICALENDAR_DATA_P_H
|
||||||
|
@ -9,16 +9,13 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists for the convenience
|
// This file is not a normal header file.
|
||||||
// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
|
// It defines data tables for internal use by QRomanCalendar.
|
||||||
// file may change from version to version without notice, or even be removed.
|
// It may change from version to version without notice, or even be removed.
|
||||||
//
|
//
|
||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/private/qglobal_p.h>
|
|
||||||
#include <QtCore/private/qcalendarbackend_p.h>
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
namespace QtPrivate::Roman {
|
namespace QtPrivate::Roman {
|
||||||
@ -5140,4 +5137,4 @@ static inline constexpr char16_t months_data[] = {
|
|||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#endif
|
#endif // QROMANCALENDAR_DATA_P_H
|
||||||
|
@ -8,10 +8,10 @@
|
|||||||
# include <QtCore/qspan.h>
|
# include <QtCore/qspan.h>
|
||||||
# include <private/qdatetime_p.h>
|
# include <private/qdatetime_p.h>
|
||||||
// Use data generated from CLDR:
|
// Use data generated from CLDR:
|
||||||
# include <private/qtimezonelocale_data_p.h>
|
# include "qtimezonelocale_data_p.h"
|
||||||
# include <private/qtimezoneprivate_data_p.h>
|
# include "qtimezoneprivate_data_p.h"
|
||||||
# ifdef QT_CLDR_ZONE_DEBUG
|
# ifdef QT_CLDR_ZONE_DEBUG
|
||||||
# include <private/qlocale_data_p.h>
|
# include "../text/qlocale_data_p.h"
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
static_assert(std::size(locale_data) == std::size(QtTimeZoneLocale::localeZoneData));
|
static_assert(std::size(locale_data) == std::size(QtTimeZoneLocale::localeZoneData));
|
||||||
// Size includes terminal rows: for now, they do match in tag IDs, but they needn't.
|
// Size includes terminal rows: for now, they do match in tag IDs, but they needn't.
|
||||||
|
@ -9,16 +9,15 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists for the convenience
|
// This file is not a normal header file.
|
||||||
// of internal files. This header file may change from version to version
|
// It defines data tables for internal use by QTimeZone's L10n code.
|
||||||
// without notice, or even be removed.
|
// It may change incompatibly between versions, or even be removed.
|
||||||
//
|
//
|
||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
// Only qtimezonelocale.cpp should #include this (after other things it needs),
|
// Only qtimezonelocale.cpp should #include this (after other things it needs),
|
||||||
// and even that only when feature icu is disabled.
|
// and even that only when feature icu is disabled.
|
||||||
#include "qtimezonelocale_p.h"
|
|
||||||
|
|
||||||
QT_REQUIRE_CONFIG(timezone_locale);
|
QT_REQUIRE_CONFIG(timezone_locale);
|
||||||
#if QT_CONFIG(icu)
|
#if QT_CONFIG(icu)
|
||||||
|
@ -10,17 +10,13 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists for the convenience
|
// This file is not a normal header file.
|
||||||
// of internal files. This header file may change from version to version
|
// It defines data tables for internal use by QTimeZone's L10n code.
|
||||||
// without notice, or even be removed.
|
// It may change incompatibly between versions, or even be removed.
|
||||||
//
|
//
|
||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/private/qglobal_p.h>
|
|
||||||
#include "qbytearrayview.h"
|
|
||||||
#include "qstring.h"
|
|
||||||
|
|
||||||
QT_REQUIRE_CONFIG(timezone);
|
QT_REQUIRE_CONFIG(timezone);
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user