Changeset 846 for trunk/src/gui/kernel/qevent_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qevent_p.h (modified) (3 diffs)

trunk/src/gui/kernel/qevent_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -121 +121 @@
 };
 
+#ifndef QT_NO_GESTURES
 class QNativeGestureEvent : public QEvent
 {
@@ -165 +166 @@
     QMap<Qt::GestureType, QWidget *> targetWidgets;
 };
-
+#endif // QT_NO_GESTURES
 
 class QFileOpenEventPrivate