diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:24:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:28:48 +0200 |
| commit | 9556f6d075b61fa95d6e1057f305e522a26f71d6 (patch) | |
| tree | 53190472453390810c47b9b5a47b23188a00267e /src/quick/util/qquicktimeline.cpp | |
| parent | 42ffe9b193a5bd958b0853233fd0d94170722bd1 (diff) | |
| parent | 1fd0cdc6a2e01775d8a79c6614910cc5a2fbf2b3 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquicktext.cpp
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
Diffstat (limited to 'src/quick/util/qquicktimeline.cpp')
| -rw-r--r-- | src/quick/util/qquicktimeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp index c3ff630dd7..88fc03bba8 100644 --- a/src/quick/util/qquicktimeline.cpp +++ b/src/quick/util/qquicktimeline.cpp @@ -717,7 +717,7 @@ void QQuickTimeLine::updateCurrentTime(int v) void QQuickTimeLine::debugAnimation(QDebug d) const { - d << "QuickTimeLine(" << hex << (void *) this << dec << ")"; + d << "QuickTimeLine(" << hex << (const void *) this << dec << ")"; } bool operator<(const QPair<int, Update> &lhs, |