| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 49fbb6e14af78f751fa114c3cf986aaa607d7408 which
introduced crashes e.g. in Qt Creator. Since the original
change was an optimization, it is reverted in the Qt 4.8 branch
since stability is the main priority there. The crash has been
fixed for the corresponding Qt 5 commit.
It would be an option to recommit the optimization and the
crash fix to a future minor release of Qt 4.
Task-number: QTBUG-27140
Change-Id: I9dc959ea252fe55a22fd90f333ccb335b3ef1311
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is basically a backport from Qt5:
- revert the revert: 22995948cd3f46780be5d8016708aeef0cd7b066
- backport from qtbase: 487583459ea7958f24cd579888a662bcce26caf3
this fixes the off-by-one error in the binary search
Task-number: QTBUG-17209
Task-number: QTBUG-231
Change-Id: I7f62fb33cf919ecd7fb2246ae01bb23559e11bf4
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
If the cached state is not dirty and the instanceCount is zero, when the
instanceCount is incremented the cached state will not be correct. To
fix this, reset the cached state to dirty if the instanceCount is
incremented from zero.
Change-Id: Ic49eef7f83b1289a939f998817b1b2b5f5a2a45f
(cherry picked from commit e5ebcbc6343a5d5d815cbbd1812f1f5791b7bc88)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
| |
When using QBlittable with SourceOverScaledPixmapCapability, rendering
through clipAndDrawPixmap is incorrect when stretching: source pixmap
rectangle has to be corrected using scaling factor.
Change-Id: I80ad1c5ddc73a7b7394d0f5b412931c6279c175a
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If a QWizard is shown when Aero is enabled, the current visual style is
cached in a static member of QVistaHelper. The cached state is updated
by QVistaHelper when it receives WM_THEMECHANGED or
WM_DWMCOMPOSITIONCHANGED events from Windows.
If all QWizard instances are destroyed, there are no instances of
QVistaHelper to receive these notifications and update the cache. If
Aero is now disabled, the cached current visual style in QVistaHelper
isn't updated. If a wizard is now created and shown, a large black
rectangle is shown in the titlebar.
A static instance count is added so that when no wizards are running,
the cached state is not used.
Task-number: QTBUG-27004
Change-Id: Iefe4c8552388280219c9726418ed7476b8ebb15a
(cherry picked from commit 952ea029f40aaff9de0101fc165907ef8693e4aa)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Qt::KeypadModifier modifier is internally masked away from all
shortcuts. So it is not possible to set a keypad only shortcut.
Changed the implementation so that first a full keysequence match is
searched. Then if no match is found the same sequence is tried
without the keypad modifer.
Added a autotest for this also to cover the basic use cases relating
to this.
This is a backport of qt5 commit:
547a1bea492954d828aa0798be93384669812489
Task-number: QTBUG-20191
Change-Id: Ibb6809050ff6da23bdb1c087b93e517d1963d34c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Before, setBoundary was O(N), now it is O(log N) assuming the boundaries
are added in order. (splitItem might still be linear because of the call
to QVector::insert)
This speeds up a lot QTextEngine::addRequiredBoundaries when there is a
lot of addFormats. (For example if there is a very long line with syntax
highlighting)
Task-number: QTBUG-8389
Change-Id: I10c9fca72343f46db24b1d4f519f7747188d4009
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit c13011829fd39661cc9e983256766c6edb88dead)
|
|
|
|
|
|
|
|
|
|
| |
Don't call the linear QTextEngine::format in the loop.
Instead, keep track of the current formats by indexing their start and end position.
Task-number: QTBUG-8389
Change-Id: I89c18b804111edfab6254442cbee33da39d1a273
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit 4f6efe16416f0222ae78ab16c0eb8085bf9c521b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When hitting on a child widget that does not accept drops,
go up the hierarchy until the parent is hit or a widget
that accepts drops is found.
Introduced by f6bf4b2baa91e55f40596bf3f2823b119fdfa5e0 .
Task-number: QTBUG-22987
Task-number: QTBUG-27037
Change-Id: I4d9308942c1109c11f7e31555d4ad84fa2610d15
Reviewed-by: Markku Tapio Heikkilä <markku.heikkila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If you had a QTreeView with expandable items, if you tried to expand and while
the animation was still running you'd try to collpase the node,
the display would be completely broken: the items below that items would
not be visible any more except for a fraction of a second when expanding
or collapsing it again.
The problem is in the fact that when starting an animation the QTreeView
stores the state before animating. And it does that even if an animation
is already running. So the stateBeforeAnimation becomes AnimatingState and
when the animation finishes, AnimatingState is the state that is restored
breaking the painting.
Unit test is included.
qtbase-sha1: 1e97dbaf6ca807397e3ec77a3611763769499d17
Change-Id: I62e16101b70153f78022f6195fd9de6db0cd4878
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
| |
This is a backport of 799ceebad8a2dbe1ca0e60a11c7d6ca0c2c8b7a9 from
qtbase.
Task-number: QTBUG-21804
Change-Id: I757b9598f354cdfa62c08d0c2613ded93fe88804
Reviewed-by: Jani Honkonen <jani.honkonen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The listitem width was calculated incorrectly because spacing was
not considered. This fixes the second part of the reported bug where
spacing is set. Added some tests to catch the issue relating to the
reported bug.
Also added a test to check spacing in general.
Backported from Qt5 commit:
d2bba5e5535726f277e8dc67b1478168f57b24bd
Task-number: QTBUG-21804
Change-Id: I20cae3a2b9d42650052441f9f15b43f72418f58b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QWindowsVistaStyle::drawPrimitive() method was trying to draw the
pixmap for an item in an item view even if the section width was zero
or less then zero. This resulted "QPainter::begin: Paint device
returned engine == 0, type: 2" error.
It's now checked that the width and the height of the section is
greater than zero before creating the painter.
Task-number: QTBUG-26047
Change-Id: I36dd2792fd505be773951e5ac36b0e3362ec2292
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 929e934969c621d7c1773e4233c14d358de4d385)
|
|
|
|
|
| |
Change-Id: Iec3efb4b91bdba33fe93b928ff2349440e15aa35
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-26891
Change-Id: I9b726d8766337fbb001afcb9ecbc45f51b6e363f
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
(cherry picked from commit 75901712f04eceafd164cbbf752c916070b44507)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are some security issues with undo/redo. User should not be
able to get the erased password back in any situation. Therefore
redo must be disabled completely and undo is limited only for erasing
previously entered text.
Backported from Qt5 SHA1: 121062d8848986dcfaf421388a5603b3b48a1e58
Task-number: QTBUG-14226
Change-Id: Ia712f95e8a2e45537a95d48b70686a1a8dd95da2
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the selected item is scrolled with keyboard keys the selected item
will go outside the visible area. The scrolling did not take hidden
items into account when calculating the amout to be scrolled.
Backported from Qt5 commit:
d4385e48b8566a5587048a3c6d8b2396ba587ed5
Task-number: QTBUG-21804
Change-Id: I81a82ed56bb0e4c0229fd117784790e1234aacca
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
| |
It was probably not implemented because it needed to access
private APIs.
However, accessing those from this a11y plugin is unproblematic.
Change-Id: Icadad45a83daa60e2fbc4cab17b91c84c3f36a7f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
|
|
|
|
|
|
|
|
|
| |
When user drags a dockwidget out of the docking area, restore widget's
previous floating size and center it's titlebar under the mouse.
Task-number: QTBUG-2940
Change-Id: I004de36d649abc4c32420bdd46bb6c810ef98c64
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These files where skipped when tst_license was enabled a while
ago since they had a different license header that didn't match
our test.
Fix these licenses and stop skipping them in tst_license.cpp
Change-Id: I14b2aa1b7c794894c2c74aedab01ff8667621003
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
delay deco widget freeing because the pointer to it
is still available to the drag operation.
Task-number: QTBUG-19363
Change-Id: I775864f72d7151c9fbd26feff5a9bd844f87f292
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QItemDelegate takes the USER property as the value to be set using
model->setData(). The text is what is expected.
follow-up to b1b87a73012342dc1619a8e907ea9954d59ca564 which in Qt 4.8.0
broke the interaction between QComboBox and QItemDelegate used by
QDataWidgetMapper and item views.
Task-number: QTBUG-26501
Cherry-picked from qt5/qtbase 816c5540179362500dfc175b77f05abf3ef25233
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Change-Id: Ie9c228f2aa47f194467419398b37d05d98a70a1b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
Backport of b84e180263d0da3d1e6967fcf759225a778ea6ea
from qtbase.
Task-number: QTBUG-26107
Change-Id: I8323b19ce7b641165de21ad9a6e6b05bf4d93b1c
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
| |
Change-Id: Id9bdb0199f926d1a518a94080285f96f0810cf92
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
| |
Change-Id: I9db2572ea2d437ecbba94911e1dfb9d0cb6503a4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
| |
Probably leftovers, they're not matching with the code anymore
and break the build when uncommented for testing.
Remove the first one and move the second one to the right place.
Change-Id: Ib40df6036efefd6e228c280821a8719f0e6fd47e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The corresponding window and widget are found by the function later on
if not provided by the plugin, so having a null widget pointer is valid.
This check is unnecessary and breaks integration of QPA plugins not
widget-aware, such as the LinuxInput and TsLib ones.
The bug has already been fixed in Qt5.
Change-Id: I650308ce14e84d42b0c6d64f4f0ae1720728054c
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
| |
Change-Id: I604c489b9209603346eec23d35444ee1b02bf698
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Replace duplicated line MaximizeAction with RestoreAction
Task-number: QTBUG-17428
Change-Id: I5120afeed6715d28045f3eee01f26ee482f02ed1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 006b620ef9390e9396c69db74e31785b04a5d2d6)
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Bug detected with animatedtiles in example/animation.
In qpa mode, using some specific resolution of directfb such as
800x600 causes a bug in FillRectF where there is an infinite loop due
to scalabilty of qreal value: One is rounded and the other not.
Change-Id: I0a9c902889f589d669f60ff1b71fdc5266143826
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-23657
Change-Id: I1a931c92fb07806c80353b4c17ee86a0c09f8ad8
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QML TextInput and TextField elements with echoMode TextInput.Password
adds enter key into container string.
Modified filtering in Symbian QCoeFepInputContext to disable adding
enter key for hidden editors.
Task-Number: 1009418
Change-Id: If7928ccdb131d11f8c975b0efe890b85f3ba202e
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When you're inserting a column in front of a rowspanned cell
and this cell is not the first in the rowspan, we would get
the wrong logical index of the new cell (putting it in
front of the initial cell with the rowspan). If the cell
does not span all rows, the table will get into a broken state
and trigger asserts in update(). To fix this, we search for
the first cell after the insertion point which has a logical
index higher than the cell directly before the insertion point.
Change-Id: Ic6fb66bc25ad91f3534886f964173ead924429e2
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This is already handled by the QPlatformTheme in Qt5
Change-Id: Ice21ecbaeb3f62e467a6e1496200f9040e907eb5
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Fabian Bumberger
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
| |
Change-Id: Ie5634dce74d115a68f64681e964edce68427f1a6
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
C++11 makes narrowing initialisation using {}s an error.
For an ARM target qreal != double, so force-cast to
qreal.
KAPPA now is consistent with the define of the same name
in qbezier.cpp.
Change-Id: I506218ee1f8cd0cdee21791cc402a479a429f7e5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
Gerrit change I0b9f6205ca1521fc54d3b688ccd1225823263aac
is missing two needed header file includes. This task
adds them in.
Change-Id: I210515cef81bc03a5ad76a4bac3a5a50ad28e37d
Reviewed-by: Aapo Haapanen <ext-aapo.haapanen@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
On Mac we have to fake the QEvent::Enter event when entering a widget
so we need to ensure the buttons held down are set as part of that event
otherwise it causes problems with graphicsview which will update the
grabbed item based on this event.
Task-number: QTBUG-19353
Change-Id: I89252a46b5edd0d82b6b1a0cf2592f72b472e5cc
Reviewed-by: Nils Jeisecke <jeisecke@saltation.de>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
|
|
|
|
|
|
|
| |
Since we could have moved the line position (QTextLine::setPosition),
the truncating position should be adjusted with that.
Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Added enabling of CEikEdwin::EAvkonEnableSmileySupport flag for normal
Symbian editors so that smiley/emoticon button or menu is enabled.
Change-Id: I0b9f6205ca1521fc54d3b688ccd1225823263aac
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-14766
Change-Id: I0b9ec19ea43355e04a12f2dc0244b22b575fab44
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Prevent recursion in QMainWindowLayout::endSeparatorMove().
Task-number: QTBUG-21378
Change-Id: Ie40005a35918d4da7ef911f8c3b1d1c3b5cf4fd2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
QTBUG-25281)
Change-Id: Idbd6671fdd665b9368709832f99bc42d2d9a1f84
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com>
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Daniel Richard G. <skunk@iSKUNK.ORG>
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There have been some crashes seen on Symbian when its
adoptedThreadMonitor attempts to clean up objects created in other, now
dead, threads. Some of these objects simply can't be cleaned up
properly outside of their original thread, so the thread has to be
checked when they are cleaned up, and cleanup skipped in the wrong
thread.
For pthread created threads, we also have the ability to insert cleanup
code during thread shutdown. This was used in the 4.7 implementation of
QThread on Symbian, and is a better solution for pthread based adopted
threads as it gives in-thread cleanup. So the appropriate pthread code
is also used with changes to adoptedThreadMonitor so that it can run
along side the pthread cleanup code.
Change-Id: Iad8207879b1ece62e5cce85f26a616166aa22486
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Reverting changes from 1b031759ddfdab9703dfecac13f1ed318da3dafe except
for Mac
Task-number: QTCREATORBUG-7215
Change-Id: I8570c4bd35daf8b5820507a9399d33d00f96d41b
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Scrolling happens in integer steps, so it's necessary to use a
fractional correction value.
Task-number: QTCREATORBUG-7127
Change-Id: I1b027d2482b7daac83ddc8cac64d2a4449de257c
Reviewed-by: Matthias Ettrich <matthias.ettrich@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Drag and drop icon does not update correctly because WA_acceptDrops
attribute is not checked on DragOver event.
Drag and Drop icon does not update itself appropriately
when the cursor enters an invalid drop area.
Icon is not updated because WA_acceptDrops attribute is
not checked in dragover. Also removed lines which force parent
widget WA_acceptDrops to true, if child widget sets it to true.
No autotest, because QTestlib does not support drag and drop.
All examples under Drag and drop have been manually tested though.
Task-number: QTBUG-22987
Change-Id: I0c2b9dc7292db7710c5585d99790514329c2db8e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This fix prevents copying of a QPointer on a stack and adding/removing
QMetaObject guards
Backport of the ed776e367099754af6436f07d72352e6b73124da commit in
qtbase
Change-Id: Ie92fe1e7ac2c8d15be67404521040bf1a64b9c9a
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Frequent calls to editorForIndex/indexForEditor are very slow because of
an implicit conversion from QModelIndex to QPersistentModelIndex.
This fix allows to avoid unnecessary conversions when there are no open
editors (most common case)
Backport of the 1d859ef80540ec3dd64f4f7bda3a8e415965650c commit in qtbase
Change-Id: Id4f8c985b824a83019dc8a8543dee69c12004faa
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|