diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-20 12:26:08 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 12:26:08 +0200 |
commit | cb6c208c77e2e3c8b6d5957fae73f0326eee4296 (patch) | |
tree | cd4a956eb3208358c28adbacf11c3694091ce549 /tests | |
parent | 34956bc234bf1b2ebcf224a256297293ba4276aa (diff) | |
parent | 3cd46501b2a663c7cb20cae21b4ed051f2ce4ac7 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qml/jit/qv4targetplatform_p.h
src/quick/accessible/qaccessiblequickitem_p.h
Change-Id: Ic95075a5fad81ec997a61561bd65979dfa3b9d4d
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qmltest/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/qmltest/text/tst_text.qml | 3 | ||||
-rw-r--r-- | tests/manual/highdpi/imageprovider.cpp | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/qmltest/BLACKLIST b/tests/auto/qmltest/BLACKLIST index 86a98a2c9c..c472a51a1c 100644 --- a/tests/auto/qmltest/BLACKLIST +++ b/tests/auto/qmltest/BLACKLIST @@ -7,6 +7,8 @@ linux [tst_grabImage::test_equals] linux +[ListView::test_listInteractiveCurrentIndexEnforce] +linux [Text::test_linecount] osx windows diff --git a/tests/auto/qmltest/text/tst_text.qml b/tests/auto/qmltest/text/tst_text.qml index 691a4838cd..d2899cfb74 100644 --- a/tests/auto/qmltest/text/tst_text.qml +++ b/tests/auto/qmltest/text/tst_text.qml @@ -118,9 +118,10 @@ Item { compare(txtlinecount.lineCount, 2) txtlinecount.text = txtlinecount.third; compare(txtlinecount.lineCount, 3) + console.log(txtlinecount.width) txtlinecount.text = txtlinecount.first; compare(txtlinecount.lineCount, 1) - txtlinecount.width = 50; + txtlinecount.width = 44; compare(txtlinecount.lineCount, 3) } function test_linecounts() { diff --git a/tests/manual/highdpi/imageprovider.cpp b/tests/manual/highdpi/imageprovider.cpp index 33a69cb87e..069fa5998f 100644 --- a/tests/manual/highdpi/imageprovider.cpp +++ b/tests/manual/highdpi/imageprovider.cpp @@ -45,7 +45,7 @@ #include <qquickimageprovider.h> #include <QImage> #include <QPainter> -#include <qDebug.h> +#include <QDebug> class ColorImageProvider : public QQuickImageProvider { |