Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

9 files changed, 32 insertions, 26 deletions

diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-128.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-128.png
new file mode 100644
index 0000000000..8a052e829d
--- /dev/null
+++ b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-128.png
diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-16.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-16.png
new file mode 100644
index 0000000000..08cdc2b91f
--- /dev/null
+++ b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-16.png
diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-32.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-32.png
new file mode 100644
index 0000000000..db33c79852
--- /dev/null
+++ b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-32.png
diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-128.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-128.png
new file mode 100644
index 0000000000..fc6fd7ce1d
--- /dev/null
+++ b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-128.png
diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-16.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-16.png
new file mode 100644
index 0000000000..dd4e228280
--- /dev/null
+++ b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-16.png
diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-32.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-32.png
new file mode 100644
index 0000000000..177678c963
--- /dev/null
+++ b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-32.png
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 6c62d6f1b4..2ce6fc5058 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -375,32 +375,32 @@ void tst_QIcon::detach()
 void tst_QIcon::addFile()
 {
     QIcon icon;
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png"));
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png"));
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected);
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected);
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected);
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-32.png"));
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-128.png"));
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected);
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected);
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected);
 
 #ifndef Q_OS_WINCE
     QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
     QVERIFY(icon.pixmap(32, QIcon::Normal).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-open-32.png")).toImage());
     QVERIFY(icon.pixmap(128, QIcon::Normal).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-open-128.png")).toImage());
     QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
     QVERIFY(icon.pixmap(32, QIcon::Selected).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-save-32.png")).toImage());
     QVERIFY(icon.pixmap(128, QIcon::Selected).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-save-128.png")).toImage());
 #else
     // WinCE only includes the 16x16 images for size reasons
     QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
     QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
 #endif
 }
 
@@ -437,11 +437,8 @@ void tst_QIcon::availableSizes()
 
     {
         // we try to load an icon from resources
-        QIcon icon(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
+        QIcon icon(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
         QList<QSize> availableSizes = icon.availableSizes();
-#ifdef QT_NO_WIDGETS
-        QEXPECT_FAIL("", "See QTBUG-31993", Abort);
-#endif
         QCOMPARE(availableSizes.size(), 1);
         QCOMPARE(availableSizes.at(0), QSize(16, 16));
     }
@@ -449,7 +446,7 @@ void tst_QIcon::availableSizes()
     {
         // load an icon from binary data.
         QPixmap pix;
-        QFile file(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
+        QFile file(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
         QVERIFY(file.open(QIODevice::ReadOnly));
         uchar *data = file.map(0, file.size());
         QVERIFY(data != 0);
@@ -629,18 +626,15 @@ void tst_QIcon::fromTheme()
 void tst_QIcon::task223279_inconsistentAddFile()
 {
     QIcon icon1;
-    icon1.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
+    icon1.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
     icon1.addFile(QLatin1String("IconThatDoesntExist"), QSize(32, 32));
     QPixmap pm1 = icon1.pixmap(32, 32);
 
     QIcon icon2;
-    icon2.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
+    icon2.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
     icon2.addFile(QLatin1String("IconThatDoesntExist"));
     QPixmap pm2 = icon1.pixmap(32, 32);
 
-#ifdef QT_NO_WIDGETS
-        QEXPECT_FAIL("", "See QTBUG-31993", Abort);
-#endif
     QCOMPARE(pm1.isNull(), false);
     QCOMPARE(pm1.size(), QSize(16,16));
     QCOMPARE(pm1.isNull(), pm2.isNull());
diff --git a/tests/auto/gui/image/qicon/tst_qicon.qrc b/tests/auto/gui/image/qicon/tst_qicon.qrc
index 7925a33c84..469a0a21b4 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.qrc
+++ b/tests/auto/gui/image/qicon/tst_qicon.qrc
@@ -16,5 +16,11 @@
 <file>./icons/themeparent/index.theme</file>
 <file>./icons/themeparent/scalable/actions/address-book-new.svg</file>
 <file>./icons/themeparent/scalable/actions/appointment-new.svg</file>
+<file>./styles/commonstyle/images/standardbutton-open-16.png</file>
+<file>./styles/commonstyle/images/standardbutton-open-32.png</file>
+<file>./styles/commonstyle/images/standardbutton-open-128.png</file>
+<file>./styles/commonstyle/images/standardbutton-save-16.png</file>
+<file>./styles/commonstyle/images/standardbutton-save-32.png</file>
+<file>./styles/commonstyle/images/standardbutton-save-128.png</file>
 </qresource>
 </RCC>
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
index ed07b3fab5..663f664d94 100644
--- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -372,8 +372,8 @@ public:
     int leaves;
     int enters;
 
-    inline BlockableWindow()
-        : QWindow(), blocked(false), leaves(0), enters(0) {}
+    inline explicit BlockableWindow(QWindow *parent = 0)
+        : QWindow(parent), blocked(false), leaves(0), enters(0) {}
 
     bool event(QEvent *e)
     {
@@ -416,10 +416,13 @@ void tst_QGuiApplication::modalWindow()
     window1->setTitle(QStringLiteral("window1"));
     window1->resize(windowSize, windowSize);
     window1->setFramePosition(QPoint(x, y));
+    BlockableWindow *childWindow1 = new BlockableWindow(window1.data());
+    childWindow1->resize(windowSize / 2, windowSize / 2);
     x += spacing + windowSize;
 
     QScopedPointer<BlockableWindow> window2(new BlockableWindow);
     window2->setTitle(QStringLiteral("window2"));
+    window2->setFlags(window2->flags() & Qt::Tool); // QTBUG-32433, don't be fooled by unusual window flags.
     window2->resize(windowSize, windowSize);
     window2->setFramePosition(QPoint(x, y));
     x += spacing + windowSize;
@@ -458,6 +461,7 @@ void tst_QGuiApplication::modalWindow()
     QVERIFY(QTest::qWaitForWindowExposed(window2.data()));
     QCOMPARE(app.modalWindow(), static_cast<QWindow *>(0));
     QCOMPARE(window1->blocked, 0);
+    QCOMPARE(childWindow1->blocked, 0);
     QCOMPARE(window2->blocked, 0);
     QCOMPARE(windowModalWindow1->blocked, 0);
     QCOMPARE(windowModalWindow2->blocked, 0);
@@ -473,6 +477,7 @@ void tst_QGuiApplication::modalWindow()
     applicationModalWindow1->show();
     QCOMPARE(app.modalWindow(), applicationModalWindow1.data());
     QCOMPARE(window1->blocked, 1);
+    QCOMPARE(childWindow1->blocked, 1); // QTBUG-32242, blocked status needs to be set on children as well.
     QCOMPARE(window2->blocked, 1);
     QCOMPARE(windowModalWindow1->blocked, 1);
     QCOMPARE(windowModalWindow2->blocked, 1);
@@ -500,6 +505,7 @@ void tst_QGuiApplication::modalWindow()
     applicationModalWindow1->hide();
     QCOMPARE(app.modalWindow(), static_cast<QWindow *>(0));
     QCOMPARE(window1->blocked, 0);
+    QCOMPARE(childWindow1->blocked, 0); // QTBUG-32242, blocked status needs to be set on children as well.
     QCOMPARE(window2->blocked, 0);
     QCOMPARE(windowModalWindow1->blocked, 0);
     QCOMPARE(windowModalWindow2->blocked, 0);