summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-06-28 15:43:48 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-01 02:00:02 +0200
commit4bc450408c917381b486c03a0462b3c7b88abe1e (patch)
tree934a527d6c6aef3a38d57d1928a47bb2a79fa68b /src
parentfbcd6a29c1a79a94bfb7c3b4e56ba167c7109d99 (diff)
Fix warning caused by warning fix
qevent.h:865:36: error: unknown warning group '-Wunused-private-field', ignored [-Werror,-Wunknown-pragmas] Instead, just use Q_UNUSED() like I've done for the other unused members. Change-Id: I3adeb06937cee8b8ac24a1d5081be03931ac98b7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qevent.cpp1
-rw-r--r--src/gui/kernel/qevent.h7
2 files changed, 1 insertions, 7 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index ba97db4d39..fa289bbf8b 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -4217,6 +4217,7 @@ void QTouchEvent::TouchPoint::setFlags(InfoFlags flags)
QScrollPrepareEvent::QScrollPrepareEvent(const QPointF &startPos)
: QEvent(QEvent::ScrollPrepare), m_target(0), m_startPos(startPos)
{
+ Q_UNUSED(m_target);
}
/*!
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 82276c5342..7142450322 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -860,14 +860,7 @@ public:
void setContentPos(const QPointF &pos);
private:
-#ifdef Q_CC_CLANG
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wunused-private-field"
-#endif // Q_CC_CLANG
QObject* m_target; // Qt 6 remove.
-#ifdef Q_CC_CLANG
-# pragma clang diagnostic pop
-#endif // Q_CC_CLANG
QPointF m_startPos;
QSizeF m_viewportSize;
QRectF m_contentPosRange;