summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-039-6/+66
|\
| * Fix for virtual keyboard poping up when it should not.Robert Griebl2009-12-034-4/+4
| * Added a placeholderText(*) property to QLineEdit.Robert Griebl2009-12-033-0/+56
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-0373-258/+787
| |\
| * | compile fix for Qt in namespacehjk2009-12-011-0/+4
| * | Fix a documentation typo.Christian Kamm2009-11-301-1/+1
| * | QVector: fix const_iterator-=(int)hjk2009-11-301-1/+1
* | | Fixes: OCI QSqlDatabase.tables() does not work with system tables.Bill King2009-12-021-31/+52
| |/ |/|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-0268-252/+782
|\ \
| * \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-0239-158/+440
| |\ \
| | * \ Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-12-0238-156/+438
| | |\ \
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-021-2/+8
| | | |\ \
| | | | * | Clarify the docs a bit when setting focus.axis2009-12-011-2/+8
| | | * | | Reduce double-copying of textures when flipping upside downRhys Weatherley2009-12-021-7/+15
| | | * | | Fix crash in QVector::reserve when reserving smaller size on a shared vectorOlivier Goffart2009-12-011-2/+4
| | | * | | QWindowStyle: make sure there is no duplicate in the list of scrollbar.Olivier Goffart2009-12-011-4/+6
| | | * | | Fixed a potential crash in QDockWidgetThierry Bastian2009-12-011-2/+5
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-0111-25/+188
| | | |\ \ \
| | | | * | | Fix QFontCombobox autotest on X11Olivier Goffart2009-12-011-3/+2
| | | | * | | In QListViews, items were being hovered even when mouse was on the scrollbarsGabriel de Dietrich2009-12-011-2/+6
| | | | |/ /
| | | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-019-20/+180
| | | | |\ \
| | | | | * \ Merge branch 'mmfphonon' into 4.6Gareth Stockwell2009-11-309-20/+180
| | | | | |\ \
| | | | | | * | Clip video rect to physical screen dimensionsGareth Stockwell2009-11-261-1/+12
| | | | | | * | Tidied up logic of retrieving video window in Phonon MMF backendGareth Stockwell2009-11-261-2/+1
| | | | | | * | Suspend DSA while drawing is in progressGareth Stockwell2009-11-264-1/+85
| | | | | | * | Symbian control invokes slots before and after native draw opsGareth Stockwell2009-11-263-0/+29
| | | | | | * | Changed video widget native paint mode to zero-fill native windowGareth Stockwell2009-11-262-7/+2
| | | | | | * | Allow Symbian widget implementations to select native paint modeGareth Stockwell2009-11-263-8/+50
| | | | | | * | Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-2354-256/+378
| | | | | | |\ \
| | | | | | * \ \ Merge branch '4.6' into mmfphononFrans Englich2009-11-20291-3692/+5620
| | | | | | |\ \ \
| | | | | | * | | | Keep the same capitalization for Phonon.dll.Frans Englich2009-11-161-1/+1
| | | * | | | | | | Added caching of vectorpaths to the GL paint engine.Gunnar Sletta2009-12-015-11/+139
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-01420-5541/+7694
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Fix crash in qt3support QPixmap constructorGunnar Sletta2009-12-011-2/+2
| | | | * | | | | | Only call updateFont if the font have changed.Alexis Menard2009-11-301-1/+2
| | | | * | | | | | Fixed square root of negative number in drawTextItem().Kim Motoyoshi Kalland2009-11-302-2/+4
| | | | * | | | | | Fixed the GL2 engine stroker to handle Qt::SvgMiterJoin.Kim Motoyoshi Kalland2009-11-301-0/+1
| | | | * | | | | | Do not fill the disabled background of item.Olivier Goffart2009-11-301-2/+0
| | | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-303-3/+4
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Do not recoginze templated types or pointers as flags.Olivier Goffart2009-11-301-1/+2
| | | | | * | | | | | Compile webkit for win32-iccJan-Arve Sæther2009-11-302-2/+2
| | | | | |/ / / / /
| | | | * | | | | | X11: Avoid loading all fonts in system for text with line breaksEskil Abrahamsen Blomfeldt2009-11-301-1/+1
| | | | |/ / / / /
| | | | * | | | | Merge commit 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-2720-283/+353
| | | | |\ \ \ \ \
| | | | * | | | | | state wasn't being correctly reloaded on mac with unified toolbarThierry Bastian2009-11-271-2/+5
| | | | * | | | | | Compile QtScript for win32-iccJan-Arve Sæther2009-11-272-2/+2
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-275-32/+21
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Correctly export the horizontal part of a mixed alignment in text.Thomas Zander2009-11-271-6/+7
| | | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-2716-106/+91
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Fixed a memory leak in the newer native filedialog on windowsThierry Bastian2009-11-271-1/+3
| | | | | * | | | | | | Fix QFontDialog::getFont on Mac OS X when using an invalid initial fontEskil Abrahamsen Blomfeldt2009-11-271-2/+3