diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-08-06 08:23:07 +0200 |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-08-06 08:23:07 +0200 |
commit | 57ceb11ecf95032418712a686418116cf2398e7a (patch) | |
tree | 378533fcc07983d3a1b461aaaad07d842e50b81c /tests/auto/qxmlsimplereader | |
parent | 90d4366f1e9657b3240a872698614c7d9747f9e0 (diff) | |
parent | a4fc85c75f068b73f9c2334c77b0ae2275510e17 (diff) |
Merge commit 'origin/master'
Conflicts:
tests/auto/qfilesystemmodel/qfilesystemmodel.pro
tests/auto/qfontdialog/tst_qfontdialog.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
tests/auto/qsqldriver/qsqldriver.pro
tests/auto/qsqlquery/qsqlquery.pro
tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
tests/auto/qsqltablemodel/qsqltablemodel.pro
tests/auto/qsqlthread/qsqlthread.pro
tests/auto/qstatemachine/tst_qstatemachine.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
Diffstat (limited to 'tests/auto/qxmlsimplereader')
-rw-r--r-- | tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp index e0c183c74e..54ba29e560 100644 --- a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp +++ b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp @@ -575,10 +575,10 @@ void tst_QXmlSimpleReader::inputFromSocket_data() void tst_QXmlSimpleReader::inputFromSocket() { QFETCH(QString, file_name); - + #if defined(Q_OS_SYMBIAN) QSKIP("Symbian: Skipped due to problems in Open C and QtNetwork", SkipAll); -#endif +#endif #if defined(Q_OS_WIN32) && (defined(Q_CC_INTEL) || defined(Q_CC_MINGW) || defined(Q_CC_MSVC_NET)) QSKIP("Regression caused by QHOstInfo change 294548, see task 202231.", SkipAll); |