| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
(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)
|
|
|
|
|
| |
Task-number: QTBUG-10658
(cherry picked from commit 237bc693a527f9cb2b6bbe7c518018cbf56b0eb6)
|
|
|
|
|
|
|
|
|
|
|
| |
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: QT-3585
Pre-approved-by: Legal
Reviewed-by: Trust Me
(cherry picked from commit bba06aacb84b5ae9fc286345e721cab639db35c8)
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Reviewed-by: joerg
(cherry picked from commit 00b7befbc003682a351c18d90436010efd26ece5)
|
|
|
|
|
| |
This reverts commit 7702be3de6e2641afb1062f533567ca7a72e8e0f as a
potential fix 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.
|
|
|
|
|
| |
This reverts commit 74564a9b9f0f4e4ead8c3e38f72c24054b65f62a, which
breaks configure for Windows CE builds.
|
|
|
|
|
|
|
|
|
|
| |
Although the wait is only specified as 50ms, it might still take longer than
that for Qt to deliver the actual mouse release event (especially on
embedded devices). The problem here is that in the meantime the auto-repeat
on the button might have been triggered.
Reviewed-by: Dominik Holland
(cherry picked from commit 1e9348f52f06feb355245a9fffd786562e76e15f)
|
|
|
|
|
| |
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)
|
|
|
|
| |
(cherry picked from commit 956081702b5701ec570085174878a264c86c136b)
|
|
|
|
|
| |
Reviewed-by: Aaron Kennedy
(cherry picked from commit ae39a510f86fd13d6d41bc85d4f5c243eca45eab)
|
|
|
|
|
| |
Reviewed-by: Robert Griebl
(cherry picked from commit 30630cf2bf8c7604efc3a52f74983c2237f309c3)
|
|
|
|
| |
(cherry picked from commit bd9e495a025ff8d282d54e8909771c8760ebdb3f)
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
| |
don't have configure create the forwarding headers (or symlinks on unix)
for qconfig.h, but instead have syncqt create forwarding headers for
not yet existing files.
Reviewed-by: joerg
(cherry picked from commit 74d0482c1690211a20bdfc996aa0ad30fdb9bb28)
|
|
|
|
|
|
| |
Merge-request: 740
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 80ad34046e2d3d0b8bd5d8346cb1edb0c83c1585)
|
|
|
|
|
|
| |
Merge-request: 740
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 156193223ee9d58da66817ae6ffc0174bdf34e5b)
|
|
|
|
|
| |
Task-number: QTBUG-12157, QTBUG-12148, QTBUG-12146
(cherry picked from commit d3f67bfe7cd1cc39d25e6a7371b2b185591008c4)
|
|
|
|
| |
(cherry picked from commit 1d3aa6681423d7a39a8ed375448a9418ef33a1f5)
|
|
|
|
| |
(cherry picked from commit c50d351df3b7fe2f0d10444c1080b6a8c9833e0f)
|
|
|
|
|
|
|
| |
Adding a variable to the qdocconf file will now generate the docs in Creator format
Reviewed-by: Martin Smith
(cherry picked from commit e649d255bc3785c9af7c36e743ac204c8890137e)
|
|
|
|
| |
(cherry picked from commit bc16436e33cfc61e0009474186cbb8210fb51df7)
|
|
|
|
| |
(cherry picked from commit 25ace9513587abb5e52f78d900e6bec7b04bb663)
|
|
|
|
| |
(cherry picked from commit 5a6e3d952327753cb0cc00fa22804c5dab435c39)
|
|
|
|
| |
(cherry picked from commit a538ccb93fd05b26dc7a7058bbb62e0dcb682f81)
|
|
|
|
| |
(cherry picked from commit 3062dac75befacffc1964d49392a58f5fb0b583f)
|
|
|
|
| |
(cherry picked from commit 896de79554060aadf4963d8285ef3f5d8740428b)
|
|
|
|
| |
(cherry picked from commit 0ad74254d0810459bc08fdf9c0898a0d73f596b0)
|
|
|
|
|
|
| |
Task: QTBUG-12201
Reviewed-by: Michael Brasser
(cherry picked from commit 8ed72a96bc5c3af283f8ca4460adae9d4b466479)
|
|
|
|
| |
(cherry picked from commit 2c48de46fdfeb935d1f31ae18f13add52c162ac8)
|