purge vestiges of dead QT_NO_* defines

Change-Id: I6be54e8ce4c2522b3907a645506b695fab3aebd9
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
bb10
Oswald Buddenhagen 2013-10-25 14:49:16 +02:00 committed by The Qt Project
parent f6a5e3d1e8
commit 95156cfff7
6 changed files with 1 additions and 308 deletions

View File

@ -56,11 +56,6 @@
# define QT_NO_PROGRESSDIALOG
#endif
/* Fonts */
#ifndef QT_NO_QWS_QPF
# define QT_NO_QWS_QPF
#endif
/* Images */
#ifndef QT_NO_IMAGEFORMAT_BMP
# define QT_NO_IMAGEFORMAT_BMP
@ -76,9 +71,6 @@
#ifndef QT_NO_TRANSLATION
# define QT_NO_TRANSLATION
#endif
#ifndef QT_NO_TRANSLATION_UTF8
# define QT_NO_TRANSLATION_UTF8
#endif
/* ItemViews */
#ifndef QT_NO_TABLEVIEW
@ -101,23 +93,14 @@
#ifndef QT_NO_PROPERTIES
# define QT_NO_PROPERTIES
#endif
#ifndef QT_NO_SOUND
# define QT_NO_SOUND
#endif
/* Networking */
#ifndef QT_NO_HOSTINFO
# define QT_NO_HOSTINFO
#endif
#ifndef QT_NO_HTTP
# define QT_NO_HTTP
#endif
#ifndef QT_NO_UDPSOCKET
# define QT_NO_UDPSOCKET
#endif
#ifndef QT_NO_URLINFO
# define QT_NO_URLINFO
#endif
#ifndef QT_NO_FTP
# define QT_NO_FTP
#endif
@ -136,18 +119,7 @@
# define QT_NO_CUPS
#endif
/* Qt for Embedded Linux */
#ifndef QT_NO_QWS_SOUNDSERVER
# define QT_NO_QWS_SOUNDSERVER
#endif
/* Styles */
#ifndef QT_NO_STYLE_MOTIF
# define QT_NO_STYLE_MOTIF
#endif
#ifndef QT_NO_STYLE_CDE
# define QT_NO_STYLE_CDE
#endif
#ifndef QT_NO_STYLE_STYLESHEET
# define QT_NO_STYLE_STYLESHEET
#endif

View File

@ -58,14 +58,6 @@
#ifndef QT_NO_PROGRESSDIALOG
# define QT_NO_PROGRESSDIALOG
#endif
#ifndef QT_NO_TABDIALOG
# define QT_NO_TABDIALOG
#endif
/* Fonts */
#ifndef QT_NO_QWS_QPF
# define QT_NO_QWS_QPF
#endif
/* Images */
#ifndef QT_NO_IMAGEFORMAT_BMP
@ -91,9 +83,6 @@
#ifndef QT_NO_TRANSLATION
# define QT_NO_TRANSLATION
#endif
#ifndef QT_NO_TRANSLATION_UTF8
# define QT_NO_TRANSLATION_UTF8
#endif
/* ItemViews */
#ifndef QT_NO_TABLEVIEW
@ -125,20 +114,11 @@
#ifndef QT_NO_SHORTCUT
# define QT_NO_SHORTCUT
#endif
#ifndef QT_NO_SOUND
# define QT_NO_SOUND
#endif
#ifndef QT_NO_WHEELEVENT
# define QT_NO_WHEELEVENT
#endif
/* Networking */
#ifndef QT_NO_COP
# define QT_NO_COP
#endif
#ifndef QT_NO_HOSTINFO
# define QT_NO_HOSTINFO
#endif
#ifndef QT_NO_HTTP
# define QT_NO_HTTP
#endif
@ -151,9 +131,6 @@
#ifndef QT_NO_UDPSOCKET
# define QT_NO_UDPSOCKET
#endif
#ifndef QT_NO_URLINFO
# define QT_NO_URLINFO
#endif
#ifndef QT_NO_FTP
# define QT_NO_FTP
#endif
@ -172,24 +149,7 @@
# define QT_NO_CUPS
#endif
/* Qt for Embedded Linux */
#ifndef QT_NO_QWSEMBEDWIDGET
# define QT_NO_QWSEMBEDWIDGET
#endif
#ifndef QT_NO_QWS_SOUNDSERVER
# define QT_NO_QWS_SOUNDSERVER
#endif
#ifndef QT_NO_QWS_PROPERTIES
# define QT_NO_QWS_PROPERTIES
#endif
/* Styles */
#ifndef QT_NO_STYLE_MOTIF
# define QT_NO_STYLE_MOTIF
#endif
#ifndef QT_NO_STYLE_CDE
# define QT_NO_STYLE_CDE
#endif
#ifndef QT_NO_STYLE_STYLESHEET
# define QT_NO_STYLE_STYLESHEET
#endif

