diff options
author | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-11-05 08:27:56 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-05 08:27:56 +0000 |
commit | d8f41bdc2efa36dd9e2f80e23d7cb4874c019452 (patch) | |
tree | 254f8c661318ac73ddc128eb06498a8ab4d7babe /tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp | |
parent | f7f55c0b294f03932b205f8eae4335928647f57b (diff) | |
parent | 4159ee840549df11287294f0928e90f35f3e06ff (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp')
-rw-r--r-- | tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp index 3c1d4c589b..2e26ba609b 100644 --- a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp +++ b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp @@ -43,7 +43,6 @@ class tst_QStyleOption: public QObject private slots: void qstyleoptioncast_data(); void qstyleoptioncast(); - void copyconstructors(); }; // Just a simple container for QStyleOption-pointer @@ -133,21 +132,6 @@ void tst_QStyleOption::qstyleoptioncast() delete testOption; } -void tst_QStyleOption::copyconstructors() -{ - QStyleOptionFrame frame; - QStyleOptionFrameV2 frame2(frame); - QCOMPARE(frame2.version, int(QStyleOptionFrameV2::Version)); - frame2 = frame; - QCOMPARE(frame2.version, int(QStyleOptionFrameV2::Version)); - - QStyleOptionProgressBar bar; - QStyleOptionProgressBarV2 bar2(bar); - QCOMPARE(bar2.version, int(QStyleOptionProgressBarV2::Version)); - bar2 = bar; - QCOMPARE(bar2.version, int(QStyleOptionProgressBarV2::Version)); -} - QTEST_MAIN(tst_QStyleOption) #include "tst_qstyleoption.moc" |