diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 22:19:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 22:19:17 +0200 |
| commit | bdb53d77d1806a06646d3721c22b40ecd03d6f6a (patch) | |
| tree | 1f8f20fb068753fa3c6f1af3bc1b18a57a54bf75 /Tools/QtTestBrowser/locationedit.cpp | |
| parent | 5079a4fb1da63f00d089eac0d40a88bb0e0e45a4 (diff) | |
| parent | 8b24887dcb8e9ea1fd1b4043795a54bb3d6d3663 (diff) | |
| download | qtwebkit-bdb53d77d1806a06646d3721c22b40ecd03d6f6a.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ib5bd1f44e83e29501eaa432ddb47320375f5079a
Diffstat (limited to 'Tools/QtTestBrowser/locationedit.cpp')
| -rw-r--r-- | Tools/QtTestBrowser/locationedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/QtTestBrowser/locationedit.cpp b/Tools/QtTestBrowser/locationedit.cpp index 6489b2b2e..fd86650b5 100644 --- a/Tools/QtTestBrowser/locationedit.cpp +++ b/Tools/QtTestBrowser/locationedit.cpp @@ -80,7 +80,7 @@ void LocationEdit::resizeEvent(QResizeEvent*) void LocationEdit::updateInternalGeometry() { - QStyleOptionFrameV3 styleOption; + QStyleOptionFrame styleOption; initStyleOption(&styleOption); QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &styleOption, this); |