From 35602d75d37af5ffee41d78f8876506ce2c188bf Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Fri, 30 Nov 2018 15:41:43 +0100
Subject: [PATCH 1/9] Refactor tst_QAbstractSlider::keyPressed()

Don't do several tests at once in the test function. Instead, move
the extra tests to the data function. This makes it possible to easily
add a self-contained test (i.e row) for an upcoming fix.

Task-number: QTBUG-25988
Change-Id: I65c8d7620f01107f8f59c96896b1a641d97f5fdc
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
---
 .../qabstractslider/tst_qabstractslider.cpp   | 639 +++++++++++++-----
 1 file changed, 479 insertions(+), 160 deletions(-)

diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
index 70ae453896c..089469f8dc9 100644
--- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
@@ -467,160 +467,517 @@ void tst_QAbstractSlider::keyPressed_data()
     QTest::addColumn<int>("maximum");
     QTest::addColumn<int>("stepSize");
     QTest::addColumn<int>("pageSize");
+    QTest::addColumn<bool>("invertedAppearance");
+    QTest::addColumn<bool>("invertedControls");
     QTest::addColumn<QList<Qt::Key> >("keySequence");
-    QTest::addColumn<int>("expectedSliderPositionHorizontal");
-    QTest::addColumn<int>("expectedSliderPositionVertical");
-    QTest::addColumn<int>("expectedSliderPositionHorizontalInverted"); // :)
-    QTest::addColumn<int>("expectedSliderPositionVerticalInverted");
-
+    QTest::addColumn<int>("expectedSliderPosition");
 
     QList<Qt::Key> list;
-
     list << Qt::Key_Down;
