From c0d39fd2eda448f94c04cddbc562a767d16f5a80 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 4 Feb 2025 17:40:22 +0100 Subject: [PATCH] Move qtformat_impl.h into corelib/text ... because it is not really related to IO. We were choosing between serialization and text, and ended up with text, because that's where the standard itself puts format [0]. [0]: https://eel.is/c++draft/format.functions Amends ffac33964d51971a1c1f61308b6f0a60a4133296. Found in Qt 6.9 API review. Change-Id: I827322175da81bc027a9e136098b7e84677f43f7 Reviewed-by: Marc Mutz Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira (cherry picked from commit 584ac8185255da9b15360bf0ca50677cba46ac9f) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/CMakeLists.txt | 2 +- src/corelib/{io => text}/qtformat_impl.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/corelib/{io => text}/qtformat_impl.h (100%) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 8c1c214808b..8e72caa9a5e 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -143,7 +143,6 @@ qt_internal_add_module(Core io/qstorageinfo.cpp io/qstorageinfo.h io/qstorageinfo_p.h io/qtemporarydir.cpp io/qtemporarydir.h io/qtemporaryfile.cpp io/qtemporaryfile.h io/qtemporaryfile_p.h - io/qtformat_impl.h io/qurl.cpp io/qurl.h io/qurl_p.h io/qurlidna.cpp io/qurlquery.cpp io/qurlquery.h @@ -242,6 +241,7 @@ qt_internal_add_module(Core text/qstringtokenizer.cpp text/qstringtokenizer.h text/qstringview.cpp text/qstringview.h text/qtextboundaryfinder.cpp text/qtextboundaryfinder.h + text/qtformat_impl.h text/qunicodetables_p.h text/qunicodetools.cpp text/qunicodetools_p.h text/qutf8stringview.h diff --git a/src/corelib/io/qtformat_impl.h b/src/corelib/text/qtformat_impl.h similarity index 100% rename from src/corelib/io/qtformat_impl.h rename to src/corelib/text/qtformat_impl.h