View File

@ -75,9 +75,6 @@
#ifndef QT_NO_PROGRESSDIALOG
# define QT_NO_PROGRESSDIALOG
#endif
#ifndef QT_NO_TABDIALOG
# define QT_NO_TABDIALOG
#endif
#ifndef QT_NO_WIZARD
# define QT_NO_WIZARD
#endif
@ -109,9 +106,6 @@
#ifndef QT_NO_FREETYPE
# define QT_NO_FREETYPE
#endif
#ifndef QT_NO_QWS_QPF2
# define QT_NO_QWS_QPF2
#endif
/* Images */
#ifndef QT_NO_IMAGEFORMATPLUGIN
@ -146,9 +140,6 @@
#ifndef QT_NO_BIG_CODECS
# define QT_NO_BIG_CODECS
#endif
#ifndef QT_NO_QWS_INPUTMETHODS
# define QT_NO_QWS_INPUTMETHODS
#endif
#ifndef QT_NO_TEXTCODEC
# define QT_NO_TEXTCODEC
#endif
@ -158,9 +149,6 @@
#ifndef QT_NO_TRANSLATION
# define QT_NO_TRANSLATION
#endif
#ifndef QT_NO_TRANSLATION_UTF8
# define QT_NO_TRANSLATION_UTF8
#endif
/* ItemViews */
#ifndef QT_NO_ITEMVIEWS
@ -228,9 +216,6 @@
#ifndef QT_NO_SHORTCUT
# define QT_NO_SHORTCUT
#endif
#ifndef QT_NO_SOUND
# define QT_NO_SOUND
#endif
#ifndef QT_NO_SYSTEMSEMAPHORE
# define QT_NO_SYSTEMSEMAPHORE
#endif
@ -257,12 +242,6 @@
#endif
/* Networking */
#ifndef QT_NO_COP
# define QT_NO_COP
#endif
#ifndef QT_NO_HOSTINFO
# define QT_NO_HOSTINFO
#endif
#ifndef QT_NO_HTTP
# define QT_NO_HTTP
#endif
@ -275,9 +254,6 @@
#ifndef QT_NO_UDPSOCKET
# define QT_NO_UDPSOCKET
#endif
#ifndef QT_NO_URLINFO
# define QT_NO_URLINFO
#endif
#ifndef QT_NO_FTP
# define QT_NO_FTP
#endif
@ -286,12 +262,6 @@
#ifndef QT_NO_COLORNAMES
# define QT_NO_COLORNAMES
#endif
#ifndef QT_NO_DIRECTPAINTER
# define QT_NO_DIRECTPAINTER
#endif
#ifndef QT_NO_PAINTONSCREEN
# define QT_NO_PAINTONSCREEN
#endif
#ifndef QT_NO_PAINT_DEBUG
# define QT_NO_PAINT_DEBUG
#endif
@ -305,63 +275,10 @@
# define QT_NO_CUPS
#endif
/* Qt for Embedded Linux */
#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
#ifndef QT_NO_QWS_DECORATION_DEFAULT
# define QT_NO_QWS_DECORATION_DEFAULT
#endif
#ifndef QT_NO_QWS_DECORATION_STYLED
# define QT_NO_QWS_DECORATION_STYLED
#endif
#ifndef QT_NO_QWS_DECORATION_WINDOWS
# define QT_NO_QWS_DECORATION_WINDOWS
#endif
#ifndef QT_NO_QWS_MANAGER
# define QT_NO_QWS_MANAGER
#endif
#ifndef QT_NO_QWS_KEYBOARD
# define QT_NO_QWS_KEYBOARD
#endif
#ifndef QT_NO_QWS_MOUSE
# define QT_NO_QWS_MOUSE
#endif
#ifndef QT_NO_QWS_MOUSE_AUTO
# define QT_NO_QWS_MOUSE_AUTO
#endif
#ifndef QT_NO_QWS_MOUSE_MANUAL
# define QT_NO_QWS_MOUSE_MANUAL
#endif
#ifndef QT_NO_QWS_MULTIPROCESS
# define QT_NO_QWS_MULTIPROCESS
#endif
#ifndef QT_NO_QWS_SOUNDSERVER
# define QT_NO_QWS_SOUNDSERVER
#endif
#ifndef QT_NO_QWS_PROPERTIES
# define QT_NO_QWS_PROPERTIES
#endif
#ifndef QT_NO_QWS_PROXYSCREEN
# define QT_NO_QWS_PROXYSCREEN
#endif
#ifndef QT_NO_QWS_DYNAMICSCREENTRANSFORMATION
# define QT_NO_QWS_DYNAMICSCREENTRANSFORMATION
#endif
/* SVG */
#ifndef QT_NO_SVG
# define QT_NO_SVG
#endif
#ifndef QT_NO_GRAPHICSSVGITEM
# define QT_NO_GRAPHICSSVGITEM
#endif
#ifndef QT_NO_SVGGENERATOR
# define QT_NO_SVGGENERATOR
#endif
@ -402,9 +319,6 @@
#ifndef QT_NO_DESKTOPSERVICES
# define QT_NO_DESKTOPSERVICES
#endif
#ifndef QT_NO_SCRIPT
# define QT_NO_SCRIPT
#endif
#ifndef QT_NO_SYSTEMTRAYICON
# define QT_NO_SYSTEMTRAYICON
#endif
@ -485,9 +399,6 @@
#ifndef QT_NO_SPLITTER
# define QT_NO_SPLITTER
#endif
#ifndef QT_NO_SIGNALMAPPER
# define QT_NO_SIGNALMAPPER
#endif
#ifndef QT_NO_SIZEGRIP
# define QT_NO_SIZEGRIP
#endif

