1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of qt_qpa_set_cursor from QGuiApplication for now.

Browse Source
This commit is contained in:
Samuel Rødal 2011-05-06 12:45:11 +02:00
parent 34af023e06
commit 72409addf2
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/guikernel/qguiapplication.cpp
View File

@ -718,7 +718,6 @@ void QGuiApplication::changeOverrideCursor(const QCursor &cursor)
void QGuiApplication::setOverrideCursor(const QCursor &cursor) void QGuiApplication::setOverrideCursor(const QCursor &cursor)
{ {
qGuiApp->d_func()->cursor_list.prepend(cursor); qGuiApp->d_func()->cursor_list.prepend(cursor);
qt_qpa_set_cursor(0, false);
} }
void QGuiApplication::restoreOverrideCursor() void QGuiApplication::restoreOverrideCursor()
@ -726,7 +725,6 @@ void QGuiApplication::restoreOverrideCursor()
if (qGuiApp->d_func()->cursor_list.isEmpty()) if (qGuiApp->d_func()->cursor_list.isEmpty())
return; return;
qGuiApp->d_func()->cursor_list.removeFirst(); qGuiApp->d_func()->cursor_list.removeFirst();
qt_qpa_set_cursor(0, false);
} }
#endif// QT_NO_CURSOR #endif// QT_NO_CURSOR

3
src/gui/guikernel/qguiapplication_p.h
View File

@ -160,9 +160,6 @@ private:
static QGuiApplicationPrivate *self; static QGuiApplicationPrivate *self;
}; };
class QWidget;
extern void qt_qpa_set_cursor(QWidget *, bool);
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

2
src/gui/kernel/qapplication_p.h
View File

@ -618,6 +618,8 @@ Q_GUI_EXPORT void qt_translateRawTouchEvent(QWidget *window,
extern void qt_x11_enforce_cursor(QWidget *); extern void qt_x11_enforce_cursor(QWidget *);
#elif defined(Q_OS_SYMBIAN) #elif defined(Q_OS_SYMBIAN)
extern void qt_symbian_set_cursor(QWidget *, bool); extern void qt_symbian_set_cursor(QWidget *, bool);
#else
extern void qt_qpa_set_cursor(QWidget * w, bool force);
#endif #endif
QT_END_NAMESPACE QT_END_NAMESPACE