| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix possible crash in QTextLayout for glyphless items
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change e1915815bc5ef86b3844608bba46769da5173363 moved part of the
right bearing check out of the "non-whitespace-or-object" block of the
layout, which could potentially cause crashes for layouts that contained
items that were line separators or tabs etc. because we would access
the logical clusters array based on the position of e.g. the tab even
though it didn't have an entry. This could potentially give us an
arbitrary index which might cause an out of bounds when accessing the
glyphs array.
Task-number: QTBUG-11427
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| | |
Use the "slow" delays in all cases, not just on WinCE.
|
| |
| |
| |
| | |
Increase timeout running lconvert from 1 to 10 seconds.
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Replace this:
QTest::qWait(some_delay); QVERIFY(some_async_condition);
With this:
QTRY_VERIFY(some_async_condition);
|
|/
|
|
| |
Increase timeout when running lupdate from 5 to 30 seconds.
|
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Bump version number after 4.6.3 release.
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
This bug was introduced with bug fix 558089fb21e7f388f9810c51abbd9bf3872b2178
|
| |
| |
| |
| | |
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| | |
In waitForReadyRead we didn't check for synchronous connection loss.
Autotest added: tst_QLocalSocket::syncDisconnectNotify
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If we notice a broken pipe via _q_notified, we should call close
in case the internal read buffer is empty.
Auto test added: tst_QLocalSocket::asyncDisconnectNotify
Reviewed-by: ossi
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QTextBoundaryFinder was not consistent with ICU.
See also:
https://bugs.webkit.org/show_bug.cgi?id=31076
The previous definition of a line break was that the index
in the string after which the line break should occur.
Now it is the index of the boundary at which the break should
occur (hence one more).
Task-number: QT-3495
Reviewed-by: Simon Hausmann
Reviewed-by: Lars Knoll
|
|
|
|
| |
Reviewed-by: ossi
|
|
|
|
|
|
|
|
|
| |
Reading from a socket with a broken connection didn't work, even if
there were still bytes to read in the internal read buffer.
Autotest: tst_QLocalSocket::writeToClientAndDisconnect
Task-number: QTBUG-10921
Reviewed-by: ossi
|
|
|
|
|
|
|
| |
Fixed race condition on connection.
Done-with: ossi
Reviewed-by: ossi
|
|
|
|
| |
Reviewed-by: ossi
|
|
|
|
|
|
|
|
|
| |
add the containing directories of all files specified on the command
line to the list of project roots. otherwise, the strings from headers
which are included before being encountered on the command line will be
omitted.
Task-number: QTBUG-10345
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed compiler warnings
Window visibility changes update TLW backing store reference count
Enable visibility change events on all Symbian native windows
Added reference counting to QWidgetBackingStore
Added tst_QWidget::destroyBackingStoreWhenHidden
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* When a native window becomes completely invisible, the reference count
of the top-level widget's backing store is decremented.
* When a previously invisible native window becomes either partially or
fully visible:
- If the top-level widget has a backing store, its reference count
is incremented.
- Otherwise, the top-level widget creates a backing store with an
initial reference count of 1.
Task-number: QTBUG-8697
Reviewed-by: Jason Barron
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On Symbian, the top-level widget's backing store must be destroyed when
it is no longer required, in order to conserve memory. The criteria
for destroying the backing store is when neither the TLW nor any of
its native descendents (which share the backing store) are visible.
In order to implement this requirement, a count must be kept of the
number of native widgets which are using the TLW's backing store.
This patch provides the mechanism for maintaining this count, and for
destroying the backing store when the count is decremented to zero.
No calls to either the increment nor decrement functions are made,
however, by this code included in this patch; this code will be added
to only the Symbian backend by a subsequent patch.
Task-number: QTBUG-8697
Reviewed-by: Bjørn Erik Nilsen
Reviewed-by: Jason Barron
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8697
Reviewed-by: Jason Barron
|
|/
|
|
|
|
|
| |
The assumption that italic text is wider than unstyled text is wrong,
and will fail for some fonts. The only way to test this would be to
create a custom font for it, but the test is not useful enough to
warrant this, so it's been removed.
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The code was changed and changed the behaviour. This is
basically a kind of revert.
Reviewed-By: gabi
Task-Number: QTBUG-10735
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My 4.6.3 changes.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )
tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
|
| |/ / |
|
|/ /
| |
| |
| | |
Reviewed-by: Aleksandar Sasha Babic
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing the compile issue.
Fixing the compile issue.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We have to explicitely specify the include path to the MW headers
for Symbian. The compiler always gets confused if the private headers
get in the way.
Reviewed-by: TrustMe
|
|/ /
| |
| |
| | |
Reviewed-by:Justin McPherson
|
|\ \
| |/
|/|
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed tst_compilerwarnings test failure due to icecc node failures.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When an icecc node has some system error, icecc on the client side
outputs a warning. Since it's able to recover and the warning has
nothing to do with the code, we should ignore it.
Other distributed compile tools will have similar issues, but no attempt
has been made to cover them.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
|
| | | |
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QUrl::isValid if the host contains invalid caracter.
QUrl: parsing of host name with an undercore.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the host contains invalid caracter, QUrl::isValid should return false
Task-number: QTBUG-10355
Reviewed-by: thiago
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is not supposed to be allowed, but it work with other browsers
Rask-number: QTBUG-7434
Reviewed-by: Thiago
Reviewed-by: Markus Goetz
(cherry picked from commit a8065da96b96fcc4baeca7615c2a4195c05cbc03)
|