summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Benjamin Poulain2010-02-231271-65993/+217729
|\
| * Merge remote branch 'origin/master'Thiago Macieira2010-02-2396-1822/+1593
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-2311-158/+236
| | |\
| | | * clean up x11 desktop detectionOswald Buddenhagen2010-02-222-90/+31
| | | * avoid double reallocations in inserting operationsOswald Buddenhagen2010-02-222-35/+143
| | | * create temporaries more intelligentlyOswald Buddenhagen2010-02-221-6/+28
| | | * do not protect against self-assignment in QList::replace()Oswald Buddenhagen2010-02-221-6/+1
| | | * make queues to which only lists are appended not blow the memoryOswald Buddenhagen2010-02-222-18/+19
| | | * optimize queue-like structuresOswald Buddenhagen2010-02-221-3/+3
| | | * remove more pointless recalculationsOswald Buddenhagen2010-02-221-3/+3
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-227-8/+19
| | | |\
| | | | * Fix compilation with namespace.ck2010-02-226-6/+17
| | | | * Fix compilation with namespace.ck2010-02-221-2/+2
| | * | | Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-22496-70205/+39384
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-2284-1649/+1338
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-2264-1432/+1123
| | * | | | Remove race condition in remote pixmap cancelling.Martin Jones2010-02-221-17/+12
| | | |/ / | | |/| |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-221-0/+5
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-2210-93/+83
| | | |\ \ \
| | | * | | | Update QmlChanges with animation API changes.Michael Brasser2010-02-221-0/+5
| | * | | | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-2214-124/+127
| | | |/ / / | | |/| | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-227-66/+65
| | |\ \ \ \
| | | * | | | Fix compile error on SolarisAaron Kennedy2010-02-227-66/+65
| | | |/ / /
| | * | | | Document the default velocity of EaseFollowMartin Jones2010-02-221-1/+10
| | * | | | Remove use of unexprted private classes.Martin Jones2010-02-222-26/+8
| | |/ / /
| * | | | Cocoa: Sheets loose their opacity on 2nd showRichard Moe Gustavsen2010-02-231-2/+3
| * | | | Added function overload for QByteArray &QByteArray::replace()Zeno Albisser2010-02-232-1/+15
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2281-950/+1493
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Second attempt at work-around for MSVC2008 compiler crashKent Hansen2010-02-221-0/+5
| | * | | QNativeSocketEngine: Fix some error handling related to waitFor*()Markus Goetz2010-02-221-0/+6
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-2212-19/+15
| | |\ \ \
| | | * | | Cocoa: fix namespace buildRichard Moe Gustavsen2010-02-227-13/+9
| | | * | | Cocoa: Fix build with namespaceRichard Moe Gustavsen2010-02-224-5/+4
| | | * | | Cocoa: namespace build fixRichard Moe Gustavsen2010-02-221-1/+2
| | * | | | qdoc: List new QML elements in \sincelist for What's New page.Martin Smith2010-02-221-1/+1
| | |/ / /
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-221-1/+1
| | |\ \ \
| | | * | | Don't include private headers from public headers.Morten Johan Sørvig2010-02-221-1/+1
| | * | | | doc: Fixed some qdoc errors.Martin Smith2010-02-225-10/+10
| | |/ / /
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2266-926/+1462
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'master' of git:qt/qtThiago Macieira2010-02-21399-68675/+37844
| | | |\ \
| | | * | | Fix compilation on HP-UXi: m_volume is a #defineThiago Macieira2010-02-206-20/+20
| | | * | | WinCE doesn't have sys/types.hThiago Macieira2010-02-201-1/+1
| | | * | | Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT...Thiago Macieira2010-02-202-2/+2
| | | * | | Fix compilation on recent Linux systems: getpid(2) is in unistd.h.Thiago Macieira2010-02-201-0/+2
| | | * | | Merge remote branch 'origin/master'Thiago Macieira2010-02-20487-12279/+86567
| | | |\ \ \
| | | * | | | Cocoa: calling QEventLoop::exec from mouse up causes problemRichard Moe Gustavsen2010-02-191-0/+1
| | | * | | | Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)Thiago Macieira2010-02-191-1/+5
| | | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-1949-59/+179
| | | |\ \ \ \
| | | | * | | | Work around MSVC2008 compiler crashKent Hansen2010-02-192-1/+27