diff options
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 { |