summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add missing files about SpinnerSukhyun Kim2012-06-074-1/+71
| | | | | | | Add missing files and update qml file Change-Id: Ic9c2279b665d06a33e4f0f9484cf9a0ff648bc23 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QNAM - maintain a weak reference to the QNetworkSessionShane Kearns2012-06-064-31/+49
| | | | | | | | | | | | | | | | When handling signals from the session, a pointer is needed. Also the QNetworkReplyImpl needs to access the manager's session. So, the manager should have a strong and weak reference. The strong reference is held during connection establishment. The weak reference is held all the time, though it will become null when the session is destroyed in idle. The non static member function getNetworkSession() is used to create strong references from the weak reference where required. Task-number: ou1cimx#1004278 Change-Id: I4b5b36b1d996b98e659d993969006c61b4440c15 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (backported from commit bae1613c4c3d8c38b90ed2ba5c1b149e1bc87987)
* Track active network replies without qFindChildrenShane Kearns2012-06-062-1/+7
| | | | | | | | | | | | | | | | For bearer management to work correctly, we need to know when there are no network replies active. Previously this was implemented using qFindChildren, but that doesn't work when the user reparents QNetworkReply. QtWebkit does this (actually sets parent to 0). Also the qFindChildren implementation was racy if multiple requests were finished in parallel. Again, likely to be triggered by webkit loading page elements. Task-number: QTBUG-15812 Change-Id: I181a9ba6611c7c4b6fffa2d84fe4029d89e8f596 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 3580168c3e357c2289acddc5f2515a3ad306ef2b)
* Windows: Fix uic3 autotest.Friedemann Kleint2012-06-023-5/+6
| | | | | | | | | | | | | After 39f2c09d9154e00409c73c6f6db90a4ddb06b8f0, Windows applications of type Gui/Tty (uic3) would emit many "QPixmap: Cannot create a QPixmap when no GUI is being used" when initializing the cursor cache, breaking the stderr checking of the test. Task-number: QTQAINFRA-428 Change-Id: Iac74fd7af905e462ac2063c58dfcd91a6b0759a7 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* makeqpf: Fixing range in character-generationMartin Wodok2012-06-013-3/+3
| | | | | | | | | | | | | | | | | MakeQPF currently omits generating the last character in the selected ranges, e.g. ranges requested for conversion are 0..127 128..255 then only the characters 0..126 128..254 are generated in the QPF2 output file. This fixes it, so that character 255 (in this example) also gets created. This is according to the usage-specification! Change-Id: Id85215781c9a67a90ac05efbbf374240f25bbb3c Track-number: QTBUG-19561 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* test: Remove insignification of tst_qprocess on Windows and MacSergio Ahumada2012-06-011-2/+0
| | | | | | | This test was fixed by 79a3efbd95f6df17dc1f922b469c67d86183c233 Change-Id: I4cd9f16d315de3c3f6777961ea3e682d4a1226bd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix dangling pointer issue in QGraphicsItem focus handlingPauli Jarvinen2012-06-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When focused QGraphicsWidget is being hidden, it tries to move the focus to next focusable widget by calling focusNextPrevChild(true). If there is no such widget available, the focus is cleared altogether. The logic used to rely on the return value of focusNextPrevChild to decide if clearing the focus is necessary. This was incorrect because the return value may be true also when the focus has actually moved within the graphics widget in question rather than moving to the next widget. This is the case at least when GraphicsWebView item is focused. Thus, the focus could then be left on invisible item which was a serious issue: elsewhere in the qgraphicsitem.ccp, it is assumed that no visible item can point to invisible item with its subFocus pointer. Such pointers will become dangling pointers once the pointed graphicsitem is deleted, and the process will then crash as soon as the focus is tried to be moved to another item. Now, the logic has been modified so that it is explicitely checked after call to focusNextPrevChild if the item being hidden still has the focus. If this is the case, the focus is cleared. To be consistent, the same logic is applied also when disabling a QGraphicsWidget. Having focus on disabled item is not as severe issue as having it on invisible item, but it is still wrong. Task-number: ou1cimx1#995710 Change-Id: Ica32bc381befc3ccaac79fb4cf4d50c5d452fad0 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Eliminate QTreeWidget drag crashJiewen Wang2012-05-312-1/+44
| | | | | | | | | | | | | In QTreeViewPrivate::adjustViewOptionsForIndex() wrong index had been used when referencing to array of viewItems. Variable row is set to the index of the QModelIndex, however it is not as same as the index in viewItems[] when there was hidden item in treeWidget. Index of viewItems[] should be used here. Unit test is added as well. Change-Id: Ie129cb63445bf1239ef7c5b2bc61b04dd9e81982 Task-Id: QTBUG-25333 Backport of <3be6ca3ee8c2c72f85b26a57538fd329ed811261> from Qt5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QStatusBar::showMessage will always take new timeoutJiewen Wang2012-05-312-2/+45
| | | | | | | | | | | | There is a message check in QStatusBar::showMessage causing the call exits early if the new 'message' is the same as the current message. The check has been removed, and new timeout will always take effect. Unit test is added as well. Change-Id: Id3d6ed15104d4d40c1cd2c76444c30badc8b1b72 Task-Id: QTBUG-25492 Backport of <7381328bcc37283be97eedddc24c46be1e38490e> from Qt5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix qprocess test.Friedemann Kleint2012-05-312-118/+252
| | | | | | | | | | | | | - Set the working directory such that the binaries are found: Mac: disable app-bundle Windows: cd up if we are in a debug, release folder - Suppress the debug/release folder for the wincmdline process, make it a simple console app. - Print proper message if process launch fails. Task-number: QTQAINFRA-428 Change-Id: Iaa730ade9f65240bc361bc49d409c51af1af42a9 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* DirectFB: Improvement for QDirectFBPaintEngine::fill()Marcel Schuette2012-05-301-12/+9
| | | | | | | | | | | | | | | | | | | Improvement for bug fix related to QTBUG-23850 in QDirectFBPaintEngine: combine the conditions for an accelerated fillrect (5 elements and rectangle shape) in first if-statement. The previous check for NULL pointer solves the problem for the crash, but it simply skips the type check (which caused the crash before) and the or-condition (shape) became true and leads to an accelerated fillrect. Otherwise it would fallback to raster. The original reason for the crash (elemets is null) might be Q_DISABLE_COPY macro of QVectorPath, especially with the last lines of the Q_DISABLE_COPY documentation, which could become true on embedded devices, where DirectFB is often used, with special toolchains/compilers. Task-number: QTBUG-23850 Change-Id: I340291fbce24260c7522684305c292e66cfc32af Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Propagate left key presses to the parent item when TextInput is empty.Marcel Schuette2012-05-303-2/+24
| | | | | | | | | | Don't overwrite the ignore value once it's been set to true. Backport from Qt 5.0 to Qt 4.8 (commit a7017465152d544a4217d5ce4f6f84b80cb9b8b9) Task-number: QTBUG-25447 Change-Id: I2232806b1235b0c901aab21116b5bc70c65d0500 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Updated HID drivers for INTEGRITYKalle Viironen2012-05-302-178/+298
| | | | | | | | | This patch icnludes new INTEGRITY keyboard and mouse drivers. Task-number:QTBUG-24175 Change-Id: Ifbb01357a601c44bab5961cdfe82d1c7bd44b889 Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Support mkspecs in subdirs for xcompile under windowsAndreas Holzammer2012-05-251-3/+11
| | | | | | | | | | | | Support mkspecs in subdirectories for cross compilation under windows. Mkspecs in subdirectories are separated by slashes. backport from qt5 a3a1fea094434e29c362caba711c7d9883461792 Change-Id: Id3954cc38df2922b20156589335faad989ec0537 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Fix crash when using aliases and variantsNicolas Arnaud-Cormos2012-05-254-1/+12
| | | | | | | | | | Right now, the parser crash when using id.variant.property for an alias. The current patch fix the crash, and it displays an error message in the console now (like QtQuick 2). Task-number: QTBUG-25341 Change-Id: I5e2c13f487655fd2b90129c5693f5daf3f77984b Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix bug when destruction fields in QWizardCarl Schumann2012-05-254-1/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked a70b8d407e1ca46e5dc208580534feee7ddfe51a from Qt5's qtbase master branch. Maintain the consistency of QWizardPrivate's two members: QVector<QWizardField> fields; QMap<QString, int> fieldIndexMap; during and after calls to QWizardPrivate's void _q_handleFieldObjectDestroyed(QObject *) member function. The failure to maintain this consistency caused an out of bounds access and core dump in QWizard's field(const QString &name) member function. QWizard's field(const QString &name) member function expects the values in the QMap fieldIndexMap to be indexes into the QVector fields. Prior to this change _q_handleFieldObjectDestroyed only removed the appropriate entry from the map and erased it from the vector. It did not decrement by one all the indexes greater than the index that was removed from the map and erased from the vector in the rest of the map. For example ... So if initially have the following mapping ... "field0" -> 0, "field1" -> 1, and "field2" -> 2 with fields of size 3. After destruction of "field1" have ... "field0" -> 0, and "field2" -> 2 with fields of size 2. Now attempts to look up "field2" using QWizard::field will have an out of bounds error and possibly core dump or trigger an internal Qt assert because an attempt to access this->fields[2] will be made. It should be accessing this->fields[1], but does not because the map is no longer consistent with the vector. This change adds a decrement by one for all the indexes greater than the index that was removed from the map and erased from the vector. Task-number: QTBUG-25691 Change-Id: Ia2a41027628a65faec4ecdd5da235ddd19746a57 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add OS version detection for windows 8Andreas Holzammer2012-05-242-0/+6
| | | | | | | | | | Based on consumer preview, the internal version is 6.2 backported-from: I9d6ff6c7614f46a20d489e8a8f4aefeb60c547f6 Change-Id: I543148c22cec622ad04e6bf436acd0e66cbf02d2 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Enable extra warnings for win32-g++ mkspecsJonathan Liu2012-05-242-2/+2
| | | | | | | Change-Id: Ia3a5c2ca35b9da466f0cfab054a8b69a941797fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from commit 10cfb08eae9ce60ad6895d6a75e857d2591ca4dd)
* Include scope ids in QHostAddress from QNetworkInterfaceShane Kearns2012-05-242-3/+17
| | | | | | | | | | | | | | The scope ID is a required part of the address for link local addresses (to solve the problem of the same link local address being created by two machines on different networks). It is required to send packets to a link local address on Mac and Windows, although Linux multicasts if scope is missing. Task-number: QTBUG-25634 Change-Id: Ie2bb09df8d261eefcb81716bafeb1475f0bed5fe Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit b72c8dd8a248d67b1192e3baa1fca07244a3719d) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add test case for link local TCP connectionsShane Kearns2012-05-241-0/+72
| | | | | | | | | | The socket engines already implemented this, but it is a good idea to test it explicitly. Task-number: QTBUG-25634 Change-Id: Ife3fe09b0119ed435e4055523c553847739a09fe Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (back ported from commit e5f77fe31be0ea2c891eacd3e866bb9db4e0a238)
* Properly handle unexpected EOF in QHttpThreadDelegateShane Kearns2012-05-241-6/+9
| | | | | | | | | | This prevents http POST/PUT from hanging if the QIODevice being uploaded returns -1 from read. Task-number: QTBUG-24738 Change-Id: I76500cc4f0101cc8e5da5f1dc105508b3f519a3c Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 3976339ca9b12c7eddbc69ed3a31f85ce845ba63)
* Fix sending UDP packets to link local addressesShane Kearns2012-05-243-18/+163
| | | | | | | | | | | | | | When the scope ID is not set, Mac and Windows will not transmit packets to link local addresses. This patch implements setting the scope in the native socket engines and adds a test case. (it was partially implemented already, though UDP specific code paths were missed in the unix engine) Task-number: QTBUG-25634 Change-Id: I23300bdc9856e38458078e913daaa59cd05a74b5 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (back ported from commit 6abc66e076826b24cc3700c3a0702f552ab50429) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix local variable is initialized but not referenced warningNicolas Arnaud-Cormos2012-05-231-6/+7
| | | | | | | | The pragma needs to enclose the whole function. This change is not necessary in Qt 5 since QMap was rewritten. Change-Id: I63bb94ec09b9cb3c499938cde9c7fb690039406e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QRegExp: fix crashGiuseppe D'Angelo2012-05-232-0/+30
| | | | | | | | | | | | | | | Fixes a crash when invoking various QRegExp methods on an object *before* doing any match. For instance fixes: QRegExp re; re.matchedLength(); // crash Backport of commit 136c2bf18446f2bbe7052d638c29edbc0b8ef6bc from qtbase. Task-number: QTBUG-23352 Change-Id: I9c239ff790a139c7820ef1aeced89d31320ae6b0 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNetwork: fix compilation with no opensslMartin Petersson2012-05-221-1/+1
| | | | | | Change-Id: Id637dd1155c46ffc75563812b8c9d5f062e76e22 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Symbian: inputcontext reports pointer events to FEP during inline editLauri Malmi2012-05-213-5/+35
| | | | | | | | | | | | | | | QCoeFepInputContext::mouseHandler() must report pointer events to FEP by calling CAknExtendedInputCapabilities::ReportEventL( CAknExtendedInputCapabilities::MAknEventObserver:: EPointerEventReceived). Based on this event FEP commits inline edit properly and sends notification peninputserver/VKB. Earlier QCoeFepInputContext:: mouseHandler() called CCoeFep::CancelTransaction() direclty which lead to inconsistent inline edit state between FEP and VKB. Task-number: ou1cimx1#991638 Change-Id: I90641ffd5aed97b27f2ca2328c0296e14b12f319 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* QNetworkAccessManager: Read all from socket on remote host closeMartin Petersson2012-05-211-0/+26
| | | | | | | | | | When we get a remoteHostClosed we should try to read everything from the socket before we close the channel. cherry-picked from commit 27bc9945a84c6f6d8e0d2a33183c3a6e9b2978d8 Change-Id: Ia1b64dbd991265ce0ce4c4d21f4df323133e2b07 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* QNX: Special case z-ordering of the QDesktopWidget windowSean Harmer2012-05-211-1/+11
| | | | | | | | | | | | | | | | | The assumption that window creation order implies correct initial z-ordering is broken when dealing with certain window types. In this commit we special case the QDesktopWidget's window which maybe created after normal application windows yet still need to be layered below them. Without this fix we may accidentaly activate the Desktop window when the blackberry navigator service sends an event to activate the window group. That results in broken focus handling. Backport of b09d601261244395450557187adeed6717f25155 (qtbase) Change-Id: If7c4b1ac9d99dc5a9b7d0e7b3e2080c648cf85b3 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QRegExp: fix autotest, fix usage of uninitialized valuesGiuseppe D'Angelo2012-05-212-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | A (probable) typo was causing the code dealing with anchors to use uninitialized values. This used to work by chance, but was indeed detected by Valgrind f.i. when running tst_qregexp -- the indexIn test on anc11 data reported: ==3015== Conditional jump or move depends on uninitialised value(s) ==3015== at 0x514B4EA: PeppeQt::QRegExpMatchState::testAnchor(int, int, int const*) (qregexp.cpp:1813) [...] ==3015== Uninitialised value was created by a stack allocation ==3015== at 0x514B3EB: PeppeQt::QRegExpMatchState::testAnchor(int, int, int const*) (qregexp.cpp:1803) Fixing the code also makes the aforementioned test to succeed, therefore the #if 0 sections can be droppped. Backport of commits 281771ee201e591d4f40a161b93c71914b1b38f2 and 1fe7e557d75962c9c79cc344037a02ed50369430 from qtbase. Change-Id: I4d6cffdae737def1a47e72b46e40979e0aee1719 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix memory leak in qdeclarativevisualdatamodel.Andrew den Exter2012-05-211-2/+4
| | | | | | | | | | | Parent order was backwards, the inner context was parented to the outer context, and then the inner context was reparented to the delegate. Parent the outer context to inner context so both are deleted when the delegate is deleted. Task-number: QTBUG-25784 Change-Id: I1d6cd4dfc2530424535a7e00164563d9b4aaa513 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Added changes info to changes-4.8.2Juhani Taipale2012-05-201-14/+172
| | | | | | Change-Id: Ib6b89d0cd349846ecdfb272dc325b0c140b2f872 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Fix cases where functions are called with a drive and no slashAndy Shaw2012-05-162-10/+34
| | | | | | | | | | | | | | | | When a file is specified on a path that includes a drive letter followed by a colon but no slash then it didn't always account for the fact that this refers to the current path on that drive. This fixes the problems in completeBaseName(), baseName() and path(). Tests are also added for these three cases and some others too. Task-number: QTBUG-25353 Change-Id: I47a197c6af066f532442ad269be57597ec61303a Reviewed-by: Irfan Omair <irfan.omair@gmail.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit cfb44c6528b2518274bf157388832d1d610ce0e4)
* Enable some SQLITE extensions on BB by defaultRafael Roquetto2012-05-162-0/+88
| | | | | | | | | | | | | Enable SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE by default on Blackberry platforms. These options are already enabled in Ubuntu, Nokia N9 and in some mobile devices. backport of qt5 ee69c935c0f7b4ad3747e369fc18373d31e2521b Change-Id: I0c5065df87e5e5e4c747780d193fa49c213454f1 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QElfParser: fix type of sh_sizePino Toscano2012-05-162-3/+3
| | | | | | | | | | The type of the sh_size field of a section header is either Elf32_Word or Elf64_Xword, so the type used cannot be qelfword_t (always 32 bits) but qelfoff_t. Change-Id: Ia380b6823913fee7a96b39f742630ae3a9ca0cb8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com> (backport of 77b179689ba37dc909778fdd00df2701f83a2868 from qtbase)
* qhttpthreaddelegate: check that we have a reply set when reading.Martin Petersson2012-05-161-0/+3
| | | | | | | Make sure that we always have a reply set when we try to read. Change-Id: Icedf4190f3a4f0727e9f415c41cb6041fe5f7604 Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* Fix missing include in QWS shared memorySamuli Piippo2012-05-151-0/+1
| | | | | | | | | QWS shared memory was missing include file for QByteArray. This fails with QNX when precompiled headers are not used. Change-Id: Ifb682863736ade3f74ea53a30d6fb1d4a5ff16dd Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* QHttpMultiPart: supply new line at the end of the bodyPeter Hartmann2012-05-141-2/+2
| | | | | | | | | | | ... to conform to RFC 2046 (section 5.1.1). Apparently IIS had problems without the new line. Task-number: QTBUG-25429 Change-Id: Ia619bbdcebd407b2716bc467323634e4c8d77bcd Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit 314e590d67db08690b31930e53ca61cedfc4d1e2) Reviewed-by: Peter Hartmann <9qgm-76ea@xemaps.com>
* XShaping drag and drop fixesAlbert Astals Cid2012-05-143-8/+267
| | | | | | | | | | | | No shaping rectangles means no interaction with the window The shaping rectangles are based on the window coords, so need to substract the window coords when checking for the point And some tests to prove this change is needed Backport from commit 07f3c1e26aa6dcd07a9705e7b2ea02ace9ea7c5d from qtbase Change-Id: I6dd6c75c2bd70463561445b4f4a3894c80981d26 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QNetworkReply::setReadBufferSize fix for threaded httpMartin Petersson2012-05-139-6/+123
| | | | | | | | | | | | Added the setReadBufferSize functionallity again by limiting the amount that the delegate read from the channel. Each time that data is fetched from the reply buffer, we communicate back to the thread so that more data can be fetched. Task-number: QTBUG-25327 Change-Id: I08a246f4e7fbfdb8d58f4c5982ed0c9fa474f560 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* fix composition (C/KC) of some sequencesKonstantin Ritt2012-05-112-2/+15
| | | | | | | | | | | | | an unassigned code point should be treated like a starter code point; thus, if we have met an unassigned code point in the currently processed sequence, we should start process the next one (but we know there are no composed character for an unassigned starter -> simply skip it) This patch doesn't apply to qtbase, commit 46b78113b22428e6f8540193fcf0e00591dbd724 solved the same issue in a different way. Change-Id: I781a26024878d8b83a182b0fd4e681be2a6d9a27 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Wrong signals received when moving Flickable elementKatja2012-05-111-2/+2
| | | | | | | | | | Both onMovingHorizontallyChanged and onMovingVerticallyChanged received when Flickable element moved only to one direction. Fixed so that only relevant signal sent. Task-Id: QTBUG-25042 Change-Id: I20acb2403e08c2afa681da2e553cea227c91f001 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* getting started: better names for main() argumentshjk2012-05-105-10/+10
| | | | | Change-Id: Ibc9cdd89503fc085ed0441ff34cbe2f729e67066 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Always process window (de)activated eventsKevin Ottens2012-05-101-3/+0
| | | | | | | | | | | | | | | | | QApplication::setActiveWindow() is fully able to deal with null pointers for the activated window. It is in fact necessary to call it even in case of a null pointer as it is the only way to get a ApplicationDeactivated event properly queued. Without this patch no ApplicationDeactivated event get delivered when the platform plugin informs the Qt event system of the corresponding user interaction. Note: This doesn't apply to qtbase which has the proper behavior, this bug is Qt4 specific. Change-Id: I1128d0233a8f85943cfe5fc3c298a43f66b6d4aa Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Advertise window (de)activation to Qt event systemKevin Ottens2012-05-103-0/+34
| | | | | | | | | | | | | The integration plugin now connects screens to the newly introduced signals of the navigator event handler. The relevant screen then push a corresponding event to the Qt event loop. (This is a backport from qtbase commit b6a4d69830c0d188b4f6c424808390dd8e3a90bc) Change-Id: I28c8843f2aea75bc685dcfd6e005bc628bc69202 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Emit signals to notify window (de)activationKevin Ottens2012-05-104-0/+46
| | | | | | | | | | | | | The event notifier now deals also with the windowActive and windowInactive PPS messages. The event handler simply emit the corresponding signals. (This is a backport from qtbase commit f74e5a03598e102a1d81eb4fca58e41db713e5dc) Change-Id: If9ae70d132e6a38a2dd728d8eba31dfd144e9978 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Avoid emitting finished() before user can connect the signalShane Kearns2012-05-091-1/+1
| | | | | | | | | | | | QNetworkSession::open can synchronously emit an error, therefore we need to queue this. Otherwise QNetworkReply::finished is emitted before the user has had a chance to connect the signals. Task-number: QTBUG-18824 Change-Id: I703d5e31d2934afafabdf0a77ea3aaf5336e8dec Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (backported from commit 9793dbcc4ae4f5f0976f819e6a33e82e6b24f50e)
* Connect bearer engines to manager with QueuedConnectionShane Kearns2012-05-091-4/+8
| | | | | | | | | | | | | | | | | | | This is to avoid a deadlock that happens when a user thread is accessing the QNetworkConfigurationManager at the same time the plugin emits a signal. i.e. plugin is holding engine lock user thread is holding manager lock and blocked trying to acquire the engine lock In the manager slot, it tries to acquire the manager lock. By using queued connection, there are no locks held at the time the manager slot is called. Change-Id: I95f28028b5e77f77b2b9b7e31cbd1b78a8fe3097 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 55070e863710d49dd4b09903be9a85ea94dff1fe)
* QNetworkAccessManager - ensure abort reaches QFtpShane Kearns2012-05-081-0/+3
| | | | | | | | | | Previously, we just disconnected signals from QFtp and allowed it to continue downloading in the background. Task-number: QTBUG-25494 Change-Id: I891c2fff88ef1ee554d1ccf821a3f7998eeb8406 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit c6864e0a580793f29c7d2cf180fc0f2ac2fc2b2c)
* QFtp - implement fast abort for downloadsShane Kearns2012-05-081-5/+16
| | | | | | | | | | | | | | | | Most FTP servers do not support the ABOR command (they don't process control channel traffic until the data channel is finished). Or they require the telnet IP & sync procedure on the control channel (this requires sending TCP urgent data, which we do not support). Following behaviour of most browsers and GUI FTP clients, abort downloads by resetting the data channel. Abort of uploads needs no change, because the client closes the data channel rather than the server. Task-number: QTBUG-25494 Change-Id: I69e7b7c04d709d26def9a4a7081074e1cbf69701 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit a5fcd3f799371239dd375150648bf77cb4745626)
* Windows 7 - fix nativewifi bearer pluginShane Kearns2012-05-082-7/+21
| | | | | | | | | | | The plugin code only handled the 2 events from windows XP, while there are more events defined on vista/7. As the scan complete event was being ignored, updates did not complete. Task-number: QTBUG-24503 Change-Id: Ib1fd6883b0fd6962f61dab7830e577b9292163ef Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit b45f0418e34a73da1729376c540b312b14b8ffda)