Merge 5.12 into 5.12.2

Change-Id: I3a5721aebd3afd8fa08d3f3df6bf61502fa9c347

2 files changed, 23 insertions, 1 deletions

diff --git a/tests/auto/gui/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro
index d744d37280..722c99ee0b 100644
--- a/tests/auto/gui/qopengl/qopengl.pro
+++ b/tests/auto/gui/qopengl/qopengl.pro
@@ -8,4 +8,4 @@ QT += gui-private core-private testlib
 
 SOURCES   += tst_qopengl.cpp
 
-linux:qtConfig(xcb):qtConfig(xcb-glx):qtConfig(xcb-xlib):!qtConfig(egl): DEFINES += USE_GLX
+linux:qtConfig(xcb):qtConfig(xcb-glx-plugin): DEFINES += USE_GLX
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 3e354b7523..d652bb066d 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -195,6 +195,8 @@ private slots:
     void css_linkPseudo();
     void css_pageBreaks();
     void css_cellPaddings();
+    void css_whiteSpace_data();
+    void css_whiteSpace();
     void universalSelectors_data();
     void universalSelectors();
     void screenMedia();
@@ -1770,6 +1772,26 @@ void tst_QTextDocumentFragment::css_cellPaddings()
     QCOMPARE(cell.format().toTableCellFormat().bottomPadding(), qreal(15));
 }
 
+void tst_QTextDocumentFragment::css_whiteSpace_data()
+{
+    QTest::addColumn<QString>("htmlText");
+    QTest::addColumn<bool>("nowrap");
+
+    QTest::newRow("default") << QString("<p>Normal Text</p>") << false;
+    QTest::newRow("white-space:nowrap") << QString("<p style=white-space:nowrap>Normal Text</p>") << true;
+    QTest::newRow("white-space:pre") << QString("<p style=white-space:pre>Normal Text</p>") << true;
+}
+
+void tst_QTextDocumentFragment::css_whiteSpace()
+{
+    QFETCH(QString, htmlText);
+    QFETCH(bool, nowrap);
+
+    doc->setHtml(htmlText);
+    QCOMPARE(doc->blockCount(), 1);
+    QCOMPARE(doc->begin().blockFormat().nonBreakableLines(), nowrap);
+}
+
 void tst_QTextDocumentFragment::html_blockLevelDiv()
 {
     const char html[] = "<div align=right><b>Hello World";