Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827

13 files changed, 99 insertions, 54 deletions

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 7cc043e247..f9eb8b6159 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -43,6 +43,8 @@
 
 #include "qcombobox.h"
 #include <private/qcombobox_p.h>
+#include <private/qguiapplication_p.h>
+#include <qplatformtheme_qpa.h>
 
 #include <qfontcombobox.h>
 #include <qdesktopwidget.h>
@@ -1915,19 +1917,15 @@ void tst_QComboBox::itemListPosition()
     QWidget topLevel;
     QFontComboBox combo(&topLevel);
 
-    //the code to get the avaialbe screen space is copied from QComboBox code
+    //the code to get the available screen space is copied from QComboBox code
     const int scrNumber = QApplication::desktop()->screenNumber(&combo);
-    QRect screen;
-#ifdef Q_WS_WIN
-    screen = QApplication::desktop()->screenGeometry(scrNumber);
-#elif defined Q_WS_X11
-    if (X11->desktopEnvironment == DE_KDE)
-        screen = QApplication::desktop()->screenGeometry(scrNumber);
-    else
-        screen = QApplication::desktop()->availableGeometry(scrNumber);
-#else
-    screen = QApplication::desktop()->availableGeometry(scrNumber);
-#endif
+
+    bool useFullScreenForPopupMenu = false;
+    if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme())
+        useFullScreenForPopupMenu = theme->themeHint(QPlatformTheme::UseFullScreenForPopupMenu).toBool();
+    const QRect screen = useFullScreenForPopupMenu ?
+                         QApplication::desktop()->screenGeometry(scrNumber) :
+                         QApplication::desktop()->availableGeometry(scrNumber);
 
     combo.move(screen.width()-combo.sizeHint().width(), 0); //puts the combo to the top-right corner
 
diff --git a/tests/auto/widgets/widgets/qlineedit/qlineedit.pro b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
index 77b2ae537c..83f93f0ba0 100644
--- a/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
+++ b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
@@ -1,6 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qlineedit
-QT += widgets testlib
+QT += gui-private core-private widgets testlib
 SOURCES  += tst_qlineedit.cpp
 
-CONFIG += insignificant_test # QTBUG-21402
+# QTBUG-24518 - unstable test
+linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 645f47fc72..81dc940c00 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -48,6 +48,8 @@
 #include "qvalidator.h"
 #include "qcompleter.h"
 #include "qstandarditemmodel.h"
+#include "qplatformtheme_qpa.h"
+#include <private/qguiapplication_p.h>
 
 #ifndef QT_NO_CLIPBOARD
 #include "qclipboard.h"
@@ -300,6 +302,7 @@ private:
     int lastCursorPos;
     int newCursorPos;
     QLineEdit *testWidget;
+    int m_keyboardScheme;
 };
 
 typedef QList<int> IntList;
@@ -327,9 +330,16 @@ void tst_QLineEdit::getSetCheck()
     QCOMPARE(true, obj1.dragEnabled());
 }
 
-tst_QLineEdit::tst_QLineEdit()
+tst_QLineEdit::tst_QLineEdit() : validInput(false), m_keyboardScheme(0)
 {
-    validInput = false;
+    if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme())
+        m_keyboardScheme = theme->themeHint(QPlatformTheme::KeyboardScheme).toInt();
+    // Generalize for X11
+    if (m_keyboardScheme == QPlatformTheme::KdeKeyboardScheme
+            || m_keyboardScheme == QPlatformTheme::GnomeKeyboardScheme
+            || m_keyboardScheme == QPlatformTheme::CdeKeyboardScheme) {
+        m_keyboardScheme = QPlatformTheme::X11KeyboardScheme;
+    }
 }
 
 tst_QLineEdit::~tst_QLineEdit()
@@ -1071,25 +1081,26 @@ void tst_QLineEdit::undo()
     QVERIFY(!testWidget->isUndoAvailable());
     QVERIFY(testWidget->text().isEmpty());
 
