diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-04-24 18:38:57 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-25 10:29:56 +0200 |
| commit | 17ebedf5fc640abbe7af9ffc97bb62404a7eefdd (patch) | |
| tree | e6de4c735058d3774ae7378cab8fe02c31abad4c /src/corelib/global | |
| parent | 82fcbe9d7d7505bb2e3fc53789e14405e73d5302 (diff) | |
get rid of QT_NO_IMAGE_TEXT switcher
Change-Id: Ie72f907ffb959f629af6a414959348a992c4c941
Reviewed-by: aavit <qt_aavit@ovi.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qconfig-medium.h | 3 | ||||
| -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/qconfig-small.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.h | 3 |
5 files changed, 0 insertions, 15 deletions
diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h index b52b067909..ba91303409 100644 --- a/src/corelib/global/qconfig-medium.h +++ b/src/corelib/global/qconfig-medium.h @@ -74,9 +74,6 @@ #ifndef QT_NO_IMAGEFORMAT_PPM # define QT_NO_IMAGEFORMAT_PPM #endif -#ifndef QT_NO_IMAGE_TEXT -# define QT_NO_IMAGE_TEXT -#endif #ifndef QT_NO_MOVIE # define QT_NO_MOVIE #endif diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index 3244e01c9e..57aa26b381 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -141,9 +141,6 @@ #ifndef QT_NO_IMAGE_HEURISTIC_MASK # define QT_NO_IMAGE_HEURISTIC_MASK #endif -#ifndef QT_NO_IMAGE_TEXT -# define QT_NO_IMAGE_TEXT -#endif #ifndef QT_NO_MOVIE # define QT_NO_MOVIE #endif diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h index 69980f97a6..7e48afaee3 100644 --- a/src/corelib/global/qconfig-nacl.h +++ b/src/corelib/global/qconfig-nacl.h @@ -105,9 +105,6 @@ #ifndef QT_NO_IMAGE_HEURISTIC_MASK # define QT_NO_IMAGE_HEURISTIC_MASK #endif -#ifndef QT_NO_IMAGE_TEXT -# define QT_NO_IMAGE_TEXT -#endif #ifndef QT_NO_MOVIE # define QT_NO_MOVIE #endif diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h index e764285e4a..0c0e6aa01a 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -105,9 +105,6 @@ #ifndef QT_NO_IMAGEFORMAT_XPM # define QT_NO_IMAGEFORMAT_XPM #endif -#ifndef QT_NO_IMAGE_TEXT -# define QT_NO_IMAGE_TEXT -#endif #ifndef QT_NO_MOVIE # define QT_NO_MOVIE #endif diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 4ce586a858..54c1be8bd3 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -118,9 +118,6 @@ // QImage::createHeuristicMask() //#define QT_NO_IMAGE_HEURISTIC_MASK -// Image Text -//#define QT_NO_IMAGE_TEXT - // QLCDNumber //#define QT_NO_LCDNUMBER |