| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
some code to qs60style.cpp. De-duplicated some code in
qt_s60_fill_background.
The unused QT_S60STYLE_LAYOUTDATA_SIMULATED had to go, too.
|
|
|
|
|
|
|
| |
The default DPI is stored in the S60 structure, so that can simply be
used here instead of re-calculating it each time.
Task-number: 247279
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The resize behavior of QDesktopWidget was somewhat undefined on Symbian
because we weren't actually changing the size of the widget. This patch
fixes that and also implements the resizeEvent() function so that it
properly emits signals. We didn't call resize() to change the size here
because our implementation of setGeometry_sys() ignores the desktop
widget since it doesn't have a backing store and isn't a real window.
Task-number: 253930
|
| | |
|
|/ |
|
|\ |
|
| | |
|
| |\ |
|
| | | |
|
| |/
| |
| |
| | |
builds.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
|
| | |
| | |
| | |
| | | |
Task-number: 252489
|
| | |
| | |
| | |
| | | |
Task-number: 252491
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
newline
Do the same special case as for QTextEdit
(yes, this is a pitty that we have special cases like that
Reviewed-by: Thierry
Task-number: 252532
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The problem was that we installed an eventfilter regardless if the
gtk symbols were defined or not. Instead we now initialize and
check for the symbols before we install the filter.
Task-number: 254342
Reviewed-by: ogoffart
|
| | |/
| | |
| | |
| | | |
Task-number: 252493
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If ensureSpace causes the layoutData to reallocate then the
initialGlyphs pointers will no longer be valid.
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If Harfbuzz shaping adds or merges glyphs we need to move the remaining
glyphs in the glyph layout to compensate.
Task-number: 253783
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Rather than try to resolve functions or impose configure time
limitations we simply remove the dependancy entirely and rely on the
fallbac for all platforms.
Task-number: 250731
Reviewed-by: thiago
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We currently don't support subpixel hinting when drawing text to a
QImage on Mac. The alpha map that is returned by the font engine
is a plain 8 bit gray mask, which means we have to switch off subpixel
hinting when we draw the glyph for caching.
Task-number: 249178
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
There is no way to restore float-equal warning using the pragma trick.
This means (as it was mentioned in the said commit log) anyone that
includes qtransform.h will be forced to deal with float-equal.
Reviewed-by: Samuel Rødal
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In 4.5 the toolbutton icon rendering was changed somewhat and the
bottom line of text for tool buttons icons with TextUnderIcon set is
incorrectly clipped on Windows. The style reserves only 5 pixels but
tries to use 6 pixels for text and icon spacing, hence we adjust the
text rect one pixel up. This should be safe considering the fact that
we have a margin on both sides of the icon already and avoids actually
moving the icon positioning.
Task-number: 252554
Reviewed-by: trond
|
| | |
| | |
| | |
| | | |
The typo was in commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
I made this change to make things look a bit better on the mac. However,
a toolbutton with text only looks strange and as a bonus the arrow
covers some of the text, which no one wants. It seems that similar
consructions in Cocoa don't show the arrow for text button, so we
shouldn't either.
Task-number: 253339
Reviewed-by: Jens Bache-Wiig
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Regression from 4.4 introduced while fixing task 167106
Autotest: tst_QComboBox::task253944_itemDelegateIsReset()
Task-number: 253944
Reviewed-by: jbache
|
| | | |
| | | |
| | | |
| | | | |
Task-number: 252565
|
|/ / / |
|
| | | |
|
| | |
| | |
| | |
| | | |
correctly.
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
background (part2).
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
drawing themed background.
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We changed this primarily for the mac as active appearance on
widgets in itemviews should depend on the window activation state and
not on the focus widget. It was explicitly added back for windows only
but has been reported as a bug on X11 as well so we might as well keep
it mac-only for now.
Reviewed-by: mortens
|
| |/
| |
| |
| |
| |
| | |
QMessageBox is like QDialog. It doesn't have any extra magic with window
modality on creation, so don't advertise that it does. The note about
using message boxes as sheets is also updated.
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The invariant that QCocoaWindow's lifetime is contained in a QWidget is
simply not true.
A top-level QWidget gets associated with a QCocoaWindow (which is
reference counted). However, it can be the case that we've destroyed our
QWidget, the link is removed, the window is hidden, but the window still
gets an event. In that case we would crash with an eventual null pointer
access. However, we don't really need to do anything in this case, so
just call super and return.
Task-number: 253402
Reviewed-by: Morten Sørvig
|