From d309574c03820beeb60f668fdace1817106b0bd9 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 15 Jul 2013 05:10:17 -0700 Subject: tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile() Copy some needed files into a local folder when QtWidgets is not available. Task-number: QTBUG-31993 Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53 Reviewed-by: Friedemann Kleint --- .../commonstyle/images/standardbutton-open-128.png | Bin 0 -> 5415 bytes .../commonstyle/images/standardbutton-open-16.png | Bin 0 -> 629 bytes .../commonstyle/images/standardbutton-open-32.png | Bin 0 -> 1154 bytes .../commonstyle/images/standardbutton-save-128.png | Bin 0 -> 4398 bytes .../commonstyle/images/standardbutton-save-16.png | Bin 0 -> 583 bytes .../commonstyle/images/standardbutton-save-32.png | Bin 0 -> 1092 bytes tests/auto/gui/image/qicon/tst_qicon.cpp | 42 +++++++++------------ tests/auto/gui/image/qicon/tst_qicon.qrc | 6 +++ 8 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-128.png create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-16.png create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-32.png create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-128.png create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-16.png create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-32.png (limited to 'tests/auto/gui') 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 Binary files /dev/null and b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-128.png differ 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 Binary files /dev/null and b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-16.png differ 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 Binary files /dev/null and b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-32.png differ 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 Binary files /dev/null and b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-128.png differ 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 Binary files /dev/null and b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-16.png differ 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 Binary files /dev/null and b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-32.png differ 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 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 @@ ./icons/themeparent/index.theme ./icons/themeparent/scalable/actions/address-book-new.svg ./icons/themeparent/scalable/actions/appointment-new.svg +./styles/commonstyle/images/standardbutton-open-16.png +./styles/commonstyle/images/standardbutton-open-32.png +./styles/commonstyle/images/standardbutton-open-128.png +./styles/commonstyle/images/standardbutton-save-16.png +./styles/commonstyle/images/standardbutton-save-32.png +./styles/commonstyle/images/standardbutton-save-128.png -- cgit v1.2.3 From aab50ad061dfaff7a0a30a4164163fdd41571270 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 16 Jul 2013 13:11:06 +0200 Subject: QGuiApplicationPrivate::updateBlockedStatus(): Recurse over children. Task-number: QTBUG-32242 Change-Id: Ia43257a998507b9a367f41dc2395ab92cc89a118 Reviewed-by: Shawn Rutledge --- tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index ed07b3fab5..29f198f1ba 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,6 +416,8 @@ 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 window2(new BlockableWindow); @@ -458,6 +460,7 @@ void tst_QGuiApplication::modalWindow() QVERIFY(QTest::qWaitForWindowExposed(window2.data())); QCOMPARE(app.modalWindow(), static_cast(0)); QCOMPARE(window1->blocked, 0); + QCOMPARE(childWindow1->blocked, 0); QCOMPARE(window2->blocked, 0); QCOMPARE(windowModalWindow1->blocked, 0); QCOMPARE(windowModalWindow2->blocked, 0); @@ -473,6 +476,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 +504,7 @@ void tst_QGuiApplication::modalWindow() applicationModalWindow1->hide(); QCOMPARE(app.modalWindow(), static_cast(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); -- cgit v1.2.3 From 8493f5d6a343c9a754ce439fed77c7e1a901747e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 16 Jul 2013 16:03:13 +0200 Subject: Detect popup window correctly in modal window blocked handling. Task-number: QTBUG-32433 Change-Id: Ida8f6237a383311bc2e231de90fd54b90ebd1508 Reviewed-by: Shawn Rutledge --- tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index 29f198f1ba..663f664d94 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -422,6 +422,7 @@ void tst_QGuiApplication::modalWindow() QScopedPointer 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; -- cgit v1.2.3