diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 16:25:58 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-05-10 11:53:47 +0200 |
| commit | 66646dd8c37adb488a79ab274b2396a649674e6d (patch) | |
| tree | b0f5ac752a52cec3de1d47692e09295197622dcd /tests/auto/qml/qqmlxmlhttprequest | |
| parent | da15ea0f3b5805db657f13060c21efa78f10cde2 (diff) | |
| parent | d82a17b929dd88fe76258b0f801beaa1b2ee343e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/plugins/accessible/quick/quick.pro
src/quick/items/qquickpincharea.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
Manually adjusted for TestHTTPServer constructor change:
tests/auto/quick/qquickimage/tst_qquickimage.cpp
Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f
Diffstat (limited to 'tests/auto/qml/qqmlxmlhttprequest')
| -rw-r--r-- | tests/auto/qml/qqmlxmlhttprequest/data/stateChangeCallingContext.qml | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/stateChangeCallingContext.qml b/tests/auto/qml/qqmlxmlhttprequest/data/stateChangeCallingContext.qml index f44f4f926c..b35c31d513 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/stateChangeCallingContext.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/stateChangeCallingContext.qml @@ -8,7 +8,7 @@ Item { SequentialAnimation { id: anim - PauseAnimation { duration: 525 } // delay mode is 500 msec. + PauseAnimation { duration: 1000 } // delay mode is 500 msec. ScriptAction { script: loadcomponent(0) } PauseAnimation { duration: 525 } // delay mode is 500 msec. ScriptAction { script: loadcomponent(1) } diff --git a/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro b/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro index f1fbfde0ec..fcfdf23d33 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro +++ b/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro @@ -2,8 +2,6 @@ CONFIG += testcase TARGET = tst_qqmlxmlhttprequest macx:CONFIG -= app_bundle -CONFIG+=insignificant_test # QTQAINFRA-573 - INCLUDEPATH += ../../shared/ HEADERS += ../../shared/testhttpserver.h |