summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make sure we release IAdviseSink interfaceJian Liang2012-02-291-1/+2
| | | | | | | | IAdviseSink interface is not released if spViewObject is 0 in QAxClientSite::activateObject(). This patch fix this problem. Change-Id: I5d215e18468660eab59ef69e6fd71405337264b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make reference counting for QAxClientSite multi-processor safeJian Liang2012-02-291-6/+6
| | | | | | | | | | It is not safe to use ++long/--long to implement reference counting for COM object in multi-processor environment. We use InterlockedIncrement() and InterlockedDecrement() to implement reference counting. Change-Id: Ibfc5f3456cbaefb9267feb378483c5c60c305f00 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix QTreeView header re-ordering bug on Mac OS.Chris Meyer2012-02-281-0/+7
| | | | | | | | | | | | | | | | | | | | When the mouse button is released at the end of a drag, Cocoa may simulate an extra mouse moved event. However, the state of the buttons when this event is generated is already 'no button'. This leads to some failsafe code canceling out of the drag state and when the actual mouse release event is finally processed, the header drag state has already been exited and the header drag fails. This patch disables the failsafe code on Cocoa and makes header dragging work when the mouse goes outside the bounds of the header view. Task-number: QTBUG-14179 Change-Id: Ic2762b77b78ef7b99f97ff9ed1f58254de1eba82 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Andrew Semenenko Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix to exit of adopted thread watcher in Windowsjian liang2012-02-281-7/+20
| | | | | | | | | | | | | | Don't register the thread handle and QThread object pointer to watch list for adopted thread watcher thread in Windows. Otherwise the watcher thread will never exit and can't clean up its own QThreadData and QAdoptedThread object. Task-number: QTBUG-23961 Change-Id: Ia84326cf3cfd978d2b003ccc1bb6861db950e899 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit bf66eebbc28b1f405a49a68d3f6c341d433159ea)
* Fix potential race condition in data structure of adopted thread watcherjian liang2012-02-281-1/+3
| | | | | | | | | | | | | Fix potential race condition in data structure of adopted thread watcher in Windows. Since QVector is not thread safe, it is not safe to read and append data to qt_adopted_thread_handles or qt_adopted_qthread simultaneously in qthread_win.cpp. This patch fix this race condition. Change-Id: I2d0c7a4cdde5390d38d15c98343f0fc6ddd24aba Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (cherry picked from commit 4b30882a3f74914156f165a0a062b54ad3686c45)
* Add additional QGraphicsView tests for regressionJonathan Liu2012-02-281-0/+61
| | | | | | | | | | Add additional tests for graphics view tooltip regression introduced by 7c0d15a22266a425c9e9ac0120d6774e120fe01e. Task-number: QTBUG-17517 Task-number: QTBUG-22663 Change-Id: I5e0d0e19504730a3e14ac84712a366dbebe688e6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Revert "Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition."Jonathan Liu2012-02-281-3/+7
| | | | | | | | | | | | | This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e. The commit caused a regression whereby tooltips may be shown even if the mouse is not over the item if it has the Qt::ItemIgnoresTransformations flag and the QGraphicsView had been scaled. Task-number: QTBUG-17517 Task-number: QTBUG-22663 Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix window positioning regression.Miikka Heikkinen2012-02-281-2/+2
| | | | | | | | | | | | The fix to bug QTBUG-10589 has affected the style flags of windows, which indirectly changed how their initial position is determined. Fixed initial position for windows with WS_POPUP style so that x and y cannot go negative, which makes QMainWindows with larger than screen initial dimensions to behave identically to Qt 4.7.4. Task-number: QTBUG-24071 Change-Id: Ie38cdd206df4be21cce823d7d94a4690a7cb01e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix submenu positioningMiikka Heikkinen2012-02-281-0/+8
| | | | | | | | | | | | | | | | | | Submenus are now positioned to the correct side of the parent menu based on layout direction, if there is enough space on screen to fit the menu. If there is insufficient space, then the menu is positioned to the other side of the parent menu. In case that also causes submenu to be partially ofscreen (very wide menu relative to the screen), then the submenu will be aligned with the screen edge and will overlap the parent menu. This seems like a lesser evil compared to having submenu partially offscreen, which could obscure important details such as checkmarks. Task-number: QTBUG-23568 Change-Id: I6a9ab2c232713a2ee5a6dde3227c40419d46bd3d Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 64e0560ff451676fc96dfadd21bef436ac25bb52)
* Fix divide by zero when glyphWidth is 0Jiang Jiang2012-02-281-0/+2
| | | | | Change-Id: Ic0108b76b8d73cc977f8d64e036a65cb93db4684 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QWindowsPipeWriter could terminate the process to earlyMartin Petersson2012-02-281-1/+1
| | | | | | | | | | | | | | When the QWindowsPipeWriter is deleted it will wait for the thread to exit. This wait was set to 100 ms which will not always be enough time for the thread to exit, in that case the thread will be terminated. This will increase the timeout to 30 seconds that should be more then enough time for the thread to exit by itself. Task-number: QTBUG-4425 Change-Id: I52567066b757c2bbfda6887f504cf80de262b988 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Specify global mouse position for QDeclarativeMouseArea auto testJonathan Liu2012-02-281-3/+4
| | | | | | | | | | The preventContextMenu QDeclarativeMouseArea auto test creates QContextMenuEvent without specifying the global mouse position. As a result, the event's global mouse position is incorrectly set to QCursor::pos(). Change-Id: Ib67fbcf3acf968eb2748426ad0db0e900826b232 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix modal file dialog opening on MacPasi Matilainen2012-02-281-1/+1
| | | | | | | | | | | When a modal file dialog is opened on Mac, the native file dialog is actually opened twice, first as modeless and later as modal. Normally this works (by chance), but when the application runs in a sandbox, this results in a crash. Task-number: QTBUG-21609 Change-Id: I906868e1b4bd74dc3030891bede51f32ebd16b4a Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* test: Improved stability of tst_qsharedmemorySergio Ahumada2012-02-281-2/+2
| | | | | | | Significantly increase waitForFinished() timeouts. Change-Id: I498408c756f2b46bf3870f40703e7c2f0d4ec9b5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix for Thai characters with a below markMarko Kenttala2012-02-283-4/+16
| | | | | | | | | | | Some Thai characters with a mark below got drawn under fonts descent causing them to be clipped in some situations. Added checking for this and use of lower offset if needed. Task-Number: ou1cimx1#979179 Change-Id: If9fb643d4dee24342215a637c805d52b78584333 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix static build of Qt for WinCE and WEC7.Janne Anttila2012-02-272-2/+1
| | | | | | | | | | | | | | | | | When doing a static build of Qt for WinCE/WEC7, the sqlite database driver is statically built into Qt library. In that case relevant HAVE_LOCALTIME_S=0 defined in sqlite.pro under plugins folder does not have effect because qsql_sqlite.pri and further 3rdparty/sqlite.pri are directly included to QtSql library. Moved the needed define down to such *.pri file which is included in both static and non-static Qt builds. Task-number: QTBUG-24500 Change-Id: Iacbdd6d02fc31558a1ce91f42756eaac5053414b Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* QNetwork: fix compilation with "-no-feature-bearermanagement"Martin Petersson2012-02-273-1/+5
| | | | | | | Task-number: QTBUG-23239 Change-Id: I12f89a4e595231738985ca0cf3179fee7de9fa72 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* QNetwork: remove compile warning.Martin Petersson2012-02-271-2/+2
| | | | | Change-Id: I01245f7f6943f5a8bf30e8215419dbfd4dfcdb09 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix mouse wheel page-by-page scrolling on windowsPasi Pentikainen2012-02-271-4/+14
| | | | | | | | | | | | | In windows, the page-by-page mouse wheel scrolling is configured with scroll lines value of -1, which maps to INT_MAX. The scroll calculations had an integer overflow issue which caused the wheel scrolling to scroll only downwards when configured with large enough value like this. Task-number: QTBUG-11336 Change-Id: Ib4440367ce2617f96797c1f8cc8ec9e6a2f8467c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Andrew Semenenko Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fixed zlib build for WEC7.Andreas Holzammer2012-02-273-10/+17
| | | | | | | | | | | | | | | | | 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>
* Build fix to raster window surface.Janne Anttila2012-02-261-1/+1
| | | | | | | | | | | | Fixed typo in qwindowsurface_raster.cpp, to get rid of compile error: 'class QRasterWindowSurfacePrivate' has no member named 'needsSync' Mispelling was introduces by commit: 30dee4f4 Task-number: QTBUG-23320 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Change-Id: If473289e0549b2dec440285fec1ce64030de035f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix backspace on empty lines with custom QML editorsAapo Haapanen2012-02-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Symbian AknFEP doesn't return backspace keypresses to the editor if the editor is empty. This causes problems for multiline editors, because AknFEP can only see one line at a time. This issue has been previously fixed by change a2709ef3f4410a1d1755e00353e6f969f8bb5613 so that QCoeFepInputContext::DocumentLengthForFep returns lenght as 1 for empty lines. The fix was then refined by change 0ffd7fcc78e27f9184a6f1ee5a8a9cc5e6266998 so that the length is altered only when the editor has multiple lines. After the latest change, if a custom QML editor didn't have a lineCount property, the code assumed it has only one line. This caused problems for some custom multiline editors. This change alters the behaviour so that if the code can't get the linecount from the editor, it assumes it has multiple lines. This reverts the code to behave like before change 0ffd7fcc78e27f9184a6f1ee5a8a9cc5e6266998 for such custom QML editors. Task-number: ou1cimx1#981078 Change-Id: I3551d1d3ca1984957465f894c8bc237544224468 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix a crash in QSystemLocalePrivate::uiLanguages().Friedemann Kleint2012-02-251-1/+1
| | | | | | | | | Use the correct calling convention. Discovered by the mimetype test in Qt 5. Change-Id: I79b97325dd69466885a64c238935107bf14e9a0d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Port QBBRootWindow from the Qt 5 QPA plugin.Robin Burchell2012-02-255-222/+375
| | | | | | | | | This lessens unnecessary delta between the two. Change-Id: I3bb33d977573e3404dd08c2f4e396d18dd63ddc7 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix tst-qtextscriptengine unit test when no appropriate font existsJohn Tapsell2012-02-241-0/+4
| | | | | | | | The tst_QTextScriptEngine::controlInSyllable_qtbug14204 test fails if no Devanagari font is found. Change-Id: I35cf9d788569a92daa8b370480a44f7e748ddf86 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Updated WebKit to c1252be57a3f673277c732c0902568111b2f4964Simon Hausmann2012-02-238-7/+32
| | | | | | | QNX build fix. Change-Id: I72b31faba88a569f62667f7803f6c7434ce6b15e Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* INTEGRITY mkspecs updateKalle Viironen2012-02-2311-105/+209
| | | | | | | | | | | Modifies existing structure of INTEGRITY mkspecs to be more clear and adds a new mkspec for INTEGRITY x86 target. This also moves mkspecs to supported folder as this is the case in 4.8.x. Task-number: QTBUG-24153 Change-Id: Iae893c20f88050040f7686ab2ab272c1d1af22bb Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Stabilize tst_qdbusabstractinterface and make it XFAILRohan McGovern2012-02-231-40/+40
| | | | | | | | | | | | | | | | | | This test was written incorrectly in a way which happened to allow it to pass most of the time (but not all the time). Reset the state of test objects between each test function, and mark the broken functions with QEXPECT_FAIL and a link to a task. Replace the unusual WaitForPinger construct with the usual QTRY_VERIFY/QTRY_COMPARE method of verifying asynchronous operations. (cherry picked from commit e88f9a92b7ab05ea9bc25083de7dee1b67dd673e) Task-number: QTBUG-24262 Change-Id: I7a1f265695c15c0f7b1867a8608827c951a6e3b9 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Allowing symbian cleanup code in thread started and finished slotsMurray Read2012-02-221-2/+10
| | | | | | | | | | | | | | | The run() function of QThread was inside a TRAP, but the started() and finished() signals were emitted outside of a TRAP so could not contain Symbian cleanup stack code. This broke compatability with some apps, as the older pthread based implementation had the whole main thread function running inside a TRAP. The started and finished signals are now emitted inside TRAPs, with enhanced leave/exception handling code. Task-number: ou1cimx1#979704 Change-Id: I9b4e50b1085494b5fd5e05efa11739ce19ff26fb Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Take into account input shaping in findRealWindowAlbert Astals Cid2012-02-213-26/+19
| | | | | | | | | | | | | | | In previous commits we took into account bound shaping, but X also supports input shaping, so make sure it's inside both input and bounding shaping to consider the position as inside a window My tests show that when unset Bound Shaping and Input Shaping return the rectangle of the window itself, so we need to be inside both of the rectangle sets to consider the position as a dragabble position for the window Change-Id: Icb2204a50a97e4a5e02e75301c67287525b290ba Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Implemented QAccessibleTextWidgetJosé Millán Soto2012-02-212-179/+312
| | | | | | | | | | | | | | | A new class called QAccessibleTextWidget was added. This class should implement all methods of QAccessibleTextInterface and QAccessibleEditableTextInterface which only need a QTextCursor, and it defines two pure virtual methods, to obtain and set the text cursor, so accessible implementations of widgets which use a text cursor can implement these two methods. QAccessibleTextEdit is now a subclass of QAccessibleTextWidget and most of its methods were moved to QAccessibleTextWidget. Change-Id: Ie30e7b377cb9b381c2ef6017ecb188fd0fdeeddb Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* QElapsedTimer/Win: Fix 64-bit integer overflowJonathan Liu2012-02-211-1/+3
| | | | | | | | | | | | The ticksToNanoseconds function in qelapsedtimer_win.cpp multiplies ticks from performance counter with 1000000000 which can sometimes result in 64-bit integer overflow. This can cause the elapsed time to reset or jump around. Task-number: QTBUG-23150 Change-Id: I464503e03cbe64e13906e773beafbf88e7dc256a Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Initial import of the BlackBerry Playbook QPA plugin.Rafael Roquetto2012-02-2133-0/+7381
| | | | | | Change-Id: Ibc883be9af145eafef2e5ff9eb82c3364bace331 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixes QProcess on QNXRafael Roquetto2012-02-203-82/+67
| | | | | | | | | | | | | | This patch first re-enables childStartedPipe on QNX and uses, just like other platforms, to monitor the inferior process life cycle. This also aligns QNX-specific code logic closer to the common QProcess logic, making it unecessary to have custom versions of functions such as QProcess::waitForStarted(). The only difference that remains is the use of spawn() instead of fork(), because both fork() and vfork() do not support multi-threaded applications on QNX and will segfault. Change-Id: I8e1f9823629fcb5e7c3c128fafc2542a403b969e Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove unnecessary locking from QNetworkProxy constructorShane Kearns2012-02-201-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | QGlobalNetworkProxy (a singleton) had two phase construction, with the second phase being called from QNetworkProxy's constructor. This isn't necessary, and has been reported as causing deadlocks. Although constructing socket engine handlers has side effects (they add themselves to a list on construction and remove themselves on destruction), this appears to be safe. The socket engine handlers are only used while holding the list mutex, and any socket engines created don't have any reference to the factory that created them. With the new version, it is possible that two instances of QHttpSocketEngineHandler and QSocks5SocketEngineHandler exist temporarily if a Q_GLOBAL_STATIC initialisation race occurs. This appears safe, because the loser of the race deletes its handlers, which remove themselves from the global list as above. Task-number: QTBUG-13088 Change-Id: I8cf520da717d8ab7d862ab89c6de13aea6d60ac3 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit aee4cbf22a5942c7bd4b9545a8fcb7cf2930e0ee)
* Fix handling of urls containing username/password in QNetworkAccessManagerShane Kearns2012-02-202-10/+63
| | | | | | | | | | | | | | | | | | | QNetworkAccessManager was ignoring the supplied credentials, although webkit seems to support these urls at a higher level. Following the behaviour of browsers: We use supplied credentials if authentication is required. We add supplied credentials to the authentication cache. We emit authenticationRequired signal if the credentials were wrong. We do not use previously cached credentials for that url Synchronous http requests fail, if the credentials were wrong. Task-number: QTBUG-18107 Change-Id: If46e8eab1511ba8a0f4bbe0d4efaabc4df0b8ab4 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit b4a538ea1c3cdce09e3528227dba2e8f5765cbdc)
* Fix incorrect use of QObject::disconnect in synchronous http requestShane Kearns2012-02-201-2/+4
| | | | | | | | | | In certain circumstances, this could cause the request to time out (and repeatedly send bad authentication credentials to the server) instead of failing with AuthenticationRequiredError. Change-Id: Iff66b32f1d7268f21fd77b6620aae4b5d49d857f Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit d425a0dad38e51c99cfe59294a3706ced90b24a0)
* Update documentation to show NTLMv2 is supportedShane Kearns2012-02-201-4/+2
| | | | | | | | | | This feature was implemented in 4.8, but documentation was not updated at the time. Task-number: QTBUG-18181 Change-Id: I657d7ab7aaf43b73b7bf8fd1cb76086522cf5c2b (cherry picked from commit 6f7bd6532d34713811c8f70b287d151d24cdda7c) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* RR scheduler error handling for deleted active objectsMurray Read2012-02-202-4/+10
| | | | | | | | | | | | | | | | | | 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>
* Fixed typo in text: "dpeth" -> "depth"Sergey Belyashov2012-02-202-2/+2
| | | | | | Change-Id: Ic910dc63db5625640735e2918f09c75a1d8669cc Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* tests: Mark unstable tests as insignificant on WindowsSergio Ahumada2012-02-173-2/+2
| | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qlocalsocket tst_selftests Task-number: QTQAINFRA-428 Change-Id: I294048133bac141dfd6239dba115dcc93035f868 Reviewed-by: Jyri Tahtela <jyri.tahtela@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>
* Doc fix for LinguistAndy Shaw2012-02-171-1/+1
| | | | | | | Indicate the right menu that the Batch Translation entry can be found in Change-Id: I86da9310f1672d073f7c4e207a46ecdd6757018e Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Ensure the scrollers appears when there is too many menu itemsAndy Shaw2012-02-171-10/+11
| | | | | | | | | | | | When there are too many items in a single column menu then scrollers will appear for the menu to enable scrolling to the other items. However, this broke in Qt 4.8 as the scrollers would not appear anymore due to the adjustment of the size of the menu to account for the size of the desktop. Task-number: QTBUG-23507 Change-Id: Ib6bb7a5572bc0fbbf3de6dac03a08b69404804a3 Reviewed-by: Pierre Rossi <pierre.rossi@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>
* Don't render glyph with FT with fetchMetricsOnlyJiang Jiang2012-02-151-1/+1
| | | | | | | | | Neither rendering with outline nor fetchMetricsOnly requires the rendering from FreeType so we don't need to render them or cache it. It should speed up recalcAdvances() quite a lot. Change-Id: Ic322507d54ab59020851e359088a4afa4e03c8db Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Abort FTP download, not the whole applicationShane Kearns2012-02-152-5/+25
| | | | | | | | | | An old coding error meant that the C runtime abort() function was being called instead of QFtp::abort() when cancelling an FTP download using QNetworkReply::close() Task-number: QTBUG-22820 Change-Id: Ib97fda9769b2b55a08c042c66c4444cb6216d2b1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix online status checking in generic bearer plugin.Xizhi Zhu2012-02-153-1/+98
| | | | | | | | | | | | | QNetworkInterface::IsUp means the interface is up, but not necessarily connected. QNetworkInterface::IsRunning means the interface is up and connected. Cherry-picked from Qt5 / QtBase commit: c93ac6758606f64af7fe2bac6c8bb08391d218a7 Task-number: QTBUG-22873 Change-Id: Ieb544058814520b4292b496de2e4672214f3d00a Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* tests: Mark unstable tests as insignificant on WindowsSergio Ahumada2012-02-153-0/+6
| | | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qlocale tst_quuid tst_uic3 Task-number: QTQAINFRA-428 Change-Id: I21e78e4320e28735286778125a103caf7aa45d44 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* QDial: Fix crash when singleStep-property is 0.Friedemann Kleint2012-02-151-1/+3
| | | | | | | Task-number: QTBUG-23072 Change-Id: I296b46af23420b24fa5460b9660e33bf203ea29f Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>