summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* rename QLockedMutexUnlocker to QMutexUnlockerHarald Fernengel2009-08-171-5/+5
| | | | Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Changed to SymbianVersion enum after review.axis2009-08-172-9/+9
| | | | | RevBy: Trust me AutoTest: It built...
* Merge branch 'fixCursorLagInVK'axis2009-08-171-0/+2
|\
| * Fix the cursor lagging one step behind in the Virtual Keyboard UI.axis2009-08-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | This was caused by the widget not calling update on the input context after changes to the cursor position. This is a reimplementation of 8d1691e9395, after the QLineControl refactoring. RevBy: Trust me AutoTest: Passed
* | Fixed a compile error for qs60style.cpp on s60 build.Liang Qi2009-08-151-1/+1
| |
* | Remove the history files for autotest, and move the whitelist files to ↵Liang Qi2009-08-1425-740/+0
| | | | | | | | autotest repo.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAlessandro Portale2009-08-141-3/+1
|\ \
| * | remove a ### commentLars Knoll2009-08-141-3/+1
| | | | | | | | | | | | | | | The change is actually correct, as we only need the commented out codepath for debugging.
* | | Removing some unused variables.Alessandro Portale2009-08-146-17/+0
|/ / | | | | | | | | | | Conflicts: src/gui/styles/qwindowsstyle.cpp
* | Fix incorrect logic in QPixmap::fromSymbianCFbsBitmap.Jason Barron2009-08-142-1/+12
| | | | | | | | | | | | In some alternate universes it might make sense to use a pointer before checking if it is valid, but since this isn't one we shoudn't do it. Also extend the autotest a little to make sure we catch this case.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicSami Merilä2009-08-143-7/+57
|\ \
| * | Fixed the tst_QFileInfo::isHidden test to actually test for hiddenMiikka Heikkinen2009-08-142-4/+53
| | | | | | | | | | | | attribute in Symbian in a meaningful way.
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-143-13/+18
| |\ \
| * | | Fixed merge failure in qfsfileengine_unix.cpp.Miikka Heikkinen2009-08-141-3/+4
| | | |
* | | | S60Style: Draw vertical busy indicator with correct graphic.Sami Merilä2009-08-141-1/+3
| |/ / |/| |
* | | S60Style: Draw QFrames in default casesSami Merilä2009-08-141-0/+2
| | |
* | | S60Style: Draw non-initialized icons as enabled.Sami Merilä2009-08-141-1/+1
| | |
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-142-6/+6
|\ \ \
| * | | Changed QCoeFepInputContext::ReportAknEdStateEvent so that it actually ↵mread2009-08-141-1/+1
| |/ / | | | | | | | | | forwards the event and doesn't just send a fixed one.
| * | Fixed network-settings.h build for symbianMiikka Heikkinen2009-08-141-5/+5
| | |
* | | Fixed QKeySequence autotest for Symbian.Janne Anttila2009-08-141-11/+14
|/ /
* | Partially revert oom safety fixesHarald Fernengel2009-08-141-18/+9
| | | | | | | | | | Turns out it's way too much work to make all the Pixmap backends strongly exception safe. Bumped to "future Qt version" :)
* | Fixed qdir autotest for SymbianMiikka Heikkinen2009-08-141-5/+22
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-148024-19175/+28307
|\ \
| * | Had to change ip and hostname as, at the time,Aleksandar Sasha Babic2009-08-141-1/+1
| | | | | | | | | | | | this was only accessible from Nokia network.
| * | Replies are different for platforms as we targetAleksandar Sasha Babic2009-08-141-8/+4
| | | | | | | | | | | | | | | | | | different server machines. On Symbian we read replies from external file, for others we put data into network-settings.h
| * | Fixed SRCDIR usage in QLabel autotest for Symbian.Janne Anttila2009-08-141-1/+1
| | | | | | | | | | | | This commit fixed QLabel::task226479_movieResize autotest.
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-141-12/+16
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-143-13/+20
| | |\ \
| | * | | Fixed qdiriterator test for SymbianMiikka Heikkinen2009-08-141-12/+16
| | | | |
| * | | | Fixed qgraphicsscene autotest deployment for Symbian.Janne Anttila2009-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | Makes render test case to pass at least on emulator.
| * | | | Fixed tst_QGraphicsView::scrollBarRanges autotest for Symbian.Janne Anttila2009-08-141-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | The scrollBarRanges test case is style specific, but we were using s60 style to run the test. Added Q_OS_SYMBIAN ifdef to enable windows style for this particular test case.
| * | | Fixed and re-enabled anguagechange autotest for Symbian.Janne Anttila2009-08-142-5/+2
| | | | | | | | | | | | | | | | | | | | Started to use QApplication::closeAllWindows instead of unexported QThreadData::current() and friends.
| * | | Implemented minimalistic modal handling for Symbian OS.Janne Anttila2009-08-142-8/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation is likely not complete, but makes autotests using QApplication::activeModalWidget to pass. At least the following test now pass successfully: qcolordialog qmessagebox Might have positive impact to other autotests as well.
| * | Compile fix.Alessandro Portale2009-08-131-1/+1
| | | | | | | | | | | | tst_qobject deleteQObjectWhenDeletingEvent needs QtGui.
| * | Changing names of Symbian leave <-> qt throw translation functionsmread2009-08-139-25/+25
| | | | | | | | | | | | due to http://qt-reviews.europe.nokia.com/r/67/
| * | Removing "Project ERROR: s60main.pro is intended only for Symbian!"Alessandro Portale2009-08-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | It happens during the configure phase on Non-Windows. When making Qt for S60 build on Linux, we may want to revert the change or have a different fix. Reviewed-By: Jason Barron
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-131-1/+1
| |\ \
| | * | fix compile for windows, reviewed by sashaEspen Riskedal2009-08-131-1/+1
| | | |
| * | | Fix compilation of unix file engine.Jason Barron2009-08-131-19/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | Add a bracket to the right place and re-arrange the code a little. The indenting was wrong here in the non-Symbian case since the if (exists) did not have curly bracket. Also copy the union of the Hidden flag into the Symbian #ifdef to make this code slightly more readable.
| * | Clean up platform defines a bitHarald Fernengel2009-08-131-3/+1
| | | | | | | | | | | | As per Marius' S-O's request :)
| * | trivial: change commentHarald Fernengel2009-08-131-1/+1
| | |
| * | Use QScopedPointer wherever possibleHarald Fernengel2009-08-133-53/+44
| | | | | | | | | | | | | | | Ensures that we don't leak when creating a new Pixmap while running out of memory
| * | Replace QCustomScopedPointer with QScopedPointerHarald Fernengel2009-08-132-3/+5
| | | | | | | | | | | | First step to get rid of QCustomScopedPointer class
| * | We feel that test case should be changed,Aleksandar Sasha Babic2009-08-131-20/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as we cant expect that order of the event hansling will be same on all platforms. For example, on Symbian quit will happen first, on Linux not. It is better to check if we processed 2 events in total. Reviewed by: Axis
| * | Fixed qaction autotest failures for Symbian.Janne Anttila2009-08-131-2/+2
| | |
| * | Fixed broken test case due to URL changes (commit 96b6a3c9)Janne Anttila2009-08-131-2/+2
| | |
| * | Removing some cases that were left in s60Aleksandar Sasha Babic2009-08-131-113/+6
| | | | | | | | | | | | branch after merginig with mainlin/master.
| * | Trivial, obsolete lines.Aleksandar Sasha Babic2009-08-131-4/+0
| | |
| * | Fix QVarLengthArray out of bounds readHarald Fernengel2009-08-131-1/+3
| | | | | | | | | | | | Reviewed-By: Ralf Engels