Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/plugins/platforms/qnx/qqnxscreen.cpp
	src/plugins/platforms/windows/qwindowsdialoghelpers.cpp

Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a

1 files changed, 3 insertions, 3 deletions

diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index 52c733b8ec..64eb76dbb4 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -2265,11 +2265,11 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
             case QFrame::VLine: {
                 QPoint p1, p2;
                 if (frameShape == QFrame::HLine) {
-                    p1 = QPoint(opt->rect.x(), opt->rect.height() / 2);
+                    p1 = QPoint(opt->rect.x(), opt->rect.y() + opt->rect.height() / 2);
                     p2 = QPoint(opt->rect.x() + opt->rect.width(), p1.y());
                 } else {
-                    p1 = QPoint(opt->rect.x()+opt->rect.width() / 2, 0);
-                    p2 = QPoint(p1.x(), opt->rect.height());
+                    p1 = QPoint(opt->rect.x() + opt->rect.width() / 2, opt->rect.y());
+                    p2 = QPoint(p1.x(), p1.y() + opt->rect.height());
                 }
                 if (frameShadow == QFrame::Plain) {
                     QPen oldPen = p->pen();