Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Commit patch by Gareth. | Frans Englich | 2009-08-12 | 9 | -130/+765 |
| | | | | | The patch originally contained all changed done to MMF Phonon, but this commit contains the changes only Gareth did. | ||||
* | Merge branch 'master' into topic/mmfphonon | Frans Englich | 2009-08-12 | 4505 | -263970/+200259 |
|\ | | | | | | | | | | | Conflicts: src/3rdparty/phonon/phonon/factory.cpp src/s60installs/qt_libs.pro | ||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Frans Englich | 2009-08-12 | 41 | -131/+162 |
| |\ | |||||
| | * | Removed a couple of tests for Symbian from gui category; these don't | Miikka Heikkinen | 2009-08-12 | 1 | -2/+2 |
| | | | | | | | | | | | | compile currently and are not built by auto.pro, either. | ||||
| | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-08-12 | 9 | -74/+17 |
| | |\ | |||||
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Shane Kearns | 2009-08-12 | 40 | -125/+116 |
| | | |\ | |||||
| | | | * | Removed qdirectpainter test from Symbian tests, as it is | Miikka Heikkinen | 2009-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | for embedded Linux only | ||||
| | | | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-12 | 7 | -71/+7 |
| | | | |\ | |||||
| | | | | * | Revert "Fix to QtNetwork ARMV5 UDEB compilation" | Jason Barron | 2009-08-12 | 4 | -55/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 32f931cb6ab5f3e50f1f582276d896f2dff716f1. This reverts commit e39de8681800cbe2ce31c155d23237410b7c21f3. The above commits were added as a workaround to a bug in RVCT which has been fixed. Conflicts: src/network/access/qnetworkcookie.h src/network/access/qnetworkrequest.h | ||||
| | | | | * | Revert '80dba8b8': Fixing default constructor problem with RVCT. | Jason Barron | 2009-08-12 | 3 | -16/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were added to workaround a bug in RVCT which has apparently been fixed. | ||||
| | | | * | | Fixed qfileinfo autotest for Symbian | Miikka Heikkinen | 2009-08-12 | 1 | -1/+6 |
| | | | |/ | |||||
| | | * | | only skip the QFileInfo permissions test when building for symbian OS | Shane Kearns | 2009-08-12 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Recompiled configure.exe | Janne Anttila | 2009-08-12 | 1 | -0/+0 |
| | | |/ | | |/| | |||||
| | * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-08-12 | 8 | -19/+49 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp | ||||
| | | * \ | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-12 | 1 | -1/+0 |
| | | |\ \ | |||||
| | | | * | | Removed call to base class mouseReleaseEvent that shouldn't happen. | axis | 2009-08-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In that codepath, the item is editable, and we don't want the normal mouse handling (which may move the item) to happen. RevBy: Andreas | ||||
| | | * | | | Fixed qimagereader test compilation | Miikka Heikkinen | 2009-08-12 | 2 | -1/+5 |
| | | |/ / | |||||
| | | * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-12 | 3 | -8/+37 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'qlinecontrolFixes' | axis | 2009-08-12 | 3 | -8/+37 |
| | | | |\ \ | |||||
| | | | | * | | Fixed warning. | axis | 2009-08-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | | * | | Redid 7b95b70bc307 for QLineControl. | axis | 2009-08-12 | 1 | -5/+34 |
| | | | | | | | |||||
| | | | | * | | Redid patch that was lost during merge with 4.6. | axis | 2009-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | See commit 203b2b2c611e2 for details. | ||||
| | | | | * | | Revert "Changed the behavior of ImCursorPosition slightly." | axis | 2009-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ce02d0e9e0ad8d8ac47e4f3ee95bac5cb74ed184. This turned out not to be enough for proper selection support together with S60 FEP. Instead we will revert the behavior and add new API. (cherry picked from commit 6545932efa45ea2b8fbc1459d760ec5f15c63120) Conflicts: doc/src/qnamespace.qdoc src/gui/widgets/qlineedit.cpp | ||||
| | | * | | | | Skipped setEnvironment test in qprocess test for Symbian | Miikka Heikkinen | 2009-08-12 | 1 | -4/+4 |
| | | |/ / / | |||||
| | | * | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-12 | 4 | -5/+5 |
| | | |\ \ \ | |||||
| | | * | | | | Fixed SRCDIR usage in qscriptengine test for Symbian | Miikka Heikkinen | 2009-08-12 | 2 | -5/+7 |
| | | | | | | | |||||
| | * | | | | | Fixed QtGui autotest build breaks due to incorrect SRCDIR usage. | Janne Anttila | 2009-08-12 | 5 | -3/+11 |
| | | | | | | | |||||
| | * | | | | | Updated QtGui.txt autotest category file. | Janne Anttila | 2009-08-12 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Workaround for Nokia X86 compiler, to compile get more GUI test compile. | Janne Anttila | 2009-08-12 | 3 | -3/+3 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently Nokia X86 compiler is not able to use templated qCompare when given arguments have different different type but same base class. This error should be isolated and reported to Nokia X86 team. See task: 259508 | ||||
| | * | | | | Fixed QtNetwork autotest build breaks for Symbian. | Janne Anttila | 2009-08-12 | 4 | -5/+5 |
| | |/ / / | | | | | | | | | | | | | | | | Also updated QtNetwork auto test category file. | ||||
| | * | | | Fixed qdom autotest build break due to incorrect SRCDIR usage in Symbian. | Janne Anttila | 2009-08-12 | 2 | -1/+5 |
| | | | | | |||||
| | * | | | Fixed QtScript autotest build breaks due to incorrect SRCDIR usage. | Janne Anttila | 2009-08-12 | 5 | -2/+14 |
| | | | | | |||||
| | * | | | Updated QtScript.txt autotest category file to reflect current test set. | Janne Anttila | 2009-08-12 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Fixed failure to build tests due to missing qkeyevent. | Rohan McGovern | 2009-08-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | Since the qkeyevent test was removed, also remove it from auto.pro. | ||||
| | * | | | Doc improvement made by David Boddie. | Alessandro Portale | 2009-08-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | | Docs: Mentioning that Symbian has a default font size of 7 points | Alessandro Portale | 2009-08-11 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Cleaned public Api of QS60Style due to review by Volker Hilsheimer. | Alessandro Portale | 2009-08-11 | 4 | -19/+17 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | Moved handleDynamicLayoutVariantSwitch and handleSkinChange from QS60Style to QS60StylePrivate. QApplication (the only one calling those functions) is now a friend, thus has access to the private class. | ||||
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Shane Kearns | 2009-08-11 | 6 | -13/+18 |
| | |\ \ | |||||
| | * | | | Fix autotest failure in qgraphicsitem. | Shane Kearns | 2009-08-11 | 2 | -4/+42 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | When autofocused child is deleted, remove from ancestors to avoid double deletion crash. Check for null receiver when auto SIP is enabled in mouseReleaseEvent | ||||
| * | | | Revert "QItemSelectionModel did not send selectionChanged signal when ↵ | Frans Englich | 2009-08-11 | 3 | -47/+1 |
| | |/ | |/| | | | | | | | | | | | | | deleting an item" This reverts commit d13418effc5f00474541ae513a30c9a42c2a1cb3. | ||||
| * | | Prevent unnecessary repaints when moving with zero distance in moveRect(). | Frans Englich | 2009-08-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This path is triggered from the layout system on S60. Reported by Nokia/Dallas' multimedia team. We haven't yet figured out a way to trigger this through auto test. Reviewed-by: Paul | ||||
| * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-11 | 5 | -14/+13 |
| |\ \ | |||||
| | * | | Fixed qstatemachine autotest compilaton for Symbian OS. | Janne Anttila | 2009-08-11 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently Nokia X86 compiler is not able to use templated qCompare when given arguments have different different type but same base class. This error should be isolated and reported to Nokia X86 team. See task: 259508 | ||||
| | * | | Fixed qlocale autotest compile error for Symbian. | Janne Anttila | 2009-08-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-08-11 | 13 | -455/+107 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-08-11 | 10 | -450/+102 |
| | | |\ | |||||
| | | * | | Fixed qpropertyanimation autotest build for win32-msvc2008. | Janne Anttila | 2009-08-11 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Removed unneccessary QHostAddress cast from tst_qnativesocketengine.cpp | Janne Anttila | 2009-08-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | The cast/constructor is not needed anymore due to commit 5b80fbad. | ||||
| | * | | | Fixed qline autotest merge, tst_qline.cpp was added twice to SOURCES. | Janne Anttila | 2009-08-11 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Fixed qtextstream autotest for Symbian | Miikka Heikkinen | 2009-08-11 | 2 | -2/+8 |
| | |_|/ | |/| | |