summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-161-0/+1
|\
| * Add a warning about trying to release a timer ID that isn't activeThiago Macieira2010-12-151-0/+1
* | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-153-19/+52
|\ \
| * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-131-9/+43
| |\ \ | | |/
| | * Add a small protection against releasing a timer twice.Thiago Macieira2010-12-131-2/+12
| | * Use constants the timer ID masks instead of values everywhereThiago Macieira2010-12-131-4/+8
| | * Fix ABA problem with: the serial must be updated on all accessesThiago Macieira2010-12-131-1/+1
| | * Comment a bit more the timer ID allocation code.Thiago Macieira2010-12-131-2/+22
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-101-3/+2
| |\ \ | | |/
| | * Don't include <features.h> directly: non-standard header.Thiago Macieira2010-12-101-3/+2
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-081-7/+7
| |\ \ | | |/
| | * Fix for GCC on Windows x64.Ruben Van Boxem2010-12-071-7/+7
* | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-142-2/+2
|\ \ \ | |/ /
| * | Doc: Fixed a link to the correct searchPaths() function.David Boddie2010-12-071-1/+1
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-011-1/+1
| |\ \ | | |/
| | * Fix two minor doc errorsAndy Shaw2010-12-011-1/+1
* | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0737-241/+323
|\ \ \ | |/ /
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-272-107/+97
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-272-107/+97
| | |\
| | | * QKqueueFileSystemWatcher: don't stop thread that isn't runningJoão Abecasis2010-11-261-0/+2
| | | * QPollingFileSystemWatcherEngine: Fix double report of directory change.Tijl Coosemans2010-11-261-2/+8
| | | * QKqueueFileSystemWatcherEngine: Use higher file descriptors.Tijl Coosemans2010-11-261-0/+8
| | | * QKqueueFileSystemWatcherEngine: Unlock mutex between two events.Tijl Coosemans2010-11-261-13/+6
| | | * QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).Tijl Coosemans2010-11-261-65/+69
| | | * QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.Tijl Coosemans2010-11-261-1/+2
| | | * QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().Tijl Coosemans2010-11-261-13/+1
| | | * QKqueueFileSystemWatcherEngine: Use EV_CLEAR instead of EV_ONESHOT.Tijl Coosemans2010-11-261-14/+2
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-261-0/+1
| |\ \ \ | | |/ /
| | * | Fix minor memory leakMiikka Heikkinen2010-11-261-0/+1
| | |/
| * | Doc: Removed two warnings from QDirIterator docsGeir Vattekar2010-11-261-6/+0
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-253-2/+16
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-243-2/+16
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-243-2/+16
| | | |\
| | | | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-232-15/+38
| | | | |\
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-193-2/+16
| | | | |\ \
| | | | | * | Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-191-2/+2
| | | | | * | Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-182-0/+14
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-181-2/+2
| | | | | |\ \
| | | | | | * \ Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-185-10/+11
| | | | | | |\ \
| | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-121-2/+2
| | | | | | |\ \ \
| | | | | | | * | | Bump Qt version to 4.7.2.Jason McDonald2010-11-121-2/+2
| * | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-244-6/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-241-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Prevent compilers optimizing eval timebomb code out of existence.Jason McDonald2010-11-241-2/+2
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-223-4/+14
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-223-4/+14
| | | |\ \ \ \ \ \
| | | | * | | | | | QThread::exec(): Fix possibility to enter several time the event loopOlivier Goffart2010-11-221-1/+3
| | | | * | | | | | Compile on OpenBSDOlivier Goffart2010-11-221-3/+10
| | | | * | | | | | Fix wrong error assumption when converting "0.0" to doubleJoaquim Rocha2010-11-221-0/+1
| | | | |/ / / / /
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-221-1/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |