Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	mkspecs/features/qml_module.prf
	mkspecs/features/qt_common.prf
	src/gui/text/qzip.cpp
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/windows/array.h
	src/testlib/qtestcase.cpp
	src/widgets/dialogs/qfilesystemmodel.h

Change-Id: Ie41c5868415b81f7693c80e045497035504bb210

5 files changed, 13 insertions, 13 deletions

diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index 2ad9f88e6b..1482b990a6 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -310,7 +310,7 @@ void QAbstractScrollAreaPrivate::init()
     viewportFilter.reset(new QAbstractScrollAreaFilter(this));
     viewport->installEventFilter(viewportFilter.data());
     viewport->setFocusProxy(q);
-    q->setFocusPolicy(Qt::WheelFocus);
+    q->setFocusPolicy(Qt::StrongFocus);
     q->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
     q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     layoutChildren();
diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp
index 3f6185b4e7..4221ff40ef 100644
--- a/src/widgets/widgets/qabstractslider.cpp
+++ b/src/widgets/widgets/qabstractslider.cpp
@@ -734,9 +734,10 @@ bool QAbstractSliderPrivate::scrollByDelta(Qt::Orientation orientation, Qt::Keyb
         if (stepsToScroll == 0) {
             // We moved less than a line, but might still have accumulated partial scroll,
             // unless we already are at one of the ends.
-            if (offset_accumulated > 0.f && value < maximum)
+            const float effective_offset = invertedControls ? -offset_accumulated : offset_accumulated;
+            if (effective_offset > 0.f && value < maximum)
                 return true;
-            if (offset_accumulated < 0.f && value > minimum)
+            if (effective_offset < 0.f && value > minimum)
                 return true;
             offset_accumulated = 0;
             return false;
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h
index 6abb3cd9a3..be7bc213a2 100644
--- a/src/widgets/widgets/qdatetimeedit_p.h
+++ b/src/widgets/widgets/qdatetimeedit_p.h
@@ -78,15 +78,14 @@ public:
     void init(const QVariant &var);
     void readLocaleSettings();
 
-    void emitSignals(EmitPolicy ep, const QVariant &old);
-    QString textFromValue(const QVariant &f) const;
-    QVariant valueFromText(const QString &f) const;
-
     QDateTime validateAndInterpret(QString &input, int &, QValidator::State &state,
                                    bool fixup = false) const;
     void clearSection(int index);
 
     // Override QAbstractSpinBoxPrivate:
+    void emitSignals(EmitPolicy ep, const QVariant &old) Q_DECL_OVERRIDE;
+    QString textFromValue(const QVariant &f) const Q_DECL_OVERRIDE;
+    QVariant valueFromText(const QString &f) const Q_DECL_OVERRIDE;
     void _q_editorCursorPositionChanged(int oldpos, int newpos) Q_DECL_OVERRIDE;
     void interpret(EmitPolicy ep) Q_DECL_OVERRIDE;
     void clearCache() const Q_DECL_OVERRIDE;
@@ -94,16 +93,18 @@ public:
     void updateEditFieldGeometry() Q_DECL_OVERRIDE;
     QVariant getZeroVariant() const Q_DECL_OVERRIDE;
     void setRange(const QVariant &min, const QVariant &max) Q_DECL_OVERRIDE;
+    void updateEdit() Q_DECL_OVERRIDE;
 
-    // Override QDateTimePraser:
+    // Override QDateTimeParser:
     QString displayText() const Q_DECL_OVERRIDE { return edit->text(); }
     QDateTime getMinimum() const Q_DECL_OVERRIDE { return minimum.toDateTime(); }
     QDateTime getMaximum() const Q_DECL_OVERRIDE { return maximum.toDateTime(); }
     QLocale locale() const Q_DECL_OVERRIDE { return q_func()->locale(); }
+    QString getAmPmText(AmPm ap, Case cs) const Q_DECL_OVERRIDE;
+    int cursorPosition() const Q_DECL_OVERRIDE { return edit ? edit->cursorPosition() : -1; }
 
     int absoluteIndex(QDateTimeEdit::Section s, int index) const;
     int absoluteIndex(const SectionNode &s) const;
-    void updateEdit();
     QDateTime stepBy(int index, int steps, bool test = false) const;
     int sectionAt(int pos) const;
     int closestSection(int index, bool forward) const;
@@ -114,8 +115,6 @@ public:
 
     void updateTimeSpec();
     QString valueToText(const QVariant &var) const { return textFromValue(var); }
-    QString getAmPmText(AmPm ap, Case cs) const;
-    int cursorPosition() const { return edit ? edit->cursorPosition() : -1; }
 
     void _q_resetButton();
     void updateArrow(QStyle::StateFlag state);
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index 1da8028efb..9675e5e9f2 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -802,7 +802,7 @@ void QPlainTextEditPrivate::init(const QString &txt)
 
     viewport->setBackgroundRole(QPalette::Base);
     q->setAcceptDrops(true);
-    q->setFocusPolicy(Qt::WheelFocus);
+    q->setFocusPolicy(Qt::StrongFocus);
     q->setAttribute(Qt::WA_KeyCompression);
     q->setAttribute(Qt::WA_InputMethodEnabled);
     q->setInputMethodHints(Qt::ImhMultiLine);
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index a81781bd4d..df69b49687 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -177,7 +177,7 @@ void QTextEditPrivate::init(const QString &html)
 
     viewport->setBackgroundRole(QPalette::Base);
     q->setAcceptDrops(true);
-    q->setFocusPolicy(Qt::WheelFocus);
+    q->setFocusPolicy(Qt::StrongFocus);
     q->setAttribute(Qt::WA_KeyCompression);
     q->setAttribute(Qt::WA_InputMethodEnabled);
     q->setInputMethodHints(Qt::ImhMultiLine);