Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/widgets/styles/qwindowsxpstyle.cpp
	tests/auto/gui/kernel/qwindow/qwindow.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3

10 files changed, 115 insertions, 8 deletions

diff --git a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
index 3810546146..cfe26d23e7 100644
--- a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
+++ b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
@@ -122,6 +122,8 @@ private slots:
     void update();
     void query();
     void inputDirection();
+    void inputMethodAccepted();
+
 private:
     InputItem m_inputItem;
     PlatformInputContext m_platformInputContext;
@@ -304,5 +306,23 @@ void tst_qinputmethod::inputDirection()
     QCOMPARE(m_platformInputContext.m_localeCallCount, 1);
 }
 
+void tst_qinputmethod::inputMethodAccepted()
+{
+    InputItem disabledItem;
+    disabledItem.setEnabled(false);
+
+    DummyWindow window;
+    window.show();
+    QTest::qWaitForWindowShown(&window);
+    window.requestActivateWindow();
+    QTRY_COMPARE(qApp->focusWindow(), &window);
+    window.setFocusObject(&disabledItem);
+
+    QCOMPARE(m_platformInputContext.inputMethodAccepted(), false);
+
+    window.setFocusObject(&m_inputItem);
+    QCOMPARE(m_platformInputContext.inputMethodAccepted(), true);
+}
+
 QTEST_MAIN(tst_qinputmethod)
 #include "tst_qinputmethod.moc"
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index 861ad3835d..c4db74b6ec 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -422,7 +422,9 @@ void tst_QKeySequence::mnemonic()
     QFETCH(QString, key);
     QFETCH(bool, warning);
 
-#ifndef QT_NO_DEBUG
+#ifdef QT_NO_DEBUG
+    Q_UNUSED(warning)
+#else
     if (warning) {
         QString str = QString::fromLatin1("QKeySequence::mnemonic: \"%1\" contains multiple occurrences of '&'").arg(string);
         QTest::ignoreMessage(QtWarningMsg, qPrintable(str));
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index df58d8340b..3dc2886b80 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -69,6 +69,7 @@ private slots:
     void close();
     void activateAndClose();
     void mouseEventSequence();
+    void windowModality();
 
     void initTestCase()
     {
@@ -223,6 +224,9 @@ void tst_QWindow::isExposed()
 
     window.hide();
 
+#ifdef Q_OS_MAC
+    QEXPECT_FAIL("", "This test fails on Mac OS X, see QTBUG-23059", Abort);
+#endif
     QTRY_VERIFY(window.received(QEvent::Expose) > 1);
     QTRY_VERIFY(!window.isExposed());
 }
@@ -804,5 +808,36 @@ void tst_QWindow::mouseEventSequence()
     QCOMPARE(window.mouseSequenceSignature, QLatin1String("prprprpr"));
 }
 
+void tst_QWindow::windowModality()
+{
+    qRegisterMetaType<Qt::WindowModality>("Qt::WindowModality");
+
+    QWindow window;
+    QSignalSpy spy(&window, SIGNAL(windowModalityChanged(Qt::WindowModality)));
+
+    QCOMPARE(window.windowModality(), Qt::NonModal);
+    window.setWindowModality(Qt::NonModal);
+    QCOMPARE(window.windowModality(), Qt::NonModal);
+    QCOMPARE(spy.count(), 0);
+
+    window.setWindowModality(Qt::WindowModal);
+    QCOMPARE(window.windowModality(), Qt::WindowModal);
+    QCOMPARE(spy.count(), 1);
+    window.setWindowModality(Qt::WindowModal);
+    QCOMPARE(window.windowModality(), Qt::WindowModal);
+    QCOMPARE(spy.count(), 1);
+
+    window.setWindowModality(Qt::ApplicationModal);
+    QCOMPARE(window.windowModality(), Qt::ApplicationModal);
+    QCOMPARE(spy.count(), 2);
+    window.setWindowModality(Qt::ApplicationModal);
+    QCOMPARE(window.windowModality(), Qt::ApplicationModal);
+    QCOMPARE(spy.count(), 2);
+
+    window.setWindowModality(Qt::NonModal);
+    QCOMPARE(window.windowModality(), Qt::NonModal);
+    QCOMPARE(spy.count(), 3);
+}
+
 #include <tst_qwindow.moc>
 QTEST_MAIN(tst_QWindow)
diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
index f4cf586da1..26a68338a6 100644
--- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
+++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
@@ -42,7 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <qmatrix.h>
-#include <math.h>
+#include <qmath.h>
 #include <qpolygon.h>
 
 Q_DECLARE_METATYPE(QRect)
diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp
index e8374b0cae..38208d27c8 100644
--- a/tests/auto/gui/qopengl/tst_qopengl.cpp
+++ b/tests/auto/gui/qopengl/tst_qopengl.cpp
@@ -118,6 +118,7 @@ struct SharedResource : public QOpenGLSharedResource
     void freeResource(QOpenGLContext *context)
     {
         Q_ASSERT(context == QOpenGLContext::currentContext());
+        Q_UNUSED(context)
         resource = 0;
         if (tracker)
             tracker->freeResourceCalls++;
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
index c609b4a1ed..a33e3cd13b 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
@@ -47,6 +47,7 @@
 #include <qabstracttextdocumentlayout.h>
 #include <qimage.h>
 #include <qtextobject.h>
+#include <qfontmetrics.h>
 
 class tst_QAbstractTextDocumentLayout : public QObject
 {
@@ -59,6 +60,7 @@ public:
 private slots:
     void getSetCheck();
     void maximumBlockCount();
+    void anchorAt();
 };
 
 tst_QAbstractTextDocumentLayout::tst_QAbstractTextDocumentLayout()
@@ -152,5 +154,35 @@ void tst_QAbstractTextDocumentLayout::maximumBlockCount()
     QCOMPARE(layout.blockCount, 10);
 }
 