-    QTest::newRow("Step down once 1") << 10   // initial position
-                                 << 0    // minimum
-                                 << 100  // maximum
-                                 << 3    // single step size
-                                 << 0    // page step size
-                                 << list // key sequence
-                                 << 7   // result in case of horizontal slider
-                                 << 7    // result in case of vertical slider
-                                 << 13   // result in case of inverted horiz. slider
-                                 << 13;   // result in case of inverted vertical slider
+    QTest::newRow("Step down once 1, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;   // expected position
+
+    QTest::newRow("Step down once 1, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Step down once 1, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;   // expected position
+
+    QTest::newRow("Step down once 1, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_Up;
-    QTest::newRow("Step down once 2") << 10   // initial position
-                                 << 0    // minimum
-                                 << 100  // maximum
-                                 << 3    // single step size
-                                 << 0    // page step size
-                                 << list // key sequence
-                                 << 13   // result in case of horizontal slider
-                                 << 13    // result in case of vertical slider
-                                 << 7   // result in case of inverted horiz. slider
-                                 << 7;   // result in case of inverted vertical slider
+    QTest::newRow("Step up once 2, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
 
+    QTest::newRow("Step up once 2, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
+    QTest::newRow("Step up once 2, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Step up once 2, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_Left;
-    QTest::newRow("Step left once") << 10   // initial position
-                                 << 0    // minimum
-                                 << 100  // maximum
-                                 << 3    // single step size
-                                 << 0    // page step size
-                                 << list // key sequence
-                                 << 7    // result in case of horizontal slider
-                                 << 7   // result in case of vertical slider
-                                 << 13   // result in case of inverted horiz. slider
-                                 << 13;   // result in case of inverted vertical slider
+    QTest::newRow("Step left once 2, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
+    QTest::newRow("Step left once 2, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Step left once 2, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
+    QTest::newRow("Step left once 2, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_Right;
-    QTest::newRow("Step right once") << 10   // initial position
-                                  << 0    // minimum
-                                  << 100  // maximum
-                                  << 3    // single step size
-                                  << 0    // page step size
-                                  << list // key sequence
-                                  << 13   // result in case of horizontal slider
-                                  << 13   // result in case of vertical slider
-                                  << 7    // result in case of inverted horiz. slider
-                                  << 7;  // result in case of inverted vertical slider
+    QTest::newRow("Step right once 2, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Step right once 2, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
+    QTest::newRow("Step right once 2, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Step right once 2, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_PageDown;
-    QTest::newRow("Page down once")  << 10   // initial position
-                                  << 0    // minimum
-                                  << 100  // maximum
-                                  << 0    // single step size
-                                  << 3    // page step size
-                                  << list // key sequence
-                                  << 7   // result in case of horizontal slider
-                                  << 7   // result in case of vertical slider
-                                  << 13    // result in case of inverted horiz. slider
-                                  << 13;  // result in case of inverted vertical slider
+    QTest::newRow("Page down once, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
+    QTest::newRow("Page down once, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Page down once, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
+    QTest::newRow("Page down once, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_PageUp;
-    QTest::newRow("Page up once")    << 10   // initial position
-                                  << 0    // minimum
-                                  << 100  // maximum
-                                  << 0    // single step size
-                                  << 3    // page step size
-                                  << list // key sequence
-                                  << 13   // result in case of horizontal slider
-                                  << 13   // result in case of vertical slider
-                                  << 7    // result in case of inverted horiz. slider
-                                  << 7;  // result in case of inverted vertical slider
+    QTest::newRow("Page up once, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Page up once, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
+    QTest::newRow("Page up once, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Page up once, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_Up << Qt::Key_Up << Qt::Key_PageDown << Qt::Key_PageDown  << Qt::Key_Left << Qt::Key_Left
          << Qt::Key_Right << Qt::Key_Down << Qt::Key_PageUp << Qt::Key_PageUp << Qt::Key_Down << Qt::Key_Right;
-    QTest::newRow("Symmetric seq")  << 50   // initial position
-                                 << 0    // minimum
-                                 << 100  // maximum
-                                 << 3    // single step size
-                                 << 3    // page step size
-                                 << list // key sequence
-                                 << 50   // result in case of horizontal slider
-                                 << 50    // result in case of vertical slider
-                                 << 50   // result in case of inverted horiz. slider
-                                 << 50;  // result in case of inverted vertical slider
+    QTest::newRow("Symmetric seq, horizontal")
+            << 50   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 50;  // expected position
 
+    QTest::newRow("Symmetric seq, horizontal, both inverted")
+            << 50   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 50;  // expected position
+
+    QTest::newRow("Symmetric seq, vertical")
+            << 50   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 50;  // expected position
+
+    QTest::newRow("Symmetric seq, vertical, both inverted")
+            << 50   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 50;  // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_Home;
-    QTest::newRow("Home")    << 10   // initial position
-                          << 0    // minimum
-                          << 100  // maximum
-                          << 0    // single step size
-                          << 3    // page step size
-                          << list // key sequence
-                          << 0   // result in case of horizontal slider
-                          << 0   // result in case of vertical slider
-                          << 0    // result in case of inverted horiz. slider
-                          << 0;  // result in case of inverted vertical slider
+    QTest::newRow("Home, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
+    QTest::newRow("Home, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
+    QTest::newRow("Home, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
+    QTest::newRow("Home, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 0;   // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_End;
-    QTest::newRow("End")    << 10   // initial position
-                          << 0    // minimum
-                          << 100  // maximum
-                          << 0    // single step size
-                          << 3    // page step size
-                          << list // key sequence
-                          << 100   // result in case of horizontal slider
-                          << 100   // result in case of vertical slider
-                          << 100    // result in case of inverted horiz. slider
-                          << 100;  // result in case of inverted vertical slider
+    QTest::newRow("End, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 100; // expected position
+
+    QTest::newRow("End, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 100; // expected position
+
+    QTest::newRow("End, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 100; // expected position
+
+    QTest::newRow("End, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 100; // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_End << Qt::Key_Up;
-    QTest::newRow("Past end")<< 10   // initial position
-                          << 0    // minimum
-                          << 100  // maximum
-                          << 3    // single step size
-                          << 3    // page step size
-                          << list // key sequence
-                          << 100   // result in case of horizontal slider
-                          << 100   // result in case of vertical slider
-                          << 97    // result in case of inverted horiz. slider
-                          << 97;  // result in case of inverted vertical slider
+    QTest::newRow("Past end, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 100; // expected position
+
+    QTest::newRow("Past end, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 97;  // expected position
+
+    QTest::newRow("Past end, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 100; // expected position
+
+    QTest::newRow("Past end, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 97;  // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_Home << Qt::Key_Down;
-    QTest::newRow("Past home")<< 10   // initial position
-                           << 0    // minimum
-                           << 100  // maximum
-                           << 3    // single step size
-                           << 3    // page step size
-                           << list // key sequence
-                           << 0    // result in case of horizontal slider
-                           << 0    // result in case of vertical slider
-                           << 3    // result in case of inverted horiz. slider
-                           << 3;  // result in case of inverted vertical slider
+    QTest::newRow("Past home, horizontal")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 0;   // expected position
 
+    QTest::newRow("Past home, horizontal, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 3;   // expected position
+
+    QTest::newRow("Past home, vertical")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
+    QTest::newRow("Past home, vertical, both inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 3;   // expected position
 }
 
 void tst_QAbstractSlider::keyPressed()
@@ -630,60 +987,22 @@ void tst_QAbstractSlider::keyPressed()
     QFETCH(int, maximum);
     QFETCH(int, stepSize);
     QFETCH(int, pageSize);
+    QFETCH(bool, invertedAppearance);
+    QFETCH(bool, invertedControls);
     QFETCH(QList<Qt::Key>, keySequence);
-    QFETCH(int, expectedSliderPositionHorizontal);
-    QFETCH(int, expectedSliderPositionVertical);
-    QFETCH(int, expectedSliderPositionHorizontalInverted);
-    QFETCH(int, expectedSliderPositionVerticalInverted);
+    QFETCH(int, expectedSliderPosition);
 
-    // Horizontal non-inverted
     slider->setRange(minimum,maximum);
     slider->setSliderPosition(initialSliderPosition);
     slider->setSingleStep(stepSize);
     slider->setPageStep(pageSize);
     slider->setOrientation(Qt::Horizontal);
-    slider->setInvertedAppearance(false);
-    slider->setInvertedControls(false);
+    slider->setInvertedAppearance(invertedAppearance);
+    slider->setInvertedControls(invertedControls);
     for (int i=0;i<keySequence.count();i++) {
         QTest::keyClick(slider, keySequence.at(i));
     }
-    QCOMPARE(slider->sliderPosition(), expectedSliderPositionHorizontal);
-
-    // Horizontal inverted
-    slider->setRange(minimum,maximum);
-    slider->setSliderPosition(initialSliderPosition);
-    slider->setSingleStep(stepSize);
-    slider->setPageStep(pageSize);
-    slider->setOrientation(Qt::Horizontal);
-    slider->setInvertedAppearance(true);
-    slider->setInvertedControls(true);
-    for (int i=0;i<keySequence.count();i++)
-        QTest::keyPress(slider, keySequence.at(i));
-    QCOMPARE(slider->sliderPosition(), expectedSliderPositionHorizontalInverted);
-
-    // Vertical non-inverted
-    slider->setRange(minimum,maximum);
-    slider->setSliderPosition(initialSliderPosition);
-    slider->setSingleStep(stepSize);
-    slider->setPageStep(pageSize);
-    slider->setOrientation(Qt::Vertical);
-    slider->setInvertedAppearance(false);
-    slider->setInvertedControls(false);
-    for (int i=0;i<keySequence.count();i++)
-        QTest::keyPress(slider, keySequence.at(i));
-    QCOMPARE(slider->sliderPosition(), expectedSliderPositionVertical);
-
-    // Vertical inverted
-    slider->setRange(minimum,maximum);
-    slider->setSliderPosition(initialSliderPosition);
-    slider->setSingleStep(stepSize);
-    slider->setPageStep(pageSize);
-    slider->setOrientation(Qt::Vertical);
-    slider->setInvertedAppearance(true);
-    slider->setInvertedControls(true);
-    for (int i=0;i<keySequence.count();i++)
-        QTest::keyPress(slider, keySequence.at(i));
-    QCOMPARE(slider->sliderPosition(), expectedSliderPositionVerticalInverted);
+    QCOMPARE(slider->sliderPosition(), expectedSliderPosition);
 }
 
 #if QT_CONFIG(wheelevent)

From 32fd79a20fb9b99913bba1537067f5dc8dd96a38 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Fri, 30 Nov 2018 16:53:12 +0100
Subject: [PATCH 2/9] QAbstractSlider: fix invertedControls having no effect
 for left/right keys

There was a comment in the code that said:

// It seems we need to use invertedAppearance for Left and right, otherwise, things look weird.

It's not clear what that was referring to, but in its current state,
a slider with invertedControls set to true will not behave as expected:
pressing the left arrow key will decrease its value instead of increasing it,
and vice versa for the right arrow key.

As stated in the documentation (and by its name), invertedAppearance only
controls the appearance of the slider, and not the effect of key events.

Remove the comment and use invertedControls instead.

Change-Id: I13296cbda9244413978ef0d7f0856065f74fd0bf
Fixes: QTBUG-25988
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
---
 src/widgets/widgets/qabstractslider.cpp       |   9 +-
 .../qabstractslider/tst_qabstractslider.cpp   | 490 +++++++++++++++++-
 2 files changed, 491 insertions(+), 8 deletions(-)

diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp
index 99ee1eccb7d..2172ebc99cf 100644
--- a/src/widgets/widgets/qabstractslider.cpp
+++ b/src/widgets/widgets/qabstractslider.cpp
@@ -829,7 +829,6 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
             break;
 #endif
 
-        // It seems we need to use invertedAppearance for Left and right, otherwise, things look weird.
         case Qt::Key_Left:
 #ifdef QT_KEYPAD_NAVIGATION
             // In QApplication::KeypadNavigationDirectional, we want to change the slider
@@ -848,9 +847,9 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
             else
 #endif
             if (isRightToLeft())
-                action = d->invertedAppearance ? SliderSingleStepSub : SliderSingleStepAdd;
+                action = d->invertedControls ? SliderSingleStepSub : SliderSingleStepAdd;
             else
-                action = !d->invertedAppearance ? SliderSingleStepSub : SliderSingleStepAdd;
+                action = !d->invertedControls ? SliderSingleStepSub : SliderSingleStepAdd;
             break;
         case Qt::Key_Right:
 #ifdef QT_KEYPAD_NAVIGATION
@@ -868,9 +867,9 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
             else
 #endif
             if (isRightToLeft())
-                action = d->invertedAppearance ? SliderSingleStepAdd : SliderSingleStepSub;
+                action = d->invertedControls ? SliderSingleStepAdd : SliderSingleStepSub;
             else
-                action = !d->invertedAppearance ? SliderSingleStepAdd : SliderSingleStepSub;
+                action = !d->invertedControls ? SliderSingleStepAdd : SliderSingleStepSub;
             break;
         case Qt::Key_Up:
 #ifdef QT_KEYPAD_NAVIGATION
diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
index 089469f8dc9..1a0d7a92895 100644
--- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
@@ -485,6 +485,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 7;   // expected position
 
+    QTest::newRow("Step down once 1, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;   // expected position
+
+    QTest::newRow("Step down once 1, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
     QTest::newRow("Step down once 1, horizontal, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -507,6 +529,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 7;   // expected position
 
+    QTest::newRow("Step down once 1, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;   // expected position
+
+    QTest::newRow("Step down once 1, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;   // expected position
+
     QTest::newRow("Step down once 1, vertical, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -531,6 +575,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 13;  // expected position
 
+    QTest::newRow("Step up once 2, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Step up once 2, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
     QTest::newRow("Step up once 2, horizontal, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -553,6 +619,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 13;  // expected position
 
+    QTest::newRow("Step up once 2, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Step up once 2, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
     QTest::newRow("Step up once 2, vertical, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -577,6 +665,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 7;  // expected position
 
+    QTest::newRow("Step left once 2, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
+    QTest::newRow("Step left once 2, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
     QTest::newRow("Step left once 2, horizontal, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -599,6 +709,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 7;  // expected position
 
+    QTest::newRow("Step left once 2, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
+    QTest::newRow("Step left once 2, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
     QTest::newRow("Step left once 2, vertical, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -623,6 +755,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 13;  // expected position
 
+    QTest::newRow("Step right once 2, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Step right once 2, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
     QTest::newRow("Step right once 2, horizontal, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -645,6 +799,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 13;  // expected position
 
+    QTest::newRow("Step right once 2, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Step right once 2, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 0    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;   // expected position
+
     QTest::newRow("Step right once 2, vertical, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -654,7 +830,7 @@ void tst_QAbstractSlider::keyPressed_data()
             << true // inverted appearance
             << true // inverted controls
             << list // key sequence
-            << 7;  // expected position
+            << 7;   // expected position
 
     list = QList<Qt::Key>();
     list << Qt::Key_PageDown;
@@ -667,7 +843,29 @@ void tst_QAbstractSlider::keyPressed_data()
             << false// inverted appearance
             << false// inverted controls
             << list // key sequence
-            << 7;  // expected position
+            << 7;   // expected position
+
+    QTest::newRow("Page down once, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;   // expected position
+
+    QTest::newRow("Page down once, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
 
     QTest::newRow("Page down once, horizontal, both inverted")
             << 10   // initial position
@@ -689,7 +887,29 @@ void tst_QAbstractSlider::keyPressed_data()
             << false// inverted appearance
             << false// inverted controls
             << list // key sequence
-            << 7;  // expected position
+            << 7;   // expected position
+
+    QTest::newRow("Page down once, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 7;   // expected position
+
+    QTest::newRow("Page down once, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 13;  // expected position
 
     QTest::newRow("Page down once, vertical, both inverted")
             << 10   // initial position
@@ -715,6 +935,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 13;  // expected position
 
+    QTest::newRow("Page up once, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Page up once, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
     QTest::newRow("Page up once, horizontal, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -737,6 +979,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 13;  // expected position
 
+    QTest::newRow("Page up once, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 13;  // expected position
+
+    QTest::newRow("Page up once, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 7;  // expected position
+
     QTest::newRow("Page up once, vertical, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -762,6 +1026,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 50;  // expected position
 
+    QTest::newRow("Symmetric seq, horizontal, appearance inverted")
+            << 50   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 50;  // expected position
+
+    QTest::newRow("Symmetric seq, horizontal, controls inverted")
+            << 50   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 50;  // expected position
+
     QTest::newRow("Symmetric seq, horizontal, both inverted")
             << 50   // initial position
             << 0    // minimum
@@ -784,6 +1070,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 50;  // expected position
 
+    QTest::newRow("Symmetric seq, vertical, appearance inverted")
+            << 50   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 50;  // expected position
+
+    QTest::newRow("Symmetric seq, vertical, controls inverted")
+            << 50   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 50;  // expected position
+
     QTest::newRow("Symmetric seq, vertical, both inverted")
             << 50   // initial position
             << 0    // minimum
@@ -808,6 +1116,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 0;   // expected position
 
+    QTest::newRow("Home, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
+    QTest::newRow("Home, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
     QTest::newRow("Home, horizontal, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -830,6 +1160,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 0;   // expected position
 
+    QTest::newRow("Home, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
+    QTest::newRow("Home, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
     QTest::newRow("Home, vertical, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -854,6 +1206,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 100; // expected position
 
+    QTest::newRow("End, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 100; // expected position
+
+    QTest::newRow("End, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 100; // expected position
+
     QTest::newRow("End, horizontal, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -876,6 +1250,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 100; // expected position
 
+    QTest::newRow("End, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 100; // expected position
+
+    QTest::newRow("End, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 0    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 100; // expected position
+
     QTest::newRow("End, vertical, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -900,6 +1296,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 100; // expected position
 
+    QTest::newRow("Past end, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 100; // expected position
+
+    QTest::newRow("Past end, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 97;  // expected position
+
     QTest::newRow("Past end, horizontal, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -922,6 +1340,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 100; // expected position
 
+    QTest::newRow("Past end, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 100; // expected position
+
+    QTest::newRow("Past end, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 97;  // expected position
+
     QTest::newRow("Past end, vertical, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -946,6 +1386,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 0;   // expected position
 
+    QTest::newRow("Past home, horizontal, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << true // inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
+    QTest::newRow("Past home, horizontal, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 3;   // expected position
+
     QTest::newRow("Past home, horizontal, both inverted")
             << 10   // initial position
             << 0    // minimum
@@ -968,6 +1430,28 @@ void tst_QAbstractSlider::keyPressed_data()
             << list // key sequence
             << 0;   // expected position
 
+    QTest::newRow("Past home, vertical, appearance inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << false// inverted controls
+            << list // key sequence
+            << 0;   // expected position
+
+    QTest::newRow("Past home, vertical, controls inverted")
+            << 10   // initial position
+            << 0    // minimum
+            << 100  // maximum
+            << 3    // single step size
+            << 3    // page step size
+            << false// inverted appearance
+            << true // inverted controls
+            << list // key sequence
+            << 3;   // expected position
+
     QTest::newRow("Past home, vertical, both inverted")
             << 10   // initial position
             << 0    // minimum

From 9d76beee5be0812fdc8bd53c3145de95b45ab6a6 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 14 Dec 2018 14:18:39 +0100
Subject: [PATCH 3/9] qmake: don't mess up linking order of libraries

... which are specified by full filepath, by making the de-duplication
consistent with that applied to libs specified with -l, that is, last
one wins.

the problem existed "forever", but it became more visible after the
recent configure changes.

fwiw, Win32MakefileGenerator is not affected, because it has the
opposite problem: it de-duplicates everything (including object files)
in "last one wins mode". it might make sense to change that as well.

Change-Id: Id7ef1d394fcc9d444450672c06a6f11af2b19eab
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
---
 qmake/generators/unix/unixmake.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 50ec8db79e3..4cbe06d9dc6 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -399,6 +399,8 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
         libdirs.append(QMakeLocalFileName(dlib.toQString()));
     frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks"));
     frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks"));
+    ProStringList extens;
+    extens << project->first("QMAKE_EXTENSION_SHLIB") << "a";
     static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
                                            "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
     for (int i = 0; lflags[i]; i++) {
@@ -417,8 +419,6 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                     libdirs.insert(libidx++, f);
                 } else if(opt.startsWith("-l")) {
                     QString lib = opt.mid(2);
-                    ProStringList extens;
-                    extens << project->first("QMAKE_EXTENSION_SHLIB") << "a";
                     for (QList<QMakeLocalFileName>::Iterator dep_it = libdirs.begin();
                          dep_it != libdirs.end(); ++dep_it) {
                         QString libBase = (*dep_it).local() + '/'
@@ -521,8 +521,18 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                         lflags[arch].append(opt);
                     }
                 } else if(!opt.isNull()) {
+                    for (const ProString &ext : extens) {
+                        if (opt.size() > ext.size() && opt.endsWith(ext)
+                                && opt.at(opt.size() - ext.size() - 1) == '.') {
+                            // Make sure we keep the dependency order of libraries
+                            lflags[arch].removeAll(opt);
+                            lflags[arch].append(opt);
+                            goto found2;
+                        }
+                    }
                     if(!lflags[arch].contains(opt))
                         lflags[arch].append(opt);
+                  found2: ;
                 }
             }
 

From 74cdd89e0fd437ef4c4041f04c9aa522f2371615 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 13 Dec 2018 16:20:40 +0100
Subject: [PATCH 4/9] qmake: don't assign fallbacks for
 QMAKE_DEFAULT_{INC,LIB}DIRS in x-builds

these cannot be possibly correct, and might mislead.

Change-Id: Ie10531807978def04768e2429304949415cafb2a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/toolchain.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 55295f271f4..e8c3f81c8b4 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -178,7 +178,7 @@ isEmpty($${target_prefix}.INCDIRS) {
         QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
     }
 
-    unix {
+    unix:if(!cross_compile|host_build) {
         isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
         isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
     }

From 852b1afa5658d410a270a09ee7b94572df52ccbe Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 13 Dec 2018 17:53:38 +0100
Subject: [PATCH 5/9] qmake: don't misuse cache()

... when QMAKE_DEFAULT_{INC,LIB}DIRS cannot be determined.

it would have been nicer to actually persist empty results, but cache()
won't do that, and fixing it doesn't seem worth the effort now.

Change-Id: I95d5645e40a0da572f0def16462703373eaeb804
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/toolchain.prf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index e8c3f81c8b4..63f2f12e21a 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -183,8 +183,11 @@ isEmpty($${target_prefix}.INCDIRS) {
         isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
     }
 
-    cache($${target_prefix}.INCDIRS, set stash, QMAKE_DEFAULT_INCDIRS)
-    cache($${target_prefix}.LIBDIRS, set stash, QMAKE_DEFAULT_LIBDIRS)
+    # cache() complains about undefined variables and doesn't persist empty ones.
+    !isEmpty(QMAKE_DEFAULT_INCDIRS): \
+        cache($${target_prefix}.INCDIRS, set stash, QMAKE_DEFAULT_INCDIRS)
+    !isEmpty(QMAKE_DEFAULT_LIBDIRS): \
+        cache($${target_prefix}.LIBDIRS, set stash, QMAKE_DEFAULT_LIBDIRS)
 } else {
     QMAKE_DEFAULT_INCDIRS = $$eval($${target_prefix}.INCDIRS)
     QMAKE_DEFAULT_LIBDIRS = $$eval($${target_prefix}.LIBDIRS)

From a8cb177d31d45a8cfee16b2c82131d1474d1d2e5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 11 Dec 2018 15:02:16 +0100
Subject: [PATCH 6/9] Fix build with win32-clang-msvc and win32-icc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fbbe8aba9d70a3c13d1cd7797eb4dbbd1f05ade5 introduced a check for
MSVC_VER to qmake, which is not set in win32-clang-msvc,
causing the build to fail:

Mkspec does not specify MSVC_VER. Cannot continue.
Unable to generate output for: .../config.tests/verifyspec/Makefile

Extract a minimal msvc-based-version.conf which determines
MSVC_VER from QMAKE_MSC_VER for win32-clang-msvc and win32-icc.

Task-number: QTBUG-63512
Change-Id: Ia6de8c4b1aae2ae1962cf4e60e3e6d51fdbbbabe
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 mkspecs/common/msvc-based-version.conf | 32 ++++++++++++++++++++++++++
 mkspecs/common/msvc-version.conf       | 10 +++-----
 mkspecs/features/toolchain.prf         |  6 ++++-
 3 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 mkspecs/common/msvc-based-version.conf

diff --git a/mkspecs/common/msvc-based-version.conf b/mkspecs/common/msvc-based-version.conf
new file mode 100644
index 00000000000..38aecbaf59a
--- /dev/null
+++ b/mkspecs/common/msvc-based-version.conf
@@ -0,0 +1,32 @@
+#
+# qmake configuration for Compilers based on the Microsoft Visual Studio
+# C/C++ Compilers like win32-clang-msvc
+
+#
+# Version-specific changes
+#
+
+isEmpty(QMAKE_MSC_VER): error("msvc-based-version.conf loaded but QMAKE_MSC_VER isn't set")
+
+MSVC_VER = 14.0
+COMPAT_MKSPEC       = win32-msvc2015
+
+# -utf-8 compiler option for Visual Studio 2015 Update 2
+greaterThan(QMAKE_MSC_FULL_VER, 190023918):!intel_icl {
+    isEmpty(QT_CLANG_MAJOR_VERSION)|!lessThan(QT_CLANG_MAJOR_VERSION, 4) {
+        QMAKE_CFLAGS_UTF8_SOURCE = -utf-8
+    }
+}
+
+greaterThan(QMAKE_MSC_VER, 1909) {
+    # Visual Studio 2017 (15.0) / Visual C++ 19.10 and up
+    MSVC_VER            = 15.0
+    COMPAT_MKSPEC       = win32-msvc2017
+}
+
+greaterThan(QMAKE_MSC_VER, 1910) {
+    # No compat spec past MSVC 2017
+    COMPAT_MKSPEC       =
+}
+
+!isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC
diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf
index 3fb55c9d816..de8ba56b7b8 100644
--- a/mkspecs/common/msvc-version.conf
+++ b/mkspecs/common/msvc-version.conf
@@ -1,7 +1,6 @@
 #
 # qmake configuration for Microsoft Visual Studio C/C++ Compiler
-# This file is used by win32-msvc, win32-clang-msvc, and all
-# winrt-XXX-msvcXXX specs
+# This file is used by win32-msvc and all winrt-XXX-msvcXXX specs
 #
 
 #
@@ -70,11 +69,8 @@ greaterThan(QMAKE_MSC_VER, 1899) {
     QMAKE_CXXFLAGS     += -Zc:strictStrings -Zc:throwingNew
     QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 -wd4577 -wd4467
 
-    greaterThan(QMAKE_MSC_FULL_VER, 190023918):!intel_icl {
-        isEmpty(QT_CLANG_MAJOR_VERSION)|!lessThan(QT_CLANG_MAJOR_VERSION, 4) {
-            QMAKE_CFLAGS_UTF8_SOURCE = -utf-8
-        }
-    }
+    # -utf-8 compiler option for Visual Studio 2015 Update 2
+    greaterThan(QMAKE_MSC_FULL_VER, 190023918): QMAKE_CFLAGS_UTF8_SOURCE = -utf-8
 }
 
 greaterThan(QMAKE_MSC_VER, 1909) {
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 63f2f12e21a..c7ea20e180e 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -281,4 +281,8 @@ QMAKE_COMPILER_DEFINES += __cplusplus=$$QT_COMPILER_STDCXX
 QMAKE_CFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
 
-msvc:!intel_icl:!clang_cl: include(../common/msvc-version.conf)
+clang_cl|intel_icl {
+    include(../common/msvc-based-version.conf)
+} else: msvc {
+    include(../common/msvc-version.conf)
+}

From 3c3a2eb3cea0bbb0b45e43278421e051c253e434 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 14 Dec 2018 09:27:15 +0100
Subject: [PATCH 7/9] uic: Generate version check macros around newly
 introduced palette color role
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change ebd3a13b807c6af2684b42d3912549caf7ef82aa introduced a new
QPaletter::PlaceholderText color role which causes the uic-generated
code not to compile when using Qt Designer embedded in Qt Creator with
older (5.9 LTS) kits. Generate a version check macro to fix this.

Change-Id: I6d9f7edb0c6047c2f64ef3357b29f91655c52aac
Fixes: QTBUG-72555
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/tools/uic/cpp/cppwriteinitialization.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 4f6ac1eb974..7ab6c31cb20 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -35,6 +35,7 @@
 #include "globaldefs.h"
 
 #include <qtextstream.h>
+#include <qversionnumber.h>
 #include <qdebug.h>
 
 #include <algorithm>
@@ -1765,6 +1766,13 @@ QString WriteInitialization::domColor2QString(const DomColor *c)
         .arg(c->elementBlue());
 }
 
+static inline QVersionNumber colorRoleVersionAdded(const QString &roleName)
+{
+    if (roleName == QLatin1String("PlaceholderText"))
+        return QVersionNumber(5, 12, 0);
+    return QVersionNumber();
+}
+
 void WriteInitialization::writeColorGroup(DomColorGroup *colorGroup, const QString &group, const QString &paletteName)
 {
     if (!colorGroup)
@@ -1785,10 +1793,19 @@ void WriteInitialization::writeColorGroup(DomColorGroup *colorGroup, const QStri
     const auto &colorRoles = colorGroup->elementColorRole();
     for (const DomColorRole *colorRole : colorRoles) {
         if (colorRole->hasAttributeRole()) {
+            const QString roleName = colorRole->attributeRole();
+            const QVersionNumber versionAdded = colorRoleVersionAdded(roleName);
             const QString brushName = writeBrushInitialization(colorRole->elementBrush());
+            if (!versionAdded.isNull()) {
+                m_output << "#if QT_VERSION >= QT_VERSION_CHECK("
+                    << versionAdded.majorVersion() << ", " << versionAdded.minorVersion()
+                    << ", " << versionAdded.microVersion() << ")\n";
+            }
             m_output << m_indent << paletteName << ".setBrush(" << group
-                << ", " << "QPalette::" << colorRole->attributeRole()
+                << ", " << "QPalette::" << roleName
                 << ", " << brushName << ");\n";
+            if (!versionAdded.isNull())
+                m_output << "#endif\n";
         }
     }
 }

From 3e4f8aa8f434d791b3dfe9450bad85b82406d4b3 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 11 Dec 2018 12:48:12 -0800
Subject: [PATCH 8/9] Doc: fix null pointer passing to fprintf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When these docs were written, the context.file and context.function
pointers were never null. But in commit d78fb442d750b33afe2e41f31588ec94
(Qt 5.4), we made the logging pass null pointers in release builds. The
C standard does not say that passing null pointers is permitted. In
fact, it says "If no l length modifier is present, the argument shall be
a pointer to the initial element of an array of character type." and
that's pretty explicit that it needs to point to the initial element of
a string.

Fixes: QTBUG-72478
Change-Id: I4ac1156702324f0fb814fffd156f624ffefa1445
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 .../doc/snippets/code/src_corelib_global_qglobal.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
index 02486403695..03904659f58 100644
--- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
@@ -279,21 +279,23 @@ const TInputType &myMin(const TInputType &value1, const TInputType &value2)
 void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
     QByteArray localMsg = msg.toLocal8Bit();
+    const char *file = context.file ? context.file : "";
+    const char *function = context.function ? context.function : "";
     switch (type) {
     case QtDebugMsg:
-        fprintf(stderr, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        fprintf(stderr, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
         break;
     case QtInfoMsg:
-        fprintf(stderr, "Info: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        fprintf(stderr, "Info: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
         break;
     case QtWarningMsg:
-        fprintf(stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        fprintf(stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
         break;
     case QtCriticalMsg:
-        fprintf(stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        fprintf(stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
         break;
     case QtFatalMsg:
-        fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
         break;
     }
 }

From e9c08f8287556742fbb927653b4c2d071923e5a7 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 22 May 2018 21:17:11 -0300
Subject: [PATCH 9/9] Mark ICC 18 & 19 as warning-free
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I052407b777ec43f78378fffd15311de83f978817
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
---
 mkspecs/features/qt_common.prf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index e67b79acc37..6cb2e78c1c9 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -112,16 +112,17 @@ warnings_are_errors:warning_clean {
             QMAKE_CXXFLAGS_WARN_ON += -Werror -Wno-error=\\$${LITERAL_HASH}warnings -Wno-error=deprecated-declarations $$WERROR
         }
     } else:intel_icc:linux {
-        # Intel CC 13.0 - 17.0, on Linux only
+        # Intel CC 13.0 - 18.0, on Linux only
         ver = $${QT_ICC_MAJOR_VERSION}.$${QT_ICC_MINOR_VERSION}
-        linux:contains(ver, "(1[3456]\\.|17\\.0)") {
+        linux:contains(ver, "(1[345678]\\.|19\\.0)") {
             # 177: function "entity" was declared but never referenced
             #      (too aggressive; ICC reports even for functions created due to template instantiation)
             # 1224: #warning directive
             # 1478: function "entity" (declared at line N) was declared deprecated
+            # 1786: function "entity" (declared at line N of "file") was declared deprecated ("message")
             # 1881: argument must be a constant null pointer value
             #      (NULL in C++ is usually a literal 0)
-            QMAKE_CXXFLAGS_WARN_ON += -Werror -ww177,1224,1478,1881 $$WERROR
+            QMAKE_CXXFLAGS_WARN_ON += -Werror -ww177,1224,1478,1786,1881 $$WERROR
         }
     } else:gcc:!clang:!intel_icc:!rim_qcc {
         # GCC 4.6-4.9, 5.x, ...