summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Raise loopLevel for deleteLater in event filtersJohn Stanley2012-02-103-12/+16
| | | | | Change-Id: I163f510f6e99d86a35cc78965fa383e7f4618f42 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* When doing mouse move compression, pass non-MotionNotify events to installed ↵John Stanley2012-02-101-1/+4
| | | | | | | event dispatcher event filters Change-Id: Ia71f23458b9a6bc728f3e05592f530e317ae453c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Pass events to installed event dispatcher event filters before passing them ↵John Stanley2012-02-103-13/+25
| | | | | | | | | | | to x11ProcessEvent() Change-Id: If551c732b520b0105a3d4578db1b039c1b5d49fd Pass events to eventFilter first Change-Id: If551c732b520b0105a3d4578db1b039c1b5d49fd Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* test: Do not mark tst_qdeclarativetimer as insignificant anymoreSergio Ahumada2012-02-101-2/+0
| | | | | | | This test has been stable for quite some time now. Change-Id: I485ad4c904db758fa4e594ba0cd883fbe964e525 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Do not mark tst_uic3 as insignificant anymoreSergio Ahumada2012-02-101-2/+0
| | | | | | | This test has been stable for quite some time now. Change-Id: I0a45af35abb263dc4ee9bcab519fda5b313446df Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Mark tst_QMdiSubWindow with insignificant_test on Mac OS XSergio Ahumada2012-02-101-1/+1
| | | | | | | This test only fails on Mac, so enforcing it on Linux. Change-Id: I417a6b4fa76d267232f44009c5b8d2622cbe2f7c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Re-enabled passing test in tst_qdbuspendingcallSergio Ahumada2012-02-101-2/+0
| | | | | | | | | tst_QDBusPendingCall::watcher_waitForFinished_threaded() autotest was fixed by 42004eccf246cbc110f0ad22caa85efeeeb640bb Task-number: QTBUG-20859 Change-Id: Iad3c735e07b3ef21796c3aab1211e18e621ca4d3 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QTextEngine - treat a fullstop (0x2E) as the same script as the preceeding ↵John Tapsell2012-02-102-7/+57
| | | | | | | | | | | text when dividing up strings Many languages use a fullstop to indicate an abbreviation, making the fullstop part of the word. For languages like thai, it is required to pass the fullstop along for correct word breaking. Change-Id: Ideded63432d06a1ab3b786a7bd13356f2cc1a090 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Harfbuzz-thai: Hide ZWJ and ZWNJ characters and show Inherited charactersJohn Tapsell2012-02-102-3/+50
| | | | | | | | | | | | | | | | | | | | | | Thai is not supposed to have ZWJ and ZWNJ characters or any other of the Inherited Unicode Scripts (http://www.verisigninc.com/assets/idn-inherited-unicode-script.pdf) - they don't have a mapping to the thai encoding tis620 which libthai requires. However it is an unfortunate fact that there are many websites etc that liberally place these ZWJ and ZWNJ characters throughout thai text to force word boundaries, so we must also deal with them. We deal with all Inherited characters by mapping them to the invalid code ~0 in tis620 encoding, following what libthai does internally in its own tis620 encoding functions, and then replacing this character with the original unicode and setting dontPrint to true to hide the ZWJ and ZWNJ characters. Includes a unit test to check the behaviour. Change-Id: I49e44da6e39443daa832e7f50c94804e13deabb4 Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Harfbuzz-thai - When calling HB_OpenTypePosition we must set doLogClusters ↵John Tapsell2012-02-101-1/+1
| | | | | | | | | | to true for thai This bug resulted in word wrapping not working correctly for thai. Change-Id: I676deb12258beb224736414712a32e23513f406e Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix crash in qt_init when the XFIXES extension is not available.David Faure2012-02-101-0/+8
| | | | | | | | | | | | This happened to me when starting a Qt4 application in VNC (vncserver, vncviewer -via host, on linux). The pointers to the xfixes functions were not being set to 0 when XFIXES is not available, so it would crash later on in the method, in the (null-checked) use of X11->ptrXFixesSelectSelectionInput. Change-Id: Icbeec16e211790ea9d8ebe7e2d96c7a8021214cd Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix unstable test due to a race in QThreadBradley T. Hughes2012-02-091-1/+1
| | | | | | | | | | | | | | QThread::finished() is emitted before setting the thread's state to finished and !running, which means it's possible to receive the finished() signal and act on it while QThread::isRunning() still returns true. This test randomly fails due to this race. Fix it by using checking the return value of QThread::wait() instead. Change-Id: Ibf347fc9a2e8d32b328227ee6978e1129dd781f4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit faa6113c41b81368c5bbc2a764c2ae9bbc42e415)
* Fixes a possible out-of-bound write in QByteArray.Nick Ratelle2012-02-091-6/+11
| | | | | | | | | | The QByteArray::QByteArray(int size, Qt::Initialization) constructor does not validate the 'size' parameter, allowing for negative values, for example. Use shared_empty on QByteArray(int, Qt::Initialization) for future compatibility. Change-Id: I25ba1918faa53eaaf3564c57cf28a27f93c42922 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* realpath(X,0) IS supported on QNX.Nick Ratelle2012-02-091-1/+1
| | | | | | | | | | | Adds check for Q_OS_QNX to force QFileSystemEntry QFileSystemEngine::canonicalName() use realpath(X, 0) on QNX as well. cherry-picked from qt5/qtbase ee592fc042efc19acbc5407f5277abe7372c138d Change-Id: I715b1a226cc89831333f70a295c5d269bf6a8baf Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Fix qmake evaluation of QMAKE_TARGET.arch on msvc2010 x86_64Giotis Nikos2012-02-091-2/+8
| | | | | | | | | | | | This change is needed because msvc2010 tools have a '\' character at the end of environment variable VCINSTALLDIR. This variable on msvc2008 does not have this '\' character at its end. Without this change QMAKE_TARGET.arch on msvc2010 x64 evaluates to x86 instead of x86_64. cherry picked from qtbase 66f56024ccfc39f818e0f16b44d4916b6a03d322 Task-number: QTBUG-22686 Change-Id: Ibc7546c522506b2c4e7a729a8de319aea788b662 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix QListView::scrollTo() when there are hidden rowsJani Honkonen2012-02-092-1/+53
| | | | | | | | | | | | | | QListView does not consider hidden rows when scrolling to an item. If there are hidden rows (or columns) before the selected item then the visual index of an item is not the same as the row index from the model. So scrolling will be off by the number of hidden rows before the selected item. Added a autotest for this also. Task-number: QTBUG-21115 Change-Id: I49c39033d83f80d4405b59510617096029ee6d3b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Avoiding early deleteLater in Symbian with better loopLevel trackingMurray Read2012-02-095-21/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Harfbuzz-thai - fix to_tis620 function for latin charactersJohn Tapsell2012-02-091-1/+1
| | | | | | | | | This was an obvious typo - a missing "else" in a group of if statements. Change-Id: Iaa58e761ebdff86d4e0bc19113162f380a311f63 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Symbian building: enable symbian platform autodetectionPasi Pentikainen2012-02-091-3/+0
| | | | | | | | | Enable Symbian platform autodetection to differentiate between platform versions. Change-Id: I9553d181952f011b162232cc8946d0dc0a64d92c Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Symbian: Fix for blank window after taping Editing options.Satyam Bandarapu2012-02-092-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens in FlightInfo app when menu is opened, editor lost focus and Fep manager looks for focused editor to do ccpu related tasks. It also has some partially regression from fix a2709ef3f4410a1d1755e00353e6f969f8bb5613. The regression is fixed in QCoeFepInputContext::DocumentLengthForFep by returning size to 1 only for multiline editors with no text and multiple lines presented. And also set focused editor to last focused editor when Menu is opened. Opening EditOptions shows blank window if virtual keyboard is never open before. This is because 'm_lastFocusedEditor' is null and it will set to last focused editor only when virtual keyboard open. Fixed in QCoeFepInputContext::setFocusWidget by setting 'm_lastFocusedEditor' to current editor. Above fixes causes other issue, Qt application 'actions' are never added to optionsMenu. This happens because Qt Symbian implementation assumes that default menu items are less than or equal to one, but in Qt 4.8.0 CCPU adds one more default menu item (EditOptoins) to OptionsMenu in addition to 'Writing language' menu item. Fixed by setting NumberOfItemsInPane<=2 in QS60MainAppUi::DynInitMenuPaneL. Change-Id: Idd35cbc746f06f1c64d003c0a32ef1b8f8bc3c89 Reviewed-by: Sami Merilä <sami.merila@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Change bugreports.qt.nokia.com -> bugreports.qt-project.orgSergio Ahumada2012-02-0917-22/+22
| | | | | | Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fixed null pointer dereference in QUnifiedTimerNick Ratelle2012-02-081-6/+9
| | | | | Change-Id: I8b7ab19a98e2920fc020043088c32d073aa1d60d Reviewed-by: David Faure <david.faure@kdab.com>
* Fix bug in qatomic for INTEGRITY RTOSKalle Viironen2012-02-081-34/+57
| | | | | | | | Fixes errors in INTEGRITY qatomic pointer and int templates and wrongly defined IS_WAIT_FREE's & IS_NATIVE's Change-Id: I1ab0236bb4979c0fda6a075ca82ee618a6da40e1 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fix Qt to use font with simplified chinese characters as default if neededMarko Kenttala2012-02-081-0/+8
| | | | | | | | | | | | Qt defaulted to use a font with traditional chinese characters even if system language was set as ELangPrcChinese. Fixed qfont_s60 to use a font with simplified chinese characters in this case. Task-Number: ou1cimx1#915614 Change-Id: I0258a95f6630b4fa07acc9340bb38fc67bea7b1d Reviewed-by: Sami Merilä <sami.merila@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix for effects in Qt-applications startupAri Lehtola2012-02-081-0/+7
| | | | | | | | | | | This is part of the solution for reducing flickering in Qt-applications startup. Fix is effective together with changes in platform effects framework. Task-Number: ou1cimx1#951526 Change-Id: Ia8d0544ec30741605efd6f7db035bcea2f36e67a Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* tests: Don't mark qcopchannel and qdirectpainter subtests as testcases.Sergio Ahumada2012-02-082-3/+0
| | | | | | | | | The subtests are intended to be executed by tst_qcopchannel/tst_qdirectpainter and therefore don't need to have "CONFIG += testcase", which causes 'make check' to treat them as stand-alone tests. Change-Id: I3461275f5e32f1fa8836f17d0e9e6d0780dd81e5 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Prevent crashing on Symbian in case EGL surface creation fails.Pauli Jarvinen2012-02-084-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible in environment with limited resources, that EGL surface creation fails. When this happens, the QPainter doesn't get properly activated, which in turn caused a crash later in the drawing code. Now, a check has been added into qapplication_s60.cpp to abort window drawing immediately, if surface creation has failed. The EGL surface is then tried to be recreated on the next time when the window becomes visible, which usually allows the application to recover. In most cases, the crash happened in the function qDrawBorderPixmap, which didn't check the validity of the QPaintEngine pointer before accessing it. This method is analogous with the public methods of the class QPainter where, on the other hand, availability of QPaintEngine was always checked. To be in line, and to prevent ptential crashes, a similar safety check and warning message have now been added to method qDrawBorderPixmap. Furthermore, a null-check was added to qwindowsurface_gl.cpp for the QGLContext pointer. The same pointer was already previously null-checked in the other branch of the same function, indicating that the null-check is probably necessary. Task-number: ou1cimx1#969923 Change-Id: I6d78be72b9c2308ef74b1119d8c8ec34ec015195 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Update accessibility selections in QTextControl.Frederik Gladhorn2012-02-081-2/+13
| | | | | | Change-Id: Iae0c2792b64b8ec2736a9ff621cf7c313a394093 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix access to uninitialized values in QtXmlPatternsSami Rosendahl2012-02-083-29/+14
| | | | | | | | | | | | | | | | | | | | | | | Fixes valgrind warning like below when executing tst_QXmlQuery::copyConstructor() Conditional jump or move depends on uninitialised value(s) at: QPatternist::NodeIndexStorage::operator!=(QPatternist::NodeIndexStorage const&) const (q by: QXmlItem::operator=(QXmlItem const&) (qabstractxmlnodemodel.cpp:1228) Reason for the warning is that QPatternist::NodeIndexStorage::operator!= accesses all fields of NodeIndexStorage, which are all not intialized in every execution path of QXmlItem::QXmlItem(const QVariant &) and class QPatternist::Item constructors. Fixed by adding NodeIndexStorage::reset() function that resets all fields and put a call to that function where NodeIndexStorage objects were previously incompletely initialized. Note that unfortunately class NodeIndexStorage cannot have a default constructor, because it is used as a union field. Change-Id: I686433ba552f025658f7e583226e77346db82159 (cherry picked from commit f42f82f435d738339ad85c1380d1167338517247) (cherry picked from commit 65d2458408ccda1b37e1069fd13791a60fa0c672) Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Some small doc fixes, typos and removal of one incorrect paragraphAndy Shaw2012-02-085-12/+7
| | | | | | | | The QTextStream paragraph that is removed referred to something that is incorrect. This was confirmed for Windows, Linux and Mac. Change-Id: Ibac8f82482f2060308b5b8485d6da228bdf52fe6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Don't get stuck in a loop while trying to close the active popup widgetAndy Shaw2012-02-081-1/+1
| | | | | | | | | | | When the application is deactivated then it will try to close down the active popup widget. However, the popup widget can prevent a close from occuring and Qt should respect this without causing problems when the application is reactivated later on. Task-number: QTBUG-23448 Change-Id: Icc4902cbeac99eb631e569167227d9bcd4d4dcbb Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Improved stability of tst_networkselftestRohan McGovern2012-02-081-12/+12
| | | | | | | Significantly increase most timeouts. Change-Id: I3c25692d1e26ae3efd301df2f02089e57a8708d3 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Handling adopted thread death with active timers on SymbianMurray Read2012-02-083-6/+50
| | | | | | | | | | | | | | 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>
* Changes in Symbian CleanupStack use to allow dodgy app startMurray Read2012-02-082-12/+11
| | | | | | | | | | | | | | Some important apps were found to invoke Qt code using the Symbian CleanupStack during static data initialization. This is not legal Qt code, but due to the importance of maintaining compatability with these apps, Qt has been modified to avoid the problem. In one case by removing unnessary use of CleanupStack. In the other by creating a temporary CleanupStack. Task-number: ou1cimx1#960665 Change-Id: Iff631a638dceec10aa38add88ba93a63a831a574 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Make QString::latin1() re-entrant, the global QHash needs a mutex.David Faure2012-02-083-1/+29
| | | | | | | | | | *Different* instances of QString used in different threads would often lead to crashes due to the global QHash used by latin1() and ascii(). Basic autotest for latin1() added. Change-Id: If4fd450deb28f41b1d71f377cacb8815ddeffbee Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Ensure the header's context menu is in sync with the visible sectionsAndy Shaw2012-02-071-1/+12
| | | | | | | | | | | When the filedialog was reshown the context menu for the header was not in sync with the sections that were actually visible. This ensures that it is in sync after the state of the header is restored. Task-number: QTBUG-23271 Change-Id: Ia1546bf300d43a5822482f63de99eb52b674bf52 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Ensure that QSqlDatabase::database() is still thread-safeAndy Shaw2012-02-071-4/+1
| | | | | | | | | | | | | | | | QSqlDatabase::database() is documented to be thread-safe and when the driver is queried for the numericalPrecisionPolicy set then it can comprimise the thread-safety. Since the driver itself (if one is set) will be queried for the numericalPrecisionPolicy when numericalPrecisionPolicy() is called on the QSqlDatabase then we can have it fallback to the default instead rather than taking the driver's own setting. Task-number: QTBUG-13423 Change-Id: Ie6a8ed76236a3bb3b8bfdb61ef156699b05a93ab Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fixed CustomDashLine drawing bug.Samuel Rødal2012-02-071-1/+3
| | | | | | | | | | The bug was caused by attempting to stroke an empty subpath. If there have been no line-to's emitted we should not try to join the start and end of that line segment. Task-number: QTBUG-23248 Change-Id: I38b7e955ed6683f8fc25f9551e93b4f472c022bf Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* test: improved stability of tst_qiodevice on slow machinesRohan McGovern2012-02-071-4/+4
| | | | | | | | | | | Increased network timeout from 5 to 30 seconds. Change-Id: I4751dbfbb82c2091f1cec26150f06f913ffbe4c0 Reviewed-on: http://codereview.qt.nokia.com/2456 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> (cherry picked from commit 493634a71190679666082687626c05047b5cd463) Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix height of some Thai charactersMarko Kenttala2012-02-071-0/+28
| | | | | | | | | | | | | | Some Thai characters with two above glyphs were higher than fonts ascent. This caused them to be clipped in for example qtcomponents buttons. Added checking for this and calculation of new lower offset between glyphs if needed. Task-Number: ou1cimx1#898104 Change-Id: I6eff058cbe5fe92a01ac1ad10ee351fe8ed78e67 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Sami Merilä <sami.merila@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Improved stability of tst_qsemaphore (especially on mac)Rohan McGovern2012-02-071-14/+26
| | | | | | | | | | | | | | | | Timers are not entirely precise; if we ask for a timeout of 10000 milliseconds, we might time out in 9999 instead. Also, we know the expected elapsed time in each case, so do a fuzzy comparison against that time. Previously the test was verifying that the elapsed time was greater than or equal to the timeout in the case where a timeout was expected, which means the test would not detect bugs which incorrectly caused the timeout to occur later than it should. Change-Id: Ic054013c7d53af8a87a89e9d9c4acbce68ba575e Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Improved stability of tst_qhttpsocketengineRohan McGovern2012-02-071-7/+7
| | | | | | | | | | | | This autotest assumed that various network operations could always be completed within 5 seconds. Notably, it assumed that an attempt to resolve a nonexistent hostname would always result in an error within 5 seconds. In my testing, it usually takes 4-6 seconds to complete, but occasionally takes as much as 13 seconds. Change-Id: Ia31bb86495928633159f3527763aad086635e7e4 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2012-02-074-1/+6
| | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Change-Id: Ie3afe664e3a91c2d1f9ca03c2f39f8f9c5aa6edc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed CeTest remotelib build for WinCE 5.jaanttil2012-02-071-1/+1
| | | | | | | | | | WinCE 5 does not have PPN_POWERBUTTONPRESSED but PPN_SUSPENDKEYPRESSED. Newer WinCE version have both, but PPN_POWERBUTTONPRESSED is defined to same as PPN_SUSPENKEYPRESSED, that's why it is safe to use PPN_SUSPENKEYPRESSED in all WinCE versions. Change-Id: Ida0604f86330c3e833a1ad41a88db55aa6a625fa Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed Qt examples building when QT_NO_GESTURES is used.jaanttil2012-02-071-0/+2
| | | | | | | | | | Gesture examples were always enabled regardless the used Qt configuration. Added check for QT_NO_GESTURES to examples.pro, and included gestures examples only when needed. Change-Id: Ic8789aedb1251a3827191c647d4b0c4d5a1b6306 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use available geometry when maximized.Rafael Roquetto2012-02-071-1/+9
| | | | | | | | | | | | | | | Use the available geometry as a maximized window would fit on the desktop in the available area (some space is used up by task bar, system menu, etc.) as opposed to the fullscreen geometry which would be the entire screen. cherry-picked from qt5/qtbase: c051d3350e4f227f71921e7db7e52d02525cc8fc Change-Id: Id20fdf68bcbd2eb1fc7db5cf1658bbefbe5737a4 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixes QIconvCodec::convertToUnicode()Nick Ratelle2012-02-072-1/+6
| | | | | | | | | | | | We need to hang onto the internal state of the utf16 converter object whenever converting a long string to unicode. This was failing with the text stream class -- the first read was okay, but subsequent reads could not be correctly converted to unicode. cherry-picked from qt5/qtbase: 72c07311228ce6eefb460d7e5da3de24220ba81e Change-Id: I794d78808ccd9deedcb406bfe46e373c18142d05 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove unnecessary codeblock.Casper van Donderen2012-02-071-9/+0
| | | | | | | Fixes: QTBUG-24082 Change-Id: I000e397983d3f26b49ffc9cc61f0d4e20583e6ee Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2012-02-071-0/+2
| | | | | | | | | | | With MSVC 2010 if a single configuration vcxproj file was created then it would not have an entry for the .rc file only the .res file that would be compiled from it. Without the entry for the .rc file then it would not compile the .res file. Task-number: QTBUG-22545 Change-Id: Ieb77530ca53c7e76056c18542a3bb7e2d3688d73 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Fixed qmldbg_inspector build for WEC7.jaanttil2012-02-062-0/+9
| | | | | | | | | | 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>