diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 23:30:31 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 23:30:31 +0100 |
commit | e5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch) | |
tree | 8e1bd6704205307e0a23484221ea1bb67a9f411e /tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp | |
parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
parent | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff) |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp')
-rw-r--r-- | tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp index 1203e12045..8a00198cf1 100644 --- a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp +++ b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp @@ -44,7 +44,7 @@ #include <QStyleOption> -class tst_QStyleOption: public QObject +class tst_QStyleOption: public QObject { Q_OBJECT @@ -54,7 +54,7 @@ private slots: void copyconstructors(); }; -// Just a simple container for QStyleOption-pointer +// Just a simple container for QStyleOption-pointer struct StyleOptionPointerBase { QStyleOption *pointer; @@ -80,7 +80,7 @@ void tst_QStyleOption::qstyleoptioncast_data() { QTest::addColumn<StyleOptionPointerBase *>("testOption"); QTest::addColumn<bool>("canCastToComplex"); - QTest::addColumn<int>("type"); + QTest::addColumn<int>("type"); QTest::newRow("optionDefault") << stylePtr(new QStyleOption) << false << int(QStyleOption::SO_Default); QTest::newRow("optionButton") << stylePtr(new QStyleOptionButton) << false << int(QStyleOption::SO_Button); |