summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed wrong iconv_open call under QNXRafael Roquetto2012-03-111-1/+1
| | | | | | | | | | | The wrong macro logic was causing iconv_open to never be called under QNX. cherry-picked from qt5/qtbase 8a15c41d36b1905a2 Change-Id: I0a1e3fb01d726daca637f8f51abfc924cd493311 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Windows - handle both auto detect proxy settings togetherShane Kearns2012-03-091-7/+31
| | | | | | | | | | | | | | | | | If both "automatically detect settings" and "use automatic configuration script" are selected in internet options, then respect that. Because of performance issues, these are tried separately, and disabled if they fail. Task-number: QTBUG-13957 Task-number: QTBUG-10238 Change-Id: Ibc824d3039afeaf12c5ea82ed95287e5cf4e1776 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit 4cc8209998c386a4372f10496f0c97f3d86f92bb)
* Fix a number of bugs with windows system proxiesShane Kearns2012-03-091-6/+75
| | | | | | | | | | | | | | | | | TcpServer requests always returned no proxy, even if socks was available Tag handling was broken for empty tag (if system proxies were tagged) Tag handling was broken for unknown tags - now handled the same as if no tag was given at all. When there are different proxies for http and https, windows returns the http proxy first. However we should prefer to use the https proxy for general sockets, as it's more likely to support the CONNECT method. Change-Id: I55dcadf2e142367e857f94e55fdbb0c4ddb513a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit ea92d02b6ba873c10153dc6ab7472edf07f99f03)
* Windows - fall back on static proxy config if autoproxy failsShane Kearns2012-03-091-23/+17
| | | | | | | | | | | | | If both manual proxy settings are configured and the autodetect setting is enabled, fall back on the manual configuration when auto detection fails. Task-number: QTBUG-10428 Change-Id: If008c7c967eec6256ce3c614fff0ec258190d451 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit 276f64d21d7b877044fddd646b855829950099b0)
* Windows - handle proxy autoconfiguration resulting in no proxyShane Kearns2012-03-091-0/+2
| | | | | | | | | | | | The PAC file may result in direct connection, in which case WinHttp returns null strings for the proxies and the connection type marked as direct. In this case, return the default list (no proxy) Change-Id: I601033f56a841bb92ea80a28174bb993b024ad79 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 25c05ce3bb8b53ed937363492b8222ee3b83d749) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Windows - fix proxy types for manually specified proxiesShane Kearns2012-03-091-8/+15
| | | | | | | | | | | | | | | | | When the windows internet options are used to specify a different proxy for each protocol, assume the proxy server type matches that protocol too. e.g. "socks=qt-test-server:1080" is both tagged for socks, and assumed to be a socks server. "ftp=qt-test-server:2121" is assumed to be an ftp proxy "ftp=http://qt-test-server:3128" is overridden to be a http proxy used for ftp. Task-number: QTBUG-10502 Change-Id: I70615c89d6ede53f0e7d62e6d0754b90d042aa2e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit a7489b2ba3f2f3ea28d6fff0c835c12b0666af45) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Windows - fix QWindowsSystemProxy global static raceShane Kearns2012-03-091-1/+1
| | | | | | | | | | Loser of the race would try to delete an uninitialised pointer Task-number: QTBUG-15765 Change-Id: Ie184ee2306e102aa8fbad752ef09b95c3ede00c2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 2cf8e487a5c546382daaa954c23d3926668b0a85) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* BlackBerry Plugin: support 8 mouse buttons, instead of just 3.Kevin Krammer2012-03-091-3/+10
| | | | | | | | | | | | | | | | The mask of possible mouse buttons in QNX provides tracking for the up/down State of up to 8 mouse buttons. This update adds support or 2 of buttons which we previously ignored in Qt on this Platform. Backport of a0933f4d7485d22f38b80c67f79b8d3f721b19a2 in Qt5/qtbase reduced to the 5 buttons Qt4 has support for Related to task-number: QTBUG-24682 Change-Id: I4253b96b2d7ed3f806749432b2eb7f884fd0f580 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Use QSocketNotifier instead of sleeping in an endless loopKevin Krammer2012-03-092-35/+51
| | | | | | | | | Event driven listening for navigator events, basically a backport of the respective QPA plugin code in Qt5/qtbase Change-Id: I120a755af614d35a9e5a0e755c521bbf8bf0d13d Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixes codecs.pri to reflect new QNX mkspec nameRafael Roquetto2012-03-091-1/+1
| | | | | | Change-Id: I7d22d48b189e8abfd6164a51b1e025360ef3da5a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix platforms.pro to match new qnx mkspec nameRafael Roquetto2012-03-091-1/+1
| | | | | | | | | cherry-picked from Qt5/qtbase 4ba895a86 Change-Id: Ic15d00df4b83d4510ea9622d74e988515fbfbae5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Enable storage of global Qt settings in app-local settings file on MacPasi Matilainen2012-03-072-2/+84
| | | | | | | | | | | | | The Mac App Store has limitations on where applications can write their settings, and com.trolltech.plist is not allowed. Changed the settings code to store all settings in the app-local file when the application runs in sandbox, or when the application's Info.plist contains a key "ForAppStore" with value "yes". The application's bundle identifier is also used for naming the settings file in these cases. Task-number: QTBUG-16549 Change-Id: Idd2241fbd7eb346da987226f05460642b0d6e5a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Don't allow app panic on QProcess destruction, kill or terminateMurray Read2012-03-071-4/+12
| | | | | | | | | | | | | | | | QProcess destruction will call kill() if the process is still running. PRocess::Kill() and Terminate() both require the PowerMgmt capability to operate on Symbian, otherwise a KERN-EXEC 46 panic happens. An app should be able to use QProcess safely if it doesn't have PowerMgmt capability, it should just be prevented from trying to kill the created process. Now a debug message is issued on ~QProcess(), kill() or terminate() if the capability is not present, rather than actually trying to kill/terminate the process. Task-number: ou1cimx1#985227 Change-Id: I3242ca2c39528c70c2c79e39f6a6384dd72f6ae6 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Windows - fix getsockopt calls for narrower than int optionsShane Kearns2012-03-071-2/+6
| | | | | | | | | | | | | | | | | | | Windows unhelpfully writes to only one byte of the output buffer when getsockopt is called for a boolean option. Therefore we have to zero initialise the int rather than initialising to -1 as was done before. This in general only works for little endian architecture, because the word would look like 0x01000000 on big endian. So I have added some compile time asserts in the assumption that windows is always little endian. This is ok for comparisons with 0/false, but not comparisons with true or nonzero values. Task-number: QTBUG-23488 Change-Id: I3c586d1ada76465fc045a82661f289920c657a4c Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> (cherry picked from commit 46e4a9d5231e2d9e35424259858713ca539b8e30)
* Fix error handling in QHostInfo windows backendShane Kearns2012-03-071-10/+18
| | | | | | | | | | | If the DNS server returns a non authoritative host not found response, then windows returns WSATRY_AGAIN error code. This is now reported as HostNotFound and not UnknownError Change-Id: I212985acd4e85ff4b2bdb6c57ec403405a7695fb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 844b096d674c3b803923357502435ef89ce0c738)
* Prevent stack corruption when using OpenGL Core Profile on WindowsSean Harmer2012-03-061-1/+1
| | | | | | | | | | | This is the backport of commit 1c5b2de9b75a5e74fd7d511fea71edc382d539b6 to qtbase. Change-Id: I8680c20c8b804fb4e77062f52b8f4188b49263a8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* qpa: Don't force event handling every secondEike Ziller2012-03-061-1/+2
| | | | | | | No need to wake up the CPU if we know that nothing happened. Change-Id: I95a26fa4869d9f694729d71c1bc6947f477cc283 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Improving clipboard integrationKevin Krammer2012-03-062-44/+157
| | | | | | | | | | | | | | | | Derive a data accessor class from QMimeData so application level code can query MIME type availability through it or directly attempt to fetch data by MIME type even if the type is not yet known to QBBClipboard. Also make sure any MIME type used by the application in setMimeData operations is checked for availability when being queried for formats. This is a backport of 08cc2d27794e6bafb75cdc35b6966def35f9facb in master of Qt5 qtbase Change-Id: I86455cfb58e2e00ac3e992a8228ee7167f8d2a20 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Add egl include paths and link lines to eglfs.Girish Ramakrishnan2012-03-061-0/+11
| | | | | | | Similar to the code in gui/egl/egl.pri. Change-Id: I1dbcf6f0d70405d8dc9f404bfed64fdfcd7c14ab Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Correcting fixed native orientation translation for touch pointsMurray Read2012-03-062-10/+13
| | | | | | | | | | | | | | | | | | | | | | | For a symbian application using fixed native orientation held in landscape, touches starting from the top of the screen were ignored. This was caused by an off-by-one error when reflecting touch positions. For example a touch in the range 0..359 could be mapped to the range 360..1. And since 0 mapped to a value outside of the valid range, touches starting with that were ignored. The same translation function is used for both touch points and rectangle coordinates, but these use different meanings for a point. For a touch, a point is the centre of the touched pixel, so translations should be against the last pixel, which is at size-1. But Symbian TRect points specify the edges of pixels, and these should be translated against the edge of the screen, which is at size. So the function now takes a parameter describing the type of translation required. Task-number: ou1cimx1#982747 Change-Id: I7af10b3a5b9b8658db9af8fa9bc04ad9cb531588 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
* React to changes of focus widgetKevin Krammer2012-03-052-0/+15
| | | | | | | | | | | Needed to automatically show/hide virtual keyboard when focus changes in or out of an input widget Change-Id: I21325452938e1d551bcc4421721f3bc5d85c5fbf Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-053-4/+4
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed missing parenthesesRobert Loehning2012-03-051-1/+1
| | | | | | Change-Id: Ic0a2f9bb6a1d59261240fc0de85d6db52974c964 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Harfbuzz-shaper - fix incorrect logClusters being set in HB_OpenTypePositionJohn Tapsell2012-03-041-13/+35
| | | | | | | | | | | | | | After shaping in HB_OpenTypePosition, when we come to calculate the new logClusters array we have to take into account that the glyphs passed in are not a 1 to 1 correspondance with the original string, because some shaping might have already been done. So we must use the old logClusters values (stored in tmpLogClusters) to map from the glyphs passed in back to the original string. This fixes visual word wrapping problems in thai Change-Id: I384dfa98f0946e9e074728f89542acb2b6b6bc27 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QSslCertificate - make lazy initialisation thread safeShane Kearns2012-03-041-0/+8
| | | | | | | | | | | | | | | | | | | QSslCertificate can be copied around into multiple threads, without detaching. For example, the https worker threads inside QNetworkAccessManager. There are const methods, which lazily initialise members of the private class without detaching (i.e. caching results of expensive function calls) These functions now lock the d pointer using QMutexPool to avoid concurrency related crashes. autotest crashes 20% of the time in release builds without the fix, passes 100 times in a row with the fix. Task-number: QTBUG-20452 Change-Id: I64a01af8159216f2dd6215a08669890f6c029ca8 (cherry picked from commit 55bf4ed9468ad467a0b681d2d041edbc2a5a4d21) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix signature of q_atomic_test_and_set_ptr.Girish Ramakrishnan2012-03-041-1/+1
| | | | | | | | | | | The lack of const results in a compile error when compiling 32-bit Qt in a 64-bit machine (-platform linux-g++-32 -xplatform linux-g++-32). Adding const is safe since expected and newval parameters are not modified by qatomic_i386.s. Task-Number: QTBUG-22479 Change-Id: Iee9f73b9bed777177aeae34bfcedb2feac83e67a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix incorrect state of show/hide menu items in Mac application menuPasi Matilainen2012-03-043-0/+13
| | | | | | | | | | | The "Hide <app>", "Hide Others" and "Show All" menu items in Mac application menu are always enabled, and do not get disabled correctly. Fix by turning on autoenable for the menu in qt_menu.nib, and by implementing menu item validation in QCocoaMenuLoader. Task-number: QTBUG-10705 Change-Id: Ic181dfa26a71acad0067f5269c72517b50b17362 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix crash when opening a file dialog in sandbox on MacPasi Matilainen2012-03-041-6/+13
| | | | | | | | | | | | | The sandboxed version of the native file dialog does not implement NSWindow methods, and does not respond to validateVisibleColumns. Calling these methods on a sandboxed file dialog results in a crash, so check support for the methods using respondsToSelector before calling. Task-number: QTBUG-21609 Change-Id: I7de7d8b24dab886a261ae02c395a4a22f0f489c0 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Add accessible role Desktop.Frederik Gladhorn2012-03-032-0/+3
| | | | | | | | Another role that is mostly needed to make Qt based desktops accessible. Would be nice to have for KDE's Plasma in the future. Change-Id: I1d2ce9d55d677f73cc59f0a3646ee5e588c1d948 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fixing z-ordering of windowsKevin Krammer2012-03-021-1/+1
| | | | | | | | | | | | | | The application root window is at z-order == 0, all platform windows created for Qt windows are its descendants, so their base value for z-order needs to be 1. Backport of qtbase 117bdad3f270a4c0589cff332a7a8e904263de08 Change-Id: Ic1fb91c30559177bc094a5db96e4088860a8d6ac Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed handling of keyboard info messages.Kevin Krammer2012-03-021-3/+3
| | | | | | | | | | | | | Country and language values were assigned to in the case of decoding failure but left unchanged in case of success. Thus members mLanguageId and mCountryId remained at "en" and "US" respectively instead of being changed to whatever the keyboard sent. Change-Id: I9f48a55d3c431458426c5c4da8e69600948f219b Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed Windows performance regression introduced by ac2818bef95f134.Samuel Rødal2012-03-021-2/+7
| | | | | | | | Only create a temporary DC if we're not on the main thread. Task-number: QTBUG-24602 Change-Id: I36dad4c197c7cc1e019b19d42c81526fc8cfdcf4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Include blackberry QPA plugin when building for blackberry make specKevin Krammer2012-03-021-0/+3
| | | | | | | Change-Id: Ia756609ed4406deacf92e15b4e6591a91ef5c8a6 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed missing parenthesesRobert Loehning2012-03-011-1/+1
| | | | | | Change-Id: Ide85353a85750a1ff85d392629855670ec4f67c0 Reviewed-by: Corentin Chary <corentin.chary@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert "Don't render glyph with FT with fetchMetricsOnly"Jiang Jiang2012-03-011-1/+1
| | | | | | | | | | | | Report https://bugs.webkit.org/show_bug.cgi?id=79561 shows that this commit will cause significant slow down in text handling operations. Though the exact reason is unknown we should revert it first and find out the reason later. This reverts commit 5ffac0cfc732b994e60af0b6b965b1780ca41f2e. Change-Id: I072bd817e20cf2f3455b6799d68079100e1a49dd Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix xcb-icccm 3.8 supportGirish Ramakrishnan2012-03-011-0/+25
| | | | | | | | | | | | Build fix on platforms having xcb-icccm >= 3.8 This is a backport of 7ce8491280990350162933a0716d1b014f65aeb6 and f005dee1b3692a09e47782dcff9b5b07aa659b51 from qtbase. Change-Id: Ic6cbb555335a74cc7b00273081c249aa7e08afaf Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make reference counting in activeQt container multi-processor safejian liang2012-02-292-18/+21
| | | | | | | | Use InterlockedIncrement() and InterlockedDecrement() to implement reference couting in activeQt container to make it multi-processor safe. Change-Id: Ibe7daab69c27117bb3e35c10ba273bccd29afc69 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Activate replacements when installing .pc files for win32Hib Eris2012-02-291-7/+7
| | | | | | | (backported from qtbase commit 1e3015d8f4c5b3c04e412dfa8f87def0922c52d9) Change-Id: Iaacbe8528bdbe1c1fca60ae8c94625e951f14554 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* De-duplicate platform-dependent pathsHib Eris2012-02-291-12/+8
| | | | | | | (backported from qtbase commit 525d98725b72984e3d2526415829b763fc7654ea) Change-Id: Ifee9f05fc8d924877f24edfddb0dc5e324a29080 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make sure we release IAdviseSink interfaceJian Liang2012-02-291-1/+2
| | | | | | | | IAdviseSink interface is not released if spViewObject is 0 in QAxClientSite::activateObject(). This patch fix this problem. Change-Id: I5d215e18468660eab59ef69e6fd71405337264b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make reference counting for QAxClientSite multi-processor safeJian Liang2012-02-291-6/+6
| | | | | | | | | | It is not safe to use ++long/--long to implement reference counting for COM object in multi-processor environment. We use InterlockedIncrement() and InterlockedDecrement() to implement reference counting. Change-Id: Ibfc5f3456cbaefb9267feb378483c5c60c305f00 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix QTreeView header re-ordering bug on Mac OS.Chris Meyer2012-02-281-0/+7
| | | | | | | | | | | | | | | | | | | | When the mouse button is released at the end of a drag, Cocoa may simulate an extra mouse moved event. However, the state of the buttons when this event is generated is already 'no button'. This leads to some failsafe code canceling out of the drag state and when the actual mouse release event is finally processed, the header drag state has already been exited and the header drag fails. This patch disables the failsafe code on Cocoa and makes header dragging work when the mouse goes outside the bounds of the header view. Task-number: QTBUG-14179 Change-Id: Ic2762b77b78ef7b99f97ff9ed1f58254de1eba82 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Andrew Semenenko Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix to exit of adopted thread watcher in Windowsjian liang2012-02-281-7/+20
| | | | | | | | | | | | | | Don't register the thread handle and QThread object pointer to watch list for adopted thread watcher thread in Windows. Otherwise the watcher thread will never exit and can't clean up its own QThreadData and QAdoptedThread object. Task-number: QTBUG-23961 Change-Id: Ia84326cf3cfd978d2b003ccc1bb6861db950e899 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit bf66eebbc28b1f405a49a68d3f6c341d433159ea)
* Fix potential race condition in data structure of adopted thread watcherjian liang2012-02-281-1/+3
| | | | | | | | | | | | | Fix potential race condition in data structure of adopted thread watcher in Windows. Since QVector is not thread safe, it is not safe to read and append data to qt_adopted_thread_handles or qt_adopted_qthread simultaneously in qthread_win.cpp. This patch fix this race condition. Change-Id: I2d0c7a4cdde5390d38d15c98343f0fc6ddd24aba Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (cherry picked from commit 4b30882a3f74914156f165a0a062b54ad3686c45)
* Revert "Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition."Jonathan Liu2012-02-281-3/+7
| | | | | | | | | | | | | This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e. The commit caused a regression whereby tooltips may be shown even if the mouse is not over the item if it has the Qt::ItemIgnoresTransformations flag and the QGraphicsView had been scaled. Task-number: QTBUG-17517 Task-number: QTBUG-22663 Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix window positioning regression.Miikka Heikkinen2012-02-281-2/+2
| | | | | | | | | | | | The fix to bug QTBUG-10589 has affected the style flags of windows, which indirectly changed how their initial position is determined. Fixed initial position for windows with WS_POPUP style so that x and y cannot go negative, which makes QMainWindows with larger than screen initial dimensions to behave identically to Qt 4.7.4. Task-number: QTBUG-24071 Change-Id: Ie38cdd206df4be21cce823d7d94a4690a7cb01e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix submenu positioningMiikka Heikkinen2012-02-281-0/+8
| | | | | | | | | | | | | | | | | | Submenus are now positioned to the correct side of the parent menu based on layout direction, if there is enough space on screen to fit the menu. If there is insufficient space, then the menu is positioned to the other side of the parent menu. In case that also causes submenu to be partially ofscreen (very wide menu relative to the screen), then the submenu will be aligned with the screen edge and will overlap the parent menu. This seems like a lesser evil compared to having submenu partially offscreen, which could obscure important details such as checkmarks. Task-number: QTBUG-23568 Change-Id: I6a9ab2c232713a2ee5a6dde3227c40419d46bd3d Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 64e0560ff451676fc96dfadd21bef436ac25bb52)
* Fix divide by zero when glyphWidth is 0Jiang Jiang2012-02-281-0/+2
| | | | | Change-Id: Ic0108b76b8d73cc977f8d64e036a65cb93db4684 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QWindowsPipeWriter could terminate the process to earlyMartin Petersson2012-02-281-1/+1
| | | | | | | | | | | | | | When the QWindowsPipeWriter is deleted it will wait for the thread to exit. This wait was set to 100 ms which will not always be enough time for the thread to exit, in that case the thread will be terminated. This will increase the timeout to 30 seconds that should be more then enough time for the thread to exit by itself. Task-number: QTBUG-4425 Change-Id: I52567066b757c2bbfda6887f504cf80de262b988 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix modal file dialog opening on MacPasi Matilainen2012-02-281-1/+1
| | | | | | | | | | | When a modal file dialog is opened on Mac, the native file dialog is actually opened twice, first as modeless and later as modal. Normally this works (by chance), but when the application runs in a sandbox, this results in a crash. Task-number: QTBUG-21609 Change-Id: I906868e1b4bd74dc3030891bede51f32ebd16b4a Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
generated by cgit v0.12 at 2025-01-22 12:35:04 (GMT)