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/searchlineedit.cpp | |
| parent | 3d698f5de377bde2293e222536bc50171cfdf1b8 (diff) | |
| parent | 12dd6ff845656eb625e2ee3d0e73392bc2c61983 (diff) | |
| download | qtwebengine-a077399f4c17f57e911334867c918cc6ddeb15fc.tar.gz | |
Merge branch '5.6' into dev
Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
Diffstat (limited to 'examples/webenginewidgets/demobrowser/searchlineedit.cpp')
| -rw-r--r-- | examples/webenginewidgets/demobrowser/searchlineedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/webenginewidgets/demobrowser/searchlineedit.cpp b/examples/webenginewidgets/demobrowser/searchlineedit.cpp index 5152ac1c0..1573b1046 100644 --- a/examples/webenginewidgets/demobrowser/searchlineedit.cpp +++ b/examples/webenginewidgets/demobrowser/searchlineedit.cpp @@ -45,7 +45,7 @@ #include <QtGui/QMouseEvent> #include <QtWidgets/QMenu> #include <QtWidgets/QStyle> -#include <QtWidgets/QStyleOptionFrameV2> +#include <QtWidgets/QStyleOptionFrame> ClearButton::ClearButton(QWidget *parent) : QAbstractButton(parent) @@ -181,7 +181,7 @@ void SearchLineEdit::paintEvent(QPaintEvent *event) { if (lineEdit()->text().isEmpty() && !hasFocus() && !m_inactiveText.isEmpty()) { ExLineEdit::paintEvent(event); - QStyleOptionFrameV2 panel; + QStyleOptionFrame panel; initStyleOption(&panel); QRect r = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this); QFontMetrics fm = fontMetrics(); |