View File

@ -72,9 +72,6 @@
#ifndef QT_NO_FILESYSTEMWATCHER
# define QT_NO_FILESYSTEMWATCHER
#endif
#ifndef QT_NO_FSFILEENGINE
# define QT_NO_FSFILEENGINE
#endif
#ifndef QT_NO_FILESYSTEMMODEL
# define QT_NO_FILESYSTEMMODEL
#endif
@ -94,11 +91,6 @@
# define QT_NO_LIBRARY
#endif
/* Fonts */
#ifndef QT_NO_QWS_QPF2
# define QT_NO_QWS_QPF2
#endif
/* Images */
#ifndef QT_NO_IMAGEFORMATPLUGIN
# define QT_NO_IMAGEFORMATPLUGIN
@ -114,9 +106,6 @@
#ifndef QT_NO_BIG_CODECS
# define QT_NO_BIG_CODECS
#endif
#ifndef QT_NO_QWS_INPUTMETHODS
# define QT_NO_QWS_INPUTMETHODS
#endif
#ifndef QT_NO_TEXTCODEC
# define QT_NO_TEXTCODEC
#endif
@ -126,9 +115,6 @@
#ifndef QT_NO_TRANSLATION
# define QT_NO_TRANSLATION
#endif
#ifndef QT_NO_TRANSLATION_UTF8
# define QT_NO_TRANSLATION_UTF8
#endif
/* ItemViews */
@ -158,9 +144,6 @@
#ifndef QT_NO_SHAREDMEMORY
# define QT_NO_SHAREDMEMORY
#endif
#ifndef QT_NO_SOUND
# define QT_NO_SOUND
#endif
#ifndef QT_NO_SYSTEMLOCALE
# define QT_NO_SYSTEMSEMAPHORE
#endif
@ -187,12 +170,6 @@
#endif
/* Networking */
#ifndef QT_NO_COP
# define QT_NO_COP
#endif
#ifndef QT_NO_HOSTINFO
# define QT_NO_HOSTINFO
#endif
#ifndef QT_NO_HTTP
# define QT_NO_HTTP
#endif
@ -205,9 +182,6 @@
#ifndef QT_NO_UDPSOCKET
# define QT_NO_UDPSOCKET
#endif
#ifndef QT_NO_URLINFO
# define QT_NO_URLINFO
#endif
#ifndef QT_NO_FTP
# define QT_NO_FTP
#endif
@ -216,12 +190,6 @@
#ifndef QT_NO_COLORNAMES
# define QT_NO_COLORNAMES
#endif
#ifndef QT_NO_DIRECTPAINTER
# define QT_NO_DIRECTPAINTER
#endif
#ifndef QT_NO_PAINTONSCREEN
# define QT_NO_PAINTONSCREEN
#endif
#ifndef QT_NO_PAINT_DEBUG
# define QT_NO_PAINT_DEBUG
#endif
@ -235,75 +203,10 @@
# define QT_NO_CUPS
#endif
/* Qt for Embedded Linux */
#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
#ifndef QT_NO_QWS_DECORATION_DEFAULT
# define QT_NO_QWS_DECORATION_DEFAULT
#endif
#ifndef QT_NO_QWS_DECORATION_STYLED
# define QT_NO_QWS_DECORATION_STYLED
#endif
#ifndef QT_NO_QWS_DECORATION_WINDOWS
# define QT_NO_QWS_DECORATION_WINDOWS
#endif
#ifndef QT_NO_QWS_MANAGER
# define QT_NO_QWS_MANAGER
#endif
#ifndef QT_NO_QWS_KEYBOARD
# define QT_NO_QWS_KEYBOARD
#endif
#ifndef QT_NO_QWS_MOUSE
# define QT_NO_QWS_MOUSE
#endif
#ifndef QT_NO_QWS_MOUSE_AUTO
# define QT_NO_QWS_MOUSE_AUTO
#endif
#ifndef QT_NO_QWS_MOUSE_MANUAL
# define QT_NO_QWS_MOUSE_MANUAL
#endif
#ifndef QT_NO_QWS_MULTIPROCESS
# define QT_NO_QWS_MULTIPROCESS
#endif
#ifndef QT_NO_QWS_SOUNDSERVER
# define QT_NO_QWS_SOUNDSERVER
#endif
#ifndef QT_NO_QWS_PROPERTIES
# define QT_NO_QWS_PROPERTIES
#endif
#ifndef QT_NO_QWS_PROXYSCREEN
# define QT_NO_QWS_PROXYSCREEN
#endif
#ifndef QT_NO_QWS_DYNAMICSCREENTRANSFORMATION
# define QT_NO_QWS_DYNAMICSCREENTRANSFORMATION
#endif
#ifndef QT_NO_QWS_LINUXFB
# define QT_NO_QWS_LINUXFB
#endif
#ifndef QT_NO_QWS_MOUSE_PC
# define QT_NO_QWS_MOUSE_PC
#endif
#ifndef QT_NO_QWS_MOUSE_LINUXTP
# define QT_NO_QWS_MOUSE_LINUXTP
#endif
#ifndef QT_NO_QWS_QPF
# define QT_NO_QWS_QPF
#endif
/* SVG */
#ifndef QT_NO_SVG
# define QT_NO_SVG
#endif
#ifndef QT_NO_GRAPHICSSVGITEM
# define QT_NO_GRAPHICSSVGITEM
#endif
#ifndef QT_NO_SVGGENERATOR
# define QT_NO_SVGGENERATOR
#endif
@ -315,12 +218,6 @@
#endif
/* Styles */
#ifndef QT_NO_STYLE_MOTIF
# define QT_NO_STYLE_MOTIF
#endif
#ifndef QT_NO_STYLE_CDE
# define QT_NO_STYLE_CDE
#endif
#ifndef QT_NO_STYLE_STYLESHEET
# define QT_NO_STYLE_STYLESHEET
#endif
@ -347,9 +244,6 @@
#ifndef QT_NO_DESKTOPSERVICES
# define QT_NO_DESKTOPSERVICES
#endif
#ifndef QT_NO_SCRIPT
# define QT_NO_SCRIPT
#endif
#ifndef QT_NO_SYSTEMTRAYICON
# define QT_NO_SYSTEMTRAYICON
#endif

