diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2019-09-17 14:59:34 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2019-09-18 11:04:11 +0200 |
commit | 35f6e58cd747a3d19a503c7fa49bb74aeaedd87e (patch) | |
tree | 98cee27b652838b5d05f16b89a13494730c39370 | |
parent | 06d10a78e15faae8b644c011c6a66c171cf0ec22 (diff) |
Fix compile issuesv5.14.0-beta2v5.14.0-beta1v5.14.0-alpha1
* missing namespace
* use right constructor
Change-Id: I8e76cf4250af5519c9c4888db34ddfd6471ffec4
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
-rw-r--r-- | examples/knx/discoverer/main.cpp | 2 | ||||
-rw-r--r-- | examples/knx/knxproj/main.cpp | 4 | ||||
-rw-r--r-- | src/knx/netip/qknxnetipserverdescriptionagent.cpp | 4 | ||||
-rw-r--r-- | src/knx/qknxadditionalinfo.cpp | 2 | ||||
-rw-r--r-- | src/knx/qknxaddress.cpp | 4 | ||||
-rw-r--r-- | src/knx/qknxcontrolfield.cpp | 2 | ||||
-rw-r--r-- | src/knx/qknxextendedcontrolfield.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qknxnetipknxaddressesdib/tst_qknxnetipknxaddressesdib.cpp | 2 |
9 files changed, 14 insertions, 10 deletions
diff --git a/examples/knx/discoverer/main.cpp b/examples/knx/discoverer/main.cpp index d9944cb..2a42634 100644 --- a/examples/knx/discoverer/main.cpp +++ b/examples/knx/discoverer/main.cpp @@ -188,7 +188,7 @@ int main(int argc, char *argv[]) const auto servers = agent.discoveredServers(); if (servers.size() > 0) { - qInfo().noquote() << endl << QString::fromLatin1("%1 server(s) found on the network.") + qInfo().noquote() << Qt::endl << QString::fromLatin1("%1 server(s) found on the network.") .arg(servers.size()); for (auto server : servers) { qInfo().noquote() << QString::fromLatin1(" Network interface: %1, address: %2") diff --git a/examples/knx/knxproj/main.cpp b/examples/knx/knxproj/main.cpp index d838bbf..3781a98 100644 --- a/examples/knx/knxproj/main.cpp +++ b/examples/knx/knxproj/main.cpp @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) bool verbose = cliParser.isSet(verboseOption); if (!cliParser.isSet(projFilePathOption)) { - qInfo() << "Error: Missing project file name" << endl; + qInfo() << "Error: Missing project file name" << Qt::endl; cliParser.showHelp(EXIT_FAILURE); } @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) qInfo().noquote() << QString::fromLatin1(" %1: %2") .arg(addInfo.name()).arg(addInfo.address().toString()); } - qInfo() << endl; + qInfo() << Qt::endl; } } diff --git a/src/knx/netip/qknxnetipserverdescriptionagent.cpp b/src/knx/netip/qknxnetipserverdescriptionagent.cpp index 5735ed7..596cbbb 100644 --- a/src/knx/netip/qknxnetipserverdescriptionagent.cpp +++ b/src/knx/netip/qknxnetipserverdescriptionagent.cpp @@ -213,7 +213,11 @@ void QKnxNetIpServerDescriptionAgentPrivate::setupSocket() continue; setAndEmitServerDescriptionReceived({ m_server, response.deviceHardware(), +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) response.supportedFamilies() }); +#else + response.supportedFamilies(), {}, {} }); +#endif } }); } diff --git a/src/knx/qknxadditionalinfo.cpp b/src/knx/qknxadditionalinfo.cpp index 6226313..611bdb5 100644 --- a/src/knx/qknxadditionalinfo.cpp +++ b/src/knx/qknxadditionalinfo.cpp @@ -318,7 +318,7 @@ QDebug operator<<(QDebug debug, const QKnxAdditionalInfo &info) { QDebugStateSaver _(debug); if (info.isValid()) { - QDebug &dbg = debug.nospace().noquote() << "0x" << hex << qSetFieldWidth(2) + QDebug &dbg = debug.nospace().noquote() << "0x" << Qt::hex << qSetFieldWidth(2) << qSetPadChar(QLatin1Char('0')); const auto rawData = info.bytes(); for (quint8 byte : qAsConst(rawData)) diff --git a/src/knx/qknxaddress.cpp b/src/knx/qknxaddress.cpp index 46a0cc2..439847e 100644 --- a/src/knx/qknxaddress.cpp +++ b/src/knx/qknxaddress.cpp @@ -421,8 +421,8 @@ QDebug operator<<(QDebug debug, const QKnxAddress &address) QDebugStateSaver _(debug); if (address.isValid()) { const auto rawData = address.bytes(); - debug.nospace().noquote() << "0x" << hex << qSetFieldWidth(2) << qSetPadChar(QLatin1Char('0')) - << rawData.at(0) << hex << rawData.at(1); + debug.nospace().noquote() << "0x" << Qt::hex << qSetFieldWidth(2) + << qSetPadChar(QLatin1Char('0')) << rawData.at(0) << Qt::hex << rawData.at(1); } else { debug.nospace().noquote() << "0x1nv4l1d"; } diff --git a/src/knx/qknxcontrolfield.cpp b/src/knx/qknxcontrolfield.cpp index e6f9702..b3c2d65 100644 --- a/src/knx/qknxcontrolfield.cpp +++ b/src/knx/qknxcontrolfield.cpp @@ -319,7 +319,7 @@ QKnxControlField::Builder QKnxControlField::builder() QDebug operator<<(QDebug debug, const QKnxControlField &field) { QDebugStateSaver _(debug); - debug.nospace().noquote() << "0x" << hex << qSetFieldWidth(2) << qSetPadChar(QLatin1Char('0')) + debug.nospace().noquote() << "0x" << Qt::hex << qSetFieldWidth(2) << qSetPadChar(QLatin1Char('0')) << field.bytes(); return debug; } diff --git a/src/knx/qknxextendedcontrolfield.cpp b/src/knx/qknxextendedcontrolfield.cpp index 849aa2f..65bedc9 100644 --- a/src/knx/qknxextendedcontrolfield.cpp +++ b/src/knx/qknxextendedcontrolfield.cpp @@ -234,7 +234,7 @@ QKnxExtendedControlField::Builder QKnxExtendedControlField::builder() QDebug operator<<(QDebug debug, const QKnxExtendedControlField &field) { QDebugStateSaver _(debug); - debug.nospace().noquote() << "0x" << hex << qSetFieldWidth(2) << qSetPadChar(QLatin1Char('0')) + debug.nospace().noquote() << "0x" << Qt::hex << qSetFieldWidth(2) << qSetPadChar(QLatin1Char('0')) << field.bytes(); return debug; } diff --git a/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp b/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp index 2deae37..de9dea8 100644 --- a/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp +++ b/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp @@ -190,7 +190,7 @@ void tst_QKnxNetIpCri::testAdditionalData() QKnxNetIpCriProxy cri(frame); QCOMPARE(cri.isValid(), true); QCOMPARE(cri.isExtended(), false); - QCOMPARE(cri.individualAddress(), {}); + QCOMPARE(cri.individualAddress(), QKnxAddress{}); QKnxAddress address { QKnxAddress::Type::Individual, 2013 }; frame = QKnxNetIpCriProxy::builder() diff --git a/tests/auto/qknxnetipknxaddressesdib/tst_qknxnetipknxaddressesdib.cpp b/tests/auto/qknxnetipknxaddressesdib/tst_qknxnetipknxaddressesdib.cpp index c3722c9..2e956b7 100644 --- a/tests/auto/qknxnetipknxaddressesdib/tst_qknxnetipknxaddressesdib.cpp +++ b/tests/auto/qknxnetipknxaddressesdib/tst_qknxnetipknxaddressesdib.cpp @@ -77,7 +77,7 @@ void tst_QKnxNetIpKnxAddressesDib::testConstructorWithOneArgument() QKnxNetIpKnxAddressesDibProxy view(addresses); QCOMPARE(view.isValid(), true); QCOMPARE(view.descriptionType(), QKnxNetIp::DescriptionType::KnxAddresses); - QCOMPARE(view.individualAddresses(), { QKnxAddress::createIndividual(1, 1, 1) }); + QCOMPARE(view.individualAddresses(), QVector<QKnxAddress> { QKnxAddress::createIndividual(1, 1, 1) }); } void tst_QKnxNetIpKnxAddressesDib::testConstructorWithTwoArguments() |