| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
| |
This test has been passing lately for Linux and Windows.
Task-number: QTQAINFRA-574
Change-Id: I7a3001381df805c9424b694197a92b467d69c1bc
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes a regression whereby on the first mouse move the contentItem was
moved the total distance from the touch point to where the drag
distance was exceeded. For large drag thresholds this causes a
noticeable jump.
Task-number: QTBUG-30032
(cherry picked from qtquick1 3a80424aeae19e838be03aa12a5243911ec3f020)
Change-Id: I92c119d27dc2e22203484f9ada5978697d171957
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
|
|
|
|
|
|
|
|
|
| |
This test is now passing on all CI platforms.
Change-Id: I526a92a2bd94fff03b58f63df0119db0d124ba18
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
| |
This test has been passing lately for Linux and Mac.
Task-number: QTQAINFRA-574
Change-Id: I4e1a95d66596b29a926a92dae325fd2fbb114d81
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
| |
This test is now passing on all CI platforms.
Task-number: QTQAINFRA-574
Change-Id: I6a536c7c4c33817544bff1d933d6f4a05f1631c2
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
| |
This test has been passing lately on Linux.
Change-Id: I3c7e5cf4214899a65f4eccd15a0fd49e822675d8
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
| |
This test has been passing lately for Linux and Mac.
Task-number: QTQAINFRA-574
Change-Id: I507a6b4220a3e3ded7bcfed2aded1e15bf53958a
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
| |
This test is now passing on all CI platform
Change-Id: Ib16a0e1e914ae85271f751f66bdece7e4ec851b6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
|
| |
This test has been passing lately for Linux and Windows.
Task-number: QTQAINFRA-574
Change-Id: Ic4d96c3645d6d10227ad1ce957f27a2079e9b834
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
| |
This test is now passing on all CI platforms.
Change-Id: I0d669849e0b17f42e78c1864ea3ba9f070560093
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
|
| |
This test has been passing lately for Linux and Mac.
Task-number: QTQAINFRA-574
Change-Id: I5c4cbea784af6e879ccd6a02aaf77f9debad594f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
| |
The mark is actually in qudpsocket/test/test.pro
Change-Id: I4b4d9843b5643e15d988ceabfb9abca4f8cf77a2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
| |
This test is now passing on all CI platforms.
Change-Id: Ia3f4e9dd863e04758e1c794f29142e4417d044d2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
| |
The mark is actually in qnetworkreply/test/test.pro
Change-Id: I391c3863b6a98f485b8e6b585f346bf06820999e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
|
| |
This test is now passing on all CI platforms.
Task-number: QTQAINFRA-574
Change-Id: I8a08beef2f9876d88b7b903cda445ec5decce706
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
|
| |
This test has been passing lately for Linux and Mac.
Task-number: QTQAINFRA-574
Change-Id: I6ed79e9bf166a17226b3196a90b47a3fd48912b2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
These containers don't make sense and will just result in no action
being taken (all items added will simply be discarded), but it
shouldn't crash due to a division by zero.
Task-number: QTBUG-27339
Change-Id: Ib9acf5c0a9a826e6853e7beaf5e56511fde98dc6
(cherry-picked from qt5 commit 320c4e31e124f99601399d00935362b587c77510)
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
| |
By calling itemData() of the source model directly, the result cannot
contain data provided by the proxy model itself. The base class
implementation however will call data() on the proxy instead.
Cherry-picked from qtbase/96e3c2bcbfedc8b5cb8fc099229a02a1fa335c21.
Change-Id: I7e8b65ab045382089c577d9832edc1555b71419e
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
| |
French_Morocco locale was introduced in CLDRv22.1 and already exists in Qt5
Change-Id: I4f0452f421cf074eb2c4fae22351d430d5f02e42
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Set correct working directory on Windows, do not create app-bundle
on Mac. Changing numbering of garbage libraries to 1..5.
use test data and and check for 'real' error message as well
as plugin cache message.
Set a fixed target for the test plugin, omitting debug suffixes
on Mac and Windows.
Change-Id: Ia2bf826d117ec346915de4cb24b16f8b6d61d579
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously if l had a parent, addChildLayout would warn and skip the
reparenting, but it would still add the sub layout to the layout.
This caused some inconsistencies in the hierarchy which in worst case
could cause crashes.
Task-number: QTBUG-30758
(cherry-picked from qtbase commit 146658a10f290603470b800d71b778239e764312)
Change-Id: Iee6ace3189620395d7670007a23783823ed616b9
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QODBCResult::exec() returns false when query is an delete
with no data do delete caused by SQLExecute function returning
SQL_NO_DATA, but the false return means error on execution.
Task-number: QTBUG-10569
Change-Id: I6c7ebadcf62ab404b60c7bcccdab6a10bf16a923
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry-picked from qtbase commit 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Caused by operator precedence error.
Follow-up to commit b8b79a0f37ec74fd5b4ad829e522a384ba3622ae
Task-number: QTBUG-2192
Change-Id: I17decd18c469b48a0bc938ae05c16cced8042219
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry-picked from qtbase commit 36b6d4afc970a328cced87af3d39b70d327eb3ad)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
... but rather throw an error, so the HTTP layer can recover from a SSL
shutdown gracefully. In case the other side sent us a shutdown, we tried
to send one as well, which results in an error.
(backport of commit e145b67fbd54f147dab0f8e460280a9c8533aa7b)
Change-Id: I57291a5363cb0f6585dbd6aaa521c748766a1fdf
Reviewed-by: Richard J. Moore <rich@kde.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-14904
Cherry-picked Qt5 change:
18be0749eb58316036d6eaff9dc5fecc1379f31a
Change-Id: I81edd9df68cfde15900315978dc3742ca6e22df5
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Keep the content aligned to the bottom when the view has been scrolled
to the bottom and the content is relayouted (for example due to
sorting).
Task-number: QTBUG-30653
(cherry-picked from qtbase commit 00b11ccdead05d77589d4ec5ebb3b376c6ae2ca1)
Change-Id: I183145fbd84339e82d2d1d0bc39cea33d9cc9734
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
We need to do bounds comparison on the actual offset we're going to use
with _mm_load_si128 to read 16 bytes from memory (even though we won't
use the trailing bytes in the end).
Task-number: QTBUG-28324
(cherry-picked from qtbase commit 52619ae7787b3c4febb73a02afa623b12edabc97)
Change-Id: I705ae191312e5ffe25e45caea71ada73ec97f68d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QImage is supposed to maintain the invariant that each scan-line begins
on a 4-byte boundary, so we need to verify that this is the case before
using the optimized path of short-cutting QImage::copy() by referencing
the source image's bits directly.
Task-number: QTBUG-14766
Change-Id: I0a178aeb2f34cc64f98deae9470b55b5c53fcb06
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit 711773776ed324efce7f1ed227104da9c7e21e05)
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was spotted while tracking down a similar bug related to spans.
This now also eliminates the Q_EXPECT_FAILs in
heightForWidthWithSpanning(), since it now finally works.
The problem was only for the maximum size, since the size of an ignored
row/column was min: 0, pref: 0, max: FLT_MAX (the default constructed
values for a QGridLayoutBox).
Change-Id: Ibb33c26ede40ed02edd26f596ba6133d59c9962f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
(cherry picked from qtbase/9d7ae6dfbe25fb70a362a4cf955c187cd24cb007)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If a row/column is only used only because of the spanning of an item,
the cell should be treated as it didn't exist. We keep track of this
with the "ignore" bit array.
The old code would always start from the row/column at position 1.
In the attached testcase this made the effectiveRowSpan become larger
than actually needed.
Task-number: QTBUG-30255
Change-Id: Ief0e7018ee8e5ee36272ce075a43312ffeac7b91
(cherry picked from qtbase/f9e43c526a30ae3912adfe3d5cb781af5ddda4b0)
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
|
|
| |
This is a backport from qt5/qtquick1 (commit aad8f0b)
Change-Id: Ia3eacce5ccd50827526203a9992ddef81a9f0c41
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The handling of StyleChange de-maximizes the child window temporarily,
which was emitting subWindowActivated.
This would crash lokalize, because deactivating a window means deleting
the widgets associated with it, and style-change handling is done in
QApplication by looping over QApplication::allWidgets, which would then
contain dangling pointers.
Full valgrind log at https://bugs.kde.org/show_bug.cgi?id=271494#c7
Change-Id: I256da214bf00fd7925dcee67b4f0414e57fc453b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qtbase/a6e5ccbe223c5a606e15556e8708e863442d9f72)
|
|
|
|
|
|
|
|
|
|
|
| |
Expanding on the change fixing QTBUG-24762 with the realization that any
line needs to be drawn in a consistent way regardless of system or
painter clip, not just dashed lines.
Task-number: QTBUG-25036
Change-Id: Ief7ef19cc92c52e7d792500a581a072ba032767e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit c7191d3e214b9cdb17ec383b61f7e21e784f80d0)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem was that the elapsed timer was not restarted,
causing the currentTime() not being adjusted for the time
it was paused.
(cherry-picked from Qt 5: 75614792fa2370b6b0402117bf)
Task-number: QTBUG-30108
Change-Id: I9718aa408075623514717328321c34e7ab3af436
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The test has been recently failing in CI. The problem was easy to
reproduce in a virtual machine by resizing the window of the virtual
machine small enough. This change makes sure that the requested size
hint is significantly smaller than the desktop size, to avoid the
window manager stepping in and limiting the window size.
Change-Id: Id8ce63b2b88cbed964e0330633c5d2e1dc33598c
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
(cherry picked from commit 36e6632fa363152e1a0d42e53a0e5ada09092324)
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Emit activeFocusChanged up the focus tree when an item receives a focus
event, rather than when the focusItem changes which happens before
internal state is sufficiently updated for hasFocus and hasActiveFocus
to return the correct values from within a changed signal handler.
There are some limitions to this. First the signals are not emitted
reliably when the scene is not active which makes sense for activeFocus
but not for focus. The second is in some instances the focus and
activeFocus can update unnecessarily while the focus chain sorts itself
out.
QDeclarativeItem tests by Andreas Aardal Hanssen <andreas@hanssen.name>
Task-number: QTBUG-28288
Task-number: QTBUG-25644
(cherry picked from qtquick1/c520a69f06317fb90d37324bf284ef9614cb5dbf)
Change-Id: Iac12bf8c95cbf3525b454f4afca06a54a5c14b4e
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
and isRunning() should return false.
This restore the Qt 4.7 behaviour
In Qt 4.7, the finished() was called with the thread's intenal mutex
locked. Which mean that:
- Call to isRunning or isFinished called from a slot connected to
finish within the thread would deadlock. (Hence no compatibility
to keep here)
- Call to isRunning or isFinished from a slot connected with
QueuedConnection in another thread would lock the mutex until
the destructors are finished. and then return as if the thread have
finished.
Change-Id: I963eccae8f7634aff90cc4bbab6ca886a78e35eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry-picked from qtbase commit ec5e59b73c20a7dc6aec96c829f1e53c3fa58c07)
Task-number: QTBUG-30251
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We need to clip lines to the unclipped device rect in the case of
dashing, since otherwise the dashes will be shifted and rendered
differently when partial repaints are done.
Task-number: QTBUG-24762
Change-Id: I3599b54baa552acc20bf8cc2e12f846b45f6019e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit a12f6ba302e54c1570c54aa4c722f2dafbf794af)
|
|
|
|
|
| |
Change-Id: I89ad9b97dba6f76d34a23ec03b119fb51e592917
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We cannot access children directly, since that won't ensure that
the pending sort is executed. However, the functions we need are
there already and actually makes the code nicer.
Task-number: QTBUG-29903
Change-Id: I6899284275dd79b991896a5f08486b58d95f819d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
(cherry picked from qtbase/aa2d10750ad8cdb6a86d519063664c2924b2a635)
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
|
|
|
|
|
|
|
|
|
| |
- Statement has no effect
- Adding int to string
- Unspecified behavior when comparing character literals.
Change-Id: Ie9cb9a1036b5cf5c62890685c60dee4af1ce7148
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
make sure we keep track of when we can load root certs and when we
cannot (we cannot when the developer set the certs explicitly). This is
implemented the same way for QSslSocket already, and needs to be
duplicated because we have 2 methods for setting CA certificates: one in
QSslSocket and one in QSslConfiguration.
In addition, adapt the auto test which checks whether setting a default
QSslConfiguration works: There is no way to set on demand loading
through the API, so it should be enabled by default.
Task-number: QTBUG-29103
(backport of commit ce35c0db0d9dd849c736eabaeb57d597186aaa13)
Change-Id: Idf15c21092c7727e1080b1c261ce055f30dbcf63
Reviewed-by: Richard J. Moore <rich@kde.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the boundBehavior prevents the flickable from moving its content
item in response to a drag it shouldn't grab the mouse as that will
prevent a parent MouseArea or Flickable from handling the drag.
(cherry picked from commit e8ca72d484c0e56f030e4742bb5f92b6f0555146)
Task-number: QTBUG-29718
Change-Id: Ief82ef7b898ea2581fd0b7e52548f451d887e2f1
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
A MouseArea shouldn't prevent a parent MouseArea or Flickable from
handling a drag event unless it is going to do something useful with
it.
(cherry picked from commit 67db779665b1d95a20720c0dee058c47f7df8726)
Task-number: QTBUG-29717
Change-Id: I17caa51ebc2e547e73e727fd185e60644591ad2b
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
|
| |
We also have to make sure that when moving back to a page
that has a focusWidget(), the focus should go to the focusWidget()
Task-number: QTBUG-18242
Change-Id: Ibfa7d6361c1a456480b2f1584a88ef4c4f405709
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qtbase/18f9eb797bffe8626f1edeca3c88f80dae0da8d7)
|
|
|
|
|
|
| |
Change-Id: Iec1950a0f4053cd71633162f0cb50efc9d4d493f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qtbase/64106705e7ca6132b1de15529c6206ebb0c58dfa)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Model modifications that did not trigger the refill logic caused
the view's currentSection property to contain an outdated value.
A new autotest has been added to catch the bug.
Task-number: QTBUG-29712
Change-Id: I88cf1295ac55dad7596b6ba1fe475ebf98a31026
Reviewed-by: Alan Alpert <aalpert@rim.com>
(cherry picked from qtquick1/d31f965b72a1bb8aba0b846471780e90fcc895ba)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is currently no way in C++ to duplicate the functionality of a qmldir
file in mapping QML files to versioned types in a module. This functionality
would be useful both in cases where a separate qmldir file would be overkill,
and for cases where the type mapping should be generated dynamically.
Since public API is frozen for 4.8, this is being added as private API
for those who need some measure of compatibility with qtquick1 in Qt5.
Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288ea6
Manual cherry pick of qtquick1/9995a2910d8a5f0317fe3adeb54f838b99ab31a8
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
Change-Id: I355d24fcaaf2c76b8bdbc51f71f931118f5cb3cd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Return value of the QFile::decodeName(qgetenv("HOME")); is never null
if HOME environment variable is not set. So need to check the return
value using isEmpty() instead.
Task-number: QTBUG-28912
Change-Id: I7875520965bf2c0c7311fb051c1f5177e9c3685b
(cherry picked from qtbase/05b4000e01ff5785739617c3069fbe0b0d36a606)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|