diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 23:25:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 23:25:26 (GMT) |
| commit | 8e38da7771b40f5585e874a8d12b71225be76503 (patch) | |
| tree | 8bf874631a934c98872a634bfa04455fc186e8c6 /src/gui/kernel/qdnd_p.h | |
| parent | d80c2837a41903f66159617fbd0b8b69e4a8da75 (diff) | |
| parent | f09fc6c958ac8f0307686cd8a59a1adc92771b0c (diff) | |
| download | Qt-8e38da7771b40f5585e874a8d12b71225be76503.zip Qt-8e38da7771b40f5585e874a8d12b71225be76503.tar.gz Qt-8e38da7771b40f5585e874a8d12b71225be76503.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile fix for embedded.
Revised fix for system tray popup activation
Fixed draggabletext example.
Added new mouse cursor types.
Doc: more \since 4.7
Doc: add \since 4.7 to new functions.
Diffstat (limited to 'src/gui/kernel/qdnd_p.h')
| -rw-r--r-- | src/gui/kernel/qdnd_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h index d70b983..033e6a6 100644 --- a/src/gui/kernel/qdnd_p.h +++ b/src/gui/kernel/qdnd_p.h @@ -261,8 +261,6 @@ public: #endif private: - QPixmap *pm_cursor; - int n_cursor; #ifdef Q_WS_QWS Qt::DropAction currentActionForOverrideCursor; #endif |