diff options
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/plugin/qsystemlibrary.cpp | 1 | ||||
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/itemviews/qabstractitemview.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qdnd_win.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qxmlschema_p.cpp | 1 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qxmlschemavalidator.cpp | 2 |
8 files changed, 13 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 1294ed4..73a82f0 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -542,6 +542,7 @@ LRESULT QT_WIN_CALLBACK qt_GetMessageHook(int code, WPARAM wp, LPARAM lp) } } #ifdef Q_OS_WINCE + Q_UNUSED(code); return 0; #else return CallNextHookEx(0, code, wp, lp); diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp index 76213a3..e54cecf 100644 --- a/src/corelib/plugin/qsystemlibrary.cpp +++ b/src/corelib/plugin/qsystemlibrary.cpp @@ -84,6 +84,7 @@ QT_BEGIN_NAMESPACE #if defined(Q_OS_WINCE) HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory /* = true */) { + Q_UNUSED(onlySystemDirectory); return ::LoadLibrary(libraryName); } #else diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index bb0e559..239c1b8 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -910,7 +910,9 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded */ QStringList QFileDialogPrivate::typedFiles() const { +#ifdef Q_OS_UNIX Q_Q(const QFileDialog); +#endif QStringList files; QString editText = lineEdit()->text(); if (!editText.contains(QLatin1Char('"'))) { diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 402d8d3..ef69b7d 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -3392,9 +3392,9 @@ void QAbstractItemViewPrivate::_q_rowsInserted(const QModelIndex &index, int sta Q_UNUSED(start) Q_UNUSED(end) - Q_Q(QAbstractItemView); #ifndef QT_NO_ACCESSIBILITY #ifdef Q_WS_X11 + Q_Q(QAbstractItemView); if (QAccessible::isActive()) { QAccessible::queryAccessibleInterface(q)->table2Interface()->rowsInserted(index, start, end); QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged); @@ -3443,10 +3443,10 @@ void QAbstractItemViewPrivate::_q_modelDestroyed() */ void QAbstractItemViewPrivate::_q_layoutChanged() { - Q_Q(QAbstractItemView); doDelayedItemsLayout(); #ifndef QT_NO_ACCESSIBILITY #ifdef Q_WS_X11 + Q_Q(QAbstractItemView); if (QAccessible::isActive()) { QAccessible::queryAccessibleInterface(q)->table2Interface()->modelReset(); QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged); diff --git a/src/gui/kernel/qdnd_win.cpp b/src/gui/kernel/qdnd_win.cpp index 0dc42f6..96261ea 100644 --- a/src/gui/kernel/qdnd_win.cpp +++ b/src/gui/kernel/qdnd_win.cpp @@ -539,6 +539,8 @@ QOleDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) if (!(currentButtons & buttons)) return ResultFromScode(DRAGDROP_S_DROP); } +#else + Q_UNUSED(grfKeyState); #endif QApplication::processEvents(); return NOERROR; diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index 358ec2a..9bc6f7e 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -694,6 +694,8 @@ void QLineControl::internalSetText(const QString &txt, int pos, bool edited) #ifndef QT_NO_ACCESSIBILITY if (changed) QAccessible::updateAccessibility(parent(), 0, QAccessible::TextUpdated); +#else + Q_UNUSED(changed); #endif } diff --git a/src/xmlpatterns/api/qxmlschema_p.cpp b/src/xmlpatterns/api/qxmlschema_p.cpp index 8ebde03..c29a55f 100644 --- a/src/xmlpatterns/api/qxmlschema_p.cpp +++ b/src/xmlpatterns/api/qxmlschema_p.cpp @@ -145,6 +145,7 @@ void QXmlSchemaPrivate::load(QIODevice *source, const QUrl &documentUri, const Q m_schemaIsValid = true; } catch (QPatternist::Exception exception) { + Q_UNUSED(exception); m_schemaIsValid = false; } } diff --git a/src/xmlpatterns/api/qxmlschemavalidator.cpp b/src/xmlpatterns/api/qxmlschemavalidator.cpp index 7ba38a8..65815ae 100644 --- a/src/xmlpatterns/api/qxmlschemavalidator.cpp +++ b/src/xmlpatterns/api/qxmlschemavalidator.cpp @@ -202,6 +202,7 @@ bool QXmlSchemaValidator::validate(QIODevice *source, const QUrl &documentUri) c try { item = loader.openDocument(source, normalizedUri, d->m_context); } catch (QPatternist::Exception exception) { + Q_UNUSED(exception); return false; } @@ -216,6 +217,7 @@ bool QXmlSchemaValidator::validate(QIODevice *source, const QUrl &documentUri) c try { reader.read(); } catch (QPatternist::Exception exception) { + Q_UNUSED(exception); return false; } |