Merge remote branch 'qt/master' into lighthouse-master

Conflicts:
	configure
	src/corelib/global/qglobal.h
	src/corelib/tools/qsimd.cpp

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp
index 6498ae4..49d6633 100644
--- a/tests/auto/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/qstatictext/tst_qstatictext.cpp
@@ -73,6 +73,8 @@ private slots:
     void prepareToCorrectData();
     void prepareToWrongData();
 
+    void copyConstructor();
+
     void translatedPainter();
     void rotatedPainter();
     void scaledPainter();
@@ -107,6 +109,31 @@ void tst_QStaticText::constructionAndDestruction()
     QStaticText text("My text");
 }
 
+void tst_QStaticText::copyConstructor()
+{
+    QStaticText text(QLatin1String("My text"));
+
+    QTextOption textOption(Qt::AlignRight);
+    text.setTextOption(textOption);
+
+    text.setPerformanceHint(QStaticText::AggressiveCaching);
+    text.setTextWidth(123.456);
+    text.setTextFormat(Qt::PlainText);
+
+    QStaticText copiedText(text);
+    copiedText.setText(QLatin1String("Other text"));
+
+    QCOMPARE(copiedText.textOption().alignment(), Qt::AlignRight);
+    QCOMPARE(copiedText.performanceHint(), QStaticText::AggressiveCaching);
+    QCOMPARE(copiedText.textWidth(), 123.456);
+    QCOMPARE(copiedText.textFormat(), Qt::PlainText);
+
+    QStaticText otherCopiedText(copiedText);
+    otherCopiedText.setTextWidth(789);
+
+    QCOMPARE(otherCopiedText.text(), QString::fromLatin1("Other text"));
+}
+
 Q_DECLARE_METATYPE(QStaticText::PerformanceHint)
 void tst_QStaticText::drawToPoint_data()
 {