Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.6' into 5.7 | Liang Qi | 2016-06-10 | 1 | -17/+12 |
| | | | | | | | | | | | | | | | | | | Part of 0e053528 was reverted in the merge, about lastTimestamp. It will be applied later in separate commit. qmltest::shadersource-dynamic-sourceobject::test_endresult() was blacklisted on linux. Conflicts: .qmake.conf tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp tests/auto/qmltest/BLACKLIST tests/auto/qmltest/qmltest.pro Task-number: QTBUG-53590 Task-number: QTBUG-53971 Change-Id: I48af90b49a3c7b29de16f4178a04807f8bc05130 | ||||
* | Removed insignificant of qmltest again | Liang Qi | 2016-06-02 | 1 | -0/+68 |
Blacklisted or skipped broken and unstable test functions. Some are moved to tests/auto/qmltest-blacklist folder. Task-number: QTBUG-33723 Task-number: QTBUG-38290 Task-number: QTBUG-53778 Task-number: QTBUG-53779 Task-number: QTBUG-53780 Task-number: QTBUG-53781 Task-number: QTBUG-53782 Task-number: QTBUG-53785 Task-number: QTBUG-53793 Change-Id: I35594d0d054f4f5719f6549536a1fc5bd7e2518f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> |