From b4a55e6db6b3a4340d36dc3b424b8bba06d30ae8 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 4 Aug 2023 11:20:33 +0200 Subject: [PATCH] Remove explicit use of QT_USE_QSTRINGBUILDER MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we enabled QT_USE_QSTRINGBUILDER by default for all plugins it doesn't make sense to add this definition explicitly. Change-Id: I22ad0b1fb567e12a842df4299231a5697ab9216d Reviewed-by: MÃ¥rten Nordheim --- src/plugins/networkinformation/android/CMakeLists.txt | 2 -- src/plugins/platforms/android/CMakeLists.txt | 2 -- src/plugins/tls/schannel/CMakeLists.txt | 1 - 3 files changed, 5 deletions(-) diff --git a/src/plugins/networkinformation/android/CMakeLists.txt b/src/plugins/networkinformation/android/CMakeLists.txt index f9ed4913e3..07d9201bbb 100644 --- a/src/plugins/networkinformation/android/CMakeLists.txt +++ b/src/plugins/networkinformation/android/CMakeLists.txt @@ -29,8 +29,6 @@ qt_internal_add_plugin(QAndroidNetworkInformationPlugin wrapper/androidconnectivitymanager.cpp wrapper/androidconnectivitymanager.h LIBRARIES Qt::NetworkPrivate - DEFINES - QT_USE_QSTRINGBUILDER ) set_property( diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index d2edcae67f..0b24e52d9a 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -54,8 +54,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin # Conflicting JNI classes, and types androidcontentfileengine.cpp qandroidplatformintegration.cpp - DEFINES - QT_USE_QSTRINGBUILDER INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} ${QtBase_SOURCE_DIR}/src/3rdparty/android diff --git a/src/plugins/tls/schannel/CMakeLists.txt b/src/plugins/tls/schannel/CMakeLists.txt index 57f4927b4f..a7f7fcd99f 100644 --- a/src/plugins/tls/schannel/CMakeLists.txt +++ b/src/plugins/tls/schannel/CMakeLists.txt @@ -31,5 +31,4 @@ qt_internal_add_plugin(QSchannelBackendPlugin ncrypt DEFINES QT_NO_CAST_FROM_ASCII - QT_USE_QSTRINGBUILDER )