From 72409addf2576db9a4f45f966299ae912d6f8fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Fri, 6 May 2011 12:45:11 +0200 Subject: Get rid of qt_qpa_set_cursor from QGuiApplication for now. --- src/gui/guikernel/qguiapplication.cpp | 2 -- src/gui/guikernel/qguiapplication_p.h | 3 --- src/gui/kernel/qapplication_p.h | 2 ++ 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/gui/guikernel/qguiapplication.cpp b/src/gui/guikernel/qguiapplication.cpp index 210a4e1abe..556f3d8798 100644 --- a/src/gui/guikernel/qguiapplication.cpp +++ b/src/gui/guikernel/qguiapplication.cpp @@ -718,7 +718,6 @@ void QGuiApplication::changeOverrideCursor(const QCursor &cursor) void QGuiApplication::setOverrideCursor(const QCursor &cursor) { qGuiApp->d_func()->cursor_list.prepend(cursor); - qt_qpa_set_cursor(0, false); } void QGuiApplication::restoreOverrideCursor() @@ -726,7 +725,6 @@ void QGuiApplication::restoreOverrideCursor() if (qGuiApp->d_func()->cursor_list.isEmpty()) return; qGuiApp->d_func()->cursor_list.removeFirst(); - qt_qpa_set_cursor(0, false); } #endif// QT_NO_CURSOR diff --git a/src/gui/guikernel/qguiapplication_p.h b/src/gui/guikernel/qguiapplication_p.h index a0b6ddf154..7305e8c51a 100644 --- a/src/gui/guikernel/qguiapplication_p.h +++ b/src/gui/guikernel/qguiapplication_p.h @@ -160,9 +160,6 @@ private: static QGuiApplicationPrivate *self; }; -class QWidget; -extern void qt_qpa_set_cursor(QWidget *, bool); - QT_END_NAMESPACE QT_END_HEADER diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 5e8ea1f21d..97106dc54d 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -618,6 +618,8 @@ Q_GUI_EXPORT void qt_translateRawTouchEvent(QWidget *window, extern void qt_x11_enforce_cursor(QWidget *); #elif defined(Q_OS_SYMBIAN) extern void qt_symbian_set_cursor(QWidget *, bool); +#else + extern void qt_qpa_set_cursor(QWidget * w, bool force); #endif QT_END_NAMESPACE -- cgit v1.2.3