diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-18 13:15:18 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-21 11:31:54 +0000 |
| commit | 3f42c989eefc61a232716779271ecac82e64521c (patch) | |
| tree | 40503cda733a7fbab33617be0d699044aeb49e2c /src/tools/iostool | |
| parent | dc1439deddaf1b5dbd5707c088fff5e0e62db966 (diff) | |
| download | qt-creator-3f42c989eefc61a232716779271ecac82e64521c.tar.gz | |
Fix Qt 6 build of ProjectExplorer and targets & build systems
QStringRef is gone.
qsizetype vs int.
QMultiHash::insertMulti is gone.
QXmlStreamWriter writes UTF-8 by default.
Task-number: QTCREATORBUG-24098
Change-Id: Id217e40a1f17993a84fc725976e9cb84618b0580
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/tools/iostool')
| -rw-r--r-- | src/tools/iostool/iosdevicemanager.cpp | 2 | ||||
| -rw-r--r-- | src/tools/iostool/main.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp index f3f1c444c6..7003710d9d 100644 --- a/src/tools/iostool/iosdevicemanager.cpp +++ b/src/tools/iostool/iosdevicemanager.cpp @@ -799,7 +799,7 @@ void IosDeviceManagerPrivate::deviceWithId(QString deviceId, int timeout, pendingLookup->timer.setSingleShot(true); pendingLookup->timer.setInterval(timeout); QObject::connect(&(pendingLookup->timer), &QTimer::timeout, q, &IosDeviceManager::checkPendingLookups); - m_pendingLookups.insertMulti(deviceId, pendingLookup); + m_pendingLookups.insert(deviceId, pendingLookup); pendingLookup->timer.start(); } enum GdbServerStatus { diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp index 6195888d37..b62b2a9b93 100644 --- a/src/tools/iostool/main.cpp +++ b/src/tools/iostool/main.cpp @@ -521,7 +521,6 @@ IosTool::IosTool(QObject *parent): { outFile.open(stdout, QIODevice::WriteOnly, QFileDevice::DontCloseHandle); out.setAutoFormatting(true); - out.setCodec("UTF-8"); } IosTool::~IosTool() |