From 55fbf1db19fbe9dba60cd11d2fdccc85b4bab7ac Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 22 Sep 2014 20:42:53 +0200 Subject: Widgets: remove references to QStyleOptionFrameV They're gone since Qt 5.0 and only exist as typedefs for QStyleOptionFrame. Change-Id: Icff45cbd3a47db8618a7f7a80f7252651969237c Reviewed-by: Friedemann Kleint --- tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp | 2 +- tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index 063741f87d..c1331d62e1 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -3200,7 +3200,7 @@ void tst_QTreeWidget::task239150_editorWidth() //we check that an item with no text will get an editor with a correct size QTreeWidget tree; - QStyleOptionFrameV2 opt; + QStyleOptionFrame opt; opt.init(&tree); const int minWidth = tree.style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(0, 0). expandedTo(QApplication::globalStrut()), 0).width(); diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index cffb255a28..78fa0b4928 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -1670,7 +1670,7 @@ void tst_QLineEdit::displayText() void tst_QLineEdit::passwordEchoOnEdit() { - QStyleOptionFrameV2 opt; + QStyleOptionFrame opt; QLineEdit *testWidget = ensureTestWidget(); QChar fillChar = testWidget->style()->styleHint(QStyle::SH_LineEdit_PasswordCharacter, &opt, testWidget); @@ -1715,7 +1715,7 @@ void tst_QLineEdit::passwordEchoDelay() if (delay <= 0) QSKIP("Platform not defining echo delay and overriding only possible in internal build"); - QStyleOptionFrameV2 opt; + QStyleOptionFrame opt; QChar fillChar = testWidget->style()->styleHint(QStyle::SH_LineEdit_PasswordCharacter, &opt, testWidget); testWidget->setEchoMode(QLineEdit::Password); @@ -3648,7 +3648,7 @@ void tst_QLineEdit::task233101_cursorPosAfterInputMethod() void tst_QLineEdit::task241436_passwordEchoOnEditRestoreEchoMode() { - QStyleOptionFrameV2 opt; + QStyleOptionFrame opt; QLineEdit *testWidget = ensureTestWidget(); QChar fillChar = testWidget->style()->styleHint(QStyle::SH_LineEdit_PasswordCharacter, &opt, testWidget); -- cgit v1.2.3