| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
|
|
| |
There are some fraudulent certificates in the wild that are not valid;
this patch introduces a blacklist of serial numbers of those
certificates.
Reviewed-by: Richard J. Moore
Reviewed-by: Markus Goetz
Task-number: QTBUG-18338
(cherry picked from commit 04e074e8d7c097295505e63565abdc7ca2b49f7b)
|
|
|
|
|
|
|
| |
Merge-request: 731
Task-number: QTBUG-4455
Reviewed-by: Peter Hartmann
(cherry picked from commit 5f6018564668d368f75e431c4cdac88d7421cff0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
in the unix code, if the QMutexPrivate::wait() with a timeout
expires in the same moment that the mutex is released, wakeup
would be set, but would be then ignored. (reset to false
quickly after)
If we waken up between the timeout and the re-aquisition of
the internal mutex, we consider that the mutex has been locked.
Reviewed-by: brad
Task-number: QTBUG-16115
(cherry picked from commit 7987d4cfd3ce86c20a55b5661a5221f12246b27e)
|
|
|
|
|
|
|
|
|
|
| |
Note that this is a surgical fix for 4.7 only.
In 4.8 we will add these checks at the top
of the styling functions or in the widgets instead.
Task-number:QTBUG-15227
Reviewed-by:gabi
(cherry picked from commit 8a3c4c8283e4762744a29262ce507713565c1c0c)
|
|
|
|
|
|
|
|
|
| |
This patch reduce time in which QScriptEngine would abort an script
executing multiple long-running native functions.
Task-number: QTBUG-9433
Reviewed-by: Olivier Goffart
(cherry picked from commit eb407209bb9f2c06684fd1299169cd3b8ab4b58d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change 7c673a4cf64ba04 introduced some autotest failures in the
fpe_steepSlopes test in QPainter.
Since the other rasterizers all deal in a 26.6 fixed point coordinate
space we should snap the line vertices to this to prevent floating point
overflows due to very steep slopes.
This also necessitates keeping track of four different slope / inverse
slope increments for each of the four edges.
This also fixes a previously QEXPECT_FAIL'ed test case.
Task-number: QTBUG-13429
Reviewed-by: Trond
(cherry picked from commit 93199a5b7082fd484b7f21ad4825d71693ecead2)
|
|
|
|
|
|
|
|
|
|
|
|
| |
With a large pen width and a small scale, due to the hacky way we draw
points (stroking a line from (x, y) to (x + tiny_amount, y)), we some
times end up snapping these two points to the same in rasterizeLine().
If we instead apply the SquareCap before we do clipping / snapping we
don't get this problem.
Task-number: QTBUG-13429
Reviewed-by: Trond
(cherry picked from commit 7c673a4cf64ba043bb27f90287517bdcdd7a21db)
|
|
|
|
|
|
|
|
|
| |
We were accessing the d-pointer of a QSslConfiguration which is
initialized lazily.
Reviewed-by: Markus Goetz
Task-number: QTBUG-13265
(cherry picked from commit d686a95ed54b19336affc14c9222de54c9af0e72)
|
|
|
|
|
|
|
|
|
|
| |
X509 has two time formats: UTC, where the year is in two-digit format,
and generalized time with four-digit years.
This patch allows dates specified generalized time.
Reviewed-by: Thiago Macieira
Task-number: QTBUG-12489
(cherry picked from commit a77dbcdbb7022cc754ba87aea9a4fc471d1e4495)
|
|
|
|
|
|
|
|
| |
even if the local specify QLocale::OmitGroupSeparator
Task-number: QTBUG-9281
Reviewed-by: Denis
(cherry picked from commit 720f4ca0ec3b42a101ac24b2cf74cdc87d29eac9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 3c7e7992461b1fef37ada68244f1b5b891015bda)
|
|
|
|
|
|
|
|
| |
Trivial fix, valid formats have pixel format != Invalid, not ==.
Task-number: QTBUG-12337
Reviewed-by: Andrew den Exter
(cherry picked from commit 51cf737151c1c446a9ce77832774202b6bdb4ba2)
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We used to delete the tracked object before the new tracking was
properly set up in QSharedPointer. That means if the tracked object's
destructor or deletion function recursed into the QSharedPointer, it
would find itself in an inconsistent state.
So instead finish the setup and only then call out to user code. That
ensures the internal state is always valid.
Task-number: QTBUG-11730
Reviewed-by: ossi
(cherry picked from commit 943d63e45ad09f75daa7d2f3dcc17bb28fda1766)
|
|
|
|
|
|
|
|
| |
That would happen because the loop to find the next action when
navigating with the keyboard was not good enough.
Task-number: QTBUG-11823
(cherry picked from commit 8ea60a39a8c4661db505a6dc1342e524ec2e460c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Problem was that we didn't take the children's effective mask
into account when checking whether a point was inside or not.
This commit is also an optimization since we no longer check the point
against the widget's rect twice. Furthermore, unnecessary
QRegion operations are completely avoided in the common case.
Auto tests included.
Task-number: QTBUG-7150
Reviewed-by: paul
(cherry picked from commit 7101ae5a0e90d97acf86a444c4d51ca45e7863fe)
|
|
|
|
|
|
|
|
|
|
| |
have only one element
Replaced the isEmpty() check for the shortcut in map() with elementCount() == 0
Task-number: QTBUG-11264
Reviewed-by: Samuel
(cherry picked from commit 90e009e9e273a4fea5166007e4c2b0638c6588cd)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
the internal ucstricmp and ucstrcmp contains different bugs if the
strings are not 0-terminated, as it is with QStringRef.
- in ucstricmp, even if the pointer are the same, the lenght could
be different
- we used to deference the 'end' pointer, that would be 0 if the
string ends with 0, but we cannot do that in the general case
Task-number: QTBUG-10404
Reviewed-by: Denis
(cherry picked from commit cd003bfcf9a05967893099e8948ba3d8f281aa7d)
|
|
|
|
|
|
|
|
|
|
|
| |
We were calling an OpenSSL function that returned a long for the serial
number; sometimes serial numbers are too big to fit into a long (up to
20 octets). In that case, do not convert the serial number to decimal,
but just output the hexadecimal value.
Reviewed-by: Zeno Albisser
Task-number: QTBUG-9973
(cherry picked from commit 0f16c7ce8dcd6f4905d14875088c55148e41366a)
|
|
|
|
|
|
|
|
| |
warning: format not a string literal and no format arguments
Task-number: QTBUG-8967
Reviewed-by: Gabriel
(cherry picked from commit 814f7d3d607edacca091273302297b6b2674424f)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
http://bugreports.qt.nokia.com/browse/QTBUG-9618
QtWebKit currently fails the following test:
LayoutTests/http/tests/xmlhttprequest/cookies.html
This is because QNetworkCookieJar::cookiesForUrl returns secure
cookies even when the connection is not secure.
A 'secure' cookie is set by response headers from a http server as follows:
'Set-Cookie: cookie-name=value; secure'
Correct QNetworkCookieJar::cookiesForUrl to ignore secure cookies when the
url in the request is not 'https:'.
Task-number: QTBUG-9618
Merge-request: 2372
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 483fdd017d9998c6d7f4a035ca615e15fbc97e6a)
|
|
|
|
|
|
|
|
|
| |
It could return wrong values because we were not always checking
the right cols/rows.
Reviewed-By: gabi
Task-Number: QTBUG-10169
(cherry picked from commit 8bde410a6d0b1510d182a365d769db182b1c07dd)
|
|
|
|
|
|
|
|
|
|
|
| |
Only the leftmost tab was being correctly laid out after the move due
to a mistake in QTabBarPrivate::layoutTab().
Auto-test included.
Reviewed-by: Thierry
Task-number: QTBUG-10052
(cherry picked from commit 4743831d128dfad4ac9fbafa6e7544dbe7fb7ed2)
|
|
|
|
|
|
|
|
|
| |
The cursor was reset even when it had not been previously saved.
Autotest included.
Task-number: QTBUG-7438
Reviewed-by: bnilsen
(cherry picked from commit ad0c6b17cde4a3ce0041d1a54b96ccb5a6792520)
|
|
|
|
|
|
|
|
|
|
|
| |
Improved/fixed canRead(). Added svgz support. Implemented ClipRect,
ScaledClipRect and BackgroundColor support. Avoid data copy when reading
from memory. Improved support reading from sequential devices. Added svg
and svgz files to the qimagereader autotests.
Task-number: QTBUG-8227 and QTBUG-9053
Reviewed-by: Kim
(cherry picked from commit 2fe059c863377befdcf65084a07a7f4841beef0d)
|
|
|
|
|
|
|
|
|
|
|
| |
... according to the online MSDN documentation.
Hid the cachedFd member in private data under WinCE, since it's never
used there.
Task-number: QTBUG-9085
Reviewed-by: Zeno Albisser
(cherry picked from commit 7986ab58b9a5d0828291c857d3ce86bfa1af4e6e)
|
|
|
|
|
|
|
|
|
| |
We can't rely on the exposed rect since the item can be outside the view
so we need to regenerate the complete pixmap.
Task-number:QTBUG-8750
Reviewed-by:sroedal
(cherry picked from commit fcb738161efc965e91c3d528c31ac77d3a05ac64)
|
|
|
|
|
|
|
|
| |
This could happen if a section was moved andthen hidden
Task-number: QTBUG-8650
Reviewed-by: Andy Shaw
(cherry picked from commit f9b0efc17962df74a67d81daca5814af93a5fb97)
|
|
|
|
|
| |
Reviewed-by: Peter Hartmann
(cherry picked from commit dd6c5cad88a56fb3a342fe9d4fc3b113ffe3fd53)
|
|
|
|
|
|
|
|
|
|
|
| |
Ideally, we should write a BOM after seek(0) if setGenerateByteOrderMark
has been called, but we don't store that information. This commit is an
improvement for the default case when generateByteOrderMark is false, and
also when seeking to any other position than 0.
Task-number: QTBUG-6295
Reviewed-by: Olivier
(cherry picked from commit 7837de27309c958dc5a5985afc55492ec3054ee0)
|
|
|
|
|
|
|
|
|
|
| |
This commit fixes an auto-test failure after fixing QTBUG-8733.
The calculated element bounds should now be much tighter and
respect the width of non-cosmetic pens.
Task-number: QTBUG-8733
Reviewed-by: Trond
(cherry picked from commit ea9f2aeba6f18d19d6a82b3a829373ec032af14f)
|
|
|
|
|
|
|
|
|
|
| |
The vector-effect property is not inherited by default, so it
must be set on each item with a stroke. It is not sufficient
to set it on G nodes.
Task-number: QTBUG-8733
Reviewed-by: Trond
(cherry picked from commit 7b500ed543bb86429ef6fdb82b103784d6cc6a0c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The obvious fix is to use the previsously computed 'section' as paramatter.
(It is even faster)
But one might wonder why logicalIndexAt() does not return the same result
before and after flipSortIndicator(). The reason is that while being
sorted, in _q_layoutChanged, all the hidden section where unhidden and hidden
again. Leaving some pending computation.
Task-number: QTBUG-7833
Reviewed-by: Gabriel
(cherry picked from commit 188c2ef11e92d04dcf334309c85a7f1b14945aaa)
|
|
|
|
|
|
|
|
|
|
| |
Instead, we were returning 0, even if this index did not belong to the
match.
Task-number: QTBUG-7049
Reviewed-by: Volker Hilsheimer
Reviewed-by: Olivier Goffart
(cherry picked from commit dadb99ea2c59d7d0f7a83134b7df5aaaaf80a995)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
dynamicSortFilter is turned off
We should not sort when inserting items if the dinamicSortFilter flag
is set to false.
Note that some of the test used to rely on the fact that it was sorted.
Those test have been fixed.
The patch has been contributed to us in the task.
Task-number: QTBUG-7716
Reviewed-by: Thierry
(cherry picked from commit 895b9bedc3746723f6c77754df3c428dbc0661d3)
|
|
|
|
|
|
| |
Task: QTBUG-7054
Reviewed-by: Peter Hartmann
(cherry picked from commit 8aaa61f8ea11c6e5794b5a3f6bf14bbbcb712074)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We need to update the sorting column in clear_mapping.
But the problem is that updating the source column create a mapping
(because it uses mapToSource). So we need to clear that wrong mapping again
In _q_sourceLayoutChanged there was an uneeded special case.
The case where the source_sort_column might change was never triggered
because of that. So now that the special case has been removed, we need
to do as in clear_mapping.
The test cover the change in clear_mapping and in _q_sourceLayoutChanged
The problem was shown in the Kopete: https://bugs.kde.org/show_bug.cgi?id=199850
Reviewed-by: Thierry
Task-number: QTBUG-7537
(cherry picked from commit 7b96944a02991e404cdab61e24182b90f5849120)
|
|
|
|
|
|
|
|
|
| |
The native border width need to be taken into account in QRenderRule::boxRect()
Task-number: QTBUG-6855
Reviewed-by: Benjamin Poulain
(cherry picked from commit 6e90192b599cee9b903177a0978198326f667613)
(cherry picked from commit 71f7c1d006d0942fb91e795855bd00a35f226385)
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Auto-test added in 8060094144d6104659b8ce3b88d6f8b1e53cfb59 does not
compile when using Qt in namespace, because Q_DECLARE_TYPEINFO needs to
be used from inside QT_NAMESPACE.
Wrapper macros added.
Task-number: QTBUG-10978
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There was a serious regression wherei, under certain conditions,
assignment would be treated as an append. This was due to poor tracking
of container invariants inside realloc.
From now on, after the allocation decision, s shall contain the number
of elements in the array to be kept. Deleting extra elements in the old
array needn't update this value. Instead, it needs to be updated once
and if new elements are created afterwards.
Auto-test greatly expanded to avoid future embarassments.
Task-number: QTBUG-10978
Reviewed-by: Olivier Goffart
Reviewed-by: Fabien Freling
Olivier reviewed the patch, Fabien the auto-test.
|
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make test work with shadow builds again.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Broken by 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c, which assumes the
binary and sources are in the same directory. The fix reverts the code
back to how it was in 4.5 (where it still works with shadow builds).
Reviewed-by: Denis Dzyubenko
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|