summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
Commit message (Collapse)AuthorAgeFilesLines
* QTranslator: Use resource memory instead of copying itThomas McGuire2012-11-051-19/+44
| | | | | | | | | | | | Previously, translations in resource files were loaded through QFile and the data was copied. Now, simply use the resource memory in-place. This is a backport of qtbase commit 92d75077d686fcad26b5ad02a40c3987fb1fc82b Change-Id: Id96c58e96db3bed669dd211011aaed880b9a0133 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Removed usage of pipe in Blackberry event dispatcherBernd Weimer2012-11-024-42/+78
| | | | | | | | | | | | | | | Using a pipe for thread wake-ups is inefficient and can introduce significant latency. Replaced the pipe by directly sending a BPS event. Refactored the wake-up code in the private class of the UNIX event dispatcher. Backport of 9dacccd0391219c97c01e89f0547ee002abb1e55 Change-Id: I222516f53afdd8daf845249cc33172399cfd6c21 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Jeff Kehres <jkehres@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Blackberry: Fix for slowness of touch move eventsBernd Weimer2012-10-301-60/+46
| | | | | | | | | | | | | In the event dispatcher native events will be processed in a tight loop to drain the queue. IO events and timers will be postponed. Backported from c4b2d77f40a42a67480bb49aa63b0953c80c024a Change-Id: Iaf408425000e7fd6fdbf0992bbf927d03a650581 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Blackberry: Fix QCoreApplication::applicationFilePath() performance.Sergio Martins2012-10-301-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | Listing all files with QDir is slow. Instead, use argv[0] for zygotized apps and _cmdname() for non-zygotized. Apps run through the terminal will fall in the zygotized case, which is ok. Note about zygotized apps: Zygotized apps don't have an executable, they live in a shared object file. These apps are run through a deamon that forks and dlopens() the shared object ( for performance reasons ). For this reason we can't use _cmdname(), since it just contains the the file path of the daemon. On the other hand, non-zygotized apps have a bogus argv[0] when run through the navigator ( command line is fine ). Change-Id: I73d1cd742a70d1be36a8efe829671d6d7594a6fb Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Blackberry: Populating the QCoreApplicationDataFabian Bumberger2012-10-181-0/+47
| | | | | | | Backport of: 49f277482e86d21edf9a055229100486aaf8b4c0 Change-Id: I7549834efc86f834d549c9a4278f693a29b7ee11 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Blackberry: Emit aboutToBlock() and awake() correctly in the dispatcherThomas McGuire2012-10-181-7/+31
| | | | | | | | | | | | | | On Blackberry, select() can actually temporarily wake up to process mative BPS events. Make sure to emit the aboutToBlock() and awake() signals in this situation accordingly. This is a backport of qtbase commit a1082dbc3f61f1747bd756f8fce2a54f558793ed Change-Id: If1bd1c300b037cb5dac1c96c68abbfb22188dd34 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Introducing the PlatformPanel event type.Sergio Martins2012-10-122-0/+4
| | | | | | | | | | | | | | | | | This event can be used by any platform plugin to implement special application panels/overlayed menus. Currently used by QNX only. This replaces sending fake Qt::Key_Menu presses in the QNX plugin. Qt::Key_Menu is already used when invoking context menus with the keyboard. ( backport of qtbase/9695df4d44b228e7e778ff17d5cccac30967b1fd ) Change-Id: Id5cf96758f1104f454a2bb977b367d09d4685b62 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* Use QVarLengthArray when creating the connectNotify() argumentThomas McGuire2012-10-122-11/+18
| | | | | | | | | | | This gets rid of the heap allocation of the QByteArray. This change is not needed in Qt5, as there, QMetaMethod is used as the argument, and therefore there is no need to construct a SIGNAL-compatible string in memory. Change-Id: Ie2023aeb99bc8f792d437ec604e9989a5efe456b Reviewed-by: Alan Alpert <416365416c@gmail.com>
* QNX: Fix input lagThomas McGuire2012-10-121-0/+8
| | | | | | | | | | | We were breaking out of select() too early with a timeout of -1. This is a backport of qtbase commit ba8f3002d49d9941b2991fbe4d78883ea59827b2 Change-Id: I65e534caea665fea3d99de621bcdbcf7c47fac55 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QNX: Remove workaround for BPS bugThomas McGuire2012-10-121-25/+6
| | | | | | | | | | | This BPS bug has been fixed with the latest BB10 release. This is a backport of qtbase commit 4a755752e919b8a6d68bea265c16c44b90eeb545 Change-Id: Ifa9fb9efd8c12aef6e554f5bf7a731fdf983f83d Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QNX: Remove the busy loop work around for bps ignoring timeout bugSean Harmer2012-10-121-21/+41
| | | | | | | | | This is a backport of qtbase commit b72904e8540e4aa1f1396893f5d1b216d745cdc3 Change-Id: I7489dc69fa505e76f707531e70a8011d596da19d Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-291-3/+3
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2992-2199/+2199
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Include the signal code in the argument of (dis)connectNotify().Thomas McGuire2012-09-262-11/+15
| | | | | | | | | | | | | | | | As it turns out, the convention of (dis)connectNotify() is to include the signal prefix, i.e. '2'. Therefore add this prefix also when calling these functions from QML. Also add a unit test confirming that the C++ and QML cases are now handled the same way. This patch is not needed in Qt5, as connectNotify() and disconnectNotify() take a QMetaMethod as a parameter, not a const char*. Change-Id: I3add0fc13c60a479949cf3d31218af5fd3f546a2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOSIan Dean2012-09-182-5/+5
| | | | | | | Similar work was done in Qt5 in Change Id3b02316 Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QNX: Add some optional debug output to event dispatcherSean Harmer2012-09-171-0/+19
| | | | | | | | Backport of 6998c4b2ad5fdf5f525bd77ec0fd3c6667b102b7 Change-Id: I32ceb7cc8e000c8fd00bf9e5ed6d6f8b796c73ad Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Make connectNotify() work with QMLThomas McGuire2012-08-311-0/+15
| | | | | | | | | | | | | Call connectNotify() and disconnectNotify() in QML signal handlers and in QML bindings. This is a backport of Qt5's QtDeclarative commit 26ea8e01e9ee2a8c8c09266147b94c9ac92d09f9. Task-number: QTBUG-11284 Change-Id: If5c3701426208875f3b775040c4e7bcbaac2b0a9 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove qurl.cpp from qmake and bootstrap, it's not needed.David Faure2012-08-211-1/+17
| | | | | | | | (and I need this out to be able to use QMutex in QUrl) Change-Id: Ic3eec2b41bd8626ce99f31c83a167c1c197dad82 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* license: Fix Blackberry/QNX license headersSergio Ahumada2012-08-142-4/+4
| | | | | | | | | | | | | These files where skipped when tst_license was enabled a while ago since they had a different license header that didn't match our test. Fix these licenses and stop skipping them in tst_license.cpp Change-Id: I14b2aa1b7c794894c2c74aedab01ff8667621003 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0190-180/+180
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@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>
* 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>
* Removing potential crashes from out-of-thread cleanup on SymbianMurray Read2012-06-211-1/+2
| | | | | | | | | | | | | | | | | | | | 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>
* Avoid crash cancelling timer in wrong thread on terminateMurray Read2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | When the Symbian timer active object detects that it is cancelled in the wrong thread, it was issuing a qFatal. But that was an overreaction, as the situation is not necessarily fatal if the thread in which the timer lives is about to die. For example if QThread::terminate is used outside of the thread targeted. Instead a debug message should be issued so that if there is a crash, the programmer should get information as to why. The debug message, in this case, is issued with RDebug::Print to avoid the use of Qt's message output which itself was crashing in partially finished thread situations. Task-number: ou1cimx1#1006699 Change-Id: I7d192eb27ba85ba2ef4f80fec3d8479f0df8f90c Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix crash with evaluation licenseSamuli Piippo2012-04-271-7/+2
| | | | | | | | | | With QWS, an infinite loop is formed at application startup when commercial evaluation license is used and QT_EVAL is defined. Change-Id: Ia8e9a02c95e7277f49cf4866bae2422e6cef7973 (cherry picked from commit bf3c3862b486bbc472117d8e11e03f621b11c064) Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Integrate Blackberry Platform Services (BPS) with Qt event loop.Jeff Kehres2012-04-254-3/+375
| | | | | | | | | | | | | This ensures interoperability between the Blackbery C and C++ APIs and makes it easier to expose platform services in C++ that are exposed in BPS - since events from both APIs can be processed on the same thread. Backport of qtbase 0723e14699704c35d5d61fa7f5e9f3bdbb378afa Change-Id: Ie0d66e7f9b9984ad3acff61f01665a2b90ef40db Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Moved qmljs_debug_arguments to QCoreApplicationRafael Roquetto2012-04-202-0/+34
| | | | | | | | | Enable the use of the QML debugger without QtGUI Based on Qt5's 9a096d9e. Change-Id: If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* 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>
* Fixed zlib build for WEC7.Andreas Holzammer2012-02-271-0/+10
| | | | | | | | | | | | | | | | | errno in zutil.c is leftover, and not used anymore -> removed. In gzguts.h qfunctions_wince.h are included. To use this header qglobal.h is needed. In qfunctions_wince.h a special define section is added for zlib. Task-number: QTBUG-22507 Change-Id: I78ec78d22e2930a03b349a47ab3a3ad077277c42 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 10830e844683c75d96c024450b4b7a624d8d6d8f) Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* RR scheduler error handling for deleted active objectsMurray Read2012-02-201-2/+6
| | | | | | | | | | | | | | | | | | We have discovered that the active object ConnectionStarter could potentially leave after deleteing itself in RunL. If that were to happen, QtRRActiveScheduler::RunMarkedIfReady would have crashed when it asked the deleted active object to handle the error. Some active object deletion detection has been added to QtRRActiveScheduler::RunMarkedIfReady to protect against crashes. The ConnectionStarter active object has been modified so that even if it does leave, when running in CActiveScheduler, it still won't cause a crash and will clean itself up correctly. Task-number: ou1cimx1#979241 Change-Id: Iafa10b96bbd8bedfec82d6d546c7ffaf0557fd8b Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix for Shazam crashMurray Read2012-02-171-7/+5
| | | | | | | | | | | | | | | QtRRActiveScheduler::RunMarkedIfReady was setting a flag in active objects after RunL(). Active objects potentially delete themselves in RunL(), and so this flag setting potentially corrupts memory. The flag is unnecessary, so has been removed. Other flags are renamed to make their roles clearer. Task-number: ou1cimx1#947013 Change-Id: I1391c31b33074ee9d7fd02410fdb879afc455842 Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
* Fix Windows timer performance regressionJonathan Liu2012-02-161-1/+1
| | | | | | | | | | | | This fixes a Windows timer performance regression caused by 74251fb0fc57b1e0f7db0b561e4aa4c0347f6f37. This regression causes a degradation in timer precision which can cause animations to not be as smooth as well as negatively impact timing sensitive code. Change-Id: I2821fde66799a5b1e9994e823a7dc56c91148742 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Raise loopLevel for deleteLater in event filtersJohn Stanley2012-02-101-1/+5
| | | | | Change-Id: I163f510f6e99d86a35cc78965fa383e7f4618f42 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Avoiding early deleteLater in Symbian with better loopLevel trackingMurray Read2012-02-092-17/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | There have been a number of app crashes where deleteLater has been triggering too early, causing an object to be deleted before it has been finished with. This was happening when deleteLater was issued then Symbian's active scheduler loop was nested. Qt keeps track of loop nesting level to implement deleteLater correctly, but it was only tracking the event loop in processEvents and QEventLoop correctly. The wakeup and timer active objects were assuming they were always run from processEvents and its round robin active scheduler and were adjusting the loop level to account for this. However if they happened to run in another event loop, eg the active scheduler, the loop level adjustment meant that it looked like the event loop was re-running at the same level, which allowed deleteLater to act. The fix is to mark active objects as being run from the RR scheduler, then the wakeup and timer active objects can be tested to see which type of scheduler they are actually running in. With this knowledge, the correct loop level adjustment can be made, and deleteLater runs at the correct time. Task-number: ou1cimx1#947013 Change-Id: Id05cd63ad10e100ea807cc276844aaa36c614351 Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Handling adopted thread death with active timers on SymbianMurray Read2012-02-082-6/+23
| | | | | | | | | | | | | | Timers are thread local objects on Symbian. When the adopted thread monitor tries to tidy up a thread, any existing qt timers will be cleaned up. But that has to be done very carefully without touching the underlying symbian timer objects. Checks are added to make sure the Symbian timers are only touched in the correct thread. Task-number: ou1cimx1#960478 Change-Id: If16750b455aa576aa9f2d93657a3627d18060272 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fixed qmldbg_inspector build for WEC7.jaanttil2012-02-061-0/+5
| | | | | | | | | | WEC7 does not have std::floor, define it in qfunctions_wince.h and include qfunctions_wince.h to qmldbg_inspector in WinCE environments. Task-number: QTBUG-22510 Change-Id: I801d908bf1a70203619e3af9262d7ffcb8ccb1bb Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Reduces compiler warnings when compiling for WEC7jaanttil2012-02-031-0/+1
| | | | | | | | Task-number: QTBUG-22512 Change-Id: I17fd0ff83fa23ae3e17597b753819d1f6b5d8446 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Various qt documentation fixes (wk 43)artoka2012-01-313-4/+27
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12389 Task-number: QTBUG-16667 Task-number: QTBUG-6151 Task-number: QTBUG-8625 Task-number: QTBUG-19808 Task-number: QTBUG-12096 Task-number: QTBUG-1231 Task-number: QTBUG-21073 Task-number: QTBUG-8939 Task-number: QTBUG-20399 Task-number: QTBUG-20944 Task-number: QTBUG-7542 Task-number: QTBUG-22095 Task-number: QTBUG-11278 Task-number: QTBUG-15653 Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix qsystemerror for WinCEJanne Anttila2012-01-301-25/+33
| | | | | | | | | | | | | | Windows CE does not have strerror(_r), so lets use string formatting provided by windowsErrorString function. In order to use windowsErrorString it was moved before standardLibraryErrorString function. Task-number: QTBUG-22498 Change-Id: Ifa20c4ac314ac8a26de6b0c5b67ced96b262c2b4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com> (cherry picked from commit 106bab644a5d55f136d223fadc1440e07cd41872)
* Fix exception handling in Symbian event dispatcherMurray Read2012-01-261-1/+1
| | | | | | | | | | | | The Symbian event dispatcher handles exceptions from active objects as well as leaves. But if the active object throws while it has something pushed on the cleanup stack, the exception must be converted to a leave for the cleanup to happen and the cleanup stack balance to be maintained. Task-number: ou1cimx1#970701 Change-Id: I6c8eed61cb1666e36eb4858a2c72ad0d8c6b0c8f Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1190-92/+92
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Symbian - prefer sessions started by this process to choose proxyShane Kearns2011-11-302-0/+54
| | | | | | | | | | | | When WLAN and 3G connections are both active, the proxy for the wrong connection may have been chosen in the case of plain sockets or QNetworkAccessManager with an invalid configuration. When enumarating active connections to choose a proxy, prefer a connection that was opened by this process. Task-number: QTBUG-22615 Task-number: ou1cimx1#930701 Reviewed-by: mread
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-242-6/+25
|\ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Linux-Symbian parallel cross-compilation configure step Symbian: don't merge native clipboard, overwrite. Surviving out of memory in Qt Quick app Export QtGui functions required by QtMultimediaKit backend fix bearer crash Fix alignment of non-wrapped richtext QML Text elements.
| * Surviving out of memory in Qt Quick appmread2011-11-212-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtQuickPlayground app contains a version of samegame which allow the user to edit the code. By setting the ball size to 8, the app can run out of memory. This leaves it in a pretty bad state. But apps on Symbian shouldn't crash due to OOM and should allow some operation. This change fixes the immediate OOM crashes in declarative, gui and corelib. It shows warning dialogs which explain what has gone wrong and leaves the app in a state that can be exited cleanly from the Symbian task list. Task-number: QT-5319 Reviewed-by: Shane Kearns Reviewed-by: Gareth Stockwell Reviewed-by: Martin Jones
* | Add spaces for string concatenation to work around C++11 source incompatibility.hjk2011-11-211-1/+1
|/ | | | | Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Task-number: QTBUG-22847
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-11-151-3/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: tests: allow unstable tests to be marked with CONFIG+=insignificant_test Fix focusScopeItemChange setting crash Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd symbian - handle path being passed as part of filename in QTranslator Symbian - fix compile error when default configured Compile when -no-rtti is specified as a configure option Ensure that the RC_FILE is correctly handled in a single configuration
| * Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-151-3/+15
| |\
| | * symbian - handle path being passed as part of filename in QTranslatorShane Kearns2011-11-071-3/+15
| | | | | | | | | | | | | | | | | | | | | Although incorrect API usage, this was a regression from 4.7.3 behaviour Task-number: QTBUG-22489 Reviewed-by: mread
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-111-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix memory leak in QCursorData Create cleanup stack in idleDetectorThread
| * \ \ Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-101-0/+5
| |\ \ \
generated by cgit v0.12 at 2025-04-25 21:26:30 (GMT)