| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Daniël (1):
Memory of fixedKernel is never returned, found by cppcheck.
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/419
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Merge commit 'd8a2e52e4db873a2cfd39630df47b61bec502fd1' into HEAD
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Previously, two images with indexed colors were not equal if their
color tables were not the same. The image are not compared by
the value of the pixels
Reviewed-by: Samuel
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Avoid needless DPI calculations when not needed, and simplify the DPI
calculations to the point where most of the operations disappear. Also
avoid calling QImage::metric() so that we don't need to go through two
switch statements and an extra function call just to get the width of a
pixmap.
Reviewed-by: Trond
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| | |
If we don't remove the pixmap from QCache first then the key is invalid
and the removal failed
Reviewed-by: sroedal
|
| | |
| |
| |
| | |
Reviewed-by:TrustMe
|
| | |
| |
| |
| |
| |
| |
| | |
Wherever I found that we were using a string instead of a single char
I fixed the code.
Reviewed-by: olivier
|
| | |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
| |
| |
| | |
Reviewed-by:thierry
|
| |\ \ |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Usually, "the the" is not proper English
Reviewed-By: Thiago Macieira
|
| | | | |
|
| | |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit add a new API to add/find/remove pixmaps into QPixmapCache.
This new extension is based on a key that the cache give you during
the insertion. This key is internally a int which makes all operations
in the cache much more faster that the string approach.
Auto-tests has been extended as well and a benchmark has been added to
compare both approach. I also depecrate the find method for the
string API to have a method pointer based and not reference based like
the Qt policy says.
Reviewed-by: bnilsen
Reviewed-by: andreas
Followed-deeply-by: trond
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| | |
addFile makes a QIcon not null, which may be a surprise if the path
given is bad.
Reviewed-by: Jens Bache-Wiig
|
| | |
| |
| |
| |
| |
| |
| | |
There was a qFree() call missing.
Task-number: related to 253367
Reviewed-by: jbache
|
| | | |
|
| |\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| | |
| |
| |
| | |
Task-number: 252415
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: 246130
Reviewed-by: joerg
Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we
decided to stick with Q_WS_WIN32, but having a separate define
makes the code more readable. In addition Q_WS_WINCE_WM is available
for Windows Mobile only parts, where we do not check for the OS on
runtime.
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you insert a new pixmap in the cache with a key that was already in
the cache then we remove the old pixmap and add the new one. This avoid
to fill the memory with garbage even if the cache has a protection to
avoid running out of memory. This was discovered with QraphicsView
and its cache. We don't need to keep old cached pixmaps for an item.
Task-number: KDE
Reviewed-by: Trond
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qaction/tst_qaction.cpp
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/itemviews/qheaderview_p.h
|
| | |
| |
| |
| |
| |
| |
| |
| | |
On big endian systems with Xrender, the QPixmap::toImage() function
did an unnecessary byte swap for 32 bit pixmaps.
Task-number: 196152
Reviewed-by: Samuel
|
| | |
| |
| |
| |
| |
| |
| |
| | |
We have to add the palette cacheKey to ensure that the icon is
properly regenerated after a system palette change.
Task-number: 250542
Reviewed-by: nrc
|
| | |
| |
| |
| | |
Task: 250730
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/painting/qtransform.cpp
|
| | |
| |
| |
| |
| |
| | |
Looks like a typo.
Reviewed-by: Bradley T. Hughes
|
| | |
| |
| |
| | |
Reviewed-by: Trond
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| | |
Task-number: 240164
Reviewed-by: Jan Erik Hanssen <janerik@trolltech.com>
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
qt_win_display() will always trigger an assert and should not be used
in the src/painting directory.
Task-number: 248266
Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
|
| | |
| |
| |
| |
| |
| |
| |
| | |
QPicture didn't have an implementation for drawImage(). All images were
converted to QPixmaps before they were drawn.
Task-number: 249322
Reviewed-by: Gunnar Sletta
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tools/linguist/lupdate/qscript.cpp
tools/linguist/lupdate/qscript.g
tools/linguist/lupdate/ui.cpp
tools/linguist/shared/cpp.cpp
tools/linguist/shared/qph.cpp
tools/linguist/shared/translator.h
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Monochrome images should be converted to black and white, not
transparent and white. Reported on qt-interest.
Task-number: 249175
Reviewed-by: Trond
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Task: 246446
RevBy: Olivier
AutoTest: tst_qpixmap::test_246446()
Details: The new QX11PixmapData object wasn't referenced (e.g. the ref
count would be 0) after calling setMask() on a 32 bit QPixmap
when Xrender was used.
|
| | |
|
| |
|
