summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorRobin Burchell <robin+qt@viroteck.net>2014-05-31 11:51:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-05 19:10:58 +0200
commit9e01483cdfff068517e29c674e0332818e76cb21 (patch)
treea843f62d0bd1f2ceb23f3715ded6867e71b234ea /src/corelib/global
parent3b00497d50a022a359cce59696195dce43615b00 (diff)
Make the ICO image handler capable of reading CUR files too.
This simple patch was an unfortunate victim of the Gitorious to Gerrit transition. (https://qt.gitorious.org/qt/qt/merge_requests/1179) As noted in the Gitorious review, a small bug in readHeader is also fixed: || instead of &&. Done-with: Pali Rohár Task-number: QTBUG-12684 Change-Id: I1fe16359b9b68c10e518904c6a5c58b00fb7379b Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/corelib/global')
0 files changed, 0 insertions, 0 deletions