diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-27 13:55:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-27 13:55:23 (GMT) |
| commit | 877318aef0f270362c4fb93d9f4f8903e29a495d (patch) | |
| tree | 37fff748476ca20e8016374d52be96930ce89858 /src/gui/kernel/qapplication_p.h | |
| parent | aac8c2678867ae86af846a2644e37b3d1436406a (diff) | |
| parent | c59b63b22b60846e9602e1727a254ea482096f04 (diff) | |
| download | Qt-877318aef0f270362c4fb93d9f4f8903e29a495d.zip Qt-877318aef0f270362c4fb93d9f4f8903e29a495d.tar.gz Qt-877318aef0f270362c4fb93d9f4f8903e29a495d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: non-native toolbar shows in window when hidden
Cocoa: disable scroll optimization for certain cases
Cocoa: fix scroll optimization bug
Cocoa: add scroll optimization when scrolling both hor and ver
Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4
Cocoa: remove compiler warning
Add support for disabling touch on to enhance scrolling in Cocoa
Cocoa/Alien: replace depricated API
Cocoa/Alien: remove unneded code for scrolling with alien
Cocoa/Alien: keep the scrolling within correct bounds
Cocoa/Alien: bugfix scrolling, dirty region issue
Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets
Cocoa: enable more autotests for qwidget as a result of Alien
Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)
Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine
Alien implementation for the Cocoa port
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 1a511a8..a6815a8 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -489,8 +489,6 @@ public: #ifdef QT_MAC_USE_COCOA static void qt_initAfterNSAppStarted(); static void setupAppleEvents(); - static void updateOverrideCursor(); - static void disableUsageOfCursorRects(bool disable); #endif static bool qt_mac_apply_settings(); #endif |