From fc52cbbc137e576deb7a85bc0cfa0054eebc807c Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 15 Apr 2011 17:35:13 +1000
Subject: Make tst_exceptionsafety_objects part of the test set.

Re-enable this test, with the two test functions that fail on Linux
disabled until the failures can be diagnosed.

Change-Id: I915e1a0d675cb71a80086e89f9799a4f9f6b600c
Reviewed-by: Rohan McGovern
(cherry picked from commit ee55dec1efe9c67518bf3e27f81b0696075f7153)
---
 tests/auto/other.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/auto/other.pro')

diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index a84ab05104..2a24cb5e70 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -3,7 +3,7 @@
 
 TEMPLATE=subdirs
 SUBDIRS=\
-#           exceptionsafety_objects \ shouldn't enable it
+           exceptionsafety_objects \
 #           baselineexample \ Just an example demonstrating qbaselinetest usage
            lancelot \
            qaccessibility \
-- 
cgit v1.2.3


From 22d6cd5cdd7c1f64de60b1761521fbaa3c05ff1b Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 18 Apr 2011 17:21:03 +1000
Subject: Don't try to run exceptionsafety_objects test by default on windows.

This test relies on some API specific to MSVC's debug runtime, which is
not always guaranteed to be available.

Change-Id: Ib0ae4694ad51f59198dadfce802f0dfdf0522002
Reviewed-by: Rohan McGovern
(cherry picked from commit 01dfb9ca25bfaec5784f404dcd4bf41bbc2b6fcb)
---
 tests/auto/other.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/auto/other.pro')

diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 2a24cb5e70..0b49d29cc4 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -3,7 +3,6 @@
 
 TEMPLATE=subdirs
 SUBDIRS=\
-           exceptionsafety_objects \
 #           baselineexample \ Just an example demonstrating qbaselinetest usage
            lancelot \
            qaccessibility \
@@ -56,6 +55,8 @@ symbian {
                qs60mainapplication
 }
 
+!win32-msvc*:!wince*:SUBDIRS += exceptionsafety_objects
+
 # Following tests depends on private API
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
            qcombobox \
-- 
cgit v1.2.3


From 089ad377510515a9499f390ef2e994d781dbe509 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Wed, 18 May 2011 09:58:16 +1000
Subject: If accessibility isn't built, don't try to test it

Only build the autotest when the feature to be tested is in the Qt
build.  This is better than building and running an empty test.

Change-Id: I67721f5f48296afcca64f761d12325f8e040f2d8
Reviewed-by: Rohan McGovern
(cherry picked from commit cf911bc0d297ed30e615fd115b0d3ae574cb2412)

Conflicts:

	tests/auto/qaccessibility/tst_qaccessibility.cpp
---
 tests/auto/other.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/auto/other.pro')

diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 0b49d29cc4..b3715b3993 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -5,7 +5,6 @@ TEMPLATE=subdirs
 SUBDIRS=\
 #           baselineexample \ Just an example demonstrating qbaselinetest usage
            lancelot \
-           qaccessibility \
            qalgorithms \
            qcombobox \
            qcssparser \
@@ -36,6 +35,8 @@ SUBDIRS=\
            windowsmobile \
            nativeimagehandleprovider
 
+contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility
+
 contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
 mac: {
     SUBDIRS += macgui \
-- 
cgit v1.2.3


From 0cd93933d8e5cc69151958fc285936854ff86e47 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 17 May 2011 18:09:34 +1000
Subject: Make QDataStream test compile and re-enable it

This test can't use svg files as QtSvg is a separate module, on which
qtbase does not depend.  This commit changes the test to use a pixmap
that was already present in the test.

Change-Id: Iab4ce70aa376a7d2985b69816bd251ce4f5d46cf
Task-number: QTBUG-19244
Reviewed-by: Rohan McGovern
---
 tests/auto/other.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/auto/other.pro')

diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index b3715b3993..b50e1697b3 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -8,7 +8,7 @@ SUBDIRS=\
            qalgorithms \
            qcombobox \
            qcssparser \
-           #qdatastream \      # FIXME: uses qtsvg (QTBUG-19244)
+           qdatastream \
            qdir \
            qfocusevent \
            qimage \
-- 
cgit v1.2.3