summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix clang warning about bool to pointer conversion.Jędrzej Nowacki2013-05-102-2/+2
| | | | | | | | | | | The operation is legal from C++ perspective but only for "false" as it is guaranteed to be 0. Anyway returning 0 instead of "false" is logical and it follows coding style used in the modified functions. (cherry-picked from qt5 commit 50995e6936c5ca75a0a8a48c29bbbedd2cc60567) Change-Id: Ia09758e8d28599097f5c40eb24722890508afdbc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* test: Remove insignificant_test from tst_qsslsocket_onDemandCertificates_memberSergio Ahumada2013-05-081-2/+0
| | | | | | | | | 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>
* test: Mark tst_qtableview as insignificant only on WindowsSergio Ahumada2013-05-081-1/+1
| | | | | | | | 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>
* test: Remove insignificant_test from tst_qtimelineSergio Ahumada2013-05-081-2/+0
| | | | | | | | This test is now passing on all CI platforms. Task-number: QTQAINFRA-574 Change-Id: I6a536c7c4c33817544bff1d933d6f4a05f1631c2 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qwizard as insignificant on Windows and Mac OS XSergio Ahumada2013-05-081-1/+1
| | | | | | | This test has been passing lately on Linux. Change-Id: I3c7e5cf4214899a65f4eccd15a0fd49e822675d8 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_xmlpatterns as insignificant only on WindowsSergio Ahumada2013-05-081-1/+1
| | | | | | | | 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>
* test: Remove insignificant_test from tst_qlocalsocketSergio Ahumada2013-05-081-2/+0
| | | | | | | | 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>
* test: Mark tst_qsocketnotifier as insignificant only on Mac OS XSergio Ahumada2013-05-081-1/+1
| | | | | | | | | 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>
* test: Remove insignificant_test from tst_qsocks5socketengineSergio Ahumada2013-05-081-2/+0
| | | | | | | | 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>
* test: Mark tst_qtcpserver as insignificant only on WindowsSergio Ahumada2013-05-081-1/+1
| | | | | | | | | 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>
* test: Remove useless insignificant_test mark tst_qudpsocketSergio Ahumada2013-05-081-2/+0
| | | | | | | | 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>
* test: Remove insignificant_test from tst_qsslsocket_onDemandCertificates_staticSergio Ahumada2013-05-081-2/+0
| | | | | | | | 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>
* test: Remove useless insignificant_test markSergio Ahumada2013-05-081-2/+0
| | | | | | | | 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>
* test: Remove insignificant_test from tst_qhttpnetworkconnectionSergio Ahumada2013-05-081-2/+0
| | | | | | | | | 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>
* test: Mark tst_qnetworksession as insignificant only on WindowsSergio Ahumada2013-05-081-1/+1
| | | | | | | | | 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>
* Compile in C++11 mode: narrowing conversion problemsThiago Macieira2013-05-071-2/+3
| | | | | | Matches qtbase commit a13b17e42a7ca146ec9503285df546d4ade22c91 Change-Id: Ie554499f40c03c715d527f2c1624b97fafe5ce8c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Make QContiguousCache with zero capacity not crashThiago Macieira2013-05-072-0/+27
| | | | | | | | | | | 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>
* Don't bypass overwritten [set]data() methods in the proxy.Volker Krause2013-05-062-4/+28
| | | | | | | | | | | 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>
* Make Qt 4.8 also compile with the LSB SDK on LinuxThiago Macieira2013-05-062-8/+8
| | | | | | | | | | | Generate worse code. This is similar to Qt5 commits 46bfd84fdc24fa3e3e721a5dda6cfbebe75be073 and c69106d1bf66d64e046c4f639542457151187dfc. Task-number: QTBUG-25336 Change-Id: Idd61c23d2b528db9d8c7895df008b9c1b0e2a2a4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix QtScript crash on 64bit with JIT.Friedemann Kleint2013-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | During back-trace generation we calculate a code offset towards JIT generated code. Using JITCode::offsetOf() will crash/assert if the offset doesn't fit into 32 bits, because the generated code can only encode relative offsets in 32-bits and not 64-bits. However in this context - backtrace generation - we just want to calculate the offset and are not interested in this architectural limitation, therefore we can just calculate the offset ourselves using the fully sized uintptr_t. Initial-patch-by: Simon.Hausmann@digia.com Task-number: QTCREATORBUG-8629 Task-number: QTBUG-23463 Change-Id: I0efadd5ed20855409122e1fcc9236fdfbc4f62a4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> (cherry picked from qtscript/3b26f6f6643978c9d041a6267dc88e2a59ced763) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QLocale: Add fr_MA localeEl Mehdi Fekari2013-05-033-904/+924
| | | | | | | | 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>
* make sure qmake finds itself in CWD on windowsOswald Buddenhagen2013-04-301-0/+1
| | | | | | | | | and consequently that it finds qt.conf. Task-number: QTBUG-30583 Change-Id: I48441477e941d9609270d6e5e1b405127c0c0aca Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/e7c3b21b7c1ed9247cb2f9eeddc154534a038549)
* Bring in WebKit r74029 to fix the build with clang.Raphael Kubo da Costa2013-04-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | ------------------------------------------------------------------------ r74029 | cwzwarich@webkit.org | 2010-12-14 18:57:14 +0200 (Tue, 14 Dec 2010) | 12 lines Reviewed by Eric Seidel. Clang fails to build the JSC interpreter https://bugs.webkit.org/show_bug.cgi?id=51016 Clang does not allow indirect gotos out of scopes with cleanup. GCC 4.2 allows them, but it does not correctly generate the cleanup, causing a leak if the cleanup decrements a reference count. * interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): Put an Identifier into its own scope. ------------------------------------------------------------------------ Cherry-picked from qtscript/c85662167123b433a69a662212c67ce03e44a25a. Change-Id: I21ee882961264d131cebdee04cb641c0d0de3d18 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fixed -dbus-linked when cross-compiling from WindowsMatt Fischer2013-04-291-2/+6
| | | | | | | | | | | | | | | | Since Windows doesn't have pkg-config, it doesn't get -ldbus-1 added to the command line automatically like Linux does. Code was present to deal with this case, however it was only configured to work when native-compiling Qt. The flag was not added when cross-compiling, meaning that -dbus-linked did not work correctly in that case. This patch changes the code to add the flag properly in both cases. Change-Id: I67881643bd658161f4929f3932859ccf636ca7a9 Task-number: QTBUG-29984 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry-picked from qtbase/c82b0815ec80b3750a110d47c68142bb448ddf56) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix QPluginLoader-test.Friedemann Kleint2013-04-293-56/+98
| | | | | | | | | | | | | 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>
* Revert "JSCore build fix for WEC7"Janne Anttila2013-04-291-11/+0
| | | | | | | | | | | | | | | | | | | | I's reverted, because there seems to be at least two implementations of the stl in WEC7. One for each BSP SDK and one shipped with the compiler, which is in this case Visual Studio 2008. The Compiler has a stl with std::min etc. Visual Studio GUI also uses the compiler version of the stl first. It seems to be that the environment was setup wrongly. Checksdk also uses the right order. The same patch is reverted for Qt5 as well: https://codereview.qt-project.org/25482 This reverts commit 1fba05343eb6fea40f6617a62e31e10a0e918ec2 Change-Id: I956cc6f0669c67a094a2af464f8aa719a137a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* QNonContiguousByteDevice: reset() instead of seek() if possiblePeter Hartmann2013-04-271-2/+2
| | | | | | | | | | ... because e.g. QHttpMultiPartIODevice does not implement seek at all (QTBUG-30295), which would make resetting such a device fail. (cherry picked from commit 804a067846cd90e3ca31f985d539c8d75d654d82) Change-Id: I8ba1ef76cc6e7f5ebf0b39c9a75e3aea26980b82 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* QHttpMultipart: reset read pointer when device is resetPeter Hartmann2013-04-271-0/+1
| | | | | | | | | | | ... otherwise we would not read from the beginning when trying to read again. The device is reset when we try to resend a request (e.g. remote host closed etc.). (cherry picked from commit 795468bdc68931a90454bd1c975f7de7ba670e3b) Change-Id: I8d7b3afb64b9cd25ee7c13b78f0b470d9dae3021 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix some warnings in qtquick1 found by ClangThiago Macieira2013-04-263-5/+5
| | | | | | | | | | | | qml/qdeclarativevme.cpp:286:26: error: destination for this 'memset' call is a pointer to dynamic class 'QObject'; vtable pointer will be overwritten [-Werror,-Wdynamic-class-memaccess] qml/qdeclarativemetatype.cpp:441:9: error: expression result unused; should this cast be to 'void'? [-Werror,-Wunused-value] util/qdeclarativefontloader.cpp:87:52: error: addition of default argument on redeclaration makes this constructor a default constructor [-Werror,-Wdefault-arg-special-member] Cherry-picked from qtquick1/99f138ad08101315cc871489c78cd10755b046b0 Change-Id: If0a690eacf9421f932214d2917cd3fa0a7daac9a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix Mac OS X Carbon build with Qt in a namespace.Danny Boelens2013-04-262-2/+8
| | | | | | Change-Id: I03a4fa4ab7517929c723483deaf1dcb42a8f9b17 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* qmlplugindump: add an explicit -relocatable flagFawzi Mohamed2013-04-251-2/+7
| | | | | | | | | | | * explicit -relocatable will allows us to change the default to nonrelocatable. * add support for both -notrelocatable and the grammatically correct -nonrelocatable. * backport from qt5 Change-Id: I0f5335e2cf86ba2eda7ad80b4f7271b8b6ddcada Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fixed QLayout::addChildLayout(QLayout *l) when l had a parentJan Arve Saether2013-04-256-5/+40
| | | | | | | | | | | | 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>
* Fixed potential invalid memory access in OpenGL engine glyph cache.Samuel Rødal2013-04-251-11/+9
| | | | | | | | | | | | We need to clamp glyph_height to prevent from overflowing the texture cache. A slightly similar issue was fixed for glyph_width in change 9520674b0f02aac55da6. Also, we should only increment the y_offset in the place where we check for an overflow. Task-number: QTBUG-26649 Change-Id: I297191b2ffd68a636bfced7f5284fd3b9383e988 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* qsql_odbc: fix SQLGetStmtAtt usageMark Brand2013-04-241-5/+3
| | | | | | | | | | | | | | | | | | | | Failure to initialize the variable can cause spurious non-zero values. http://msdn.microsoft.com/en-us/library/windows/desktop/ms715438(v=vs.85).aspx "..value can either be a SQLULEN value or a null-terminated character string. If the value is a SQLULEN value, some drivers may only write the lower 32-bit or 16-bit of a buffer and leave the higher-order bit unchanged. Therefore, applications should use a buffer of SQLULEN and initialize the value to 0 before calling this function. Also, the BufferLength and StringLengthPtr arguments are not used." Follow-up to 1509316a37fb2d365230d020d1dfc251c830fd56 Change-Id: I2e92eb845a2590bea0849c52bde8902adff1b419 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry-picked from qtbase commit af35ee291a1bbbc8627f9a17f7e104898d49b138)
* ODBC: lost info about column metadata on SQL_NO_DATAIsrael Lins2013-04-241-5/+0
| | | | | | | | | | In reset() if SqlExecDirect returns SQL_NO_DATA the column metadata is ignored. Change-Id: I0501fa47c42754bba42b3531da59e66c696eac53 Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry-picked from qtbase commit f9d856b3f5a4ceaeb8a5ac88aad2ad6b9e540abf) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* ODBC: fixed consistence of return of QODBCResult::exec()Israel Lins2013-04-242-1/+5
| | | | | | | | | | | | 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>
* ODBC: fix loss of milliseconds when binding QDateTimeIsrael Lins2013-04-242-4/+9
| | | | | | | | | | | | 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>
* SSL internals: do not write after shutting down the socketPeter Hartmann2013-04-244-5/+15
| | | | | | | | | | ... 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>
* Increase the size of the QHostInfo cache.Richard Moore2013-04-241-2/+2
| | | | | | | | | | | | | This change increases the size of the DNS cache in QHostInfo from 64 entries to 128. Given the figures in the google chrome performance paper http://www.igvita.com/posa/high-performance-networking-in-google-chrome/ this should mean we can cache enough entries to handle 4 tabs at once. (cherry picked from commit fd9013658bab096839154ae6e68adfd1a4e10189) Change-Id: I824aa4127b6067c3ed6a2be3dbc819288ba41d1c Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Allow QHostInfo::lookupHost() with no receiver to warm the DNS cache.Richard Moore2013-04-241-1/+8
| | | | | | | | | | | | This change lets you call QHostInfo::lookupHost() with a null receiver in order to warm up the DNS cache. This allows you to try to get the DNS request in flight early. (cherry picked from commit 4030b6339c3dae4474f60b07700526fccf428b0c) Change-Id: Ieac3c535b8f9b12a2f894510a898b349712e2fce Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Avoid macro re-definition after 65bd0bd1f047f6db6d67a8f089a9a409354b95a1Konstantin Ritt2013-04-2411-9/+11
| | | | | | | based on qt5/qtbase: a9ba92740670ddbbcb0c68f80ad1a18cf2ff0598 Change-Id: Ie036d502950f5e3c0b0297d480af6cfd351e3db0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QNX host lookup: do not try to load libresolv.so, it is not therePeter Hartmann2013-04-241-1/+1
| | | | | | | | | | Not trying to load the lib saves 30 - 50ms upon an apps' 1st host lookup. Task-number: QTBUG-30809 (cherry picked from commit b4985215df767c14ddd888cbb2919be3a7617cfd) Change-Id: If7338188c05f7fdf2ff80d06d91e7c7022e0e3d7 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fix for Sql query aliases with dotsMarko Kangas2013-04-232-2/+40
| | | | | | | | | | | 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>
* Fix a typo of an internal function nameLiang Qi2013-04-233-4/+4
| | | | | | | | becomeDelegteForWindow -> becomeDelegateForWindow Task-number: QTBUG-30754 Change-Id: Ied7fba42c642deb2c22ff414069659a62cb1a200 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix warning about narrowing inside {}Olivier Goffart2013-04-232-3/+3
| | | | | | | | | | | | Such as qdialogbuttonbox.cpp:259:1: warning: narrowing conversion of ‘2147483650u’ from ‘unsigned int’ to ‘const int’ inside { } [-Wnarrowing] Cherry-picked from qtbase/e1d53553259e7edefb2a76712fd6a1ddc072d22d. Change-Id: I7fa4b80cc21d5f4765c229f62ff977e7b9076e99 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix C++11 narrowing error.Raphael Kubo da Costa2013-04-231-1/+1
| | | | | | | | | | | | | | src/opengl/qgl_x11.cpp:1805:21: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'int' in initializer list [-Wc++11-narrowing] 0x20D4, options & QGLContext::CanFlipNativePixmapBindOption ? 0xFFFFFFFF : 0, Simply add an explicit cast to the expression to make it build with libc++. No cherry-pick, this file does not exist in qt5. Change-Id: Ic2fc636fc21a87dae848c062acb048e4a623a1f2 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix QTableView::doItemsLayout()J-P Nurmi2013-04-232-3/+42
| | | | | | | | | | | | 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>
* QSystemTrayIcon: fix narrowing warningMarc Mutz2013-04-231-1/+1
| | | | | | | | | | | | | GCC complained: warning: narrowing conversion of ‘((QSystemTrayIconSys*)this)->QSystemTrayIconSys::<anonymous>.QWidget::winId()’ from ‘WId {aka long long unsigned int}’ to ‘long int’ inside { } [-Wnarrowing] Cherry-picked from qtbase/55819341a9fd899c3f105bd067dd2d1528c9efef. Change-Id: Idb4caa09be160b8fed626bb154d6bf86c1a97f1c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Explicitly cast some shorts to ushorts.Raphael Kubo da Costa2013-04-231-1/+3
| | | | | | | | This should fix some C++11 build errors, as clang was warning that r, g and b were being narrowed from short to ushort. Change-Id: I15333063bfdff3503d00e8baac18adcc343dba4b Reviewed-by: David Faure (KDE) <faure@kde.org>
* QThreadDataPrivate: fix data race on canWait boolean.David Faure2013-04-233-3/+10
| | | | | | | | | | postEvent() accesses it with the postEventList mutex locked, but processEvent() was checking it without any mutex locked. Change-Id: I31bbb50f7a1c337067b8e3de16ee7cd11400b517 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/bf3a5ccef13d568662f027be62280aba1f73bada) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
generated by cgit v0.12 at 2024-12-26 17:44:34 (GMT)