summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Introduce QStaticText APIEskil Abrahamsen Blomfeldt2010-01-146-2/+222
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Alan Alpert2010-01-143376-4814/+6597
|\
| * Fix QGLWidget::renderPixmap() on Windows.Trond Kjernaasen2010-01-141-6/+6
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1422-448/+530
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1412-27/+62
| | |\
| | * | Rework how Qt handles GL extensions.Trond Kjernåsen2010-01-1315-428/+469
| | * | Make compile on symbian/LinuxThomas Zander2010-01-131-1/+1
| | * | Removed pointless image comparison in raster colorize filter.Samuel Rødal2010-01-131-1/+1
| | * | Improved performance of translating device coordinate graphics effects.Samuel Rødal2010-01-135-18/+59
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-1416-130/+68
| |\ \ \ | | |_|/ | |/| |
| | * | Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-1412-96/+49
| | * | Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-148-34/+19
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-131-2/+5
| |\ \ \
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-1383-690/+2098
| | |\ \ \
| | * | | | Doc: Describe QStackedWidget::removeWidget() more thoroughly.David Boddie2010-01-131-2/+5
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-131-10/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Use a QTextBrowser instead of a read only QTextEditHarald Fernengel2010-01-131-10/+11
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1322-334/+419
| |\| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-134-8/+18
| | |\ \ \ \
| | | * \ \ \ Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-133376-3895/+5604
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-124-8/+18
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-114-8/+18
| | | | |\ \ \ \
| | | | | * | | | Do not set the font size unnecessarily in the simulated s60 style.Christian Kamm2010-01-114-8/+18
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1317-325/+400
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Fixed tst_qgl multipleFBOInterleavedRendering.Samuel Rødal2010-01-131-1/+1
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1317-325/+400
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1217-325/+400
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge remote branch 'qt/4.6' into oslo-staging-2/4.6Paul Olav Tvete2010-01-123352-3700/+4463
| | | | | |\ \ \ \ \
| | | | | * | | | | | Significant digits were lost in QDoubleSpinBox range when changing precisionGabriel de Dietrich2010-01-121-3/+13
| | | | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-122-1/+9
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Fixed bug where QGLPixmapData::toImage() returned too dark image.Kim Motoyoshi Kalland2010-01-121-1/+1
| | | | | | * | | | | | Fix completion in QFileDialog.Alexis Menard2010-01-121-0/+8
| | | | | * | | | | | | Put LinesHint into QVectorPath hints to enable further optimizationsGunnar Sletta2010-01-121-2/+14
| | | | | * | | | | | | Avoid coordinate limitations in the raster engine.Gunnar Sletta2010-01-122-4/+9
| | | | | * | | | | | | Fix point drawing on raster engine for flat and square capsGunnar Sletta2010-01-121-4/+4
| | | | | |/ / / / / /
| | | | | * | | | | | warning fixes for platforms, where qreal == floatJoerg Bornemann2010-01-111-256/+256
| | | | | * | | | | | fix release mode crash in qfont.cpp initFontSubst() on Windows mobileJoerg Bornemann2010-01-111-2/+1
| | | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-118-53/+94
| | | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | |
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-131-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Kurt Korbatits2010-01-1351-601/+996
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Fix example in QAudioOutput/QAudioInput docsKurt Korbatits2010-01-132-2/+2
| * | | | | | | | | | QSslSocket: Remove writeBuffer,readBuffer and use from QAbstractSocketMarkus Goetz2010-01-131-3/+0
| * | | | | | | | | | Remove erroneous warning in QFileInfo::absolutePath()Andreas Kling2010-01-131-2/+5
| * | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-133-1/+22
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-131-0/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Make compile on HPUXPierre Rossi2010-01-121-0/+2
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-1224-227/+1146
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge commit 'origin/mmfphonon' into 4.6Gareth Stockwell2010-01-1223-226/+1145
| | |\ \ \ \ \ \ \
| | | * | | | | | | Added enable/disable parameter to each effect in Phonon MMF backendGareth Stockwell2010-01-1112-68/+74
| | | * | | | | | | Simplified error handling for audio effectsGareth Stockwell2010-01-1112-31/+33