diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-29 09:39:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 07:57:41 +0200 |
| commit | f18b690cca2de6c75e70a2fd5871edf9fa993a5e (patch) | |
| tree | 7884c18b46777aa0af313f4a1ee0993f82ba1152 /tests/auto/corelib/io/qdir | |
| parent | c3d9d3698674a2240aa97403e3b684894d6f19db (diff) | |
Tests: Fix compilation on Windows.
Replace Q_WS_... by Q_OS_... in corelib tests.
Change-Id: I14c41dca1ec490b3c49ba2c24e60def14c6de9da
Reviewed-on: http://codereview.qt-project.org/5778
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/io/qdir')
| -rw-r--r-- | tests/auto/corelib/io/qdir/tst_qdir.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp index 7696c8b114..d61e4316c5 100644 --- a/tests/auto/corelib/io/qdir/tst_qdir.cpp +++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp @@ -232,7 +232,7 @@ void tst_QDir::setPath_data() QTest::addColumn<QString>("dir2"); QTest::newRow("data0") << QString(".") << QString(".."); -#if (defined(Q_WS_WIN) && !defined(Q_OS_WINCE)) +#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) QTest::newRow("data1") << QString("c:/") << QDir::currentPath(); #endif } @@ -387,7 +387,7 @@ void tst_QDir::isRelativePath_data() QTest::addColumn<bool>("relative"); QTest::newRow("data0") << "../somedir" << true; -#if (defined(Q_WS_WIN) && !defined(Q_OS_WINCE)) +#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) QTest::newRow("data1") << "C:/sOmedir" << false; #endif QTest::newRow("data2") << "somedir" << true; @@ -615,7 +615,7 @@ void tst_QDir::entryList() #endif #endif //Q_NO_SYMLINKS -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC if (qstrcmp(QTest::currentDataTag(), "unprintablenames") == 0) QSKIP("p4 doesn't sync the files with the unprintable names properly on Mac",SkipSingle); #endif @@ -750,7 +750,7 @@ void tst_QDir::canonicalPath_data() else appPath.chop(1); // remove the ending slash -#if defined Q_WS_WIN +#if defined Q_OS_WIN if (appPath.endsWith("release", Qt::CaseInsensitive) || appPath.endsWith("debug", Qt::CaseInsensitive)) { QDir appDir(appPath); QVERIFY(appDir.cdUp()); @@ -761,7 +761,7 @@ void tst_QDir::canonicalPath_data() QTest::newRow("relative") << "." << appPath; QTest::newRow("relativeSubDir") << "./testData/../testData" << appPath + "/testData"; -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN QTest::newRow("absPath") << appPath + "/testData/../testData" << appPath + "/testData"; #else QTest::newRow("absPath") << appPath + "\\testData\\..\\testData" << appPath + "/testData"; @@ -824,7 +824,7 @@ void tst_QDir::current_data() appPath = QCoreApplication::instance()->applicationDirPath(); else appPath.chop(1); // remove the ending slash -#if defined Q_WS_WIN +#if defined Q_OS_WIN if (appPath.endsWith("release", Qt::CaseInsensitive)) appPath = appPath.left(appPath.length()-8); else if (appPath.endsWith("debug", Qt::CaseInsensitive)) @@ -833,7 +833,7 @@ void tst_QDir::current_data() QTest::newRow("startup") << QString() << appPath; QTest::newRow("relPath") << "testData" << appPath + "/testData"; -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN QTest::newRow("absPath") << appPath + "/testData" << appPath + "/testData"; #else QTest::newRow("absPath") << appPath + "\\testData" << appPath + "/testData"; |