diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-23 15:01:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 12:18:37 +0200 |
| commit | dea76f3496ee077e271b334c7e8101fed5119481 (patch) | |
| tree | 6a8833a12f851391f148ea1aae1fcfd5eaef88b9 /tests/auto/corelib/io | |
| parent | cb57d36f4559faf63acdca2cfb7b35431b959164 (diff) | |
Make qtbase build with Qt-in-namespace again
Change-Id: I5faa8690a05d6ec352fc69c0b69848539f2ed216
Reviewed-on: http://codereview.qt-project.org/5460
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/corelib/io')
| -rw-r--r-- | tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp index e5a80d9bf3..d34887f6e6 100644 --- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp @@ -420,7 +420,7 @@ static const char* open_xpm[]={ // ************************************ -static QString QStringData(int index) +static QString stringData(int index) { switch (index) { case 0: return QString(); @@ -447,7 +447,7 @@ void tst_QDataStream::stream_QString() void tst_QDataStream::writeQString(QDataStream* s) { - QString test(QStringData(dataIndex(QTest::currentDataTag()))); + QString test(stringData(dataIndex(QTest::currentDataTag()))); *s << test; *s << QString("Her er det noe tekst"); *s << test; @@ -462,7 +462,7 @@ void tst_QDataStream::writeQString(QDataStream* s) void tst_QDataStream::readQString(QDataStream *s) { QString S; - QString test(QStringData(dataIndex(QTest::currentDataTag()))); + QString test(stringData(dataIndex(QTest::currentDataTag()))); *s >> S; QCOMPARE(S, test); |