+void tst_QAbstractTextDocumentLayout::anchorAt()
+{
+    QTextDocument doc;
+    doc.setHtml("<a href=\"link\">foo</a>");
+    QAbstractTextDocumentLayout *documentLayout = doc.documentLayout();
+    QTextBlock firstBlock = doc.begin();
+    QTextLayout *layout = firstBlock.layout();
+    layout->setPreeditArea(doc.toPlainText().length(), "xxx");
+
+    doc.setPageSize(QSizeF(1000, 1000));
+    QFontMetrics metrics(layout->font());
+    QPointF blockStart = documentLayout->blockBoundingRect(firstBlock).topLeft();
+
+    // anchorAt on start returns link
+    QRect linkBr = metrics.boundingRect("foo");
+    QPointF linkPoint(linkBr.width() + blockStart.x(), (linkBr.height() / 2) + blockStart.y());
+    QCOMPARE(documentLayout->anchorAt(linkPoint), QString("link"));
+
+    // anchorAt() on top of preedit at end should not assert
+    QRect preeditBr = metrics.boundingRect(doc.toPlainText() + "xx");
+    QPointF preeditPoint(preeditBr.width() + blockStart.x(), (preeditBr.height() / 2) + blockStart.y());
+    QCOMPARE(documentLayout->anchorAt(preeditPoint), QString());
+
+    // preedit at start should not return link
+    layout->setPreeditArea(0, "xxx");
+    preeditBr = metrics.boundingRect("xx");
+    preeditPoint = QPointF(preeditBr.width() + blockStart.x(), (preeditBr.height() / 2) + blockStart.y());
+    QCOMPARE(documentLayout->anchorAt(preeditPoint), QString());
+}
+
 QTEST_MAIN(tst_QAbstractTextDocumentLayout)
 #include "tst_qabstracttextdocumentlayout.moc"
diff --git a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
index 034d08fc8f..c853aaa100 100644
--- a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
+++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
@@ -11,4 +11,3 @@ wince* {
 }
 
 mac: CONFIG += insignificant_test # QTBUG-23062
-win32:CONFIG += insignificant_test # QTBUG-24193
diff --git a/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro
index bb0d8e3c4a..f5cf957722 100644
--- a/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro
+++ b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro
@@ -3,5 +3,3 @@ TARGET = tst_qfontmetrics
 QT += testlib
 SOURCES  += tst_qfontmetrics.cpp
 RESOURCES += testfont.qrc
-
-win32:CONFIG += insignificant_test # QTBUG-24195
diff --git a/tests/auto/gui/text/qglyphrun/qglyphrun.pro b/tests/auto/gui/text/qglyphrun/qglyphrun.pro
index 97b9806c11..acdff0584f 100644
--- a/tests/auto/gui/text/qglyphrun/qglyphrun.pro
+++ b/tests/auto/gui/text/qglyphrun/qglyphrun.pro
@@ -10,5 +10,3 @@ wince* {
 } else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
-
-win32:CONFIG += insignificant_test # QTBUG-24196
diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index a88e93c93e..d566f0a20d 100644
--- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -105,7 +105,7 @@ private slots:
 
     void thaiIsolatedSaraAm();
     void thaiWithZWJ();
-
+    void thaiMultipleVowels();
 private:
     bool haveTestFonts;
 };
@@ -1325,5 +1325,27 @@ void tst_QTextScriptEngine::thaiWithZWJ()
         QCOMPARE((bool)e->layoutData->glyphLayout.attributes[i].dontPrint, (i == 1 || i == 3));
 }
 
+void tst_QTextScriptEngine::thaiMultipleVowels()
+{
+    QString s(QString::fromUtf8("ส"));
+    for (int i = 0; i < 100; i++)
+        s += QChar(0x0E47); // Add lots of "VOWEL SIGN MAI TAI KHU N/S-T"  stacked on top of the character
+    s += QChar(0x200D); // Now add a zero width joiner (which adds a circle which is hidden)
+    for (int i = 0; i < 100; i++)
+        s += QChar(0x0E47); //Add lots of "VOWEL SIGN MAI TAI KHU N/S-T"  stacked on top of the ZWJ
+
+    for (int i = 0; i < 10; i++)
+        s += s; //Repeat the string to make it more likely to crash if we have a buffer overflow
+    QTextLayout layout(s);
+    layout.beginLayout();
+    layout.createLine();
+    layout.endLayout();
+
+    QTextEngine *e = layout.engine();
+    e->width(0, s.length()); //force itemize and shape
+
+    // If we haven't crashed at this point, then the test has passed.
+}
+
 QTEST_MAIN(tst_QTextScriptEngine)
 #include "tst_qtextscriptengine.moc"