| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
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.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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)
|
| | |
| | |
| | |
| | | |
tests/auto/xmlpatterns.pro was missing some dependency information.
|
| | | |
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove garbage test.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove garbage test.
|
| | |/ |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Preemptive anti crash if() statement
QNAM HTTP: More testcases
|
| |/ |
|
|/
|
|
|
|
|
|
| |
On tb92 compiler gets confused when there is private header in the main
cpp file. This happens in a lot of places in autoteste and benchmarks.
We have to give explicite path to the MW headers.
Reviewed-by: TrustMe
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QUrl: fix parsing of IRIs with more than one IDN label
QUrl: update the whitelist of IDN domains
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-10511
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change 02532ec80375c686503c4250c6ad6bb211515ec8 removed the early-exit
for 0 byte reads, causing us to hit code that assumed the buffer was
empty since nothing was read. It would thus read more into the end of
the buffer, causing the buffer to grow bigger than QIODEVICE_BUFFERSIZE.
Next, if the actual number of bytes we wanted to read was bigger than
the original buffer size we'd read the same data twice.
Reviewed-by: João Abecasis
Reviewed-by: Thiago Macieira
|
|/
|
|
|
|
|
|
|
|
|
| |
The geometry was not properly set because QGraphicsWidget rely on itemChange
to update its own geometry. Now when calling setPos we also ensure that
for a widget the geometry will be up to date. Setting the flag
ItemSendsPositionChanges to false for a given widget will give a small
performance boost.
Reviewed-by:janarve
Reviewed-by:bnilsen
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed a leak in QTextDocument::print().
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When focusInEvent is called we need to ensure that WA_InputMethodEnabled
is set, since FocusInEvent might lead to that
QInputContext::setFocusWidget is called (with the QGraphicsView as the
widget parameter).
However, if the widget still does not have WA_InputMethodEnabled set
yet it will assert in QInputContext::setFocusWidget (it requires that
the widget has the flag set).
This was a problem for the morbit bridge, where Dui requires the
attribute to be set (while Orbit actually does not require)
Task-number: QTBUG-10276
Reviewed-by: jasplin
Reviewed-by: Alexis Menard
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If metaObject is 0 and the signal or slot is in a class deriving from
QDBusInterface, this would lead to a crash.
Deriving from QDBusInterface is very unusual and usually indicates
misunderstanding of QtDBus, but the fix is correct.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=165175
Patch-By: Maemo developer
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|/ / |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Otherwise, the tests break when the Qt version changes
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
this fixes a possible off-by-one data corruption which apparently is
only triggered in rare circumstances.
The problem was: We were checking whether we would need to reallocate
the stack (line 1245), but sometimes were incrementing tos (line 1278)
and then accessing the state stack at an out-of-bounds position (line
1951).
Additionally, adapt the qlalr generator for changes made to
qxmlstream_p.h directly and recreate that file with qlalr.
Reviewed-by: Frans Englich
Reviewed-by: Roberto Raggi
Task-number: QTBUG-9196
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The crash occurred when an anonymous type was created that was a list
type. In that case, we did not set the item type, which is used later at
XsdSchemaChecker::checkSimpleDerivationRestrictions(), which would lead
to a crash.
Additionally, in the xmlpatternsvalidator test, check the exit status of
the process after it has finished, to detect crashes.
Reviewed-by: Tobias Koenig <tokoe@kde.org>
Reviewed-by: Frans Englich
Task-number: QTBUG-8920
|
|
|
|
| |
it compile
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was another regression in QLineEdit introduced with the move to QLineControl
setCursorPosition clear the selection, and setSelection move the cursor position.
So the case where we want the position at the beginning of the selection need
to be handled separately (by doing the selection reverse)
This does not cover the case where the position is in the middle, or outside
the selection, but it is not possible to do.
Task-number: QTBUG-10019
Reviewed-by: jbache
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
|