diff options
| author | jaanttil <janne.anttila@digia.com> | 2011-10-05 09:55:56 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 14:25:17 (GMT) |
| commit | aff964df58e213986cc5c18e4c2e81948345aeeb (patch) | |
| tree | 3e96d465ea54edf4dd968f1f2e5784f30b2fdfcf /src/gui | |
| parent | d0a32c943b9ce21de33ab19757cc5f2a994b41c7 (diff) | |
| download | Qt-aff964df58e213986cc5c18e4c2e81948345aeeb.zip Qt-aff964df58e213986cc5c18e4c2e81948345aeeb.tar.gz Qt-aff964df58e213986cc5c18e4c2e81948345aeeb.tar.bz2 | |
Reduces compiler warnings when compiling for WEC7
Task-number: QTBUG-22512
Change-Id: I17fd0ff83fa23ae3e17597b753819d1f6b5d8446
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/gui')
| -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 |
4 files changed, 8 insertions, 2 deletions
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 } |