Changeset 561 for trunk/src/testlib/qtestevent.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qtestevent.h (modified) (8 diffs)

trunk/src/testlib/qtestevent.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -49 +49 @@
 
 #include <QtTest/qtest_global.h>
+#ifdef QT_GUI_LIB
 #include <QtTest/qtestkeyboard.h>
 #include <QtTest/qtestmouse.h>
+#endif
 #include <QtTest/qtestsystem.h>
 
@@ -72 +74 @@
 };
 
+#ifdef QT_GUI_LIB
 class QTestKeyEvent: public QTestEvent
 {
@@ -136 +139 @@
     int _delay;
 };
+#endif //QT_GUI_LIB
+
 
 class QTestDelayEvent: public QTestEvent
@@ -160 +165 @@
     { qDeleteAll(*this); QList<QTestEvent *>::clear(); }
 
+#ifdef QT_GUI_LIB
     inline void addKeyClick(Qt::Key qtKey, Qt::KeyboardModifiers modifiers = Qt::NoModifier, int msecs = -1)
     { addKeyEvent(QTest::Click, qtKey, modifiers, msecs); }
@@ -195 +201 @@
     inline void addMouseMove(QPoint pos = QPoint(), int delay=-1)
     { append(new QTestMouseEvent(QTest::MouseMove, Qt::NoButton, 0, pos, delay)); }
+#endif //QT_GUI_LIB
 
     inline void addDelay(int msecs)