diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2025-01-01 17:03:54 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2025-01-15 13:28:16 +0200 |
| commit | 185cba6e95a006d2548f20599f84390e5a3ad653 (patch) | |
| tree | 6dc7754b561b0744cb7b72acde50e979da978b99 /src/corelib | |
| parent | a10acaca0887541207ad5607680d7864d317cf4b (diff) | |
Replace qdebug.h includes in public headers with forward-declarations
qdebug.h includes many Qt and STL headers, so if you include a Qt header
you get all those transitive includes, which may affect build time.
- Where appropriate use the printf-like syntax of qDebug() and co.,
these don't need the QDebug streaming operators
- qfloat16 is used in an inline member function, so include it
explicitly
[ChangeLog][Potentially Source Incompatible Changes] Various Qt public
headers don't include QDebug any more; if you need QDebug's streaming
you'll have to include it in your code.
Task-number: QTBUG-132439
Pick-to: 6.9
Change-Id: I750587e17a3b38fa226cd3af8eaccc8da580f436
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qdebug.h | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 4 | ||||
| -rw-r--r-- | src/corelib/serialization/qcborcommon.h | 3 | ||||
| -rw-r--r-- | src/corelib/serialization/qcborvalue.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/thread/qfutureinterface.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/time/qtimezonelocale.cpp | 5 |
6 files changed, 10 insertions, 8 deletions
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 9cfd461870b..4af152440c7 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -11,6 +11,7 @@ #include <QtCore/qcompare.h> #include <QtCore/qcontainerfwd.h> +#include <QtCore/qfloat16.h> #include <QtCore/qtextstream.h> #include <QtCore/qttypetraits.h> #include <QtCore/qtypes.h> diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 65eaf50e8b3..e0253afa645 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -15,9 +15,6 @@ #include <QtCore/qscopedpointer.h> #endif #include <QtCore/qnativeinterface.h> -#ifndef QT_NO_DEBUGSTREAM -#include <QtCore/qdebug.h> -#endif #ifndef QT_NO_QOBJECT #if defined(Q_OS_WIN) && !defined(tagMSG) @@ -29,6 +26,7 @@ QT_BEGIN_NAMESPACE class QCoreApplicationPrivate; +class QDebug; class QTranslator; #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) class QPostEventList; diff --git a/src/corelib/serialization/qcborcommon.h b/src/corelib/serialization/qcborcommon.h index bd7a93dfe70..202bc49278d 100644 --- a/src/corelib/serialization/qcborcommon.h +++ b/src/corelib/serialization/qcborcommon.h @@ -6,7 +6,6 @@ #include <QtCore/qobjectdefs.h> #include <QtCore/qmetatype.h> -#include <QtCore/qdebug.h> #if 0 #pragma qt_class(QtCborCommon) @@ -20,6 +19,8 @@ QT_BEGIN_NAMESPACE +class QDebug; + enum class QCborSimpleType : quint8 { False = 20, True = 21, diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp index 9581015dc11..e9b7d5b71b6 100644 --- a/src/corelib/serialization/qcborvalue.cpp +++ b/src/corelib/serialization/qcborvalue.cpp @@ -15,6 +15,7 @@ #include "qcborstreamwriter.h" #endif +#include <QtCore/qdebug.h> #include <qendian.h> #include <qlocale.h> #include <qdatetime.h> diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index 280615bf76a..7f1b2bef154 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -897,8 +897,8 @@ void QFutureInterfaceBase::setContinuation(std::function<void(const QFutureInter // future's data stays alive. if (d->continuationState != QFutureInterfaceBasePrivate::Cleaned) { if (d->continuation) { - qWarning() << "Adding a continuation to a future which already has a continuation. " - "The existing continuation is overwritten."; + qWarning("Adding a continuation to a future which already has a continuation. " + "The existing continuation is overwritten."); } d->continuation = std::move(func); d->continuationData = continuationFutureData; diff --git a/src/corelib/time/qtimezonelocale.cpp b/src/corelib/time/qtimezonelocale.cpp index 21002373d7a..1ea1f40b701 100644 --- a/src/corelib/time/qtimezonelocale.cpp +++ b/src/corelib/time/qtimezonelocale.cpp @@ -245,8 +245,9 @@ const MetaZoneData *metaZoneDataFor(const MetaZoneData *from, QLocale::Territory // Fall back to World (if territory itself isn't World). } while (std::exchange(land, QLocale::World) != QLocale::World); - qWarning() << "Metazone" << from->metaZoneId() << "lacks World data for" - << QLocale::territoryToString(territory); + qWarning("Metazone %s lacks World data for %ls", + from->metaZoneId().constData(), + qUtf16Printable(QLocale::territoryToString(territory))); return nullptr; } |