From 4448576ae04ad9261ffad07c8ff15486d56fa28c Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Date: Tue, 13 Jan 2015 16:13:34 +0100
Subject: Android: Fix QLayout tests

This test requires test data to be available and the
testRetainSizeWhenHidden test assumes that a widget will be
sized based on its sizeHint(), which does not work on
platforms where show() implies showMaximized().

Change-Id: I9bf372d8c0ea94845ae08481ec555fe25dcfebc0
Reviewed-by: BogDan Vatra <bogdan@kde.org>
---
 tests/auto/widgets/kernel/qlayout/qlayout.pro     | 5 +++++
 tests/auto/widgets/kernel/qlayout/testdata.qrc    | 5 +++++
 tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp | 4 ++++
 3 files changed, 14 insertions(+)
 create mode 100644 tests/auto/widgets/kernel/qlayout/testdata.qrc

(limited to 'tests/auto/widgets/kernel')

diff --git a/tests/auto/widgets/kernel/qlayout/qlayout.pro b/tests/auto/widgets/kernel/qlayout/qlayout.pro
index 4a5db512c8..8bdbde9282 100644
--- a/tests/auto/widgets/kernel/qlayout/qlayout.pro
+++ b/tests/auto/widgets/kernel/qlayout/qlayout.pro
@@ -11,3 +11,8 @@ wince* {
 } else {
    TESTDATA += baseline/*
 }
+
+android: !android-no-sdk {
+    RESOURCES += \
+        testdata.qrc
+}
diff --git a/tests/auto/widgets/kernel/qlayout/testdata.qrc b/tests/auto/widgets/kernel/qlayout/testdata.qrc
new file mode 100644
index 0000000000..24e8e56263
--- /dev/null
+++ b/tests/auto/widgets/kernel/qlayout/testdata.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>baseline/smartmaxsize</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index c889643524..0bdc71e55b 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -345,6 +345,10 @@ void tst_QLayout::adjustSizeShouldMakeSureLayoutIsActivated()
 
 void tst_QLayout::testRetainSizeWhenHidden()
 {
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+    QSKIP("Test does not work on platforms which default to showMaximized()");
+#endif
+
     QWidget widget;
     QBoxLayout layout(QBoxLayout::TopToBottom, &widget);
 
-- 
cgit v1.2.3