| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
| |
|
|
|
| |
Change-Id: I8b7ab19a98e2920fc020043088c32d073aa1d60d
Reviewed-by: David Faure <david.faure@kdab.com>
|
| |
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| |
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
|
|
| |
Change-Id: If209db684878ab734b3265b479c59dfc27b18be1
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Pause animations (like Timer) could trigger a jump to the next tick,
which meant that other pause animations would have missed the interval
skipped by the pause.
Change-Id: Idebe4cbe70b2a1536d684288fc1c5d65e4c5df84
Cherry-pick-of: 115d437efb25adc2262460e001c034ea3cd8ba14
Task-number: QTBUG-18126
Reviewed-by: Leo Cunha
Reviewed-by: Michael Brasser
|
| |
|
|
|
| |
Change-Id: If03c9e4539e984db725f7e7d89e8b565890fcbed
Reviewed-by: Gunnar Sletta
|
| |\ |
|
| | | |
|
| |/
|
|
|
| |
We are not entirely comfortable with the API yet, so it needs
a bit more maturity
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |/
|
|
|
|
|
|
| |
We need such a concept in place in order to do animations that are driven
by vertical sync rather than QTimer, as vertical sync comes constantly at
16.66 ms. This means that animations do will not be jerking...
Reviewed-by: bnilsen
|
| |
|
|
| |
Reviewed-by: Thierry
|
| |
|
|
|
|
|
|
| |
The slowdown factor is useful for debugging complex animations.
Setting it to 0 will stop all animations when slowMode is enabled.
Submitted-by: Lasse
Reviewed-by: Thierry
|
| |
|
|
|
| |
Task-number: QTBUG-10654
Reviewed-by: Thierry Bastian
|
| |
|
|
|
| |
Reviewed-By: gabi
Task-Number: QTBUG-10017
|
| |
|
|
| |
tst_qtimeline improvement: from 56187446 to 53915928 (callgrind)
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | | |
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-6890
Reviewed-by: Thierry
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It seems that the time spent between the execution of QTime::start()
and QTime::elapsed() can be higher than what QTime::elapsed() sometimes
reports. (To put it differently, QTime::elapsed() was sometimes
returning a time that was *less* than the actual time spent.)
Note that this is *not* a bug on Windows, since GetLocalTime explicitly
mentions that we should not use local system times to to relative
comparisions (this is what elapsed() currently do).
This is also partly reflected by the documentation of QTime::elapsed(),
where it says that the result of elapsed() is undefined if the clock
setting has been changed.
Due to the fact mentioned in the above paragraph this is also a
potential problem on other platforms (at least Linux and Mac).
However, these platforms do not suffer from the immediate problem we
observed on windows (that QTime::elapsed() could return a too small
value), so this commit only fixes the problem on Windows (it now uses
GetTickCount instead of QTime). For the other platforms the behaviour
should be unchanged, since we still use QTime.
This was found by running the QPauseAnimation autotest, where some
tests were unstable (and failed). However, it did not fail on all
windows systems. (Luckilly it failed on my Win 7 system)
Reviewed-by: Leo
|
| |
|
|
|
|
|
|
| |
We ensure that the startStop timer is always ticking before the
animation timer.
Task-number: QTBUG-5967
Reviewed-by: Aaron Kennedy
|
| | |
|
| | |
|
| |
|
|
| |
this was suggested by Michael B
|
| | |
|
| |
|
|
|
|
|
| |
The new threashold for using the multimedia timer is 20, so we can get back to
16 ms for the interval.
This reverts commit bdcde683bc863d0c574b1e4d64b5a16ba0130596.
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
| |
The unregistration has to happen befaire calling virtual methods
to support changing the state in those functions.
Reviewed-by: ogoffart
|
| |
|
|
|
|
| |
On windows this will make it much more accurate
Reviewed-by: ogoffart
|
| |\ |
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
This includes the startstop timer delay in QAbstractAnimation, and the
inSizeMove workaround for paint events.
Reviewed-by: Prasanth Ullattil
|
| | |/
|/|
| |
| |
| |
| | |
This could be prevented by a pause animation currently running.
Reviewed-by: Leo
|
| | |
| |
| |
| |
| |
| |
| | |
It could happen that an animation would be unregistered when it
shouldn't.
Reviewed-by: Leo Cunha
|
| | |
| |
| |
| |
| |
| |
| | |
We avoid stopping/starting the timer over and over again
Patch suggested by Aaron.
Reviewed-by: Aaron Kennedy
|
| | | |
|
| |/ |
|
| |
|
|
|
|
|
| |
This is needed in case we change consistentTime while the animation is
running.
Reviewed-by: thierry
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
When there are only pause animations running, the timer will stop and
restart when the closest pause animation finishes. While there are only
pause animations running, there are no additional timer ticks, but
if there is at least one animation running that is not a group or a pause,
then the global animation timer will restore it's update interval.
Includes a new auto-test for the QPauseAnimation class.
Task-number: QT-941
Reviewed-by: thierry
Reviewed-by: janarve
|
| |
|
|
|
|
|
| |
If we want to avoid timer ticks in QPauseAnimation, We need to update the
current time when an animation pauses, for being able to resume correctly.
Reviewed-by: thierry
|