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>
void tst_QParallelAnimationGroup::initTestCase()
{
qRegisterMetaType<QAbstractAnimation::State>("QAbstractAnimation::State");
-#if defined(Q_WS_MAC) || defined(Q_WS_WINCE)
+#if defined(Q_OS_MAC) || defined(Q_OS_WINCE)
// give the mac/wince app start event queue time to clear
QTest::qWait(1000);
#endif
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
}
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;
#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
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());
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";
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))
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";
QFETCH( QString, filename );
QFETCH( qint64, size );
-#ifdef Q_WS_WINCE
+#ifdef Q_OS_WINCE
filename = QFileInfo(filename).absoluteFilePath();
#endif
}
{
-#ifdef Q_WS_WINCE
+#ifdef Q_OS_WINCE
QSKIP("Currently low level file I/O not well supported on Windows CE", SkipSingle);
#endif
QFile f;
void tst_QFile::invalidFile_data()
{
QTest::addColumn<QString>("fileName");
-#if !defined(Q_WS_WIN)
+#if !defined(Q_OS_WIN)
QTest::newRow( "x11" ) << QString( "qwe//" );
#else
QTest::newRow( "colon1" ) << QString( "fail:invalid" );
QVERIFY(QFile::exists("file-copy-destination.txt"));
QVERIFY(!file.isOpen());
-#ifdef Q_WS_WINCE
+#ifdef Q_OS_WINCE
// Need to reset permissions on Windows to be able to delete
QVERIFY(QFile::setPermissions("file-copy-destination.txt",
QFile::WriteOther));
sizeNeeded *= 2;
sizeNeeded += 1024;
qlonglong freespace = qlonglong(0);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
_ULARGE_INTEGER free;
if (::GetDiskFreeSpaceEx((wchar_t*)QDir::currentPath().utf16(), &free, 0, 0))
freespace = free.QuadPart;
QString fileName = QDir::currentPath() + '/' + "qfile_map_testfile";
-#ifdef Q_WS_WINCE
+#ifdef Q_OS_WINCE
fileName = QFileInfo(fileName).absoluteFilePath();
#endif
void tst_QFile::openStandardStreamsFileDescriptors()
{
-#ifdef Q_WS_WINCE
+#ifdef Q_OS_WINCE
//allthough Windows CE (not mobile!) has functions that allow redirecting
//the standard file descriptors to a file (see SetStdioPathW/GetStdioPathW)
//it does not have functions to simply open them like below .
QVERIFY(nonexistant.isNull());
-#ifdef Q_WS_WINCE
+#ifdef Q_OS_WINCE
// Windows CE has no environment
QVERIFY(path.isEmpty());
QVERIFY(!system.contains("PATH"));
void tst_QProcessEnvironment::putenv()
{
-#ifdef Q_WS_WINCE
+#ifdef Q_OS_WINCE
QSKIP("Windows CE has no environment", SkipAll);
#else
static const char envname[] = "WE_RE_SETTING_THIS_ENVIRONMENT_VARIABLE";
requires(contains(QT_CONFIG,private_tests))
-include(../platformsocketengine/platformsocketengine.pri)
+include(../../../network/socket/platformsocketengine/platformsocketengine.pri)
CONFIG += insignificant_test # QTBUG-21204
QTest::newRow( "qtime" ) << QVariant( QTime( 12, 34, 56 ) ) << QString( "12:34:56" );
QTest::newRow( "qdatetime" ) << QVariant( QDateTime( QDate( 2002, 1, 1 ), QTime( 12, 34, 56 ) ) ) << QString( "2002-01-01T12:34:56" );
QTest::newRow( "qkeysequence" ) << qVariantFromValue( QKeySequence( Qt::CTRL + Qt::Key_A ) )
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
<< QString( "Ctrl+A" );
#else
<< QString(QChar(0x2318)) + "A";
QString currDir = QDir::currentPath();
QTest::newRow( "mylib" ) << currDir + "/mylib" << true;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_3)
QEXPECT_FAIL("mylib", "dlcompat cannot unload libraries", Continue);
#endif
QTest::newRow( "ok02" ) << sys_qualifiedLibraryName(QLatin1String("mylib"))
<< sys_qualifiedLibraryName(QLatin1String("mylib"));
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
#ifndef Q_OS_WINCE
QTest::newRow( "ok03" ) << "user32"
<< "USER32.dll";
void tst_QString::toNum()
{
-#if defined (Q_WS_WIN) && defined (Q_CC_MSVC)
+#if defined (Q_OS_WIN) && defined (Q_CC_MSVC)
#define TEST_TO_INT(num, func) \
a = #num; \
QVERIFY2(a.func(&ok) == num ## i64 && ok, "Failed: num=" #num ", func=" #func);
#undef TEST_TO_INT
-#if defined (Q_WS_WIN) && defined (Q_CC_MSVC)
+#if defined (Q_OS_WIN) && defined (Q_CC_MSVC)
#define TEST_TO_UINT(num, func) \
a = #num; \
QVERIFY2(a.func(&ok) == num ## i64 && ok, "Failed: num=" #num ", func=" #func);
QCOMPARE(locale, GetThreadLocale());
# endif
-#elif defined (Q_WS_MAC)
+#elif defined (Q_OS_MAC)
QSKIP("Setting the locale is not supported on OS X (you can set the C locale, but that won't affect CFStringCompare which is used to compare strings)", SkipAll);
#elif defined(QT_USE_ICU)
QLocale::setDefault(QLocale(locale));
#include <float.h>
#include <limits.h>
#include <math.h>
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
# include <windows.h>
// mingw defines NAN and INFINITY to 0/0 and x/0
# if defined(Q_CC_GNU)
**
****************************************************************************/
+#include <QtTest/QTest>
-#include <QtTest/QtTest>
-
-
-#define protected public
#include <qtextdocument.h>
-#undef protected
#include <qdebug.h>
-#ifndef Q_WS_WIN
-#include <private/qtextdocument_p.h>
+#ifndef Q_OS_WIN
+# include <private/qtextdocument_p.h>
#endif
-
-
#include <qtextobject.h>
#include <qtextcursor.h>
-
//TESTED_FILES=
QT_FORWARD_DECLARE_CLASS(QTextDocument)
QVERIFY(doc);
// Block separators are always a fragment of their self. Thus:
// |Hello|\b|World|\b|
-#if !defined(Q_WS_WIN) && !defined(Q_WS_S60)
+#if !defined(Q_OS_WIN)
QVERIFY(doc->docHandle()->fragmentMap().numNodes() == 4);
#endif
QCOMPARE(cursor.block().text(), QString("Hello"));
}
QT_BEGIN_NAMESPACE
-extern int qt_defaultDpiY();
+Q_GUI_EXPORT int qt_defaultDpiY();
QT_END_NAMESPACE
void tst_QTextLayout::testTabDPIScale()
tst_QSslKey::tst_QSslKey()
{
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
// applicationDirPath() points to a path inside the app bundle on Mac.
QDir dir(qApp->applicationDirPath() + QLatin1String("/../../../keys"));
#else
int errorAt = 0;
int entry = 0;
static int treelevel = 0; // for error diagnostics
- QAccessibleInterface *middleChild, *if2, *if3;
+ QAccessibleInterface *middleChild, *if2;
middleChild = 0;
++treelevel;
int middle = iface->childCount()/2 + 1;
QCOMPARE(iface->childCount(), 1);
#ifdef Q_OS_UNIX
- QCOMPARE(iface->text(QAccessible::Name), QStringLiteral("one"));
+ QCOMPARE(iface->text(QAccessible::Name), QLatin1String("one"));
#endif
- QCOMPARE(iface->text(QAccessible::Value), QStringLiteral("one"));
+ QCOMPARE(iface->text(QAccessible::Value), QLatin1String("one"));
combo.setCurrentIndex(2);
#ifdef Q_OS_UNIX
- QCOMPARE(iface->text(QAccessible::Name), QStringLiteral("three"));
+ QCOMPARE(iface->text(QAccessible::Name), QLatin1String("three"));
#endif
- QCOMPARE(iface->text(QAccessible::Value), QStringLiteral("three"));
+ QCOMPARE(iface->text(QAccessible::Value), QLatin1String("three"));
QAccessibleInterface *listIface = iface->child(0);
QCOMPARE(listIface->role(), QAccessible::List);