View File

@ -64,9 +64,6 @@
#ifndef QT_NO_PROGRESSDIALOG
# define QT_NO_PROGRESSDIALOG
#endif
#ifndef QT_NO_TABDIALOG
# define QT_NO_TABDIALOG
#endif
/* File I/O */
#ifndef QT_NO_SETTINGS
@ -105,9 +102,6 @@
#endif
/* Internationalization */
#ifndef QT_NO_QWS_INPUTMETHODS
# define QT_NO_QWS_INPUTMETHODS
#endif
#ifndef QT_NO_TEXTCODEC
# define QT_NO_TEXTCODEC
#endif
@ -117,9 +111,6 @@
#ifndef QT_NO_TRANSLATION
# define QT_NO_TRANSLATION
#endif
#ifndef QT_NO_TRANSLATION_UTF8
# define QT_NO_TRANSLATION_UTF8
#endif
/* ItemViews */
#ifndef QT_NO_DIRMODEL
@ -163,20 +154,11 @@
#ifndef QT_NO_SHORTCUT
# define QT_NO_SHORTCUT
#endif
#ifndef QT_NO_SOUND
# define QT_NO_SOUND
#endif
#ifndef QT_NO_WHEELEVENT
# define QT_NO_WHEELEVENT
#endif
/* Networking */
#ifndef QT_NO_COP
# define QT_NO_COP
#endif
#ifndef QT_NO_HOSTINFO
# define QT_NO_HOSTINFO
#endif
#ifndef QT_NO_HTTP
# define QT_NO_HTTP
#endif
@ -195,14 +177,6 @@
# define QT_NO_CUPS
#endif
/* Qt for Embedded Linux */
#ifndef QT_NO_QWS_SOUNDSERVER
# define QT_NO_QWS_SOUNDSERVER
#endif
#ifndef QT_NO_QWS_PROPERTIES
# define QT_NO_QWS_PROPERTIES
#endif
/* Styles */
#ifndef QT_NO_STYLE_FUSION
# define QT_NO_STYLE_FUSION

