1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable QT_NO_QSNPRINTF globally

Browse Source 
The qsnprintf() function introduces even more platform variability
than std::snprintf(), so from now on, we're using only std::snprintf().

Task-number: QTBUG-127110
Change-Id: Ic81b2a760521d77442cc328d2cfa7659bba8b7e2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit b8a956c2d3f9c158594265eca89185bd2bc671e7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-07-22 16:10:13 +02:00 committed by Qt Cherry-pick Bot
parent ba823e3a5f
commit a9f26089ed
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtInternalTargets.cmake
View File

@ -151,6 +151,7 @@ target_link_libraries(PlatformToolInternal INTERFACE PlatformAppInternal)
qt_internal_add_global_definition(QT_NO_JAVA_STYLE_ITERATORS) qt_internal_add_global_definition(QT_NO_JAVA_STYLE_ITERATORS)
qt_internal_add_global_definition(QT_NO_QASCONST) qt_internal_add_global_definition(QT_NO_QASCONST)
qt_internal_add_global_definition(QT_NO_QEXCHANGE) qt_internal_add_global_definition(QT_NO_QEXCHANGE)
qt_internal_add_global_definition(QT_NO_QSNPRINTF)
qt_internal_add_global_definition(QT_NO_NARROWING_CONVERSIONS_IN_CONNECT) qt_internal_add_global_definition(QT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
qt_internal_add_global_definition(QT_EXPLICIT_QFILE_CONSTRUCTION_FROM_PATH) qt_internal_add_global_definition(QT_EXPLICIT_QFILE_CONSTRUCTION_FROM_PATH)
qt_internal_add_global_definition(QT_USE_QSTRINGBUILDER SCOPE PLUGIN TOOL MODULE) qt_internal_add_global_definition(QT_USE_QSTRINGBUILDER SCOPE PLUGIN TOOL MODULE)

1
src/corelib/CMakeLists.txt
View File

@ -332,7 +332,6 @@ qt_internal_add_module(Core
QT_NO_CONTEXTLESS_CONNECT QT_NO_CONTEXTLESS_CONNECT
QT_NO_FOREACH QT_NO_FOREACH
QT_NO_QPAIR QT_NO_QPAIR
QT_NO_QSNPRINTF
QT_NO_USING_NAMESPACE QT_NO_USING_NAMESPACE
QT_TYPESAFE_FLAGS QT_TYPESAFE_FLAGS
QT_USE_NODISCARD_FILE_OPEN QT_USE_NODISCARD_FILE_OPEN

1
src/gui/CMakeLists.txt
View File

@ -275,7 +275,6 @@ qt_internal_add_module(Gui
QT_NO_CONTEXTLESS_CONNECT QT_NO_CONTEXTLESS_CONNECT
QT_NO_FOREACH QT_NO_FOREACH
QT_NO_USING_NAMESPACE QT_NO_USING_NAMESPACE
QT_NO_QSNPRINTF
QT_USE_NODISCARD_FILE_OPEN QT_USE_NODISCARD_FILE_OPEN
QT_QPA_DEFAULT_PLATFORM_NAME="${QT_QPA_DEFAULT_PLATFORM}" QT_QPA_DEFAULT_PLATFORM_NAME="${QT_QPA_DEFAULT_PLATFORM}"
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES

1
src/testlib/CMakeLists.txt
View File

@ -68,7 +68,6 @@ qt_internal_add_module(Test
QT_NO_CONTEXTLESS_CONNECT QT_NO_CONTEXTLESS_CONNECT
QT_NO_DATASTREAM QT_NO_DATASTREAM
QT_NO_FOREACH QT_NO_FOREACH
QT_NO_QSNPRINTF
QT_USE_NODISCARD_FILE_OPEN QT_USE_NODISCARD_FILE_OPEN
# Ensure uniform location info between release and debug builds # Ensure uniform location info between release and debug builds
QT_NO_MESSAGELOGCONTEXT QT_NO_MESSAGELOGCONTEXT

4
tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
View File

@ -2,6 +2,10 @@
// Copyright (C) 2016 Intel Corporation. // Copyright (C) 2016 Intel Corporation.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#ifdef QT_NO_QSNPRINTF
# undef QT_NO_QSNPRINTF // test of the function
#endif
#include <QTest> #include <QTest>
#include <qbytearray.h> #include <qbytearray.h>