| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I7a3cec664aa028202de3d3bda9f499e4deb2998d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
Task-number: QTQAINFRA-574
Change-Id: I385818d81d2565285e9402c0b6d63938f9019081
Reviewed-by: Richard J. Moore <rich@kde.org>
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 28b06b3ebae3d411c74f09fa7de52bc290c47dc3
That commit contains new symbols added in a patch release of Qt. That is not permitted.
Change-Id: I1d36b50d4c26aa32072fd3f9c311a0e773527abd
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
| |
Change-Id: I3d7acf98f12ff71a6cea803ff7af430c66b972b8
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When fd2eb070128ab6ef6b5c9343a0921f6b5a0bc041 was backported it
shouldn't have included the change to path() as this introduced
a behaviour change. This reverts that part of the patch so it
is back to Qt 4.8.2 behavior.
Task-number: QTBUG-27356
Change-Id: I7c19dda473e7aa2c53baed961c3b0e0d322362fe
Reviewed-by: João Abecasis <joao@abecasis.name>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-25207
Change-Id: I20ab722d3fcb74d90d9010c5c7c303f586e0d7c7
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The function testAndSetOrdered is not atomic.
The context of a thread may be interrupted inside testAndSetOrdered
and then if another thread calls fetchAndStoreOrdered, _q_value may be
overwritten. After that _q_value will contain random value
depending on where testAndSetOrdered was interrupted.
It should not be possible for the atomic classes.
Since the commit 8a7b5aca7b6575013a4e4ee9b99808d25edf6fdf
introduced new implementation of QMutex for linux
the bug causes deadlock.
Change-Id: Ib9ffcf0e26d3be36a0e158fd12a363b97177dcbf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
QString doesn't work on ARM platform with old ABI because QChar has
wrong size. Macro Q_PACKED was removed by commit
1ec8acd77b6c048f5a68887ac7750b0764ade598. Some projects still use
old ABI. It is better to check version of ABI during compiling.
Task-number: QTBUG-15784
Change-Id: I92180b864679e01363fa837260707b67674d0a26
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
| |
Change-Id: I90b7e3f352fb7ceea7befabbab7d3b67213dd45f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
| |
This bug is only in the Qt4 version of the plugin. In Qt5 attaching a screen works just fine.
Change-Id: I45ebc51c6da9999e7d2e4f453379fbc18dd6f857
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
The previously specified convention prevents change handlers from
being created properly. Another convention is being suggested instead.
Task-number: QTBUG-27852
Change-Id: I32a3f6f6c01e628457b30479505b32f1c5bbc92c
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Disable line ending conversion for test data files so that they are
served as lf on all platforms.
Task-number: QTBUG-26703
Change-Id: Id5f5cdc2eeaf8acf92b9e2d903518c555f1741c1
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergey Hambardzumyan <sergey.hambardzumyan@digia.com>
|
|
|
|
|
|
|
|
|
| |
If you clicked on a menu with a submenu then it should do nothing as
this is what the native behaviour is on Mac.
Task-number: QTBUG-10706
Change-Id: I7c8898b4b35a8189e1a8270d8a528eb56c81aed7
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Specifically for 32bit applications it would not get out of the waiting
state when using the Cocoa API, the QuickTime API works fine in this
respect so we can fallback to this instead.
Change-Id: I768009c1e90e8c67ed518288971f11c3e7a1c2ee
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-27885
Change-Id: I5b54713724a7bbe1458f6ca13cb7e3a59a24e877
Reviewed-by: Sergey Hambardzumyan <sergey.hambardzumyan@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If you set the duration of any variant or property animation to 0,
its progress will be stuck at 1 (0..1), and its "end" value set on
the target object, after start() has been called. If you change the
direction of the animation to QAbstractAnimation::Backward, you
would expect the progress to be 0 after start. Instead it's still
1; the code seems to assume that if the duration is 0, the
progress must be 1 always.
The fix is that if the duration is 0, the direction is checked to
determine whether progress should be 0 (Backward) or 1 (Forward).
Task-number: QTBUG-27969
Change-Id: Ibeca084bbbce41df1dca7b7d96c15b6b54394996
(cherry-picked from qtbase/f3597af5adcd2275503e9e4bfb425549f9ab3ced)
Reviewed-by: Thierry Bastian <thierryb@filewave.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Scrolldown arrow was not shown when a taller than screen QMenu was
opened because the check to draw it used the size that was already
adjusted to the screen.
Fixed by using the actual menu size in the check. Also fixed the case
where the menu was scrolled, closed, and reopened, in which case the
size hint would return incorrect cached value. This led to scrolldown
arrow not being shown in case the menu was previously fully scrolled
down.
Task-number: QTBUG-27445
Change-Id: Icd8d774071662a9317b3ac53cb05b31cadba96ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qt5/qtbase commit fe8eb057fa05433e96de21df34871647f421f962))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QKeyEvent::key() returned the wrong value if the ctrl modifier was used
in that key event. That was due to the fact that ToUnicode might not
return the correct code for these events/keyboard states. While it works
for alt+shift+= (us layout) and gives '+' as unicode value it just
claims that it cannot translate the given state for ctrl+shift+=. So if
the control modifier is used and ToUnicode return 0 toKeyOrUnicode
should try again without the control modifier.
Task-number: QTBUG-10781
Change-Id: I771f7ed18bcce60d1c7c3f6157d169d4e80ddd60
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The Cocoa code should only be used if QT_MAC_USE_COCOA is defined, this
was causing problems in Carbon with menus which are now resolved.
Task-number: QTBUG-27960
Change-Id: I60186d69a869def4b2f03f1b0fdde82208fcfbe5
Reviewed-by: Pasi Matilainen <pasi.matilainen@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
|
|
|
|
|
|
| |
Change-Id: I4859e5f02d84791f59652298f62abe8d2984af06
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
MYSQL_TYPE_TINY should be used for binding bool input value.
MYSQL_TYPE_LONG might be too big for bool, resulting in bools being
saved in the database as int 127. The problem was not specific to
the vendor's BOOL column type.
http://dev.mysql.com/doc/refman/5.0/en/numeric-type-overview.html
http://dev.mysql.com/doc/refman/5.0/en/c-api-prepared-statement-type-codes.html
Added generic autotest to make sure that binding bool works. All
drivers should pass this test.
Task-number: QTBUG-27763
Change-Id: I4e69f8e3b32fffb702ec9fa8a80ff5c50dea954b
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
(cherry picked from qt5/qtbase commit 593b8f7f0b35ddc424d8ccbd5df11fcf2442858e))
|
|
|
|
|
|
|
|
|
|
| |
Changed qt.nokia.com -> qt-project.org
Changed 87.238.50.178 -> 87.238.53.172
Task-number: QTQAINFRA-574
Change-Id: Ib85a03b15a13a066d3e095e5e2bc6060a9d093dd
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-27938
Change-Id: I6cde6167ace521e88635593aaaebd8f372fec7b3
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergey Hambardzumyan <sergey.hambardzumyan@digia.com>
|
|
|
|
|
|
|
|
|
| |
This test is crashing so marking it as QSKIP.
Task-number: QTBUG-18927
Change-Id: Iba6e6f556793747f09d2a8fa6af5c9169a53dfe9
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-26803
Change-Id: I3d4b48353256f982cae8f6d19db98971e46cbdb6
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
1. There is a behaviour change for CFDateFormatterGetFormat() between
10.6 and later, QLocale::dateFormat(QLocale::LongFormat) will return
"MMMM d, yyyy" for 10.6 and "MMMM d, y" for 10.7, 10.8
2. Add a comment for toCurrencyString() test, need another system
settings
(back port from qtbase 65685fbd2a3a587e654807d9ce44708064afdfa2)
Task-number: QTBUG-27790
Change-Id: I668ff8882cf676d4420bf4dd66dc2cdd3b84fc18
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ia5adad0b51a8db6e91ad60288eab67e506c19e47
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
| |
this is the same data we have in Qt 5 right now.
Change-Id: Ic4cea4fdde2001432f33b0cb658508756cc9e8d3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
|
|
|
|
|
|
| |
Change-Id: Id4fd9caa7c9d91d92b6ba414d04ce870a366c1f7
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To avoid leaking when converting a QFuture<T> to a QFuture<void> we need
to have a separate ref. counter for QFuture<T>. When the last QFuture<T>
goes out of scope, we need to clean out the result data.
backported from qt/qtbase commit 731ba8ed08f80644b403556638c7f6229e678ebe
Original commit by Christian Strømme
Task-number: QTBUG-27224
Change-Id: I0c6b525cf241b5c559a1bab4e0066cd4de556ea8
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In ResultStoreBase::addResults() it possible that the ResultItem we
create is invalid (filter-mode enabled). Since an invalid ResultItem
won't have any result data, we need to make sure that we don't allocate
any data for it.
Backported (with minor technical changes) from qt/qtbase commit
6039179373f7552c2a711b06a7d69b9ca9d2b175
Original commit by Christian Strømme
Task-number: QTBUG-27224
Change-Id: I5c941363c211d0414d461e7b1b0274c80f3d69b9
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
|
|
|
|
|
|
|
|
|
| |
Backport from Qt5: c86ed49a7989adb3e2e3c42794e44609f12ce493
Change-Id: I09d84b08f7c90348b4104f7e52d76ee27a4837af
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Peter Hartmann <phartmann@rim.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A 180° rotation results in a TxScale QTransform with negative scaling
factors (x=-1.0 y=-1.0). This is not properly handled by blitter paint
engine yet, so use software rendering fallback in this case.
This rendering issue can be seen when using "-webkit-transform" CSS
property in WebKit with DirectFB QPA platform.
cherry-picked from qt5/qtbase 07ea3cf0b3883979e84bd91a5dc6a7a126de3123
Change-Id: I0911fd1166a3968d0a1d6bcca47ce2b26866de44
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem is that isValid() should return true as
soon as we have a view widget.
That sadly means we need to verify that the model is still
valid whenever accessing it.
This is a backport of the Qt 5 patch
(I9237528abf2f5c75a73382525103307e9ca15f05)
Change-Id: I9237528abf2f5c75a73382525103307e9ca15f05
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
For the special transparent color index, the decoder would skip
writing anything out (thus leaving the pixels at 0 rgba value).
Although correct for later frames, for the initial frame this would
loose the color information for such pixels (which one otherwise
could have made visible e.g. by converting then image to an
alpha-less image format).
Change-Id: I316cefce8f21797feedebfbf98296ad84eaa4b99
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This calls invalidateCachedSizeHint on clear, which is a logical
thing to do.
This is a backport of SHA aa2578a1006f17cff50ca39090bae2e1e090b59b
Task-number: QTBUG-22528
Change-Id: I725748b314fd9d09441d3bf34c4607a4cc7162ed
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
__EXT_LF64SRC isn't defined in this case.
This also makes it consistent with mkspecs/common/posix/qplatformdefs.h
which uses QT_USE_XOPEN_LFS_EXTENSIONS and QT_LARGEFILE_SUPPORT
to decide which type of stat struct to declare.
Backport of b8e7265a5055da754c8b4cb2fb97b9367e83791b
Change-Id: I04e990a2402aee347870c3578bf6f76b837b8e1e
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The line to restore it was missing, and the leftover variable
caused a warning, which was removed in
abe5a0a432116963d22c4ef501a4dfd2393d66fb .
Task-number: QTBUG-27828
Change-Id: I00b8b89b07bec38a1660c3a9c61220b6d0d7eb48
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
(cherry picked from qtbase/96ebbad5f03d6db5fa81f284ccbdaf4b6259c27b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bring back code that was removed
in Qt 4: 60324267fbb8a8554e62aaf9ef01360709292320 for QTBUG-7411 .
This code reselects the submenu action of a currently opened
popup when the mouse is moved to the submenu crossing other
actions. In addition, make sure it only triggers when
the reason is not keyboard selection.
Task-number: QTBUG-20094
Change-Id: Ibb73f83e86635083aad8b1e79fc0fdd512c65754
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
(cherry picked from qtbase/0a91c9df01ec8f0c4aef9ce6e5e9bc3804fb80c2)
|
|
|
|
|
|
|
|
|
| |
The additional proxy functionality is only available starting BPS API version 3.1.1.
(cherry picked from commit 4b71432987ca9ff059d04f0e5f567b8eb09717f9)
Change-Id: Ia59adf00a15e7b0a8fc124fcbb598c9c7c331358
Reviewed-by: Peter Hartmann <phartmann@rim.com>
|
|
|
|
|
|
|
|
|
| |
d7e922e6: QtNetwork: introduce configure switch to use system proxies by default
343f559b: Support other platform names on configure.exe
Change-Id: I2fc57d4ce36469bfe2b7c088375371d229bf8c7d
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously, translations in resource files were loaded through
QFile and the data was copied. Now, simply use the resource memory
in-place.
This is a backport of
qtbase commit 92d75077d686fcad26b5ad02a40c3987fb1fc82b
Change-Id: Id96c58e96db3bed669dd211011aaed880b9a0133
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We must not close the socket, if there's still data in the read buffer.
Also waitForReadyRead must return true, even if the pipe is broken after
we've read data.
QLocalSocket::readData will close the socket after the buffer has been
drained.
This fixes the flakiness of tst_QLocalSocket::threadedConnection.
In Qt5 large portions of this code has been rewritten and this fix does
not apply.
Task-number: QTBUG-27816
Task-number: QTQAINFRA-574
Change-Id: I467340d4dbab11056e6720b145a94a87156cb419
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This happends if an event loop recursion ends before
the native print dialog gets executed (in the same scope).
The reason is that the event dispatcher gets interrupted as the
first recursion ends. And (because of the big difference between
how AppKit implements modal windows compared to Qt) this sets a flag
in the dispatcher that gets handled on the next callback to
QCocoaEventDispatcher::processPostedEvents. This will tell
the dispatcher to break out of the current modal session.
But since it cannot detect that an alien (native) session is now
running, it closes down that session by accident instead.
While code can be written in the event dispatcher to detect this
problem, it ends up more clean to just work around the problem
from the native dialogs instead. This to avoid making the
dispatcher more complex than it already is. Native dialogs is
a bit messy already, and the work-arounds needed should be
isolated inside those components, and not inside the dispatcher.
Change-Id: I8cb90b3a7a41b2122ae39e1af5eee0746505aa3a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Don't build codecs into Core when plugins are used.
Qt5 doesn't use plugins for the codecs any more
and they are part of Core. This change was considered
too drastic for Qt 4.8, so no backport is possible.
Task-number: QTBUG-27618
Change-Id: I01347645cedc6f4ecaf3158ea8336b0672ac9a46
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes an error in the calculation of the exact drop position
when an user is moving a section in QHeaderView.
Before we compared a mouse-position local to the widget
(pos) with a summed length of sections (posThreshold).
However we need to consider/substract the headers offset to make
the posThreshold comparable to the local mouse position.
This is a backport of SHA d625535728154fc9ca576bf6472c6b5057a96f17
This solves e.g.
Task-number: QTBUG-14814
Change-Id: I8e2c820dc9018fb3d14b71f28aa317417c997a44
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I7b46898ae6ccc08d96095f1658f87c063aa6b487
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Using a pipe for thread wake-ups is inefficient and can introduce significant
latency. Replaced the pipe by directly sending a BPS event.
Refactored the wake-up code in the private class of the UNIX event dispatcher.
Backport of 9dacccd0391219c97c01e89f0547ee002abb1e55
Change-Id: I222516f53afdd8daf845249cc33172399cfd6c21
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Jeff Kehres <jkehres@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
| |
Build 937 failed again to flaky tst_qlocalsocket autotest. Move
CONFIG+=insignificant_test to correct project to get CI more stable.
Change-Id: I46557ee0d1be9b9168a88595848a745d6140d7ef
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Make sure that we run at least the non-flaky QLocalSocket
tests.
Task-number: QTBUG-27816
Task-number: QTQAINFRA-574
Change-Id: I38bb0111248ff71dc8679e81ca418f9e2f7b98e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|