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/gui/text/qtextblock | |
| 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/gui/text/qtextblock')
| -rw-r--r-- | tests/auto/gui/text/qtextblock/tst_qtextblock.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp index b04a6f5559..efa5368205 100644 --- a/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp +++ b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp @@ -39,24 +39,17 @@ ** ****************************************************************************/ +#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) @@ -118,7 +111,7 @@ void tst_QTextBlock::fragmentOverBlockBoundaries() 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")); |