1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove dependency of fusion style on windows

Browse Source 
Fusion does not depend on Windows
qfeatures.h regenerated from qfeatures.txt
(QT_NO_LIBRARY and QT_NO_STYLE_FUSION were missing)

Change-Id: I5e650a826abb788c7ffb1f0f28d9bbb2d357b7a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tasuku Suzuki 2012-11-23 13:45:33 +09:00 committed by The Qt Project
parent c19c92e26a
commit fe3fa346fd
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/corelib/global/qfeatures.h
View File

@ -121,6 +121,9 @@
// QLCDNumber // QLCDNumber
//#define QT_NO_LCDNUMBER //#define QT_NO_LCDNUMBER
// QLibrary
//#define QT_NO_LIBRARY
// QLineEdit // QLineEdit
//#define QT_NO_LINEEDIT //#define QT_NO_LINEEDIT
@ -296,6 +299,16 @@
#define QT_NO_ICONV #define QT_NO_ICONV
#endif #endif
// QInputContext
#if !defined(QT_NO_IM) && (defined(QT_NO_LIBRARY))
#define QT_NO_IM
#endif
// QLocalServer
#if !defined(QT_NO_LOCALSERVER) && (defined(QT_NO_TEMPORARYFILE))
#define QT_NO_LOCALSERVER
#endif
// QMenu // QMenu
#if !defined(QT_NO_MENU) && (defined(QT_NO_ACTION)) #if !defined(QT_NO_MENU) && (defined(QT_NO_ACTION))
#define QT_NO_MENU #define QT_NO_MENU
@ -306,11 +319,6 @@
#define QT_NO_NETWORKDISKCACHE #define QT_NO_NETWORKDISKCACHE
#endif #endif
// QLocalServer
#if !defined(QT_NO_LOCALSERVER) && (defined(QT_NO_TEMPORARYFILE))
#define QT_NO_LOCALSERVER
#endif
// QProgressDialog // QProgressDialog
#if !defined(QT_NO_PROGRESSDIALOG) && (defined(QT_NO_PROGRESSBAR)) #if !defined(QT_NO_PROGRESSDIALOG) && (defined(QT_NO_PROGRESSBAR))
#define QT_NO_PROGRESSDIALOG #define QT_NO_PROGRESSDIALOG
@ -336,6 +344,11 @@
#define QT_NO_STATEMACHINE #define QT_NO_STATEMACHINE
#endif #endif
// QFusionStyle
#if !defined(QT_NO_STYLE_FUSION) && (defined(QT_NO_IMAGEFORMAT_XPM))
#define QT_NO_STYLE_FUSION
#endif
// QWindowsXPStyle // QWindowsXPStyle
#if !defined(QT_NO_STYLE_WINDOWSXP) && (defined(QT_NO_STYLE_WINDOWS)) #if !defined(QT_NO_STYLE_WINDOWSXP) && (defined(QT_NO_STYLE_WINDOWS))
#define QT_NO_STYLE_WINDOWSXP #define QT_NO_STYLE_WINDOWSXP
@ -376,11 +389,6 @@
#define QT_NO_DBUS #define QT_NO_DBUS
#endif #endif
// QInputContext
#if !defined(QT_NO_IM) && (defined(QT_NO_LIBRARY))
#define QT_NO_IM
#endif
// QPrinter // QPrinter
#if !defined(QT_NO_PRINTER) && (defined(QT_NO_PICTURE) || defined(QT_NO_TEMPORARYFILE)) #if !defined(QT_NO_PRINTER) && (defined(QT_NO_PICTURE) || defined(QT_NO_TEMPORARYFILE))
#define QT_NO_PRINTER #define QT_NO_PRINTER
@ -431,6 +439,11 @@
#define QT_NO_WHATSTHIS #define QT_NO_WHATSTHIS
#endif #endif
// Bearer Management
#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY) || defined(QT_NO_NETWORKINTERFACE) || defined(QT_NO_PROPERTIES))
#define QT_NO_BEARERMANAGEMENT
#endif
// QGraphicsView // QGraphicsView
#if !defined(QT_NO_GRAPHICSVIEW) && (defined(QT_NO_SCROLLAREA)) #if !defined(QT_NO_GRAPHICSVIEW) && (defined(QT_NO_SCROLLAREA))
#define QT_NO_GRAPHICSVIEW #define QT_NO_GRAPHICSVIEW
@ -451,16 +464,16 @@
#define QT_NO_STYLE_STYLESHEET #define QT_NO_STYLE_STYLESHEET
#endif #endif
// Bearer Management
#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY) || defined(QT_NO_NETWORKINTERFACE) || defined(QT_NO_PROPERTIES))
#define QT_NO_BEARERMANAGEMENT
#endif
// QColorDialog // QColorDialog
#if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX)) #if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX))
#define QT_NO_COLORDIALOG #define QT_NO_COLORDIALOG
#endif #endif
// Common UNIX Printing System
#if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY))
#define QT_NO_CUPS
#endif
// QGraphicsEffect // QGraphicsEffect
#if !defined(QT_NO_GRAPHICSEFFECT) && (defined(QT_NO_GRAPHICSVIEW)) #if !defined(QT_NO_GRAPHICSEFFECT) && (defined(QT_NO_GRAPHICSVIEW))
#define QT_NO_GRAPHICSEFFECT #define QT_NO_GRAPHICSEFFECT
@ -486,11 +499,6 @@
#define QT_NO_TEXTEDIT #define QT_NO_TEXTEDIT
#endif #endif
// Common UNIX Printing System
#if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY))
#define QT_NO_CUPS
#endif
// QErrorMessage // QErrorMessage
#if !defined(QT_NO_ERRORMESSAGE) && (defined(QT_NO_TEXTEDIT)) #if !defined(QT_NO_ERRORMESSAGE) && (defined(QT_NO_TEXTEDIT))
#define QT_NO_ERRORMESSAGE #define QT_NO_ERRORMESSAGE

2
src/corelib/global/qfeatures.txt
View File

@ -723,7 +723,7 @@ SeeAlso: ???
Feature: STYLE_FUSION Feature: STYLE_FUSION
Description: Supports a modern platform independent widget style. Description: Supports a modern platform independent widget style.
Section: Styles Section: Styles
Requires: STYLE_WINDOWS IMAGEFORMAT_XPM Requires: IMAGEFORMAT_XPM
Name: QFusionStyle Name: QFusionStyle
SeeAlso: ??? SeeAlso: ???