-#ifdef Q_WS_WIN
-    // Repeat the test using shortcut instead of undo()
-    for (i=0; i<insertString.size(); ++i) {
-        if (insertIndex[i] > -1)
-            testWidget->setCursorPosition(insertIndex[i]);
-        if (insertMode[i] == REPLACE_UNTIL_END) {
-            testWidget->setSelection(insertIndex[i], 8);
+
+    if (m_keyboardScheme == QPlatformTheme::WindowsKeyboardScheme) {
+        // Repeat the test using shortcut instead of undo()
+        for (i=0; i<insertString.size(); ++i) {
+            if (insertIndex[i] > -1)
+                testWidget->setCursorPosition(insertIndex[i]);
+            if (insertMode[i] == REPLACE_UNTIL_END)
+                testWidget->setSelection(insertIndex[i], 8);
+            if (use_keys)
+                QTest::keyClicks(testWidget, insertString[i]);
+            else
+                testWidget->insert(insertString[i]);
+        }
+        for (i=0; i<expectedString.size()-1; ++i) {
+            QCOMPARE(testWidget->text(), expectedString[i]);
+            QVERIFY(testWidget->isUndoAvailable());
+            QTest::keyClick(testWidget, Qt::Key_Backspace, Qt::AltModifier);
         }
-        if (use_keys)
-            QTest::keyClicks(testWidget, insertString[i]);
-        else
-            testWidget->insert(insertString[i]);
-    }
-    for (i=0; i<expectedString.size()-1; ++i) {
-        QCOMPARE(testWidget->text(), expectedString[i]);
-        QVERIFY(testWidget->isUndoAvailable());
-        QTest::keyClick(testWidget, Qt::Key_Backspace, Qt::AltModifier);
     }
-#endif
+
 }
 
 void tst_QLineEdit::redo_data()
@@ -1152,21 +1163,22 @@ void tst_QLineEdit::redo()
 
     QVERIFY(!testWidget->isRedoAvailable());
 
-#ifdef Q_WS_WIN
-    // repeat test, this time using shortcuts instead of undo()/redo()
 
-    while (!testWidget->text().isEmpty())
-        QTest::keyClick(testWidget, Qt::Key_Backspace, Qt::AltModifier);
+    if (m_keyboardScheme == QPlatformTheme::WindowsKeyboardScheme) {
+        // repeat test, this time using shortcuts instead of undo()/redo()
 
-    for (i = 0; i < expectedString.size(); ++i) {
-        QVERIFY(testWidget->isRedoAvailable());
-        QTest::keyClick(testWidget, Qt::Key_Backspace,
-                        Qt::ShiftModifier | Qt::AltModifier);
-        QCOMPARE(testWidget->text() , expectedString[i]);
-    }
+        while (!testWidget->text().isEmpty())
+            QTest::keyClick(testWidget, Qt::Key_Backspace, Qt::AltModifier);
 
-    QVERIFY(!testWidget->isRedoAvailable());
-#endif
+        for (i = 0; i < expectedString.size(); ++i) {
+            QVERIFY(testWidget->isRedoAvailable());
+            QTest::keyClick(testWidget, Qt::Key_Backspace,
+                            Qt::ShiftModifier | Qt::AltModifier);
+            QCOMPARE(testWidget->text() , expectedString[i]);
+        }
+
+        QVERIFY(!testWidget->isRedoAvailable());
+    }
 }
 
 void tst_QLineEdit::undo_keypressevents_data()
@@ -1263,7 +1275,7 @@ void tst_QLineEdit::undo_keypressevents_data()
 
         // unselect any current selection
         keys.addKeyClick(Qt::Key_Right);
-#ifdef Q_WS_WIN //Mac has a specialcase to handle jumping to the end of a selection
+#ifdef Q_OS_WIN //Mac has a specialcase to handle jumping to the end of a selection
         keys.addKeyClick(Qt::Key_Left);
 #endif
 
@@ -3080,6 +3092,7 @@ void tst_QLineEdit::leftKeyOnSelectedText()
 #ifdef Q_OS_WIN
     QCOMPARE(testWidget->cursorPosition(), 1);
 #else
+    // Selection is cleared ands cursor remains at position 2.
     // X11 used to behave like window prior to 4.2. Changes caused by QKeySequence
     // resulted in an inadvertant change in behavior
     QCOMPARE(testWidget->cursorPosition(), 2);
