summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc fixes.Bea Lam2010-03-162-28/+27
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-16631-7320/+14860
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-16207-1517/+2539
| |\
| | * Optimize drawPixmapFragments for the GL2 paint engine.Michael Brasser2010-03-152-12/+17
| | * Optimize QRegion::intersects(QRect).Michael Brasser2010-03-152-16/+70
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15217-1679/+4055
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15217-1679/+4055
| | | |\
| | | | * Compile with user defined Qt namespaceRoberto Raggi2010-03-151-2/+4
| | | | * Fix regression from previous commitmae2010-03-153-7/+20
| | | | * Import "content" with as qualifier to support network without qmldirmae2010-03-151-5/+5
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15215-1681/+4042
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-153-0/+252
| | | | | |\
| | | | | * | Small fixes to photoviewer demoYann Bodson2010-03-152-12/+14
| | * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-03-15191-1441/+2219
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-15191-1441/+2219
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-154-3/+106
| | | | |\ \ \
| | | | | * | | QSslKey: Do not make OpenSSL prompt for a password on stdinMarkus Goetz2010-03-154-3/+106
| | | | |/ / /
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-141-1/+1
| | | | |\ \ \
| | | | | * | | Typo fix in qtestlibMarkus Goetz2010-03-141-1/+1
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-1217-387/+239
| | | | |\ \ \ \
| | | | | * | | | Moved Symbian audio backend into QtMultimedia.dllGareth Stockwell2010-03-1215-385/+237
| | | | | * | | | Updated Symbian DEF filesGareth Stockwell2010-03-122-2/+2
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-121-70/+34
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Updated qt.ibyMiikka Heikkinen2010-03-121-70/+34
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-1219-68/+89
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Fixed filename cases to support building Qt for Symbian in LinuxMiikka Heikkinen2010-03-1215-34/+34
| | | | | * | | | Moved softkey "Options" action handling from QMainWindow to QMenuBar.Janne Anttila2010-03-124-34/+55
| | | | |/ / / /
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-123-4/+22
| | | | |\ \ \ \
| | | | | * | | | HotFix for fluidlauncher default size caused by 6d44dadd.Janne Anttila2010-03-122-4/+21
| | | | | * | | | Removed compiler warning from qdesktopwidget_s60.cpp.Janne Anttila2010-03-121-0/+1
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-121-2/+2
| | | | |\ \ \ \ \
| | | | | * | | | | Ensure that the entire CLOB can be returned from an Oracle databaseAndy Shaw2010-03-121-2/+2
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-121-0/+20
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-03-1193-171/+594
| | | | | |\ \ \ \ \
| | | | | * | | | | | QAudioInput sometimes not writing to QIODeviceKurt Korbatits2010-03-111-0/+20
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-112-3/+9
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-112-3/+9
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Fixed bug in QTransform::type() after using operator/ or operator*.Samuel Rødal2010-03-112-3/+9
| | | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-111-1/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | / / / | | | | | | |_|_|_|/ / / | | | | | |/| | | | | |
| | | | | * | | | | | | isalpha() is unspecified for values outside uchar and EOFOswald Buddenhagen2010-03-111-1/+1
| | | | |/ / / / / / /
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-116-7/+25
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | | | * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-113-2/+15
| | | | | * | | | | | Doc: Removed lie that access to QBuffer is unbuffered.Simon Hausmann2010-03-111-2/+1
| | | | | * | | | | | Minisplitter doesn't paint to the bottom/rightCarlos Manuel Duclos Vergara2010-03-111-2/+4
| | | | | * | | | | | Avoid unnecessary memory allocation in the jpeg handler's image detectionSimon Hausmann2010-03-111-1/+5
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-112-1/+2
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-03-112-2/+6
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | Ensure audio converter member is initialized.Justin McPherson2010-03-111-0/+1
| | | | | * | | | | | | Documentation fix.Justin McPherson2010-03-111-1/+1
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-1188-165/+545
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |