diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-20 07:59:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-21 08:24:11 +0200 |
| commit | d372a9f3709aa76322e23c98eb5a853ba83e1e21 (patch) | |
| tree | e556c3881d0a5152535dee32fa4edbcd5ab57c58 /src/testlib/qtestkeyboard.h | |
| parent | a097825b2135ebfde45a122ea9252954f4ddcd5f (diff) | |
testlib: Remove widgets dependency when only using gui
There's api in testlib that should only be available
if the application links against widgets.
Change-Id: I22e382c6710690866ed8ffed81bae27b548dc830
Reviewed-on: http://codereview.qt-project.org/5094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Diffstat (limited to 'src/testlib/qtestkeyboard.h')
| -rw-r--r-- | src/testlib/qtestkeyboard.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index 4dfdaeaf56..86d56c8710 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -68,6 +68,7 @@ namespace QTest { enum KeyAction { Press, Release, Click }; +#ifdef QT_WIDGETS_LIB static void simulateEvent(QWidget *widget, bool press, int code, Qt::KeyboardModifiers modifier, QString text, bool repeat, int delay=-1) { @@ -84,6 +85,7 @@ namespace QTest if (!qApp->notify(widget, &a)) QTest::qWarn("Keyboard event not accepted by receiving widget"); } +#endif //QWindow overload static void simulateEvent(QWindow *window, bool press, int code, Qt::KeyboardModifiers modifier, QString text, bool repeat, int delay=-1) @@ -93,6 +95,7 @@ namespace QTest QWindowSystemInterface::handleKeyEvent(window, type, code, modifier, text, repeat, delay); } +#ifdef QT_WIDGETS_LIB static void sendKeyEvent(KeyAction action, QWidget *widget, Qt::Key code, QString text, Qt::KeyboardModifiers modifier, int delay=-1) { @@ -156,6 +159,7 @@ namespace QTest simulateEvent(widget, false, Qt::Key_Shift, modifier & Qt::ShiftModifier, QString(), false, delay); } } +#endif //QWindow overload static void sendKeyEvent(KeyAction action, QWindow *window, Qt::Key code, QString text, Qt::KeyboardModifiers modifier, int delay=-1) @@ -203,6 +207,7 @@ namespace QTest } } +#ifdef QT_WIDGETS_LIB // Convenience function static void sendKeyEvent(KeyAction action, QWidget *widget, Qt::Key code, char ascii, Qt::KeyboardModifiers modifier, int delay=-1) @@ -212,6 +217,7 @@ namespace QTest text = QString(QChar::fromLatin1(ascii)); sendKeyEvent(action, widget, code, text, modifier, delay); } +#endif // QWindow convenience function static void sendKeyEvent(KeyAction action, QWindow *window, Qt::Key code, char ascii, Qt::KeyboardModifiers modifier, int delay=-1) @@ -222,12 +228,14 @@ namespace QTest sendKeyEvent(action, window, code, text, modifier, delay); } +#ifdef QT_WIDGETS_LIB inline static void keyEvent(KeyAction action, QWidget *widget, char ascii, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) { sendKeyEvent(action, widget, asciiToKey(ascii), ascii, modifier, delay); } inline static void keyEvent(KeyAction action, QWidget *widget, Qt::Key key, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) { sendKeyEvent(action, widget, key, keyToAscii(key), modifier, delay); } +#endif //Support QWindow inline static void keyEvent(KeyAction action, QWindow *window, char ascii, @@ -237,6 +245,7 @@ namespace QTest Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) { sendKeyEvent(action, window, key, keyToAscii(key), modifier, delay); } /////////////// +#ifdef QT_WIDGETS_LIB inline static void keyClicks(QWidget *widget, const QString &sequence, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) { @@ -256,6 +265,7 @@ namespace QTest { keyEvent(Release, widget, key, modifier, delay); } inline static void keyClick(QWidget *widget, Qt::Key key, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) { keyEvent(Click, widget, key, modifier, delay); } +#endif //Support QWindow inline static void keyClick(QWindow *window, Qt::Key key, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) { keyEvent(Click, window, key, modifier, delay); } |