summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>2016-02-01 17:31:33 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-02-02 19:22:55 +0000
commit09559b5b7991aa94529ad8ee8fe311427fe83834 (patch)
tree28f522268fcc1db671788dda46e102bdd6724d0c
parent615534f14ce9e0a9ad872ffe7952bc5c8e0f9534 (diff)
downloadqtbase-09559b5b7991aa94529ad8ee8fe311427fe83834.tar.gz
BIC: Rename back symbol that was mistakenly thought to be private
Being called from an inline function we were breaking BIC (however insignificant) by renaming the symbol in c7e5e1d9e0. Change-Id: I683bfd53a5ad0de7db0fae6d9aa7d175e00f96ed Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
-rw-r--r--src/gui/kernel/qwindowsysteminterface.cpp2
-rw-r--r--src/testlib/qtestkeyboard.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index a9dcb8bb7d..4bbc303ac0 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -868,7 +868,7 @@ Q_GUI_EXPORT void qt_handleKeyEvent(QWindow *w, QEvent::Type t, int k, Qt::Keybo
QWindowSystemInterface::setSynchronousWindowSystemEvents(wasSynchronous);
}
-Q_GUI_EXPORT bool qt_handleShortcutEvent(QObject *o, ulong timestamp, int k, Qt::KeyboardModifiers mods, const QString &text = QString(), bool autorep = false, ushort count = 1)
+Q_GUI_EXPORT bool qt_sendShortcutOverrideEvent(QObject *o, ulong timestamp, int k, Qt::KeyboardModifiers mods, const QString &text = QString(), bool autorep = false, ushort count = 1)
{
#ifndef QT_NO_SHORTCUT
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h
index aa117ed7de..f80a72e2df 100644
--- a/src/testlib/qtestkeyboard.h
+++ b/src/testlib/qtestkeyboard.h
@@ -57,7 +57,7 @@
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);
-Q_GUI_EXPORT bool qt_handleShortcutEvent(QObject *o, ulong timestamp, int k, Qt::KeyboardModifiers mods, const QString &text = QString(), bool autorep = false, ushort count = 1);
+Q_GUI_EXPORT bool qt_sendShortcutOverrideEvent(QObject *o, ulong timestamp, int k, Qt::KeyboardModifiers mods, const QString &text = QString(), bool autorep = false, ushort count = 1);
namespace QTest
{
@@ -93,7 +93,7 @@ namespace QTest
if (action == Shortcut) {
int timestamp = 0;
- qt_handleShortcutEvent(window, timestamp, code, modifier, text, repeat);
+ qt_sendShortcutOverrideEvent(window, timestamp, code, modifier, text, repeat);
return;
}
@@ -174,7 +174,7 @@ namespace QTest
QKeyEvent a(press ? QEvent::KeyPress : QEvent::KeyRelease, code, modifier, text, repeat);
QSpontaneKeyEvent::setSpontaneous(&a);
- if (press && qt_handleShortcutEvent(widget, a.timestamp(), code, modifier, text, repeat))
+ if (press && qt_sendShortcutOverrideEvent(widget, a.timestamp(), code, modifier, text, repeat))
return;
if (!qApp->notify(widget, &a))
QTest::qWarn("Keyboard event not accepted by receiving widget");