@@ -3603,6 +3616,9 @@ void tst_QLineEdit::taskQTBUG_7902_contextMenuCrash()
 
 void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut()
 {
+#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
+    QSKIP("QTBUG-24518 - Unstable test for Ubuntu 11.10");
+#endif
     //ReadOnly QLineEdit should not intercept shortcut.
     QLineEdit le;
     le.setReadOnly(true);
@@ -3624,9 +3640,8 @@ void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut()
 
 void tst_QLineEdit::QTBUG697_paletteCurrentColorGroup()
 {
-#ifndef Q_WS_X11
-    QSKIP("Only tested on X11");
-#endif
+    if (m_keyboardScheme != QPlatformTheme::X11KeyboardScheme)
+        QSKIP("Only tested on X11");
     QLineEdit le;
     le.setText("               ");
     QPalette p = le.palette();
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 13540355c7..0f07546559 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -101,6 +101,7 @@ private slots:
     void centralWidgetSize();
     void dockWidgetSize();
     void QTBUG2774_stylechange();
+    void QTBUG15080_restoreState();
     void toggleUnifiedTitleAndToolBarOnMac();
 };
 
@@ -1705,6 +1706,41 @@ void tst_QMainWindow::QTBUG2774_stylechange()
     }
 }
 
+void tst_QMainWindow::QTBUG15080_restoreState()
+{
+    QByteArray state;
+
+    //save state
+    {
+        QMainWindow mw1;
+        QDockWidget * dw1 = new  QDockWidget();
+        dw1->setObjectName("Left DockWidget");
+        mw1.addDockWidget(Qt::LeftDockWidgetArea, dw1);
+        mw1.setCentralWidget(new QTextEdit());
+        mw1.show();
+        QApplication::processEvents();
+        dw1->setFixedWidth(101);
+        QApplication::processEvents();
+
+        state = mw1.saveState();
+    }
+
+    //restore state
+
+    QMainWindow mw2;
+    QDockWidget * dw2 = new  QDockWidget();
+    dw2->setObjectName("Left DockWidget");
+    mw2.addDockWidget(Qt::LeftDockWidgetArea, dw2);
+    mw2.setCentralWidget(new QTextEdit());
+    mw2.restoreState(state);
+    //QTBUG15080 caused by setStyleSheet
+    mw2.setStyleSheet("color:red");
+    mw2.show();
+    QApplication::processEvents();
+
+    QCOMPARE(dw2->width(), 101);
+}
+
 void tst_QMainWindow::toggleUnifiedTitleAndToolBarOnMac()
 {
 #ifdef Q_OS_MAC
diff --git a/tests/auto/widgets/widgets/qmenu/qmenu.pro b/tests/auto/widgets/widgets/qmenu/qmenu.pro
index 55099f1c54..9efd0302bf 100644
--- a/tests/auto/widgets/widgets/qmenu/qmenu.pro
+++ b/tests/auto/widgets/widgets/qmenu/qmenu.pro
@@ -3,4 +3,3 @@ TARGET = tst_qmenu
 QT += widgets testlib
 SOURCES  += tst_qmenu.cpp
 
-win32:CONFIG += insignificant_test # QTBUG-24325
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index 9989e5e7aa..6a1f418739 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -50,10 +50,6 @@
 #include <qaction.h>
 #include <qstyleoption.h>
 
-#ifdef Q_WS_WIN
-#include <windows.h>
-#endif
-
 #include <qobject.h>
 
 QT_FORWARD_DECLARE_CLASS(QMainWindow)
diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png
index ced6eb6e5b..b9df19eeb3 100644
--- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png
diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png
index 481b99c7fc..792593ff12 100644
--- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png
diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png
index 292d3f9d4c..02e5e93380 100644
--- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png
diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png
index 69b72ede09..5ef32d2d19 100644
--- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png
diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png
index 467b91e6e0..d877e1b656 100644
--- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png
diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png
index cce921b0cc..411c0859aa 100644
--- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png
diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png
index 937494ac3c..55d060af1f 100644
--- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png