summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert '80dba8b8': Fixing default constructor problem with RVCT.Jason Barron2009-08-123-16/+5
| | | | | These were added to workaround a bug in RVCT which has apparently been fixed.
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-128-19/+49
|\ | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-121-1/+0
| |\
| | * Removed call to base class mouseReleaseEvent that shouldn't happen.axis2009-08-121-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 compilationMiikka Heikkinen2009-08-122-1/+5
| |/
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-123-8/+37
| |\
| | * Merge branch 'qlinecontrolFixes'axis2009-08-123-8/+37
| | |\
| | | * Fixed warning.axis2009-08-121-1/+1
| | | |
| | | * Redid 7b95b70bc307 for QLineControl.axis2009-08-121-5/+34
| | | |
| | | * Redid patch that was lost during merge with 4.6.axis2009-08-121-1/+1
| | | | | | | | | | | | | | | | See commit 203b2b2c611e2 for details.
| | | * Revert "Changed the behavior of ImCursorPosition slightly."axis2009-08-121-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 SymbianMiikka Heikkinen2009-08-121-4/+4
| |/ /
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-124-5/+5
| |\ \
| * | | Fixed SRCDIR usage in qscriptengine test for SymbianMiikka Heikkinen2009-08-122-5/+7
| | | |
* | | | Fixed QtGui autotest build breaks due to incorrect SRCDIR usage.Janne Anttila2009-08-125-3/+11
| | | |
* | | | Updated QtGui.txt autotest category file.Janne Anttila2009-08-121-2/+0
| | | |
* | | | Workaround for Nokia X86 compiler, to compile get more GUI test compile.Janne Anttila2009-08-123-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 Anttila2009-08-124-5/+5
|/ / | | | | | | Also updated QtNetwork auto test category file.
* | Fixed qdom autotest build break due to incorrect SRCDIR usage in Symbian.Janne Anttila2009-08-122-1/+5
| |
* | Fixed QtScript autotest build breaks due to incorrect SRCDIR usage.Janne Anttila2009-08-125-2/+14
| |
* | Updated QtScript.txt autotest category file to reflect current test set.Janne Anttila2009-08-121-1/+0
| |
* | Fixed failure to build tests due to missing qkeyevent.Rohan McGovern2009-08-121-1/+0
| | | | | | | | Since the qkeyevent test was removed, also remove it from auto.pro.
* | Doc improvement made by David Boddie.Alessandro Portale2009-08-111-3/+3
| | | | | | | | Reviewed-by: David Boddie
* | Docs: Mentioning that Symbian has a default font size of 7 pointsAlessandro Portale2009-08-111-1/+3
| |
* | Cleaned public Api of QS60Style due to review by Volker Hilsheimer.Alessandro Portale2009-08-114-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-publicShane Kearns2009-08-116-13/+18
|\ \
| * | Prevent unnecessary repaints when moving with zero distance in moveRect().Frans Englich2009-08-111-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-publicMiikka Heikkinen2009-08-115-14/+13
| |\ \
| | * | Fixed qstatemachine autotest compilaton for Symbian OS.Janne Anttila2009-08-111-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 Anttila2009-08-111-1/+1
| | | |
| | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-1113-455/+107
| | |\ \ | | | |/
| | * | Fixed qline autotest merge, tst_qline.cpp was added twice to SOURCES.Janne Anttila2009-08-111-1/+0
| | | |
| * | | Fixed qtextstream autotest for SymbianMiikka Heikkinen2009-08-112-2/+8
| | | |
* | | | Fix autotest failure in qgraphicsitem.Shane Kearns2009-08-112-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
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-1110-450/+102
|\ \ \ | |/ /
| * | Added default IAP checking to tst_qnetworkaccessmanager_and_qprogressdialog.Miikka Heikkinen2009-08-111-1/+8
| | |
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-1125-503/+236
| |\ \
| | * | Refactor S60 related changes to QGraphicsItem / QGraphicsView.Andreas Aardal Hanssen2009-08-112-133/+44
| | | | | | | | | | | | | | | | | | | | | | | | The change mostly removes duplication and does minor touchups. Reviewed-by: axis
| | * | test slots are not constHarald Fernengel2009-08-111-38/+38
| | | |
| | * | Removed qkeyevent autotest.axis2009-08-113-269/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This test hasn't been updated in years, and never worked in the first place. RevBy: Trust me
| * | | RVCT didn't like a test bool variable exported directly from QtGui,Miikka Heikkinen2009-08-113-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causing applications to panic with KERN-EXEC 3. Fixed by providing accessor for the bool in question instead of exporting it directly. Note: Unknown why exactly this panic occurs, as exporting bools works just fine when tested with small test executable + dll. Something in QtGui causes this to fail; I suspect it might be the massive code segment size and relocation of the data segment that is contributing to this problem. RevBy: Jason Barron
* | | | Fixed qpropertyanimation autotest build for win32-msvc2008.Janne Anttila2009-08-111-1/+1
| | | |
* | | | Removed unneccessary QHostAddress cast from tst_qnativesocketengine.cppJanne Anttila2009-08-111-3/+3
| |/ / |/| | | | | | | | The cast/constructor is not needed anymore due to commit 5b80fbad.
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-112-4/+8
|\ \ \ | | |/ | |/|
| * | Fixed SRCDIR for qxmlquery autotest for SymbianJanne Anttila2009-08-112-4/+8
| | |
* | | Fixed qsocketnotifier autotest compilation for win32-msvc2008 platform.Janne Anttila2009-08-111-1/+1
|/ /
* | Switched QtNetworkSetting to use 'qt-test-server' config by default.Janne Anttila2009-08-111-5/+6
| | | | | | | | | | | | | | | | Qt/Master uses qt-test-server config by default but our S60/master was configure to use different server by default. The assumption is that this caused several QtNetwork autotests to fail when testing QtS60 branch on other configurations in QtSW premises. This because the old test server was very likely unavailable...
* | Fixed KERN-EXEC 3 crash in qdesktopwidget for S60.Janne Anttila2009-08-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesktopWidgetPrivate::rects etc variables are shared between QDesktopWidgetPrivate objects and private objects maintains refcount to data. We called cleanup for private object directly from QDesktopWidget, which caused the shared private data to be freed after some instance of QDesktopWidget was destroyed. Since we bypassed the refcount also the data for other QDesktopWidgets was invalidated and this cauyse crash when resizeEvent was received. There is no need to call QDesktopWidgetPrivate::cleanup directly since when QDesktopWidget is deleted, it will call destructor for QDesktopWidgetPrivate which deletes the shared data based on ref count.
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-11366-1824/+7209
|\ \
| * | Add comparison operators also to subclassesHarald Fernengel2009-08-102-2/+59
| | | | | | | | | | | | | | | Compiler would for some reason choose operator bool() instead when comparing subclasses of QScopedPointer.