summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \
| | * | | Create cleanup stack in idleDetectorThreadhelanti2011-11-091-0/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix a crash problem in idleDetectorThread. idleDetectorThread implementation may use cleanup stack. The culprit is QSysInfo::symbianVersion, which is called in QMutex implementation. The first call of QSysInfo::symbianVersion uses functions with cleanup stack usage. Later calls use cached version info and do not need cleanup stack. Without this fix, if idleDetectorThread starts before version information is cached, a crash happens. Reviewed-by: mread
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-102-7/+152
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: WINSCW def file update so that qtgui can pick up virtual from qtcore Add mobile-reduced ts-files for Symbian. Preventing zero-timer lockups when Symbian's active scheduler used Fix memory leak in S60Style Improve whatlog generation for Symbian tools2 builds.
| * | | Preventing zero-timer lockups when Symbian's active scheduler usedmread2011-11-082-7/+152
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.7 had a deferred active object scheme to give Qt active objects some round robin behaviour with Symbian's active scheduler. Qt 4.8 has a round robin active scheduler which removed the need for any special support in Qt's active objects. Except it has been discovered that sometimes Symbian's active scheduler is used, and if Qt's zero-timer active objects are running at the time, they can prevent any other active objects from running in Symbian's scheduler, which can cause lockups. This change re-introduces the deferred active object system for Qt timer active objects. This means that a timer active object will only run once per processEvents() call when Symbian's active scheduler is used. Qt's round robin active scheduler already prevents an active object running more than once per processEvents(), so this change does not affect the normal case of using Qt's round robin scheduler. Task-number: QTTH-1494 Reviewed-by: Shane Kearns
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-11-011-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Missing icon in the designer documentation Fridge magnet example code snippet error qpaintdevice-qt3.html documentation errors QWebElement example missed information QSPlitter style-sheet example was invalid Errors in QSqlDriver::handle examples QGLColormap example was invalid QPointer made no mention of QWeakPointer Invalid links to http://developer.symbian.org QNetworkDiskCache documentation missed information QStyleSheet example used a property that is hidden. QList document referenced to non existing function QXmlQuery::bindVariable documentation bug Fix multiple typos in QLineF documentation. Qmake project file docs lacked information. Documentation error in SSL document Fix multiple typos in documentation. Fix for QVector::toList - code example documentation.
| * | QPointer made no mention of QWeakPointerartoka2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointer didn't mention QWeakPointer although those are "related" to each other. Added link to "see also" section. Task-number: QTBUG-20721 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-281-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian configuration parameter change for linux building Improve patch_capabilities script output. Fix QtSql autotest server addresses Update SQLite version number in legal document Update SQLite version mentioned in licence document Symbian Linuxification building case changes Fix FTP example to handle failure to open network session Use QBasicAtomicInt as a static variable FTP - fix interoperability issues with SIZE command QS60StyleAnimation exception safety Catch potential throw in ~QSymbianControl Fixed access to null threadData in ~QObjectPrivate Fix the build for makefile build system of Symbian Symbian - fix compile error when default configured
| * | | Fixed access to null threadData in ~QObjectPrivatemread2011-10-181-2/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | If a class derived from QObjectPrivate throws an exception in its constructor, ~QObjectPrivate will be invoked with threadData being null. This change tests for null before accessing threadData. Task-number: QTBUG-4871 incidental finding Reviewed-by: Shane Kearns
* | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-10-262-2/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Doc: Fix example code Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504 Accepting predicted text using hardware keyboard replaces unwanted part Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4 Workaround to VideoCore III scissor bug. Fix to QGLWidget crash Update def files Fix crash on exit when overriding signal handlers in states. Typo fix Add new signals to indicate GPU resource usage. symbian - search drives for translation files symbian - search drives for translation files Cannot flick to the end of a horizontal list view width LayoutMirroring Backport more imports directory caching changes. Symbian - fix deleteLater not working from RunL Fix more test DEPLOYMENT statements for Symbian Fix deployment for declarative tests, examples on Symbian Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2 Backport imports directory caching performance optimization
| * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-252-2/+64
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qeventdispatcher_symbian.cpp src/declarative/qml/qdeclarativetypeloader.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/opengl/qgl.cpp src/opengl/qgl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qclipboard/test/test.pro tests/auto/qsound/qsound.pro
| | * symbian - search drives for translation filesShane Kearns2011-10-131-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt may be installed on a different drive from the application, particularly the case when Qt is included in ROM (Z:) and the application is on C: With this change, if QTranslator::load() specifies an absolute directory in the filesystem (e.g. "/resource/qt/translations") without a drive letter, then the symbian search paths are used. Note that this example path is the one returned by QLibraryInfo so applications using the example code from http://doc.qt.nokia.com/latest/internationalization.html#produce-translations will work as expected. Task-number: QT-5246 Reviewed-by: mread
| | * Symbian - fix deleteLater not working from RunLShane Kearns2011-10-111-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleteLater stores the loop level in the deferred delete event to prevent the object being deleted by a nested event loop. However as symbian active object RunL functions are called directly from the active scheduler, the loop level is incorrect at that point. (It is normally set by QCoreApplication::notifyInternal) To solve this, the loop level is adjusted before calling RunIfReady so that it is correct during RunL functions. It is then adjusted back for the specific active objects in the event dispatcher that call into QCoreApplication - sendPostedEvents, sendEvent. Task-number: QTBUG-21928 Reviewed-by: mread
| | * Update licenseheader text in source filesJyri Tahtela2011-05-1386-1456/+1456
| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-201-5/+4
|\ \ \ | |/ /
| * | Symbian - Change working directory of applications in ROMShane Kearns2011-10-171-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Working directory (as opposed to applicationDirPath) was on the Z drive before, change it to be the same. Task-Number: QTBUG-22024 Reviewed-By: mread
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-173-23/+80
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-142-3/+3
| |\ \
generated by cgit v0.12 at 2025-03-30 18:27:38 (GMT)