qiurui
/
qtconnectivity
mirror of https://github.com/qt/qtconnectivity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <juha.vuolle@qt.io>
This commit is contained in:
Ahmad Samir 2025-11-17 14:01:59 +02:00
parent 0d0769c802
commit da55e6f878
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.cmake.conf
View File

@ -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"
)

4
tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp
View File

@ -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);

4
tests/bttestui/main.cpp
View File

@ -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<BtLocalDevice>("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()));