diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2012-10-18 15:22:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-22 19:36:43 +0200 |
| commit | 087e4bc5171f0ced1f34663e59217d678cd350ba (patch) | |
| tree | 0d122365bbc8bd4147196a1b379e0f7e57d3eb8e /src/corelib/global | |
| parent | a0e5d6c1c05f1d9f811eaf2760193618ae8a83ca (diff) | |
Remove Cleanlooks and Plastique
We have a new style Fusion that will replace these styles.
They will be moved to a separate
module rather than included in platforms that do not need them.
Change-Id: I51ebbcad5406e99130e5b12e62ba624d1489088c
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qconfig-minimal.h | 13 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-small.h | 17 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.h | 10 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 13 |
4 files changed, 9 insertions, 44 deletions
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index 9c95d124ab..28cb8fbede 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -376,17 +376,8 @@ #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_CLEANLOOKS -# define QT_NO_STYLE_CLEANLOOKS -#endif -#ifndef QT_NO_STYLE_PLASTIQUE -# define QT_NO_STYLE_PLASTIQUE +#ifndef QT_NO_STYLE_FUSION +# define QT_NO_STYLE_FUSION #endif #ifndef QT_NO_STYLE_STYLESHEET # define QT_NO_STYLE_STYLESHEET diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h index b3a056b815..9d72cd5d4c 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -209,23 +209,14 @@ #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_CLEANLOOKS -# define QT_NO_STYLE_CLEANLOOKS -#endif -#ifndef QT_NO_STYLE_PLASTIQUE -# define QT_NO_STYLE_PLASTIQUE +#ifndef QT_NO_STYLE_FUSION +# define QT_NO_STYLE_FUSION #endif #ifndef QT_NO_STYLE_STYLESHEET # define QT_NO_STYLE_STYLESHEET #endif -#ifndef QT_NO_STYLE_WINDOWSXP -# define QT_NO_STYLE_WINDOWSXP +#ifndef QT_NO_STYLE_WINDOWSVISTA +# define QT_NO_STYLE_WINDOWSVISTA #endif /* Utilities */ diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 90ef47cf5b..b4b73a9aaa 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -396,16 +396,6 @@ #define QT_NO_SCROLLAREA #endif -// QCleanLooksStyle -#if !defined(QT_NO_STYLE_CLEANLOOKS) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGEFORMAT_XPM)) -#define QT_NO_STYLE_CLEANLOOKS -#endif - -// QPlastiqueStyle -#if !defined(QT_NO_STYLE_PLASTIQUE) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGEFORMAT_XPM)) -#define QT_NO_STYLE_PLASTIQUE -#endif - // QWindowsCEStyle #if !defined(QT_NO_STYLE_WINDOWSCE) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGEFORMAT_XPM)) #define QT_NO_STYLE_WINDOWSCE diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 3b3af8a3fc..7f31259c16 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -727,11 +727,11 @@ Requires: Name: QWindowsStyle SeeAlso: ??? -Feature: STYLE_PLASTIQUE -Description: Supports a widget style similar to the Plastik style available in KDE. +Feature: STYLE_FUSION +Description: Supports a modern platform independent widget style. Section: Styles Requires: STYLE_WINDOWS IMAGEFORMAT_XPM -Name: QPlastiqueStyle +Name: QFusionStyle SeeAlso: ??? Feature: STYLE_WINDOWSXP @@ -748,13 +748,6 @@ Requires: STYLE_WINDOWSXP Name: QWindowsVistaStyle SeeAlso: ??? -Feature: STYLE_CLEANLOOKS -Description: Supports a Gnome CleanLooks-like look and feel. -Section: Styles -Requires: STYLE_WINDOWS IMAGEFORMAT_XPM -Name: QCleanLooksStyle -SeeAlso: ??? - Feature: STYLE_WINDOWSCE Description: WindowsCE look and feel Section: Styles |