From da55e6f87887678b9e63f95b7ceeedac9b0b25d0 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Mon, 17 Nov 2025 14:01:59 +0200 Subject: [PATCH] Mark the whole repo with QT_NO_URL_CAST_FROM_STRING Drive-by, set QT_EXTRA_INTERNAL_TARGET_DEFINES in one command, more readable Change-Id: I6f430d8461493ba34484a6de1889aa95b5d3edf0 Reviewed-by: Juha Vuolle --- .cmake.conf | 9 ++++++--- .../tst_qndefnfcsmartposterrecord.cpp | 4 ++-- tests/bttestui/main.cpp | 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cmake.conf b/.cmake.conf index e337c414..93de436f 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,5 +1,8 @@ set(QT_REPO_MODULE_VERSION "6.11.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") -set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") -list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") -list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_QSNPRINTF=1") +set(QT_EXTRA_INTERNAL_TARGET_DEFINES + "QT_NO_AS_CONST=1" + "QT_NO_FOREACH=1" + "QT_NO_QSNPRINTF=1" + "QT_NO_URL_CAST_FROM_STRING=1" +) diff --git a/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp b/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp index 7eba5fd3..241a99ac 100644 --- a/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp +++ b/tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp @@ -285,11 +285,11 @@ void tst_QNdefNfcSmartPosterRecord::tst_uri() QCOMPARE(record.uri(), qtUrl); QNdefNfcUriRecord qtRecord; - qtRecord.setUri(qtString); + qtRecord.setUri(QUrl{qtString}); QCOMPARE(record.uriRecord(), qtRecord); QNdefNfcUriRecord bbRecord; - bbRecord.setUri(bbString); + bbRecord.setUri(QUrl{bbString}); record.setUri(bbRecord); QCOMPARE(record.uri(), QUrl(bbString)); QCOMPARE(record.uriRecord(), bbRecord); diff --git a/tests/bttestui/main.cpp b/tests/bttestui/main.cpp index 50d57847..2d634b5b 100644 --- a/tests/bttestui/main.cpp +++ b/tests/bttestui/main.cpp @@ -14,6 +14,8 @@ #include "btlocaldevice.h" +using namespace Qt::StringLiterals; + int main(int argc, char *argv[]) { QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); @@ -40,7 +42,7 @@ int main(int argc, char *argv[]) qmlRegisterType("Local", 6, 5, "BluetoothDevice"); QQuickView view; - view.setSource(QStringLiteral("qrc:///main.qml")); + view.setSource(QUrl{u"qrc:///main.qml"_s}); view.setResizeMode(QQuickView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));