| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
The problem was that the QT_BEGIN_NAMESPACE was in the wrong place.
I moved it 10 lines before and the problem is gone.
Task-number: QTBUG-12262
Reviewed-by: Prasanth
(cherry picked from commit b0998a44a5dc384a6cf65c1d5910cb3dd40620cf)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The way we detect the end of a default argument does not take in account
template parametter.
It is unfortunatelly not trivial to do it properly without semantic information
So we will use heuristics and if the number of < matches the number of >
we consider it is a template. Or if we have a '=' we consider it is not a
template.
Task-number: QTBUG-12260
Reviewed-by: Roberto Raggi
(cherry picked from commit 4da1a3b63445c04d4ca4acae448e9b6b046938c3)
|
|
|
|
|
|
|
|
|
| |
QTextBlock::layoutDirection() doesn't exist, and the QStaticText
constructor no longer takes a size argument.
Task-number: QTBUG-12072
Reviewed-by: Fabien Freling
(cherry picked from commit 04bc2b1f37750a2afbb88521001758249a8df383)
|
|
|
|
|
|
|
|
|
| |
Otherwise it is not possible to build projects outside of the Qt tree
without installing Qt to the SDK first.
Task: QTBUG-11727
RevBy: Trust me
(cherry picked from commit 11d626de5fd87fc8cbd9d685bde8217c7ad7fae6)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This only happens when the ItemHasNoContents and ItemClipsChildrenToShape
flags are set. Problem is that items with no content are threated as 'dummy'
items, which means they are never drawn or 'processed' otherwise, so the
cached bounding rect is not reliable/usable. This means that in case of
changing the geometry of such items, its children always have to take
care of invalidating the occupied areas and the update can not be
clipped to the item's bounding rect.
Regression after commit: c1c7dbf2
Auto test included.
Task-number: QTBUG-11504
Reviewed-by: yoann
(cherry picked from commit 4df9c96e2c213c39924e22e02621b0c61e83f8fe)
|
|
|
|
|
|
| |
Task: QTBUG-11385
RevBy: Jason Barron
(cherry picked from commit d9e75d77ac3da86c32d280895beac2936d8869ca)
|
|
|
|
|
|
|
|
|
|
| |
If Oracle national char types use different charset(NLS_NCHAR_CHARSET) with
the database charset (NLS_CHARSET), the oci client need to set OCI_ATTR_CHARSET_FORM
to SQLCS_NCHAR instead of SQLCS_IMPLICIT.
Task-number: QTBUG-10919
Reviewed-by: Michael Goddard
(cherry picked from commit f8f255553f3640355d3e196e100778256741701c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The reason for the infinite recursion was that
QAccessibleTitleBar::object() returned the titlebar's dockwidget.
This could lead to a problem when the AT client tried to
traverse the accessibility hierarchy:
As a response to QAXChildrenAttribute (retrieve children) on a dock
widget node, it would register it's children in the
hierarchy manager. In this case, the object registered for the titlebar
interface was the QDockWidget.
In order to do further traversal, the bridge could call
queryAccessibleInterface on the list of retrieved children to get the
QAccessibleInterface for those objects, however, that would return the
QAccessibleDockWidget interface that we just had traversed,....
Task-number: QTBUG-6843
Reviewed-by: Carlos Manuel Duclos Vergara
(cherry picked from commit 64b9e63f4f9162c1af299b1355e84b0e616ad768)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QSymbianBitmapDataAccess is used to provide access to the bitmap heap
in a manner that locks correctly on all platform versions. The
heapWasLocked variable was meant to protect against the case where
the heap is locked recursively. However, it failed to take into
account the case where the same QSymbianBitmapDataAccess object was
used to lock recursively. In this case the variable would be changed
to true on the second lock, which means that the lock would never be
released again.
This was fixed by making the access reference counted instead. Since
the bitmap heap lock is global, the refcount was made global as well.
Task: QTBUG-11129
RevBy: Jason Barron
AutoTest: Works again. It was hanging before this fix.
(cherry picked from commit d4cc1dcea5b4116767cfee0ec45bfba72dc011ff)
|
|
|
|
|
|
|
|
|
| |
When the sections were moved calling logicalIndex on what was already
a logical index messed up the hidden sections.
Task-number: QTBUG-12268
Reviewed-by: Gabriel
(cherry picked from commit 8517f787b798d9e300438404aab359de2acc0978)
|
|
|
|
|
| |
Task-number: QT-3613
(cherry picked from commit 2c574ed1bf9943130fb9af5435b557a47e3c462b)
|
|
|
|
|
|
| |
Task-number: QT-3584
Reviewed-by: Trustme
(cherry picked from commit 30341a6f9e57caac3ec19e02ffd67164d43c0453)
|
|
|
|
|
| |
Task-number: QTBUG-10439
(cherry picked from commit 75db37022a9fd479e2a446b57e774eaf8e3e73ea)
|
|
|
|
|
| |
Reviewed-By: Alessandro Portale
(cherry picked from commit ebf650dd893a8f6ace2252cd2a18ee895520f29d)
|
|
|
|
| |
(cherry picked from commit 368dd3c234b9011ab8a8506b50fce6f55694199c)
|
|
|
|
|
| |
Reviewed-By: Jason McDonald
(cherry picked from commit a545e26e1183133f4a66cb9a3bcd9051e2d77894)
|
|
|
|
|
|
|
| |
It relied on the now missing pixmap property. Since it isn't used, it
doesn't seem worth the effort to update it to use a declarative image
provider instead.
(cherry picked from commit 75131b7a1bfeeb033ea5b8bf62d50cc3d82d757e)
|
|
|
|
|
|
|
|
| |
Some people didn't figure it out intuitively, so extra help is now
provided.
Task-number: QTBUG-11868
(cherry picked from commit 8668f245b69da455ac7fe1d0a599226c1d6b9580)
|
|
|
|
|
|
|
|
| |
QDeclarativeVisualDataModel::stringValue() did not handle
QList<QObject*> model types.
Task-number: QTBUG-12005
(cherry picked from commit b6251d31652232a6ac3a5dff54ad4229542089b1)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Always place PathView delegates centered on the path
The scale of the delegate was used to offset the item. This was a
bad way of making the item appear to be positioned correctly when
the default transform origin was the top-left. Now that transform origin
is center, it is obvious that it was a bad idea.
Task-number: QTBUG-12245
Reviewed-by: Michael Brasser
(cherry picked from commit 19473443dbeff4a57cd6ec6572ca29c2e70d672c)
|
|
|
|
|
|
|
|
|
|
|
| |
The scale of the delegate was used to offset the item. This was a
bad way of making the item appear to be positioned correctly when
the default transform origin was the top-left. Now that transform origin
is center, it is obvious that it was a bad idea.
Task-number: QTBUG-12245
Reviewed-by: Michael Brasser
(cherry picked from commit 5572ec653fe735c4f413195c1ef34382aa8c6105)
|
|
|
|
|
|
|
|
| |
Change to Behavior from Follow means that some of the previous
assumptions are now incorrect. Script logic has been fixed.
Task-number: QTBUG-12246
(cherry picked from commit 9e4fb690b864f8d0c05d70687a3498b9eb9b2ed5)
|
|
|
|
|
| |
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)
|
|
|
|
|
| |
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)
|