1 files changed, 7 insertions, 11 deletions
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index 7328858858..94f6fc1c12 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -68,9 +68,7 @@ private slots:
     void basics();
     void operators();
     void swap();
-#ifndef Q_CC_SUN
     void forwardDeclaration1();
-#endif
     void forwardDeclaration2();
     void memoryManagement();
     void downCast();
@@ -100,10 +98,8 @@ private slots:
     void map();
     void hash();
     void validConstructs();
-#ifndef QTEST_CROSS_COMPILED
     void invalidConstructs_data();
     void invalidConstructs();
-#endif
 
 public slots:
     void cleanup() { check(); }
@@ -344,10 +340,11 @@ ForwardDeclared *forwardPointer();
 void externalForwardDeclaration();
 extern int forwardDeclaredDestructorRunCount;
 
-// This type of forward declaration is not valid with SunCC.
-#ifndef Q_CC_SUN
 void tst_QSharedPointer::forwardDeclaration1()
 {
+#if defined(Q_CC_SUN) || defined(Q_CC_WINSCW) || defined(Q_CC_RVCT)
+    QSKIP("This type of forward declaration is not valid with this compiler");
+#else
     externalForwardDeclaration();
 
     struct Wrapper { QSharedPointer<ForwardDeclared> pointer; };
@@ -359,8 +356,8 @@ void tst_QSharedPointer::forwardDeclaration1()
         QVERIFY(!w.pointer.isNull());
     }
     QCOMPARE(forwardDeclaredDestructorRunCount, 1);
-}
 #endif
+}
 
 #include "forwarddeclared.h"
 
@@ -1639,9 +1636,6 @@ void tst_QSharedPointer::validConstructs()
 
 typedef bool (QTest::QExternalTest:: * TestFunction)(const QByteArray &body);
 Q_DECLARE_METATYPE(TestFunction)
-
-// This test does not work on cross compiled systems.
-#ifndef QTEST_CROSS_COMPILED
 void tst_QSharedPointer::invalidConstructs_data()
 {
     QTest::addColumn<TestFunction>("testFunction");
@@ -1786,6 +1780,9 @@ void tst_QSharedPointer::invalidConstructs()
 #ifdef Q_CC_MINGW
     QSKIP("The maintainer of QSharedPointer: 'We don't know what the problem is so skip the tests.'");
 #endif
+#ifdef QTEST_CROSS_COMPILED
+    QSKIP("This test does not work on cross compiled systems");
+#endif
 
     QTest::QExternalTest test;
     test.setQtModules(QTest::QExternalTest::QtCore);
@@ -1840,7 +1837,6 @@ void tst_QSharedPointer::invalidConstructs()
         QFAIL("Fail");
     }
 }
-#endif
 
 namespace QTBUG11730 {
     struct IB