diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-11-16 17:39:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 11:03:48 +0100 |
| commit | 9bc49b0bca361646aac90cd00706588d3dcd66c9 (patch) | |
| tree | f4de997044c6dd6d6bc0e5dc121851412aec4997 /tests/auto/widgets/widgets/qcombobox | |
| parent | f4a2352cd1efee9bbffe89e7d430b8be0cacc5bd (diff) | |
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>
Diffstat (limited to 'tests/auto/widgets/widgets/qcombobox')
| -rw-r--r-- | tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 3b9f408e73..af14ad13d3 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -72,9 +72,7 @@ #include <qstringlist.h> #include <qvalidator.h> #include <qcompleter.h> -#ifndef QT_NO_STYLE_FUSION -#include <qfusionstyle.h> -#endif +#include <qstylefactory.h> #include <qabstractitemview.h> #include <qstyleditemdelegate.h> #ifndef QT_NO_STYLE_WINDOWS @@ -2055,7 +2053,7 @@ void tst_QComboBox::separatorItem() void tst_QComboBox::task190351_layout() { const QString oldStyle = QApplication::style()->objectName(); - QApplication::setStyle(new QFusionStyle); + QApplication::setStyle(QStyleFactory::create(QLatin1String("Fusion"))); QComboBox listCombo; QListWidget *list = new QListWidget(); @@ -2120,7 +2118,7 @@ void tst_QComboBox::task166349_setEditableOnReturn() void tst_QComboBox::task191329_size() { const QString oldStyle = QApplication::style()->objectName(); - QApplication::setStyle(new QFusionStyle); + QApplication::setStyle(QStyleFactory::create(QLatin1String("Fusion"))); QComboBox tableCombo; int rows; |