diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 17:41:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 17:41:55 (GMT) |
| commit | e41737d36419e775f602544b2b0e8b9e96f75361 (patch) | |
| tree | c8d6387ad0704257709100f644b31a775c01e318 | |
| parent | d62f8e1e593acbb69b22ed4f941f2bebbb82dd14 (diff) | |
| parent | 623e87d880812c848a8b438a2410b2f95cbeca1f (diff) | |
| download | Qt-e41737d36419e775f602544b2b0e8b9e96f75361.zip Qt-e41737d36419e775f602544b2b0e8b9e96f75361.tar.gz Qt-e41737d36419e775f602544b2b0e8b9e96f75361.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
remove unneeded function pointer in qmenu_wince.cpp
Updated the QCursor docs regarding XOR'ed cursors.
| -rw-r--r-- | src/gui/kernel/qcursor.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/qmenu_wince.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index 0f0470c..6b21d56 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -342,7 +342,8 @@ QCursor::QCursor(const QPixmap &pixmap, int hotX, int hotY) \o B=1 and M=1 gives black. \o B=0 and M=1 gives white. \o B=0 and M=0 gives transparent. - \o B=1 and M=0 gives an XOR'd result. + \o B=1 and M=0 gives an XOR'd result under Windows, undefined + results on all other platforms. \endlist Use the global Qt color Qt::color0 to draw 0-pixels and Qt::color1 to diff --git a/src/gui/widgets/qmenu_wince.cpp b/src/gui/widgets/qmenu_wince.cpp index 28b6b8b..edef466 100644 --- a/src/gui/widgets/qmenu_wince.cpp +++ b/src/gui/widgets/qmenu_wince.cpp @@ -101,7 +101,6 @@ struct qt_SHMENUBARINFO COLORREF clrBk; }; -typedef int (WINAPI *superfunc)(int, int); typedef BOOL (WINAPI *AygCreateMenuBar)(qt_SHMENUBARINFO*); typedef HRESULT (WINAPI *AygEnableSoftKey)(HWND,UINT,BOOL,BOOL); |