summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix warning about uninitialised varibale.Thiago Macieira2010-11-281-0/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-274-78/+76
|\
| * Phonon: Fix use of ASCII casting in the PulseAudio support.Thiago Macieira2010-11-261-74/+72
| * Phonon: Fix unused parameter warningThiago Macieira2010-11-261-1/+1
| * Phonon: Fix warning on casting from "false" to QFlags.Thiago Macieira2010-11-261-2/+2
| * Phonon: Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2723-146/+244
|\ \
| * | Fix strict-aliasing violation warning.Thiago Macieira2010-11-261-1/+9
| * | Fix warning about %x parameter type mismatch in EGLThiago Macieira2010-11-261-1/+1
| * | Fix warning about address of a function being constant.Thiago Macieira2010-11-261-0/+4
| * | Fix warnings related to unused variables.Thiago Macieira2010-11-268-5/+11
| * | Fix silly "will be initialised after" warning.Thiago Macieira2010-11-261-1/+1
| * | Fix warning about mixing integral with non-integral type in ?:Thiago Macieira2010-11-261-2/+2
| * | Fix warning about use of uninitialised variableThiago Macieira2010-11-261-1/+1
| * | Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
| * | Fix warnings with GCC 4.5: some cases are not part of the enumThiago Macieira2010-11-261-2/+2
| * | Fix a race condition related to service acquisition.Thiago Macieira2010-11-263-9/+108
| * | QNetworkReply autotest: fix possible crashPeter Hartmann2010-11-261-0/+1
| * | QKqueueFileSystemWatcher: don't stop thread that isn't runningJoão Abecasis2010-11-262-0/+3
| * | Fix QSettings auto test to use QTRY_VERIFYJoão Abecasis2010-11-261-8/+5
| * | tst_QFileSystemWatcher: Don't exit the event loop on first signal.Tijl Coosemans2010-11-261-8/+0
| * | 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 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-263-5/+5
|\ \
| * \ Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-11-263-5/+5
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-11-263-5/+5
| | |\ \
| | | * | QLocalSocket/Win: do not emit error() when no error actually occurredJonathan Liu2010-11-261-2/+2
| | | * | Doc: fix typoJoerg Bornemann2010-11-262-3/+3
| | |/ /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-262-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix minor memory leakMiikka Heikkinen2010-11-261-0/+1
| * | | Remove unused variableMiikka Heikkinen2010-11-261-1/+0
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2619-73/+807
|\ \ \
| * | | Revert "Fix a missing error-signal when a server is shut down while downloading"Peter Hartmann2010-11-262-18/+1
| * | | Add missing newline to configure.exe output.Jason McDonald2010-11-261-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2618-73/+824
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2518-73/+824
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2518-73/+824
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2418-73/+824
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-11-24182-5292/+8888
| | | | | |\ \
| | | | | | * | Ensure that if this is does not have a valid filter when on XP or lessAndy Shaw2010-11-241-5/+7
| | | | | | * | HTTP backend: fix build without Qt3 supportPeter Hartmann2010-11-231-1/+1
| | | | | | * | QNetworkAccessManager: enable synchronous HTTP callsPeter Hartmann2010-11-2317-67/+799
| | | | | * | | Fix a missing error-signal when a server is shut down while downloadingVille Pernu2010-11-242-1/+18
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-264-38/+45
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-262-31/+35
| |\ \ \ \ \ \ \