summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-29131-709/+1025
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-281-11/+84
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-281-11/+84
| | |\
| | | * tst_selftest: parse benchlib results in XML format tooThiago Macieira2010-04-281-1/+67
| | | * tst_selftests: replace a line number with __LINE__ in XML tooThiago Macieira2010-04-281-10/+17
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-284-46/+46
| |\ \ \ | | |/ / | |/| |
| | * | Renaming a few unexported, private symbolsAlessandro Portale2010-04-284-46/+46
| |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-282-18/+0
| |\ \
| | * | Removed fullscreen responsiveness of softkeysMiikka Heikkinen2010-04-282-18/+0
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-2894-187/+187
| |\ \ \ | | | |/ | | |/|
| | * | tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.Thiago Macieira2010-04-2894-187/+187
| |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-274-4/+16
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-274-4/+16
| | |\ \
| | | * | fix crash in QXmlStreamReaderPeter Hartmann2010-04-274-4/+16
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-271-32/+1
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-271-32/+1
| | |\ \ | |/ / /
| | * | The cmd line arguments have not been delegated properly.Aleksandar Sasha Babic2010-04-271-32/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-271-3/+2
| |\ \ \
| | * | | Fixed a QFontEngine leak for QFont objects used in threads.Trond Kjernåsen2010-04-271-3/+2
| |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-271-2/+10
| |\ \ \
| | * | | Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' value.Trond Kjernåsen2010-04-271-2/+10
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-271-235/+282
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-2724-199/+1172
| | |\ \ \
| | * | | | Adjusted layout of audiodevice example to use scrollbar.Kurt Korbatits2010-04-271-235/+282
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-278-34/+104
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | QXmlSchema internals: fix crash with anonymous typesPeter Hartmann2010-04-263-5/+41
| | * | | | QNAM HTTP: Fix invoking a method when being destructed right now (2)Markus Goetz2010-04-261-0/+7
| | * | | | QNAM: Use a reference in appendDownstreamDataMarkus Goetz2010-04-262-2/+2
| | * | | | QNAM HTTP: Divide QNetworkReplyImplPrivate::appendDownstreamDataMarkus Goetz2010-04-262-25/+53
| | * | | | QNAM HTTP: Avoid one copyMarkus Goetz2010-04-261-2/+1
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-264-78/+67
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-26226-149738/+229017
| | |\ \ \ \
| | * | | | | win32 backend for low-level audio fixesKurt Korbatits2010-04-264-78/+67
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-265-2/+45
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Re-apply change 5107946e97cbc480a9329565c29b7384c8ba0860 by IainIain2010-04-262-2/+3
| | * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-267-5/+47
| |/ / / / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-262-16/+34
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-262-16/+34
| | |\ \ \ \ \
| | | * | | | | Fix infinite recursion in QIconvCodec when iconv fails.Thiago Macieira2010-04-261-11/+11
| | | * | | | | Fix the use of strerror_r on GNU libc systems.Thiago Macieira2010-04-261-5/+23
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-262-11/+38
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | QS60Style: Menu separators are not drawn, yet they take up screen spaceSami Merila2010-04-261-0/+6
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-04-2613-133/+960
| | |\ \ \ \ \
| | * | | | | | QS60Style: QMenu behaves badly with a lot of menu itemsSami Merila2010-04-262-11/+32
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-239-120/+904
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix for EGL for symbian on 3.1/3.2/5.0, define QT_NO_EGL.Liang Qi2010-04-234-2/+25
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-237-118/+879
| | |\ \ \ \ \ \ | |/ / / / / / /
| | * | | | | | stub implementations for EGL for symbianShane Kearns2010-04-237-118/+879
| | |/ / / / /
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-234-13/+56
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Fixed two problems with generated EPS files.Trond Kjernåsen2010-04-231-11/+14