summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix typo foreigh -> foreignSergio Ahumada2012-07-161-1/+1
| | | | | | Task-number: QTBUG-23260 Change-Id: I7d9ff3a23e1f20df5883d7c932a51c582945685c Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Blackberry: Apply state from QWidget when creating new QBBWindowThomas McGuire2012-07-161-0/+7
| | | | | | | | | | | Otherwise things like the window position and the parent/child relation were wrong. This is a backport from qtbase commit 095f2d5292ddfb4c77056af89c11327d85af282b. Change-Id: I838a15def49c004d0a0229f208ffa8e4f7aa5216 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* tests: Re-enable tst_MacGui test.Sergio Ahumada2012-07-162-2/+3
| | | | | | | | | The test has one stable failure. Mark this with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26514 Change-Id: I6faeda44224f2010ed836425a787269bfe483168 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix 'make install' when cross-compiling on WindowsRafael Roquetto2012-07-131-1/+5
| | | | | | | | | | | | | | When cross-compiling on a Unix-like environment in a Windows host we let the default mkspecs be copied to the target directory, instead of being symlinked. On Windows, there is an extra-line on the install_mkspecs Makefile target which also copies (rather than linking) the default mkspecs to $QT_INSTALL_DIR/mkspecs/default. So in the end this patch removes a duplicate which was not working, causing the install_mkspecs target to fail. Change-Id: I44be3a55c11cd7916b4b9ea6a0db1f8d97d28353 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Support high resolution screens in QUIKit pluginEskil Abrahamsen Blomfeldt2012-07-132-2/+13
| | | | | | | | | We need to duplicate the scale factor of the screen for the UIView to avoid the final blit to scale the framebuffer, and we need to report scaled metrics to Qt. Change-Id: I79f9a06708436e70e8e7f632f2248b70813214f9 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* test: fixed tst_qfilesystemmodel and removed insignificant_testRohan McGovern2012-07-132-2/+4
| | | | | | | | | | | tst_qfilesystemmodel::sort uses some internal API to affect the sorting behavior. This means that part of the test must be disabled when private symbols aren't available. Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> (cherry picked from commit 4e84be2876543c1bfcab3b854c92a7edade4144b) Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix for enter key inserting into password fields in SymbianMarko Kenttala2012-07-131-1/+2
| | | | | | | | | | | | | QML TextInput and TextField elements with echoMode TextInput.Password adds enter key into container string. Modified filtering in Symbian QCoeFepInputContext to disable adding enter key for hidden editors. Task-Number: 1009418 Change-Id: If7928ccdb131d11f8c975b0efe890b85f3ba202e Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* QSqlTM: respect generated flag in insertRecord() and setRecord()Mark Brand2012-07-132-1/+29
| | | | | | | | | | | | | | | | These methods failed to respect the setting of the generated flag on the fields of source record. INSERT and UPDATE statements should only include fields where generated is TRUE. Test included. Follow-up to 0f15ab4e750690bdb2b649332d5c3276bf24c440. Change-Id: I2f10dbcd7e5e5123489b38a123effe43a673a427 Task-number: QTBUG-23592 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Jason Dolan <jason.t.dolan@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix crash when column is inserted before rowspanned cellEskil Abrahamsen Blomfeldt2012-07-132-3/+52
| | | | | | | | | | | | | | When you're inserting a column in front of a rowspanned cell and this cell is not the first in the rowspan, we would get the wrong logical index of the new cell (putting it in front of the initial cell with the rowspan). If the cell does not span all rows, the table will get into a broken state and trigger asserts in update(). To fix this, we search for the first cell after the insertion point which has a logical index higher than the cell directly before the insertion point. Change-Id: Ic6fb66bc25ad91f3534886f964173ead924429e2 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* doc: removed incorrect reference to Q_OS_X11Rohan McGovern2012-07-131-1/+1
| | | | | | | | It's Q_WS_X11, not Q_OS_X11. Change-Id: I1778f6d268ea0ce702e5eb451f7a9dc0e1b5e754 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QNX: Set the default application font to Slate Pro on BlackberrySean Harmer2012-07-121-1/+7
| | | | | | | | | | | This is already handled by the QPlatformTheme in Qt5 Change-Id: Ice21ecbaeb3f62e467a6e1496200f9040e907eb5 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Fabian Bumberger Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* qws: print the data directoryGirish Ramakrishnan2012-07-111-1/+1
| | | | | Change-Id: Ie5634dce74d115a68f64681e964edce68427f1a6 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Add Mac OS 10.8 QSysInfo enumsMorten Sorvig2012-07-102-1/+5
| | | | | | | Change-Id: If52192c5dcd8ba55b7ae7d3e3c4aea75c32d0f99 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QNX: QtGlobal: compile as a C header againMarc Mutz2012-07-091-1/+3
| | | | | | | | | | | | <utility> is a C++ header, only execute the check for the Dinkumware standard library if we're compiling under a C++ compiler. This is a backport of Qt 5 change b65291bc42c7e071e38efdd9ee6c4683f29aca13. Change-Id: I12d5a2c5c003092127773d9c25623d012976c906 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNX: fix compilation with C++11 enabledMarc Mutz2012-07-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | QNX uses GCC, but by default not libstdc++ as the standard library, but 'libcpp', a Dinkumware-derived implementation that doesn't sport many of the C++11 features, yet. Thus, the compiler detection sets Q_COMPILER_INITIALIZER_LIST, which is correct, in a way, but since we're lacking stdlib support the next #include <initializer_list> will fail. So, simply don't define Q_COMPILER_INITIALIZER_LIST if we're on QNX and detect a Dinkumware signature (taken from Boost.Config). This is a back-port of change Ieeb147251c2935517faba61f75d1580a9e1649c4 from Qt 5. Change-Id: Ic7cd11b19a01ae192f60aae33da5581ff8e4682c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Disable dedicated screen event thread by default.Rafael Roquetto2012-07-071-3/+3
| | | | | | | | | | Screen events should come through QEventDispatcherBlackberry by default. cherry-picked from qt5/qtbase c54ba8c2520243217e2901fa4379f50ccde0be96 Change-Id: I230a334da1341aca5d6b439298994e630c719233 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Don't change the current page of mainwindow containerJarek Kobus2012-07-061-1/+1
| | | | | | | Task-number: QTBUG-12097 Change-Id: I3d9fa918ac8ea9ee419a3384f0d9e33366315a6c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* [Blackberry] Fix event loop throughput issueRafael Roquetto2012-07-051-8/+25
| | | | | | | | | | | Currently, only one bps event can be handled per event loop iteration, bringing about a huge performance penalty. This patch fixes this issue by bulk processing events whenever they are available. cherry-picked from qt5/qtbase 40bfbf3a5b765d939a7eea999c49da5b16456ad1 Change-Id: I52cc82d93754c2f6acf66f5b0445e34a68d233bf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* ARM: fix compilation with C++11 enabledMarc Mutz2012-07-052-2/+2
| | | | | | | | | | | | | | | C++11 makes narrowing initialisation using {}s an error. For an ARM target qreal != double, so force-cast to qreal. KAPPA now is consistent with the define of the same name in qbezier.cpp. Change-Id: I506218ee1f8cd0cdee21791cc402a479a429f7e5 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Update macdeployqt plugin deployment logic.Morten Johan Sorvig2012-07-051-0/+12
| | | | | | | | Handle qmltooling, graphics system and bearer plugins. Change-Id: I6f75dc600255013b88558d265a1b1ed25369f8e9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix socket notifier registration on Blackberry.Rafael Roquetto2012-07-052-8/+52
| | | | | | | | | | | | This fixes a bug on QEventDispatcherBlackberry, where registerSocketNotifier() and unregisterSocketNotifier() wrongly assumed that a file descriptor was being watched exclusively by one QSocketNotifier, while in fact there can be more than one QSocketNotifier associated with a single file descriptor. cherry-picked from qt5/qtbase: c10bc4c37d07dd7a9180d1810a379e370608c574. Change-Id: Iad2de22f54038e101de744a91be56db00891aca1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix compilation errorJaakko Helanti2012-07-051-0/+2
| | | | | | | | | | Gerrit change I0b9f6205ca1521fc54d3b688ccd1225823263aac is missing two needed header file includes. This task adds them in. Change-Id: I210515cef81bc03a5ad76a4bac3a5a50ad28e37d Reviewed-by: Aapo Haapanen <ext-aapo.haapanen@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Add null httpReply checks to QHttpThreadDelegateShane Kearns2012-07-041-6/+25
| | | | | | | | | | | | | | | | | | If a request is aborted while under load, the abort signal can be queued in front of a signal emitted from the httpReply. The abort slot is deleting the httpReply and setting it to null. So when the queued slot is processed the httpReply is null and caused an MMU fault. Removed qWarning from existing null checks, as these are expected if abort is called with precise timing so that it races with the reply finishing on the socket. Task-number: QTBUG-26245 Change-Id: I0a7e0223fda1bc01d117fe8a993c7f6e43fd72ff Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 41064f851591d9437baeda502b6e2504fee8f213)
* Qml ListView highlight component cannot access ListView scopeMartin Jones2012-07-042-64/+48
| | | | | | | | | Use the component creationContext to create the highlight item. Also do this for the header and footer. Task-number: QTBUG-26043 Change-Id: Ib4b947d022cb1513f728ac66455bfd2fe2703744 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Ensure the mouse buttons are preserved when entering a widgetAndy Shaw2012-07-033-3/+5
| | | | | | | | | | | | On Mac we have to fake the QEvent::Enter event when entering a widget so we need to ensure the buttons held down are set as part of that event otherwise it causes problems with graphicsview which will update the grabbed item based on this event. Task-number: QTBUG-19353 Change-Id: I89252a46b5edd0d82b6b1a0cf2592f72b472e5cc Reviewed-by: Nils Jeisecke <jeisecke@saltation.de> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix cursor truncate to include line positionJiang Jiang2012-07-031-2/+2
| | | | | | | | Since we could have moved the line position (QTextLine::setPosition), the truncating position should be adjusted with that. Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Use utf8 to store audio device names in win32 backend.Lev Zelenskiy2012-07-031-3/+3
| | | | | | | QTBUG-21398 Change-Id: I9a319d4365b1fa26b6b4f63baf7c97e26df4f482 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added support for big endian data to QAudioOutput win32 backend.Lev Zelenskiy2012-07-031-0/+25
| | | | | | | | Convert data from big endian to little endian. QTBUG-19881 Change-Id: Id98c2158ed056dd89fe2656e8f262d4b37f94eb7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Allow frequences up to 96000 in win32 backend.Lev Zelenskiy2012-07-032-2/+2
| | | | | | | QTBUG-26102 Change-Id: I08377d49a444ca3db1d1c0ccabc00665b4480f9b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Clean buffers before closing the input device.Lev Zelenskiy2012-07-031-6/+7
| | | | | | | | Input device handle is invalid after waveInClose() QTBUG-24119 Change-Id: I3b2554f816f5ca66be4d992a0a579561639caf9f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix access to uninitialized pointerTobias Hunger2012-07-031-1/+1
| | | | | | | | | | | | The C++ standard says in 9.4..2 that the object expression is evaluated, so any compliant compiler may access d. So this syntax is a bug in this place. This is a backport of commit 88cf9402e336fddeb673c92f3c14da47a9f8450b from qtbase. Change-Id: I02a9a1b73f7c18e8342aafeae412759f78086fa6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Enable smiley support for Symbian editorsMarko Kenttala2012-07-022-1/+22
| | | | | | | | | | Added enabling of CEikEdwin::EAvkonEnableSmileySupport flag for normal Symbian editors so that smiley/emoticon button or menu is enabled. Change-Id: I0b9f6205ca1521fc54d3b688ccd1225823263aac Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Mark qglfunctions test as insignificantKalle Juhani Lehtonen2012-07-021-1/+4
| | | | | | | | | | | | qglfunctions was previously skipped due missing OpenGL support on Windows machines. After installing Mesa 3D OpenGL library the test started to run, but it fails. Marking test to insignificant until the issue is resolved. Task-number: QTBUG-26390 Change-Id: I783132a33de4e4483ff074c0df7b977e02e7fc7a Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Change default Content-Type for http POST to match 4.7.4Shane Kearns2012-06-281-2/+5
| | | | | | | | | | | | | | | | | Qt 4.7.3 sent no Content-Type header by default. This was fixed independently on 4.8.0 and 4.7.4 branches, with different defaults. Since this is often used for web service logins, the 4.7.4 default of x-www-form-urlencoded seems more likely to work. The warning message is left in place, since not specifying the content type is still an application bug. Task-number: QTBUG-23350 Change-Id: I30bf50fd216ee9894d0168e904cea1ed4251ec68 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 4f578d15fe2ef176f0533c7ff4aea99b17636f85) Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Clang: Do not warn about unused parameters (caused by ccache)Tobias Hunger2012-06-281-0/+2
| | | | | Change-Id: If4e16b17d999cebac5579e108e9a2dbb7df20d2d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QNX: Flush after changing rotationThomas McGuire2012-06-281-0/+4
| | | | | | | | | | | This fixes a painting glitch where the window would stay in the old position with the old rotation until it got repainted. This is a backport of commit c196f89b7e298252944680bf0ba230a33feef718 from qtbase. Change-Id: Idbbcd706befef0aadb3f79ab412b41f487ae978b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed tst_qfileinfo for windows.Markku Heikkila2012-06-281-0/+13
| | | | | | | | | | Manually cherry picked from Qt5 SHA 85594bd9 Task-number: QTBUG-25563 Change-Id: I16131e33712702028843f0404b65ea9f7b04c7d5 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Enable MT screen event handling on BlackberryRafael Roquetto2012-06-263-12/+38
| | | | | | | | | | | | | | | | | | Consuming incoming screen events through the BPS event dispatcher on its current incarnation has proven to be very inefficient since it cannot put up with the screen event throughput. This patch enables the screen event thread also for Q_OS_BLACKBERRY platforms, in addition to stock QNX. This behavior can still be configurated through the project file, though. Task-number: QTBUG-26177 akin to qt5/qtbase: 9e66ee2d59d28d61e06e5c57485f1a331b82f269 Change-Id: I307b805f125d0eb213b21b3ef4476c4df5d6a853 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Item.mapFromItem() crashes with Items not created by the engine.Martin Jones2012-06-261-2/+4
| | | | | | | | | | Item.mapFromItem() and Item.mapToItem() get the script engine from the item they are called on. Safer to use the script value passed to the function to determine the engine being used. Task-number: QTBUG-26280 Change-Id: Id9d6c952cc91c7799910b29a27e24945d8ba073b Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* rewind macro in WinCE wrongly substituted.Martin Jones2012-06-261-0/+8
| | | | | | | | | qdeclarativestateoperations_p.h gets wrong macro substitution by rewind(fp) macro when compiling for Windows CE Task-number: QTBUG-26227 Change-Id: I228ab17ee0be0e228d0c782bfb48ad5c8b12169f Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Updated WebKit to 0b63152ae5d572c4a817a53210d8907f3dd11bd7Simon Hausmann2012-06-257-995/+1089
| | | | | | | | | | Fresh import from qtwebkit-2.2 branch that includes -Werror fix The bison changes are due to a local bison upgrade. Change-Id: I61a413a5550c748c56b39362e2a0f67c321afb4d Task: QTBUG-23987 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix possible crash when copying QImage.Kim Motoyoshi Kalland2012-06-251-1/+1
| | | | | | | Task-number: QTBUG-14766 Change-Id: I0b9ec19ea43355e04a12f2dc0244b22b575fab44 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix infinite recursion while dragging toolbar of QMainWindow.Markku Heikkila2012-06-252-2/+62
| | | | | | | | | Prevent recursion in QMainWindowLayout::endSeparatorMove(). Task-number: QTBUG-21378 Change-Id: Ie40005a35918d4da7ef911f8c3b1d1c3b5cf4fd2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix Assistant crash when closing last tab.Markku Heikkila2012-06-252-0/+11
| | | | | | | | | | | | | | | | Disable 'Close Tab' action from 'File' menu for last tab to avoid crash. Context menu 'close' actions in "open pages" widget, are already disabled under same conditions. Manually cherry-picked from Qt5: Change I7f285f45: Fix Assistant crash when closing last tab Task-number: QTBUG-23986 Change-Id: I0176451c80f0d25e82c7cd4fb2076c23c9d50128 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Updated WebKit to 2dea2a19feedc165596b933fe9509ddd0caf4d15Simon Hausmann2012-06-2512-277/+29
| | | | | | | Includes version bump and backport of build fix with newer glib versions Change-Id: I42a7c6c835b3d7ae6e79f30f308b350b67dd1e7b Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Ensure that Proxy-Connection: Keep-Alive is respected for HTTP 1.0Andy Shaw2012-06-241-1/+2
| | | | | | | | | | | | | When doing a NTML authentication it would close the connection after the second phase before replying when the reply was a HTTP 1.0 version reply. Since the Proxy-Connection header is set to Keep-Alive in this case we want to ensure we do not close in this siutation. Task-number: QTBUG-26037 Change-Id: Icaaf2277efc0d05a946c52fb42b5191964e2e0fe (cherry picked from commit bd5ef309ba831740fd8475b2f7415f30c1a18be8) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix compile issue on AIXAndy Shaw2012-06-241-1/+1
| | | | | | | | | | Since local thread storage is used we need to turn this on for the xlc compiler with the -qtls flag. Change-Id: Ib40ec87edada56a062b0c72b7d47b38a6d0b5b13 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit ef459193ec927f347a2c91b180994428c6ea1a97)
* qtdbus: Export org.freedesktop.DBus.Peer interface when introspectedDaniele E. Domenichelli2012-06-221-0/+9
| | | | | | | | | | | | | | | | | | The ofD.Peer interface is automatically implemented when an object is registered on DBus, but the ofD.Introspectable.Introspect method does not show it. You can test it by running $ qdbus --literal <some service> <some object> \ > org.freedesktop.DBus.Peer.Ping $ qdbus --literal <some service> <some object> \ > org.freedesktop.DBus.Peer.GetMachineId Change-Id: I7062ba0cdae486d443011ee19cf3874aabf90205 (cherry picked from commit 7767eed7d678dbd51d3857e6d8353f249ab5487a) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Enable building with older SHAPE extension, or -no-xshape (QTBUG-24653, ↵Daniel Richard G2012-06-221-0/+6
| | | | | | | | | | QTBUG-25281) Change-Id: Idbd6671fdd665b9368709832f99bc42d2d9a1f84 Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com> Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Daniel Richard G. <skunk@iSKUNK.ORG> Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
* Removing potential crashes from out-of-thread cleanup on SymbianMurray Read2012-06-214-8/+48
| | | | | | | | | | | | | | | | | | | | There have been some crashes seen on Symbian when its adoptedThreadMonitor attempts to clean up objects created in other, now dead, threads. Some of these objects simply can't be cleaned up properly outside of their original thread, so the thread has to be checked when they are cleaned up, and cleanup skipped in the wrong thread. For pthread created threads, we also have the ability to insert cleanup code during thread shutdown. This was used in the 4.7 implementation of QThread on Symbian, and is a better solution for pthread based adopted threads as it gives in-thread cleanup. So the appropriate pthread code is also used with changes to adoptedThreadMonitor so that it can run along side the pthread cleanup code. Change-Id: Iad8207879b1ece62e5cce85f26a616166aa22486 Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>