Made QFusionStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QFusionStyle directly.

Change-Id: I37d8acb13b6fd328a9cd53c74df971428bbbe443
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 03814bcbf8..901bb7c38a 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -51,9 +51,8 @@
 #include <qboxlayout.h>
 #include <qaction.h>
 #include <qwidgetaction.h>
-#ifndef Q_NO_STYLE_FUSION
-#include <qfusionstyle.h>
-#endif
+#include <qcommonstyle.h>
+#include <qstylefactory.h>
 
 #include "../../../qtest-config.h"
 
@@ -1399,7 +1398,7 @@ void tst_QGraphicsWidget::setStyle_data()
 {
     QTest::addColumn<QString>("style");
     QTest::newRow("null") << "";
-    QTest::newRow("fusion") << "QFusionStyle";
+    QTest::newRow("fusion") << "Fusion";
 }
 
 // void setStyle(QStyle* style) public
@@ -1407,14 +1406,14 @@ void tst_QGraphicsWidget::setStyle()
 {
 #ifndef Q_NO_STYLE_FUSION
     SubQGraphicsWidget widget;
-    QFusionStyle fusionStyle;
 
     int oldEventCounts = widget.eventCount;
 
     QFETCH(QString, style);
-    if (style == "QFusionStyle") {
-        widget.setStyle(&fusionStyle);
-        QCOMPARE(widget.style(), static_cast<QStyle*>(&fusionStyle));
+    if (!style.isEmpty()) {
+        QStyle *fstyle = QStyleFactory::create(style);
+        widget.setStyle(fstyle);
+        QCOMPARE(widget.style(), static_cast<QStyle*>(fstyle));
     } else {
         widget.setStyle(0);
         QVERIFY(widget.style() != (QStyle *)0);