View File

@ -759,12 +759,6 @@ Section: Painting
Requires: PRINTER LIBRARY
Name: Common UNIX Printing System
Feature: PAINTONSCREEN
Description: Supports the Qt::WA_PaintOnScreen widget attribute.
Section: Painting
Requires:
Name: Qt::WA_PaintOnScreen
Feature: PAINT_DEBUG
Description: Debug painting with the environment variables QT_FLUSH_UPDATE and QT_FLUSH_PAINT
Section: Painting
@ -787,12 +781,6 @@ Section: Internationalization
Requires:
Name: Translation
Feature: TRANSLATION_UTF8
Description: Supports translations using QObject::trUtf8().
Section: Internationalization
Requires: TRANSLATION TEXTCODEC
Name: Translation (UTF-8 representation)
Feature: TEXTCODEC
Description: Supports conversions between text encodings.
Section: Internationalization
@ -819,12 +807,6 @@ Name: iconv
# Networking
Feature: HOSTINFO
Description: Supports host name lookups.
Section: Networking
Requires:
Name: QHostInfo
Feature: FTP
Description: Supports FTP file access.
Section: Networking
@ -834,7 +816,7 @@ Name: File Transfer Protocol
Feature: HTTP
Description: Supports HTTP file access.
Section: Networking
Requires: HOSTINFO
Requires:
Name: Hyper Text Transfer Protocol
Feature: UDPSOCKET