diff options
-rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformnativeinterface_qpa.cpp | 1 | ||||
-rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 9 | ||||
-rw-r--r-- | src/network/access/qhttpnetworkconnection_p.h | 2 | ||||
-rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 2 | ||||
-rw-r--r-- | src/network/kernel/qhostaddress.cpp | 1 | ||||
-rw-r--r-- | src/plugins/accessible/widgets/rangecontrols.cpp | 4 | ||||
-rw-r--r-- | src/sql/drivers/tds/qsql_tds.cpp | 1 |
8 files changed, 15 insertions, 7 deletions
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp index 3459046dab..0313f69e5b 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp @@ -72,6 +72,7 @@ void QPlatformInputContext::update(Qt::InputMethodQueries) void QPlatformInputContext::invokeAction(QInputPanel::Action action, int cursorPosition) { + Q_UNUSED(cursorPosition) // Default behavior for simple ephemeral input contexts. Some // complex input contexts should not be reset here. if (action == QInputPanel::Click) @@ -80,6 +81,7 @@ void QPlatformInputContext::invokeAction(QInputPanel::Action action, int cursorP bool QPlatformInputContext::filterEvent(const QEvent *event) { + Q_UNUSED(event) return false; } diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp index 7b9ff4a7a5..5c1f8458db 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp +++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp @@ -69,6 +69,7 @@ void * QPlatformNativeInterface::nativeResourceForBackingStore(const QByteArray */ QVariantMap QPlatformNativeInterface::windowProperties(QPlatformWindow *window) const { + Q_UNUSED(window) return QVariantMap(); } diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index c368785226..8f8367a97c 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -84,9 +84,9 @@ const int QHttpNetworkConnectionPrivate::defaultRePipelineLength = 2; QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt) : state(RunningState), + networkLayerState(Unknown), hostName(hostName), port(port), encrypt(encrypt), - channelCount(defaultChannelCount), - networkLayerState(Unknown) + channelCount(defaultChannelCount) #ifndef QT_NO_NETWORKPROXY , networkProxy(QNetworkProxy::NoProxy) #endif @@ -95,10 +95,9 @@ QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &host } QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(quint16 channelCount, const QString &hostName, quint16 port, bool encrypt) -: state(RunningState), +: state(RunningState), networkLayerState(Unknown), hostName(hostName), port(port), encrypt(encrypt), - channelCount(channelCount), - networkLayerState(Unknown) + channelCount(channelCount) #ifndef QT_NO_NETWORKPROXY , networkProxy(QNetworkProxy::NoProxy) #endif diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 0652436b35..70b9cf3754 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -151,7 +151,7 @@ public: enum ConnectionState { RunningState = 0, - PausedState = 1, + PausedState = 1 }; enum NetworkLayerPreferenceState { diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index b1630c7b2b..f2450f5662 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -79,8 +79,8 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel() , ignoreAllSslErrors(false) #endif , pipeliningSupported(PipeliningSupportUnknown) - , connection(0) , networkLayerPreference(QAbstractSocket::AnyIPProtocol) + , connection(0) { // Inlining this function in the header leads to compiler error on // release-armv5, on at least timebox 9.2 and 10.1. diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 3b777f9a68..d66d471206 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -1138,6 +1138,7 @@ QDataStream &operator<<(QDataStream &out, const QHostAddress &address) out << prot; switch (address.protocol()) { case QAbstractSocket::UnknownNetworkLayerProtocol: + case QAbstractSocket::AnyIPProtocol: break; case QAbstractSocket::IPv4Protocol: out << address.toIPv4Address(); diff --git a/src/plugins/accessible/widgets/rangecontrols.cpp b/src/plugins/accessible/widgets/rangecontrols.cpp index d5131b3bdc..b40ef8629e 100644 --- a/src/plugins/accessible/widgets/rangecontrols.cpp +++ b/src/plugins/accessible/widgets/rangecontrols.cpp @@ -83,6 +83,7 @@ QAbstractSpinBox *QAccessibleAbstractSpinBox::abstractSpinBox() const /*! \reimp */ QString QAccessibleAbstractSpinBox::text(Text t, int child) const { + Q_UNUSED(child) if (t == QAccessible::Value) return abstractSpinBox()->text(); return QAccessibleWidget::text(t, 0); @@ -91,6 +92,7 @@ QString QAccessibleAbstractSpinBox::text(Text t, int child) const /*! \reimp */ bool QAccessibleAbstractSpinBox::doAction(int action, int child, const QVariantList ¶ms) { + Q_UNUSED(child) if (!widget()->isEnabled()) return false; return QAccessibleWidget::doAction(action, 0, params); @@ -180,6 +182,7 @@ QSpinBox *QAccessibleSpinBox::spinBox() const /*! \reimp */ bool QAccessibleSpinBox::doAction(int action, int child, const QVariantList ¶ms) { + Q_UNUSED(child) if (!widget()->isEnabled()) return false; @@ -211,6 +214,7 @@ QVariant QAccessibleDoubleSpinBox::invokeMethod(QAccessible::Method, int, const /*! \reimp */ QString QAccessibleDoubleSpinBox::text(Text textType, int child) const { + Q_UNUSED(child) if (textType == Value) return doubleSpinBox()->textFromValue(doubleSpinBox()->value()); return QAccessibleWidget::text(textType, 0); diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp index 7e15cca792..735e68b603 100644 --- a/src/sql/drivers/tds/qsql_tds.cpp +++ b/src/sql/drivers/tds/qsql_tds.cpp @@ -820,6 +820,7 @@ QSqlIndex QTDSDriver::primaryIndex(const QString& tablename) const QString QTDSDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const { + Q_UNUSED(type) QString res = identifier; if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) { res.replace(QLatin1Char('"'), QLatin1String("\"\"")); |