diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:46:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:49:28 +0100 |
| commit | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (patch) | |
| tree | f165b7bc319548fb0082365411a871028f92e89e /src/testlib/qtestkeyboard.h | |
| parent | 27b4fe96b59e9e63d1e570e802c072e9afdfb2d4 (diff) | |
| parent | 36cb3f3f655a9090c82de609010cbfb88651a0f3 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
src/gui/text/qfontdatabase.cpp
src/gui/text/qharfbuzz_copy_p.h
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qcoreapplication.cpp
Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
Diffstat (limited to 'src/testlib/qtestkeyboard.h')
| -rw-r--r-- | src/testlib/qtestkeyboard.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index b1f135a722..878806737e 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -62,8 +62,6 @@ #include <QtWidgets/qapplication.h> #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE Q_GUI_EXPORT void qt_handleKeyEvent(QWindow *w, QEvent::Type t, int k, Qt::KeyboardModifiers mods, const QString & text = QString(), bool autorep = false, ushort count = 1); @@ -298,6 +296,4 @@ namespace QTest QT_END_NAMESPACE -QT_END_HEADER - #endif // QTESTKEYBOARD_H |