remove QT_NO_SOUND and QT_NO_RASTERCALLBACKS

These two defines are not used.

Change-Id: Iec4ae95a8a2222d3c6e9f35b08954cf30aa15bda
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 12d5980..2451668 100644 (file)
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -157,9 +157,6 @@
 //  Universally Unique Identifier Convertion
 //#define QT_NO_QUUID_STRING
 
-// Raster Paint Engine callback functions
-//#define QT_NO_RASTERCALLBACKS
-
 // Resize Handler
 //#define QT_NO_RESIZEHANDLER
 
@@ -187,9 +184,6 @@
 // QSlider
 //#define QT_NO_SLIDER
 
-// Sounds
-//#define QT_NO_SOUND
-
 // Spin Widget
 //#define QT_NO_SPINWIDGET
 

diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 198efdc..0512beb 100644 (file)
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -98,13 +98,6 @@ Requires:
 Name: QTabletEvent
 SeeAlso: ???
 
-Feature: SOUND
-Description: Supports playing audio files.
-Section: Kernel
-Requires:
-Name: Sounds
-SeeAlso: ???
-
 Feature: EFFECTS
 Description: Supports special widget effects (e.g. fading and scrolling).
 Section: Kernel
@@ -921,13 +914,6 @@ Requires:
 Name: Painting Debug Utilities
 SeeAlso: ???
 
-Feature: RASTERCALLBACKS
-Description: Supports subclassing the QPaintEngineRaster with callback functions.
-Section: Painting
-Requires:
-Name: Raster Paint Engine callback functions
-SeeAlso: ???
-
 # Fonts
 
 Feature: FREETYPE