| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Replace the usages of Follows with Behaviors, update docs.
(cherry picked from commit b22a5e13003ff9f23b075284a1a1e0a6b0e46250)
|
|
|
|
| |
(cherry picked from commit 1ea53e6055a7c4e9677a5003725785ad503bb242)
|
|
|
|
| |
(cherry picked from commit d5d16b3d3304774df11f40df0206d90ed5f840de)
|
|
|
|
|
|
| |
Do not stop a spring animation if the to value got
changed while notifying the target property change.
(cherry picked from commit 3f2a4f34f6206e3a94915a8d50ddfe81e047b88b)
|
|
|
|
| |
(cherry picked from commit 31cd8c15c0fdb2f08c2652609a57413a715d1b13)
|
|
|
|
| |
(cherry picked from commit 2497d922f06404f6fd1c65c6c685fbce173303ae)
|
|
|
|
|
|
|
|
|
|
|
| |
Re-add the stdlib.h include, since it brings in RAND_MAX
Reviewed-by: TrustMe
(cherry picked from commit f28a27987fa4e1b2faa1c57188c128afb735f70a)
Conflicts:
src/corelib/plugin/quuid.cpp
|
|
|
|
|
|
|
|
| |
QThreadStorage is not available when bootstrapping qmake, so fall back
to a simple static bool instead.
Reviewed-by: TrustMe
(cherry picked from commit a736d333aab9e2e97fdbb738b3f3f4646afe192e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
An unintended side-effect of commit
90a082c9076f35dcca092ade019891e92692710e is that if qrand() is used
without being seeded first, then createUuid() would always generate the
same sequence. This quite likely to happen considering the Qt does not
actually seed the PRNG, but does use it in many places (we do not call
qsrand(), but we do often call qrand()).
Fix this by changing qrand() to calculate a seed, instead of defaulting to
1. This allows us to remove the qsrand() overload with no arguments, since
qrand() will now seed automatically unless manually seeded by the programmer.
Task-number: QTBUG-11213
Reviewed-by: thiago
(manually cherry picked from commits
2ef8b92ececbf9d33d7c0b44f46c7c975fb0fdaa and
a0fffeed6fceb8244328b649a3f6feb520493bc2)
Conflicts:
src/corelib/plugin/quuid.cpp
|
|
|
|
|
|
|
|
|
|
| |
When calling showNormal on a window that was maximized, we must remove
the [X] button from the task bar. But only if it was added by
qt_wince_maximize.
Task-number: QTBUG-8408
Reviewed-by: Martin Petersson
(cherry picked from commit ad4aff6e2d188d88a2c6b4b692932adb08491d22)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The [X] or cancel button in the task bar shall just "minimize" the
widget on Windows mobile. A press on this button results in a
WM_COMMAND, IDCANCEL message. Before this patch we just sent a
QCloseEvent to the widget, which had basically no effect.
Now, we're calling showMinimzed(), which is the desired behaviour.
Task-number: QTBUG-8408
Reviewed-by: Martin Petersson
(cherry picked from commit 2c1aafa47b8915ea8aae8da229d65086e42543b3)
|
|
|
|
|
|
|
|
|
|
| |
We're now showing the cancel button explicitly in the taskbar on
maximize, if the widget does not have the widget flags
CancelButtonHint and OKButtonHint.
Task-number: QTBUG-8408
Reviewed-by: Martin Petersson
(cherry picked from commit 5f76c2b168ded91835d5d161b738a5dc03556cf6)
|
|
|
|
|
|
|
|
|
| |
By converting the char into unsigned char to avoid the overflow when
getting the century from a char for years greater or equal to 2800.
Task-number: QTBUG-8210
Reviewed-by: Michael Goddard
(cherry picked from commit 3a51462bfb3cca8c90e1c690cf045b371d2ab393)
|
|
|
|
|
| |
Task-number: QTBUG-12106
(cherry picked from commit bca7646d81d8c580820cf5f6e52122da6d984c6b)
|
|
|
|
|
|
| |
Task-number: QTBUG-12063
Reviewed-by: trustme
(cherry picked from commit 70ffe96013dcf7b4be11d1fbe850b9bbcf37c741)
|
|
|
|
|
|
|
|
|
|
|
|
| |
compilation with QT_NO_DEBUG_STREAM
Qt in debug need to stay binary compatible with Qt in release.
See also commit cbbd7e084c7e46fd906db26b13032b8368c59093 that
introduced the problem
Task-number: QTBUG-11510
(cherry picked from commit 633349982422fec92df4ed06da5d2becf788c494)
|
|
|
|
|
| |
This reverts commit 5488e9213e1163ff7cadffd32cf8c8b94e88dbf1. A fix for
the symbian build issue causing the revert is now available.
|
|
|
|
|
|
|
|
| |
It can be used for example when the hw video decoder can use
X11 pixmaps as a rendering target.
Reviewed-by: Justin McPherson
(cherry picked from commit 6771ce532f8b61499c998a502ea8c73e8e42262b)
|
|
|
|
|
| |
This reverts commit 734d4aff280f7f272a6abe8ed02fe95e2a1b4e6d, which was
not accompanied by the necessary .def file update for symbian.
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 11f5b578e398c99570215facb905f1d82f6d6817)
|
|
|
|
|
|
| |
QString::lower() is QT3_SUPPORT, the correct method is
QString::toLower().
(cherry picked from commit 46175e55c8d053b61a45aea89a3e1b8371207dee)
|
|
|
|
|
| |
Reviewed-by: Aaron Kennedy
(cherry picked from commit ae39a510f86fd13d6d41bc85d4f5c243eca45eab)
|
|
|
|
|
| |
Reviewed-by: Eskil
(cherry picked from commit 852ba9a62f65a27e42648d4b28b68c76b1589e75)
|
|
|
|
|
|
| |
Reviewed-by: Markus Goetz
Task-number: QT-3567
(cherry picked from commit c25c7c9bdfade6b906f37ac8bad44f6f0de57597)
|
|
|
|
|
|
|
|
|
|
| |
Previos versions of Mac OS X (< 10.6) didn't have support for such 'Not
Allowed' cursors. 10.6 introduced a new method for NSCursor called
operationNotAllowedCursor. This fix uses the new cusor on available platforms.
Task-number: QTBUG-5186
Reviewed-by: Denis
(cherry picked from commit 247e3637c41cc14d174a1170957274fb8a9400b4)
|
|
|
|
|
| |
Reviewed-by: Peter Hartmann
(cherry picked from commit 1c34bf050da3c4d6c303e1dd1dad9eb99e7ccbf4)
|
|
|
|
| |
(cherry picked from commit 079a4105aff9c63d4107762aec478ade9900c7c2)
|
|
|
|
| |
(cherry picked from commit 896de79554060aadf4963d8285ef3f5d8740428b)
|
|
|
|
|
|
| |
Task: QTBUG-12201
Reviewed-by: Michael Brasser
(cherry picked from commit 8ed72a96bc5c3af283f8ca4460adae9d4b466479)
|
|
|
|
| |
(cherry picked from commit 2c48de46fdfeb935d1f31ae18f13add52c162ac8)
|
|
|
|
|
|
|
|
|
|
| |
The problem was caused by the fragment id being inserted
in front of a cell spanning over several rows instead of
the next logical cell (or fragment_end) in the cells structure.
Task-number: QTBUG-11282
Reviewed-by: Simon Hausmann
(cherry picked from commit d3a6f124dde7732311ad9312ebf41997712fc6bb)
|
|
|
|
|
|
|
|
| |
This reverts commit b2a4c7f0142a48f60e7ec4fc5866917e3da8b7c3.
Unit test tst_qtexttable::QTBUG11282_insertBeforeMergedEnding
fails on mac and Linux, reverting for now.
(cherry picked from commit b2002d0814e18f7a50bdbf8d17c4bc1662fa70ee)
|
|
|
|
|
|
|
|
|
|
| |
The problem was caused by the fragment id being inserted
in front of a cell spanning over several rows instead of
the next logical cell (or fragment_end) in the cells structure.
Task-number: QTBUG-11282
Reviewed-by: Simon Hausmann
(cherry picked from commit b2a4c7f0142a48f60e7ec4fc5866917e3da8b7c3)
|
|
|
|
|
|
|
|
|
|
| |
This patch takes care of missing icon on Windows Vista+7.
It also updates the metrics to look more native in both
versions.
Task-number: QTBUG-9873, QTBUG-11974, QTBUG-6120
Reviewed-by: prasanth
(cherry picked from commit 54e3221555997d26d59b880e3e153f1fc979505d)
|
|
|
|
|
|
|
| |
Merge-request: 731
Task-number: QTBUG-4455
Reviewed-by: Peter Hartmann
(cherry picked from commit 5f6018564668d368f75e431c4cdac88d7421cff0)
|
|
|
|
|
|
| |
Task-number: QT-3573
Reviewed-by: Markus Goetz
(cherry picked from commit 1af3362a321dd055798173737d3aede367a1d30c)
|
|
|
|
|
|
| |
Task-number: QT-3573
Reviewed-By: Markus Goetz
(cherry picked from commit 69027cdb2ab9b89673edf29d5034bed33e614a05)
|
|
|
|
|
| |
Reviewed-by: Markus Goetz
(cherry picked from commit 367aa34cbcfa109926087e89d49f9223c1409d44)
|
|
|
|
|
|
|
|
|
|
|
| |
This also fixes a long-standing bug in handling usernames of type
"domainname\username", typical of Windows domains, that didn't work
with the previous NTLMv1 code.
Patch by subcontractor.
Task-number: QTBUG-9408, QTBUG-2421, QT-3248
Reviewed-By: Markus Goetz
(cherry picked from commit 1b98fbd82c7145c2f81292f8a1feb6cac74e775d)
|
|
|
|
|
| |
Task-number: QTBUG-11510
(cherry picked from commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These classes create a new QWidget and assign it to a static pointer
which is never cleaned up. Using Q_GLOBAL_STATIC ensures that they are
deleted on library unload. This is really just a cosmetic change that
removes a leak warning - the real fix should be to find a way to not
use a new QWidget like this. It seems odd that QGraphicsLayouts, which
don't use QWidget in any other way, should depend on QWidget like this.
Task-number: QTBUG-10768
Merge-request: 741
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
(cherry picked from commit ea6a5146397b668bf535ee7249bd4262d6185234)
|
|
|
|
|
|
| |
Reviewed-by: Jason McDonald
Submitted-by: Alessandro Portale
(cherry picked from commit 9c68bdf3ed66564bce3064a49ca80b7889c35952)
|
|
|
|
|
| |
Reviewed-by: Aaron Kennedy
(cherry picked from commit e55781212532e2abcdd1cef8548b146fb14f0713)
|
|
|
|
|
| |
Task-number: QTBUG-11917
(cherry picked from commit 2d4876330e292253a9133b0197e573097ecfa5bb)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Crashed because tabFocusFirst could end up being a dangling pointer when
removing an item from the scene before deleting it.
When setting tabFocusFirst in fixFocusChainBeforeReparenting, we now
check that the item is in the scene. If it is not, tabFocusFirst is set
to 0.
Autotest included.
Task-number: QTBUG-12056
Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
(cherry picked from commit 7d09f690d5b4c56699092444665d1879deb86a6e)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When setting focus on an item, subfocus chain was previously updated
only for items with a common ancestor. We now make sure that this chain
is updated also for the previously focused item (possibly not sharing
any common ancestor with the newly focused item).
Autotest included.
Task-number: QTBUG-12112
Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
(cherry picked from commit b5b011a181bd187dcef5ee8f46a3ac2c5dc2e09c)
|
|
|
|
|
| |
Task-number: QTBUG-12167
(cherry picked from commit 9adc85fdfa0af2b6948408932188ee1b79247fa6)
|
|
|
|
|
|
|
| |
Happened when currentItem was on a section boundary.
Task-number: QTBUG-12089
(cherry picked from commit 181749ff7dcfbeb5eb64026e80353f27013af833)
|
|
|
|
| |
But its still a private class.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This may mean that the cursor is to the right of the width, so components should
cater for that with a margin if they are boxed / clipped.
TextInput used to try to account for right bearing (and left bearing incorrectly since
it added it on the right). This is removed. Potentially this means that for some fonts
the text repaints incorrectly on the left or right, but if that is the case Text and TextEdit
already had such a problem (undetected), and all will need fixing.
Task-number: QTBUG-11983
(cherry picked from commit 628159323c60c434a202b036ecbaf5e433c703e8)
|