summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ukrainian translation updatedVictor Ostashevsky2012-04-111-10/+81
| | | | | Change-Id: I0eb1aa9cc6c3fd11ca530590cb6052fd69c720f8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use QPointer to store accessible object.Frederik Gladhorn2012-04-112-86/+98
| | | | | | | | | Itemview were not following the established pattern of keeping the referenced object in a QPointer. This made them a lot more crash prone. Change-Id: I210b112b9c3647b246fde2d6c69aba9ce8d25bd3 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Make QSslCertificate test fail instead of crashShane Kearns2012-04-101-6/+12
| | | | | | | | | | If the SSL dlls could not be loaded, then QSslCertificate::fromPath will return an empty list. Make the test check for this before triggering an assertion failure by calling first() Task-number: QTBUG-25229 Change-Id: Ib6280c02130142201016a3f15ddb6bd44bfa0f9f Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fix compilation when QT_NO_CURSOR is definedRomain Pokrzywka2012-04-102-0/+7
| | | | | Change-Id: Iacf8ef2032d5c229a7483d6993120684ee9bb04e Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
* Find libssl on linux using paths of loaded librariesShane Kearns2012-04-101-0/+26
| | | | | | | | | | | | | | | | | | | The installed path of libssl may include an element describing the architecture, e.g. x86_64-linux-gnu or i386-linux-gnu. In most cases, the libraries already loaded (static dependencies of Qt, such as libc) will include the path where libssl is installed. Use dl_iterate_phdr to find the paths. This is a linux specific function, but it does provide "/lib/<arch>" and "/usr/lib/<arch>" at the point ssl symbols are being resolved when running the qsslsocket autotest (which has less dependencies than a typical Qt app). Task-number: QTBUG-24694 Change-Id: I9af8081f41bb85c2fcff450a2acda5672a7f7518 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> (cherry picked from commit e5337ad1b1fb02873ce7b5ca8db45f6fd8063352) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Disconnect slots from the old sourcemodel in QIdentityProxyModelk.blammo@gmail.com2012-04-101-40/+40
| | | | | | | | | | | | | | | When setting a new sourcemodel QIdentityProxyModel::setSourceModel tries to disconnect from signals belonging to the NEW model instead of from the existing sourceModel(). QIdentityProxyModel thus receives signals from both the old model(s) and the new model. This results in ASSERTS triggering in various slots, for example: "Q_ASSERT(topLeft.isValid() ? topLeft.model() == model : true);" in QIdentityProxyModelPrivate::_q_sourceDataChanged. Change-Id: Ic6f65a9ee10981d00206335f2edef78272fadc1a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from commit fae4a2555a9402e8cecf67242b29dca624cc61e8) Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* qmake vcxproj generator: properly escape XML attributesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | Task-number: QTBUG-24954 Change-Id: I21299440ba3f268c2fa1e14d37003cdc3e6a35ad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 0174c966f734ba48d387257a14447e8b56d85d37)
* QNAM: close the channel if bytesAvailable and nothing piplinedMartin Petersson2012-04-101-8/+2
| | | | | | | | | | | | If there are still bytesAvailable on the socket and we have nothing pipelined we should close the channel. This was not done before as the chunked decoder did not read the last CRLF. This has now been fixed so this close should be enabled again. Task-number: QTBUG-24875 Change-Id: I2ebdce1094282b055f4fd72ca642887c5f96c43b Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix compilation when QT_NO_CURSOR is definedRomain Pokrzywka2012-04-102-0/+10
| | | | | | | | | | Although the QtDesigner module isn't built by default on embedded platforms, it's sometimes needed, mainly for dynamic form loading. The library contains a couple of setCursor calls which should then be #ifdef'd, as it's often a disabled feature for embedded UIs. Change-Id: I92d91249905848e73ee933e6f057a30b9cacb03c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Plug memory leak when gestures are grabbed but never triggeredAndy Shaw2012-04-101-93/+91
| | | | | | | | | | | | | | When a gesture is grabbed by QAbstractScrollArea but never triggered then the deletion of the QAbstractScrollArea would mean that the gesture created for it would not be deleted. This ensures that it always deletes the gestures waiting to be deleted even if no gesture event is triggered Task-number: QTBUG-25011 Change-Id: I36118b82baaa60ac4e014896159060e1af76b2d2 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 3ec88b355b5c9649d128fcf18cb2abc39ac0e770)
* Made qt_accStripAmp handle "&&"José Millán Soto2012-04-091-12/+28
| | | | | | | | | | | | | Changed qt_accStripAmp implementation to handle texts which contains pairs of ampersands representing a single ampersand. In order to do that, a new static function called qt_accAmpIndex was created. This function is based on the code of qt_accHotKey, which was changed to use qt_accAmpIndex. Change-Id: Idcc5d07581d7fb3251c30399b189740ca8071104 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fixes a problem with the proxy detection on WindowsThierry2012-04-051-2/+46
| | | | | | | | | | | | | | | | The current scheme is to use IE's default config. If that fails get the winhttp config. That's ok. The problem is that if you run a program as a service getting the IE config will set the fAutoDetect flag. But later the call to WinHttpGetProxyForUrl mightfail with the error code ERROR_WINHTTP_AUTODETECTION_FAILED. this patch just makes sure that we have a fallback winhttp solution in case the IE proxy is not set. The new code detcted if the current process is a service, in which case it will try to default to the system-wide proxy. Change-Id: I57e9082a46a8422c54f8f069715752c271a3a001 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixed build failure in tools/qml for HarmattanGareth Stockwell2012-04-051-11/+11
| | | | | Change-Id: I6fb26f2da3ff78dd20d06941ae1aedd059f116ff Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Call wait() after calling quit() so that it can gracefully finishAndy Shaw2012-04-052-0/+3
| | | | | | | | | | | | There was a problem with slow https connections that if the download was ongoing when quit() was called then it tended to cause a crash because it tries to shutdown the SSL connection. Task-number: QTBUG-24594 Change-Id: I6b161bc7a9bb99e41849537462de2d7c92661902 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 46c58502639c25e5d19dd84d913b1208d5051db5)
* Fix signed/unsigned warnings (QWS)Sergey Gusarov2012-04-052-3/+3
| | | | | Change-Id: I98ba87fa236b1a10ea2499e270e71a94f54c1c3b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix clang warningSergey Gusarov2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | In file included from /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/QDirectPainter:1: /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qdirectpainter_qws.h:56:1: warning: class 'QWSEmbedEvent' was previously declared as a struct [-Wmismatched-tags] class QWSEmbedEvent; ^ /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qwsevent_qws.h:269:8: note: previous use is here struct QWSEmbedEvent : QWSEvent ^ /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qdirectpainter_qws.h:56:1: note: did you mean struct here? class QWSEmbedEvent; ^~~~~ struct 1 warning generated. Change-Id: Iebda5efe8547b16e457486166a8abc8479b2fd8d Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use value of LANG if LC_TIME is empty.Thomas Sondergaard2012-04-041-0/+2
| | | | | | | Task-number: QTBUG-24912 Change-Id: I68d91c02f5d82b7fc4cae0d2dedafb862a3b323b Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: John Layt <jlayt@kde.org>
* Fix corelib build for WEC7.Janne Anttila2012-04-041-1/+3
| | | | | | | | | | | | | | | | | Qt5 backported fix http://codereview.qt-project.org/17852 broke the Qt4.8 build for WEC7. The change works fine in Qt5 because Qt5 does not anymore have QT_MODULE macro in every header, including qfunctions_wince.h. See commit: 4ecf8279 Apparently implementations of QT_MODULE and c-language zlib are not compatible, because MSVC2008 gives a lot of errors like: error C2085: 'qt_wince_getenv_s' : not in formal parameter list Build break fixed by putting QT_MODULE macro inside #ifdef __cplusplus. Change-Id: Id71386867750fcc61ab2cb2ecc527edc37c943ba Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Move handling of rotation changes from event handler to screenKevin Krammer2012-04-045-20/+25
| | | | | | | | | | | | | | | | Have the navigator event handler emit the new rotation as a signal argument and let the screen class handle all parts of the change, i.e. also notifying the window system about the geometry change. This also allows to rotate all screens, not just the primary screen, if this should be necessary. Backport of 45b7b0599cd1ebdfe17487215b36ff766068f0e8 Change-Id: Ia3e3ff321bc2d7a23e64950d15d88d007f9766dd Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Updated WebKit to 9c745c625c6d1112cec51d742ecc8c041cc090d7Simon Hausmann2012-04-044-3/+15
| | | | | | | Backport Casper's doc fix from https://bugs.webkit.org/show_bug.cgi?id=82893 Change-Id: I85bd671132fe6e1bb8798960ef0db7f02e10b4b4 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add a native interface with the ability to query the window groupThomas McGuire2012-04-035-3/+168
| | | | | | | | | | | The window group is needed by QtMobility, as the BB multimedia API requires the window group when creating a video overlay window Change-Id: Ifc029c31b5a1750631a6b397f7c33aa31e483c81 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Add support for screen overlays / foreign windowsThomas McGuire2012-04-038-19/+112
| | | | | | | | | | | | | | We're not the only one creating native windows. When using the multimedia API, the multimedia library creates a video window for video display. Here we need to deal with giving this video window overlay a proper z-order, otherwise it will never get visible. Cherry-picked from qtbase 4efd61c3cf3d25db1c60bf5c842837c5b24a05fa Change-Id: If2e2a6e51ae6553fdf645e578f68e41c7b43336a Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Make everything in QBBScreen non-staticThomas McGuire2012-04-036-110/+127
| | | | | | | | Cherry-picked from qtbase b5f343b3677a7c7f09d91d7d60f310717325e840 Change-Id: Idf7176bd83215f1251c1e2200a5bf0168adfe523 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix QTcpServer::listen() returning true when the port is in use on OS X.Robin Burchell2012-04-032-1/+24
| | | | | | | | | | | | | | | | | | | | | Way back in the mists of time, someone added SO_REUSEPORT to socket binding, which was great, because otherwise it meant that multiple UDP sockets couldn't share the same port on OS X (as platforms with SO_REUSEPORT apparently don't support rebinding with SO_REUSEADDR). However: SO_REUSEPORT also means that *any* bind on a port will succeed, which is most definitely not wanted in the case of TCP sockets, so check the socket type before performing the actual bind. Also test that multiple listens don't take effect. Cherry-picked-from: qtbase/master/a84b42e6194be0f40bd8f961effef9947c07c832 Change-Id: I2f8d450bcfb8a7f3abd8918a4e789a850281dd13 Done-with: Thiago Macieira Done-with: Shane Kearns Task-number: QTBUG-6305 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* test: Mark test as insignificant on MacSergio Ahumada2012-04-031-1/+1
| | | | | | | | This test only fails on Mac at the moment, so enabling it for all other platforms. Change-Id: I7d9ca2152f43e718944c7a0439b633566620795f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Mark test as insignificant on WindowsSergio Ahumada2012-04-031-1/+1
| | | | | | | | This test only fails on Windows at the moment, so enabling it for all the othe platforms. Change-Id: Ic85e321a369104c590f71e45891ddede208383fb Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix a crash in cursorToX() when new block is addedJiang Jiang2012-04-031-0/+4
| | | | | | | | | | When an empty new block is being added, the layoutData->memory data will be 0, thus QTextEngine::attributes() will return 0. We should only access the attributes pointer when some text actually exist. Task-number: QTBUG-24718 Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Memory leak fix of sqlite driver when close failedHonglei Zhang2012-04-033-3/+66
| | | | | | | | | | | | | | If an ongoing query is not finalized before close function is called, sqlite driver can't close the connection to sqlite. In this case, the failure is only reported to the client via getLastError(). Even if the client want to handle this case, there is no easy way to revoke the close function. This commit finalizes all queries before close is called. Task-number: QTBUG-16967 Change-Id: I069f6073bd46f53780e13d269e44aa86366e0574 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Updated Russian translationSergey Belyashov2012-04-021-1/+76
| | | | | Change-Id: I149ca83e408d62b240b6ae2f0c5f3ec630b1b709 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix platforms.pro scope to match all QNX platformsRafael Roquetto2012-04-021-1/+1
| | | | | | | | cherry-picked from qt5/qtbase: d5bc8ab811f380116c5a55a777150bc47a43a6bb Change-Id: I8d2f906c52ae56ec5cfce70f94ec3661e7d0e15f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix QFileSystemEngine::tempPath on Blackberry OSRafael Roquetto2012-04-011-0/+7
| | | | | | | | | | | Unlike Unix, Blackberry OS stores the location of the temporary directory into the TEMP environment variable. Change-Id: I31f50fc4b160e5594339c4fcd62613963cc1484f Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Separate virtual keyboard interface and implementationKevin Krammer2012-04-0110-109/+252
| | | | | | | | | | | Allows us to create a BPS based implementation and drop it in without further changes to users of the interface. Backport of 831943d7f12addef79fb536e5550da0f72480217 Change-Id: Ib047f4bbc68743cfe8c2293a235d4e9ca8195af9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix regressions due to partial QSslSocket::peek fixShane Kearns2012-03-303-12/+163
| | | | | | | | | | The fix broke HTTPS transactions with chunked encoding. It also broke use of a QSslSocket in unencrypted mode where peek and read calls are mixed. See change 68b1d5c17aa38d5921bdade2b0e0cb67c6c90513. Change-Id: Ib115b3737b0e4217496f5def10aaaea3c6452ff8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation error on Solaris caused by ShapeInputIikka Eklund2012-03-301-0/+2
| | | | | | | | | | | | | Change: Icb2204a50a97e4a5e02e75301c67287525b290ba caused build error on Solaris as ShapeInput and ShapeBounding types are not present in default system headers. This patch is compile time fix for Solaris only. On Solaris the windowInteractsWithPosition function call is omitted as suggested by the author of the original change. Task-number: QTBUG-24653 Change-Id: I29d821867ec41e7d68b5bdc126f255dc682cc983 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Move screen event processing into its own classKevin Krammer2012-03-306-514/+653
| | | | | | | | | | | | The event handler class can then be reused when we have proper BPS event support available from corelib Backport of a80a2c6da241dac77f533bc702a1c7d94349a812 Change-Id: I9f8f661ca6b976aa02990bc8c8af8e5472e5faa4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Refactoring virtual keyboard class into non-singletonKevin Krammer2012-03-3010-64/+93
| | | | | | | | | | | | | | | | Getting rid of the singleton gives us better control over when the virtual keyboard handling class is instantiated and configured. Also notify screens about keyboard height changes and let them notify through QWindowSystemInterface instead of "guessing" the screen in QQnxVirtualKeyboard. Backport of 5d117fd427e3e727df5d3f417a2b91366f2a31c1 Change-Id: I49c1a6af5decca47a5ab3ba382430a2b25578d40 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix build error for Blackberry OS QDesktopServicesRafael Roquetto2012-03-301-0/+1
| | | | | | | Add a missing include to qdir.h Change-Id: Ie24eac38411b1a578e725a62121a55df0e673595 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix window focusing problem in SymbianPauli Jarvinen2012-03-301-1/+1
| | | | | | | | | | | | | | | | | The application window didn't receive focus properly on Symbian when minimized window was maximized. This was because the code first tried to set the focus and then made the window visible. However, invisible window doesn't accept focus, so the visibility should be set first and focus only after that. Not having focus properly set caused software input pane to fail to start in the Camera application, as was reported in the error case ou1cimx1#989756. Change-Id: Id659662e7d92205321746ed5a226843382a6ac89 Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* tests: Mark unstable test as insignificant on WindowsSergio Ahumada2012-03-302-0/+4
| | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qhttpnetworkconnection tst_qsharedmemory Task-number: QTQAINFRA-428 Change-Id: I9b4d5490291799c63ff07cb8bc676c37989a7c6b Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* The scaling should not effect the width of a cosmetic penAndy Shaw2012-03-301-1/+1
| | | | | | | | | | | | When the scaling effects the pen width so that it is less than 1 pixel in width then it would use the QCosmeticStroker to draw, however this should not be the case for cosmetic pens that are not less than 1 pixel in width as the scaling does not change their width. Task-number: QTBUG-25006 Change-Id: I142db0f3a7ee02aa87171495d5a7a7011100814e Reviewed-by: Lars Knoll <lars.knoll@nokia.com> (cherry picked from commit 6eae3cec5a34fbed28e519ffd8a8f3f1cd7b5c5b)
* tests: Mark unstable test as insignificant on WindowsSergio Ahumada2012-03-291-1/+1
| | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qtextstream Task-number: QTQAINFRA-428 Change-Id: Id3b6b7c46d981bb64786c0c225f599784304ca4f Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Support QDesktopServices on BlackBerry platformsRafael Roquetto2012-03-293-1/+128
| | | | | | Change-Id: I10506b83efda8efb12ccc531f60cd4cd9b4b5bc9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* QNam: try to read the last CRLF when chunked encoding is used.Martin Petersson2012-03-292-3/+21
| | | | | | | | | | | When chunked encoding is used we should try to read the last CRLF after the last zero-lenght chunk, with chunk size coded as 0. Task-number: QTBUG-19480 Task-number: QTBUG-20924 Change-Id: I39c85f45c329246d6c53c29ba1511039b2503e13 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Update changes-4.8.1 file for 4.8.1 releaseIikka Eklund2012-03-291-20/+310
| | | | | | | | Changes-4.8.1 file matching the 4.8.1 release Change-Id: Ib5dc9706d58379192675f27a9e2440ff76609eb2 Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix scopes on iconv related pro/pri filesRafael Roquetto2012-03-282-2/+2
| | | | | | | | | | | | Ensure corelib and the iconv configure test link against libiconv on QNX-based platforms. This now includes the Blackberry mkspecs which were previously excluded. cherry-picked from qt5/qtbase: b0b36cc53c6115e5ca30986ceaf01215d09fcb39 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: Iee5758d3b31e3827e69a1598a5794b3d5ba25b03 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Give QThread threads better names on SymbianMurray Read2012-03-271-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | QThread sets the name of a Symbian thread that it creates. This name can appear in a number of debugging scenarios, and it can give useful information. However the existing name set by QThread has not been informative. This change improves the amount of information in the thread name. Threads are now named as: <object name>_<class name>_v=<class vptr>_<random> The class name and vptr can be used to identify the QThread subclass type. In the case of a QThread subclass that generates a .moc file, the class name will be the true class name. However for other cases, eg where QThread is used directly, or is subclassed without a QOBJECT declaration, the name may simply be "QThread", and the vptr field might then be more informative. This change also allows the use of RTTI to get the true class name, through a rebuild of Qt, defining the macro name QT_USE_RTTI_IN_THREAD_CLASSNAME. This is not enabled by default, as there may be Symbian cases where RTTI does not work. Task-number: QTBUG-24950 Change-Id: Ifae9c6cb64638e95a01d34e421aa36f6fd0e7444 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
* Fix TypeErrorsh kim2012-03-272-2/+2
| | | | | | | | A example has errors about TypeError Change-Id: Ie6e9c769e83c5a3410c1131383c50dfedb828c41 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fixed a possible crash in Qt CocoaThierry Bastian2012-03-261-4/+8
| | | | | | | | | | | | | | Task-Number: QTBUG-24334 This patch is not dircetly from me but was posted on https://bugreports.qt-project.org/browse/QTBUG-24334. I'm definitely affected by it. Change-Id: Ieb23a7022417188b3885dcb5467affdef71c194f Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Ivan Komissarov <ABBAPOH@nextmail.ru> Reviewed-by: Andrew Semenenko Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Blackberry mkspecsRafael Roquetto2012-03-264-0/+102
| | | | | | | | | | | | | | Unlike QNX mkspecs, these mkspecs target more specific, BlackBerry-only devices. So far, the only difference is the definition of Q_OS_BLACKBERRY and linking with -lbps, but this will likely change with time. It will also allow conditional compilation to distinguish between qnx and blackberry devices. cherry-picked from qt5/qtbase: e1c22d426f8c5cdd9ad0e119d54cfa516d45f8c1 Change-Id: I607584a472ef636a6805502a725b42163b4070ae Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Updated WebKit to c0107296d95cf4f2e988513db42572976ff7d55eSimon Hausmann2012-03-265-79/+95
| | | | | | | Includes windows fix and fixes the shared library version. Change-Id: Ia4b66661323cc4176bdfdf700aa072e9670b3bd2 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
generated by cgit v0.12 at 2025-01-15 06:21:21 (GMT)