diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 08:37:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 08:37:31 +0100 |
| commit | beb65dcd79f8c354dab7bb4a8d08157bd9d69329 (patch) | |
| tree | 4632a0ff0df8462f8913f347042cf8378de03268 /tests/auto/corelib/io | |
| parent | 3fc1002489d5861d4f7cc2e1e8800881d6593c9d (diff) | |
| parent | e3288f246b44ba2b6d90b90eb99ab61f496d8d57 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/gui/painting/painting.pri
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
tests/auto/corelib/tools/qlocale/test/test.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
tools/configure/environment.cpp
Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
Diffstat (limited to 'tests/auto/corelib/io')
| -rw-r--r-- | tests/auto/corelib/io/qsettings/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qsettings/BLACKLIST b/tests/auto/corelib/io/qsettings/BLACKLIST index 1cba99b66c..317e97730e 100644 --- a/tests/auto/corelib/io/qsettings/BLACKLIST +++ b/tests/auto/corelib/io/qsettings/BLACKLIST @@ -1,2 +1,3 @@ [isWritable:native] osx-10.10 +osx-10.11 diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp index 24cde14459..7ebccbc252 100644 --- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp @@ -2729,7 +2729,7 @@ void tst_QTextStream::readBomSeekBackReadBomAgain() QFile::remove("utf8bom"); QFile file("utf8bom"); QVERIFY(file.open(QFile::ReadWrite)); - file.write("\xef\xbb\xbf" "Andreas"); + file.write("\xef\xbb\xbf""Andreas"); file.seek(0); QCOMPARE(file.pos(), qint64(0)); |