diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2012-09-21 19:53:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-18 21:46:21 +0200 |
| commit | f45afd71551a6cd1553952ea003e9356651809b5 (patch) | |
| tree | c2fb59e5811f636ea43d0a53f126213c2a5b76e1 /src/widgets/styles/qstylefactory.cpp | |
| parent | 8b6de4677142cab41790ca50ce6c7f1efbab5de8 (diff) | |
Introduce new style Fusion
This is a new non-native style for Qt.
It is intended as a replacement for the now aging
Plastique and Cleanlooks styles.
Change-Id: I30c0518a69e4e3b8b2b05ee7d84c3a5a1f307578
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/widgets/styles/qstylefactory.cpp')
| -rw-r--r-- | src/widgets/styles/qstylefactory.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/widgets/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp index f12ea27e78..8f4f014ac8 100644 --- a/src/widgets/styles/qstylefactory.cpp +++ b/src/widgets/styles/qstylefactory.cpp @@ -52,6 +52,9 @@ #ifndef QT_NO_STYLE_CLEANLOOKS #include "qcleanlooksstyle.h" #endif +#ifndef QT_NO_STYLE_FUSION +#include "qfusionstyle.h" +#endif #ifndef QT_NO_STYLE_GTK #include "qgtkstyle.h" #endif @@ -146,6 +149,11 @@ QStyle *QStyleFactory::create(const QString& key) ret = new QPlastiqueStyle; else #endif +#ifndef QT_NO_STYLE_FUSION + if (style == QLatin1String("fusion")) + ret = new QFusionStyle; + else +#endif #ifndef QT_NO_STYLE_CLEANLOOKS if (style == QLatin1String("cleanlooks")) ret = new QCleanlooksStyle; @@ -222,6 +230,10 @@ QStringList QStyleFactory::keys() if (!list.contains(QLatin1String("GTK+"))) list << QLatin1String("GTK+"); #endif +#ifndef QT_NO_STYLE_FUSION + if (!list.contains(QLatin1String("Fusion"))) + list << QLatin1String("Fusion"); +#endif #ifndef QT_NO_STYLE_CLEANLOOKS if (!list.contains(QLatin1String("Cleanlooks"))) list << QLatin1String("Cleanlooks"); |