diff options
| author | jaanttil <janne.anttila@digia.com> | 2011-09-27 13:42:03 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-09-27 13:47:25 (GMT) |
| commit | af1925630e4e8f37c93ad8eb280bd278dfb9c7de (patch) | |
| tree | 51edb237e8321efe5fbf618c42fda1a77bd3c1f3 | |
| parent | 47287f31d108d9b8cf559f3bd7e40eb303fea09e (diff) | |
| download | Qt-af1925630e4e8f37c93ad8eb280bd278dfb9c7de.zip Qt-af1925630e4e8f37c93ad8eb280bd278dfb9c7de.tar.gz Qt-af1925630e4e8f37c93ad8eb280bd278dfb9c7de.tar.bz2 | |
Removed obsolete QWS_ALPHA_CURSOR feature.
QWS_ALPHA_CURSOR was only mentioned in qfeatures.txt and corresponding
QT_NO_QWS_ALPHA_CURSOR was not used anywhere in Qt code.
Task-number: QTBUG-20337
Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/corelib/global/qconfig-minimal.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-nacl.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 7 | ||||
| -rw-r--r-- | tools/porting/src/qt3headers0.resource | bin | 548362 -> 548304 bytes |
5 files changed, 0 insertions, 16 deletions
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index ace1eea..1035631 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -324,9 +324,6 @@ #ifndef QT_NO_QWSEMBEDWIDGET # define QT_NO_QWSEMBEDWIDGET #endif -#ifndef QT_NO_QWS_ALPHA_CURSOR -# define QT_NO_QWS_ALPHA_CURSOR -#endif #ifndef QT_NO_QWS_CURSOR # define QT_NO_QWS_CURSOR #endif diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h index 18ae261..5aefdfe 100644 --- a/src/corelib/global/qconfig-nacl.h +++ b/src/corelib/global/qconfig-nacl.h @@ -247,9 +247,6 @@ #ifndef QT_NO_QWSEMBEDWIDGET # define QT_NO_QWSEMBEDWIDGET #endif -#ifndef QT_NO_QWS_ALPHA_CURSOR -# define QT_NO_QWS_ALPHA_CURSOR -#endif #ifndef QT_NO_QWS_CURSOR # define QT_NO_QWS_CURSOR #endif diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index e0b8a8f..64d5f08 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -178,9 +178,6 @@ // QWSEmbedWidget //#define QT_NO_QWSEMBEDWIDGET -// Alpha Cursor -//#define QT_NO_QWS_ALPHA_CURSOR - // Decoration //#define QT_NO_QWS_DECORATION_DEFAULT diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 6b861d4..dea05e0 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -1268,13 +1268,6 @@ Requires: CURSOR Name: Cursor SeeAlso: ??? -Feature: QWS_ALPHA_CURSOR -Description: Supports alpha-blended cursors. -Section: Qt for Embedded Linux -Requires: -Name: Alpha Cursor -SeeAlso: ??? - Feature: QWS_MANAGER Description: Supports the window manager. Section: Qt for Embedded Linux diff --git a/tools/porting/src/qt3headers0.resource b/tools/porting/src/qt3headers0.resource Binary files differindex 8e24385..1a3e8a0 100644 --- a/tools/porting/src/qt3headers0.resource +++ b/tools/porting/src/qt3headers0.resource |