diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:32:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:35:45 +0100 |
| commit | a077399f4c17f57e911334867c918cc6ddeb15fc (patch) | |
| tree | c8e4d326d7a074e9d16b68399ecc5f728f8533fe /examples/webenginewidgets/demobrowser/urllineedit.cpp | |
| parent | 3d698f5de377bde2293e222536bc50171cfdf1b8 (diff) | |
| parent | 12dd6ff845656eb625e2ee3d0e73392bc2c61983 (diff) | |
Merge branch '5.6' into dev
Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
Diffstat (limited to 'examples/webenginewidgets/demobrowser/urllineedit.cpp')
| -rw-r--r-- | examples/webenginewidgets/demobrowser/urllineedit.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/webenginewidgets/demobrowser/urllineedit.cpp b/examples/webenginewidgets/demobrowser/urllineedit.cpp index 685277d9c..0f4e59c4b 100644 --- a/examples/webenginewidgets/demobrowser/urllineedit.cpp +++ b/examples/webenginewidgets/demobrowser/urllineedit.cpp @@ -57,7 +57,7 @@ #include <QtGui/QDrag> #include <QtGui/QPainter> #include <QtWidgets/QStyle> -#include <QtWidgets/QStyleOptionFrameV2> +#include <QtWidgets/QStyleOptionFrame> #include <QtCore/QDebug> @@ -112,7 +112,7 @@ void ExLineEdit::resizeEvent(QResizeEvent *event) void ExLineEdit::updateGeometries() { - QStyleOptionFrameV2 panel; + QStyleOptionFrame panel; initStyleOption(&panel); QRect rect = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this); @@ -131,7 +131,7 @@ void ExLineEdit::updateGeometries() clearButtonWidth, this->height()); } -void ExLineEdit::initStyleOption(QStyleOptionFrameV2 *option) const +void ExLineEdit::initStyleOption(QStyleOptionFrame *option) const { option->initFrom(this); option->rect = contentsRect(); @@ -144,7 +144,7 @@ void ExLineEdit::initStyleOption(QStyleOptionFrameV2 *option) const if (hasEditFocus()) option->state |= QStyle::State_HasEditFocus; #endif - option->features = QStyleOptionFrameV2::None; + option->features = QStyleOptionFrame::None; } QSize ExLineEdit::sizeHint() const @@ -189,7 +189,7 @@ bool ExLineEdit::event(QEvent *event) void ExLineEdit::paintEvent(QPaintEvent *) { QPainter p(this); - QStyleOptionFrameV2 panel; + QStyleOptionFrame panel; initStyleOption(&panel); style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, &p, this); } @@ -322,7 +322,7 @@ void UrlLineEdit::paintEvent(QPaintEvent *event) ExLineEdit::paintEvent(event); QPainter painter(this); - QStyleOptionFrameV2 panel; + QStyleOptionFrame panel; initStyleOption(&panel); QRect backgroundRect = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this); if (m_webView && !hasFocus()) { |