From 95984487586f0699829c35278efbc73e01bf3c23 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 9 Jan 2014 18:54:46 -0800
Subject: Remove #ifdef from outside test functions

It's usually a bad idea to surround slots or signals with #ifdef since
moc may not parse it the same way the compiler does.

Change-Id: I6a3623ed7cb9fbc1b966df9d60f71b7fdf91acfe
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 .../auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'tests/auto/gui')

diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index bd7bd3a464..493d7e20c5 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -120,10 +120,8 @@ private slots:
     void symetricConstructors();
     void checkMultipleNames();
     void checkMultipleCodes();
-#ifndef Q_OS_MAC
     void mnemonic_data();
     void mnemonic();
-#endif
     void toString_data();
     void toString();
     void toStringFromKeycode_data();
@@ -144,10 +142,8 @@ private slots:
     void standardKeys_data();
     void standardKeys();
     void keyBindings();
-#if !defined (Q_OS_MAC) && !defined (Q_OS_WINCE)
     void translated_data();
     void translated();
-#endif
     void i18nKeys_data();
     void i18nKeys();
 
@@ -405,9 +401,11 @@ void tst_QKeySequence::keyBindings()
     QCOMPARE(bindings, expected);
 }
 
-#ifndef Q_OS_MAC
 void tst_QKeySequence::mnemonic_data()
 {
+#ifdef Q_OS_MAC
+    QSKIP("Test not applicable to Mac OS X");
+#endif
     QTest::addColumn<QString>("string");
     QTest::addColumn<QString>("key");
     QTest::addColumn<bool>("warning");
@@ -427,6 +425,7 @@ void tst_QKeySequence::mnemonic_data()
 
 void tst_QKeySequence::mnemonic()
 {
+#ifndef Q_OS_MAC
     QFETCH(QString, string);
     QFETCH(QString, key);
     QFETCH(bool, warning);
@@ -444,8 +443,8 @@ void tst_QKeySequence::mnemonic()
     QKeySequence res = QKeySequence(key);
 
     QCOMPARE(seq, res);
-}
 #endif
+}
 
 void tst_QKeySequence::toString_data()
 {
@@ -734,9 +733,12 @@ void tst_QKeySequence::listFromString()
     QCOMPARE(QKeySequence::listFromString(strSequences), sequences);
 }
 
-#if !defined (Q_OS_MAC) && !defined (Q_OS_WINCE)
 void tst_QKeySequence::translated_data()
 {
+#if defined (Q_OS_MAC) || defined (Q_OS_WINCE)
+    QSKIP("Test not applicable");
+#endif
+
     qApp->installTranslator(ourTranslator);
     qApp->installTranslator(qtTranslator);
 
@@ -764,6 +766,7 @@ void tst_QKeySequence::translated_data()
 
 void tst_QKeySequence::translated()
 {
+#if !defined (Q_OS_MAC) && !defined (Q_OS_WINCE)
     QFETCH(QString, transKey);
     QFETCH(QString, compKey);
 
@@ -775,8 +778,8 @@ void tst_QKeySequence::translated()
 
     qApp->removeTranslator(ourTranslator);
     qApp->removeTranslator(qtTranslator);
-}
 #endif
+}
 
 void tst_QKeySequence::i18nKeys_data()
 {
-- 
cgit v1.2.3


From bbee8ca485acc6bad7021f4e1cb3e5b8cd32e8fc Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Tue, 14 Jan 2014 10:44:24 +0100
Subject: Fix warning in QVariant test.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Values from different enums were compared.

Change-Id: I2faf73976e4b24abbdc915e8445256fe7a5be5bd
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
---
 tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/auto/gui')

diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 42570751fc..7512829e09 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -640,7 +640,7 @@ void tst_QGuiVariant::writeToReadFromOldDataStream()
         dataFileStream.setVersion(QDataStream::Qt_4_9);
         QVariant readVariant;
         dataFileStream >> readVariant;
-        QVERIFY(readVariant.type() == QMetaType::QPolygonF);
+        QVERIFY(readVariant.userType() == QMetaType::QPolygonF);
         QCOMPARE(testVariant, readVariant);
         file.close();
     }
-- 
cgit v1.2.3