summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream'Thierry Bastian2011-04-192230-109698/+148633
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-1942-388/+3515
| |\
| | * Make sure #ifdef'd tests still have main() functionEskil Abrahamsen Blomfeldt2011-04-192-6/+12
| | * Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-1942-388/+3509
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-1828-492/+3373
| |\ \
| | * | QtDBus: Add unit tests for QDBusAbstractAdaptorDaniele E. Domenichelli2011-04-186-272/+1187
| | * | QtDBus: Add unit tests for QDBusInterfaceDaniele E. Domenichelli2011-04-186-119/+832
| | * | QtDBus: Add unit tests for QDBusAbstractInterfaceDaniele E. Domenichelli2011-04-187-12/+730
| | * | QtDBus: Register QDBusServer connection name in QDBusConnectionManagerDaniele E. Domenichelli2011-04-184-22/+109
| | * | QtDBus: Skip bus name check for peer-to-peer connectionDaniele E. Domenichelli2011-04-181-3/+4
| | * | QtDBus: Fix minor coding style issuesDaniele E. Domenichelli2011-04-184-14/+14
| | * | QtDBus: Add default constructor to QDBusServerDaniele E. Domenichelli2011-04-181-1/+1
| | * | QtDBus: Add unit tests for peer-to-peer connectionDaniele E. Domenichelli2011-04-181-0/+382
| | * | QtDBus: Add method QDBusConnection::disconnectFromPeer()Daniele E. Domenichelli2011-04-182-0/+22
| | * | QtDBus: Add method QDBusConnection::connectToPeer()Daniele E. Domenichelli2011-04-182-0/+35
| | * | QtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer connectionsDaniele E. Domenichelli2011-04-181-0/+3
| | * | QtDBus: Fix bus in peer-to-peer connections should not be usedDaniele E. Domenichelli2011-04-181-27/+31
| | * | QtDBus: Fix empty service name in peer-to-peer connectionsDaniele E. Domenichelli2011-04-182-2/+2
| | * | QtDBus: Fix registering objects using path '/' in peer-to-peer connectionsDaniele E. Domenichelli2011-04-182-1/+6
| | * | QtDBus: Fix QDBusServer to handle correctly new dbus connectionsDaniele E. Domenichelli2011-04-182-11/+10
| | * | QtDBus: Cleaning comments, spacing, etc.Daniele E. Domenichelli2011-04-183-13/+10
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-1842-94/+1583
| |\ \ \ | | |/ /
| | * | Use s/static/Q_GLOBAL_STATIC/g in QScrollerRobert Griebl2011-04-182-15/+13
| | * | Alternative fix to the strict-aliasing violation warningsThiago Macieira2011-04-181-1/+9
| | * | Revert "Fix strict-alias breaking warnings with GCC."Thiago Macieira2011-04-181-72/+43
| | * | Merge remote-tracking branch 'origin/master' into HEADThiago Macieira2011-04-17143-1284/+5284
| | |\ \
| | * | | Fix warning about vSize not being used in this functionThiago Macieira2011-04-171-1/+1
| | * | | Do not try to test UnixFDs with the system API because it may be too oldThiago Macieira2011-04-171-1/+3
| | * | | L10n: German translations for Qt 4.8Friedemann Kleint2011-04-143-26/+258
| | * | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-04-14800-3063/+50276
| | |\ \ \
| | * | | | Compile with namespace support.Thiago Macieira2011-04-141-0/+4
| | * | | | Replace the handcoded math and change the timer buckets again.Thiago Macieira2011-04-141-11/+40
| | * | | | Move the constants up, preparing for refactoringThiago Macieira2011-04-141-4/+5
| | * | | | Fix strict-alias breaking warnings with GCC.Thiago Macieira2011-04-141-43/+72
| | * | | | Fix compilation if D-Bus 1.4 isn't present.Thiago Macieira2011-04-141-0/+3
| | * | | | Change the number of entries in the first timer bucket.Thiago Macieira2011-04-131-4/+8
| | * | | | Change the error message in the timer ID deallocator.Thiago Macieira2011-04-131-1/+2
| | * | | | Add a benchmark for testing our QtDBus type-validationThiago Macieira2011-04-133-1/+125
| | * | | | Move the QDBusPerformance test to the tests/benchmark dirThiago Macieira2011-04-1311-9/+8
| | * | | | Use the Qt code for validating types in QtDBusThiago Macieira2011-04-132-15/+3
| | * | | | Add routines to validate D-Bus signature in QtDBusThiago Macieira2011-04-135-2/+379
| | * | | | Remove the unused QDBusUnixFileDescriptor::isShared functionThiago Macieira2011-04-132-9/+0
| | * | | | Doc: document the QDBusUnixFileDescriptor classThiago Macieira2011-04-131-0/+145
| | * | | | Autotest: really ensure that two fds are equalThiago Macieira2011-04-132-6/+42
| | * | | | Autotest: more file-descriptor passing testsThiago Macieira2011-04-132-8/+85
| | * | | | Autotest: Test QDBusUnixFileDescriptor support in arraysThiago Macieira2011-04-132-1/+17
| | * | | | Add support for Unix file-descriptor passing to QtDBusThiago Macieira2011-04-1310-1/+114
| | * | | | Retrieve the connection capabilities in QDBusConnectionThiago Macieira2011-04-131-0/+23
| | * | | | Add support for D-Bus 1.4 features in QtDBus codeThiago Macieira2011-04-131-0/+14
| | * | | | Add QDBusUnixFileDescriptor to the QtDBus metatype systemThiago Macieira2011-04-133-1/+20