| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash when all the items in a QListView are hidden
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Calling QIconModeViewBase::initDynamicLayout() on the second and
successive segments would return QPoint(-1,-1), resulting in a
totally empty area rectangle for all the items while in
QIconModeViewBase::doDynamicLayout(). This rectangle is used to
initialize the BSP tree, and produces an arithmetic exception when
empty.
Furthermore, a rendering bug was also apparent when displaying the
first item of a segment while the last item of the previous segment
was hidden.
Auto-tests included.
Reviewed-by: Olivier
Task-number: QTBUG-12308
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Symbian's CFont::FontMaxAscent() returns in some cases an
incorrect value of 0. That usually happens (for some font sizes)
if a stroke based font is the main system font.
We were able to reproduce it on some S60 3.2 devices with a
chinese language pack installed.
This patch will test if CFont::FontMaxAscent() returns 0. And if
so, it alculates an ascent taht makes more sense.
Task-number: QTBUG-8013
Reviewed-by: Liang Qi
|
|
|
|
|
|
|
|
|
|
|
| |
If this is not done, later deletion of the backing store may cause
a crash. If the backing store is an EGL surface, its destruction
includes a call to eglDestroySurface(), which triggers an exception
if the window handle passed as a parameter is no longer valid.
Task-number: QTBUG-10643
Task-number: QTBUG-11376
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
| |
The temporary cursor position was not being updated after committing the
input (changing the cleartext into a *), as a result of which, the next
keypress was mistaken for a multitap input which should replace the last
character.
Task-number: QTBUG-11673
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
| |
When the variable was not initalized it would randomly show a native
font dialog or a non native one if the DontUseNativeDialogs flag was
set.
Task-number: QTBUG-12042
Reviewed-by: cduclos
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change 4b709b41f5a7ae8dc6e537b644158f5201ce0a98 tried to make sure that
rows with merged cells would not be completely removed, as this would
cause a crash. However, when removing just a few columns from a merged
cell, the span of the cell should be reduced by the number of columns
removed. The "touched" guard would cause the span to be decreased a
maximum of one time, regardless of how many columns were removed,
leaving the table in an invalid state, as the column count would be
smaller than the span of the cell. This would assert later on.
To avoid this, we only guard against removal, not against decreasing
the span.
Task-number: QTBUG-11646
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
|
|
|
| |
If item clips children to shape we should take that into account when
computing the source rect, to avoid creating unnecessary large source
pixmaps which might have a significant performance impact.
Task-number: QT-3551
Reviewed-by: Gunnar
Reviewed-by: Trond
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When QLineControl was split out of QLineEdit, a regression was
introduced. When the layout direction was altered by a key press,
the layout direction of the QLineControl would be set, but not the
QLineEdit. This would in turn mean that QLineEdit would use the wrong
layout direction for its visual alignment. Patch is a small hack to
read back the layout direction from the control after it has been
set.
Task-number: QTBUG-11204
Reviewed-by: Trond
|
|
|
|
|
|
| |
This flag is Windows-specific, and should not be required on other platforms.
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
| |
The defines that can be used are QT_NO_DEBUG_OUTPUT and
QT_NO_WARNING_OUTPUT in order to turn off qDebug and qWarning output.
Reviewed-by: cduclos
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
| |
Commit 392123ef5432643d1047d1e1dd71512ec39d382d introduced the
leak.
Task-number: QTBUG-11432
Reviewed-by: Trond
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change e1915815bc5ef86b3844608bba46769da5173363 moved part of the
right bearing check out of the "non-whitespace-or-object" block of the
layout, which could potentially cause crashes for layouts that contained
items that were line separators or tabs etc. because we would access
the logical clusters array based on the position of e.g. the tab even
though it didn't have an entry. This could potentially give us an
arbitrary index which might cause an out of bounds when accessing the
glyphs array.
Task-number: QTBUG-11427
Reviewed-by: Simon Hausmann
|
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Allow to build Qt in static with mingw
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some functions were marked with Q_DECL_IMPORT where they should just be
Q_CORE_EXPORT. The reason is that this macro is expanded to nothing in
case of static builds whereas Q_DECL_IMPORT isn't (it is a dllimport).
That leads the linker to try to import it and it shouldn't.
Task-number: QTBUG-10791
Reviewed-by: gabi
|
|\ \
| |/
|/|
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Thread safety for QFontEngineS60
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On symbian, creating fonts requires a connection to the window server.
Window server sessions are not sharable across threads.
To avoid QFont crashing when used outside the GUI thread, we construct a
private session to the window server when the shared CONE session is not
available.
(CCoeEnv::Static() uses TLS, so it returns null outside of GUI thread)
The private session and screen device are stored in QThreadStorage, so
they are automatically deleted when the QThread exits.
Task-number: QTBUG-8874
Reviewed-by: mread
|
|/
|
|
| |
Reviewed-by: Olivier
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QWS build failure
Removed compiler warnings
Window visibility changes update TLW backing store reference count
Enable visibility change events on all Symbian native windows
Added reference counting to QWidgetBackingStore
Added tst_QWidget::destroyBackingStoreWhenHidden
|
| |
| |
| |
| | |
Task-number: QTBUG-8697
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed compiler warnings
Window visibility changes update TLW backing store reference count
Enable visibility change events on all Symbian native windows
Added reference counting to QWidgetBackingStore
Added tst_QWidget::destroyBackingStoreWhenHidden
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* When a native window becomes completely invisible, the reference count
of the top-level widget's backing store is decremented.
* When a previously invisible native window becomes either partially or
fully visible:
- If the top-level widget has a backing store, its reference count
is incremented.
- Otherwise, the top-level widget creates a backing store with an
initial reference count of 1.
Task-number: QTBUG-8697
Reviewed-by: Jason Barron
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously, these events were enabled only on top-level widgets. This
patch enables them also for native child widgets.
Task-number: QTBUG-8697
Reviewed-by: Jason Barron
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
On Symbian, the top-level widget's backing store must be destroyed when
it is no longer required, in order to conserve memory. The criteria
for destroying the backing store is when neither the TLW nor any of
its native descendents (which share the backing store) are visible.
In order to implement this requirement, a count must be kept of the
number of native widgets which are using the TLW's backing store.
This patch provides the mechanism for maintaining this count, and for
destroying the backing store when the count is decremented to zero.
No calls to either the increment nor decrement functions are made,
however, by this code included in this patch; this code will be added
to only the Symbian backend by a subsequent patch.
Task-number: QTBUG-8697
Reviewed-by: Bjørn Erik Nilsen
Reviewed-by: Jason Barron
|
|/ /
| |
| |
| |
| |
| |
| | |
Prevents possible crash on WM_SETTINGCHANGE.
Task-number: QTBUG-11023
Reviewed-by: ckamm
|
|/
|
|
|
| |
Task-number: QTBUG-9072
Reviewed-by: Trond
|
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Always construct s60 screen furniture even if not used.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Not creating screen furniture in full screen caused regression
when swapping into idle screen and back on Nokia 5800.
Task-number: QTBUG-10985
Reviewed-by: Jason Barron
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since the paint engine now transforms the prerendered glyphs instead of
rendering transformed glyphs as paths, we need to turn on texture
filtering to avoid antialiasing artifacts. In order to do this, we also
need to pad the glyphs in the glyph cache, otherwise you will get
artifacts when sampling the area around the glyph's bounding rect (where
there might be other glyphs.) This done by adding a glyphPadding()
function to the cache which returns the number of pixels to pad between
each glyph.
Updated: This also fixes a general issue where some combinations of font
sizes and transformations will cause the engine to sample neighbouring
glyphs, so this has been backported to Qt 4.6.x.
Task-number: QTBUG-9706, QTBUG-11028
Reviewed-by: Tom
Conflicts:
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix regression with Qt::AlignRight on monospaced text in QTextLayout
Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For monospaced fonts, using the width (including the bearing) of the
text to align it to the right hand side, will break alignment of
columns of characters. To fix the problem, we go back to the old
procedure, by using the advance of the text as basis of alignment
instead.
Done-by: thorbjorn
Reviewed-by: Eskil
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes right alignment of monospaced text, which was a regression in
Qt 4.6.0. Initially it was fixed in Qt 4.7 only, but the regression was
later deemed severe enough to fix in 4.6.x as well.
Task-number: QTBUG-8864
Reviewed-by: thorbjorn
|
|/
|
|
|
| |
Task-number: QTBUG-10986
Reviewed-by: Jason Barron
|
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't use QAtomicInt in statics because they are non-POD.
|
| |
| |
| |
| | |
Reviewed-By: Olivier Goffart
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
In Symbian^3 OS supports animated wallpapers. Unfortunately animation
is drawn to separate surface underneath the application surface. To
avoid fiddling with system surfaces, Qt apps indicate to the
OS that application does not support animated wallpaper and thus,
system draws a "regular" wallpaper for the application.
This feature is supported only in Sym^3.
Task-number: QT-3148
Reviewed-by: Shane Kearns
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed an assert in QMenu
Call eglTerminate() when the last QEglContext is destroyed to free mem.
|
| |
| |
| |
| |
| |
| |
| |
| | |
The code was changed and changed the behaviour. This is
basically a kind of revert.
Reviewed-By: gabi
Task-Number: QTBUG-10735
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We never called eglTerminate() to free memory allocated by
eglInitialize() since it was a fixed allocation that would be used
for the lifetime of an application. The new behavior is to call
eglTerminate() when the last EGL context in the app is destroyed.
Task-number: QT-3383
Reviewed-by: Rhys Weatherley
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
commit 24b811e53b30546279346ab7b16799be119ab8c4 on 4.7 includes bug
fixes which are needed for 4.6 as well.
1. TouchEnd event was missing
2. pressure in touchpoints was set to 0.0 for non pressure sensitive
touch screens, it should be set to 1.0 for consistency with existing
Qt ports (e.g. mac).
Task-number: QTBUG-10885
Reviewed-by: Bradley T. Hughes
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: fix typo
QCompleter: fix misuse of QMap that can lead to crashes
qmake: added possibility to specify the type of an install target
|
| | |
|
| |
| |
| |
| |
| |
| | |
Patch providedin the task.
Task-number: QTBUG-8407
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The internal font database was only populated with .ttf and .ccc files.
This patch adds .ltt as file type.
Without complete font type coverage in the fontstore, we may get a
mismatch in the internal association of font table and fontfamily.
Most probably, this will also fix the crash on SSE Satio's. SSE
seems to use .ltt files already on S60 5.0. An improvement needs to be
verified by an owner of such a device, however.
Task-number: QTBUG-8905
Reviewed-by: Aleksandar Sasha Babic
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
Currently style defines QStyle::SH_ItemView_ActivateItemOnSingleClick,
which leads to itemview item activation only occur on double-click
(or tap). The item selection work native-like on Sym^3.
As a correction, style needs to check the passed styleoption and
check whether or not the state "Selected" is on. In these cases,
the itemactivation can proceed.
Task-number: QTBUG-10697
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
|
| |
Native menus are dismissed by the key press event.
The Qt application then receives the key up event, as it now has keyboard
focus.
The virtual mouse implementation now filters out select key press/release
which don't match the expected mouse button state.
Task-number: QTBUG-9860
Reviewed-by: Alessandro Portale
|
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed QFont to respect the italics constructor flag.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Creating a QFont with the constructor that takes the italic bool flag
didn't work properly, since the property wasn't set to be resolved.
It may be that the property should *always* be resolved, but to
minimize impact, it's only done now if you pass in 'true' for italics.
Reviewed-by: Eskil
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After replacing some code with a function call to s60UpdateIsOpaque()
we introduced a crash for widgets that set
Qt::WA_TranslucentBackground. The reason for the crash was that the
Qt::WA_WState_Created attribute was being set before calling this
function, but *not* before setWinId() was being called. This meant that
s60UpdateIsOpaque() assumed that the window was created (and the handle
added to the widget map), but this was not actually the case.
The fix here is to move the call to s60UpdateIsOpaque() after the call
to setWinId() such that those assumptions are true.
Reviewed-by: Jani Hautakangas
|
|
|
|
|
| |
Task-number: QTBUG-10512
Reviewed-by: Kim
|