| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Patch derived from the tasks
Task-number: QTBUG-12997
Task-number: QTBUG-12984
Task-number: QTBUG-12985
Task-number: QTBUG-12990
Task-number: QTBUG-12999
|
|
|
|
|
|
| |
Everywhere we have a qWait(duration) followed by a QCOMPARE, there was
the risk that it fails because of the test machine being overloaded.
So I changed them to QTRY_COMPARE.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QAbstractAnimation:
currentTime returns the "complete" current time
currentLoopTime() returns the time inside the current loop
add setPaused(bool) for consistency with QTimeLine
stateChanged: newState passed as first paramater (before oldState)
for consistency with the reset of Qt
QAnimationGroup:
rename clearAnimations to clear
rename insertAnimationAt to insertAnimation
rename takeAnimationAt to takeAnimation
QSequentialAnimationGroup:
rename insertPauseAt to insertPause
|
|
|
|
| |
Reviewed-by: thierry
|
|
|
|
| |
Reviewed-by: Leo
|
|
|
|
|
|
|
|
| |
We're not taking a parameter in updateCurrentTime any more
because that parameter was the total currenttime. So it was taking into
account the currenttime and the currentloop at once. This was inconsistent
Reviewed-by: Leo
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/opengl/samplebuffers/glwidget.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer.cpp
src/gui/gui.pro
tests/auto/qhttp/tst_qhttp.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/widgets/qdatetimeedit.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlineedit.cpp
tests/auto/qcssparser/qcssparser.pro
tests/auto/qicoimageformat/tst_qicoimageformat.cpp
tests/auto/qmultiscreen/qmultiscreen.pro
tests/auto/qresourceengine/qresourceengine.pro
tests/auto/qresourceengine/tst_qresourceengine.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
|
| | |
|
|/
|
|
|
| |
This fix will make the gradual porting of different Qt modules for new
platforms easier.
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|