summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-08-17 10:23:29 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-08-17 10:23:29 (GMT)
commitd4711c1961314589e03aad6bb8ba27c6c6420e16 (patch)
tree19dcf37419641051ddd15de7c5f815e17f33b027 /tests
parent3ee745921c12b60dd02145665dafcfe4d05fb409 (diff)
downloadQt-d4711c1961314589e03aad6bb8ba27c6c6420e16.zip
Qt-d4711c1961314589e03aad6bb8ba27c6c6420e16.tar.gz
Qt-d4711c1961314589e03aad6bb8ba27c6c6420e16.tar.bz2
run tst_windowsmobile only on WM5
The screenshots in the QRC were taken on the WM5 emulator. Reviewed-by: thartman
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/windowsmobile/test/tst_windowsmobile.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
index bc58ea7..9c94eb3 100644
--- a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
+++ b/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
@@ -60,14 +60,14 @@ public:
#endif
}
-#ifdef Q_OS_WINCE_WM
+#if defined(Q_OS_WINCE_WM) && defined(_WIN32_WCE) && _WIN32_WCE <= 0x501
private slots:
void testMainWindowAndMenuBar();
void testSimpleWidget();
#endif
};
-#ifdef Q_OS_WINCE_WM
+#if defined(Q_OS_WINCE_WM) && defined(_WIN32_WCE) && _WIN32_WCE <= 0x501
bool qt_wince_is_platform(const QString &platformString) {
TCHAR tszPlatform[64];
@@ -118,8 +118,6 @@ void openMenu()
void compareScreenshots(const QString &image1, const QString &image2)
{
- if (qt_wince_is_smartphone())
- QSKIP("This test is only for Windows Mobile", SkipAll);
QImage screenShot(image1);
QImage original(image2);
@@ -143,6 +141,9 @@ void takeScreenShot(const QString filename)
void tst_WindowsMobile::testMainWindowAndMenuBar()
{
+ if (qt_wince_is_smartphone())
+ QSKIP("This test is only for Windows Mobile", SkipAll);
+
QProcess process;
process.start("testQMenuBar.exe");
QCOMPARE(process.state(), QProcess::Running);
@@ -156,6 +157,9 @@ void tst_WindowsMobile::testMainWindowAndMenuBar()
void tst_WindowsMobile::testSimpleWidget()
{
+ if (qt_wince_is_smartphone())
+ QSKIP("This test is only for Windows Mobile", SkipAll);
+
QMenuBar menubar;
menubar.show();
QWidget maximized;