summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-281-1/+2
|\
| * Merge remote branch 'qt-fire-review/master'aavit2011-04-281-1/+2
| |\
| | * Make QtQuick2 compile on QPAEskil Abrahamsen Blomfeldt2011-04-271-1/+2
| | * Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-151-0/+6
| | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-082-9/+0
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-082-9/+0
| | | |\
| | | | * Cocoa: p1 bug fix: revert use of subWindowStackingRichard Moe Gustavsen2011-04-062-9/+0
| | * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-072-0/+9
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-042-0/+9
| | | |\ \ | | | | |/
| | | | * Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindowRichard Moe Gustavsen2011-04-042-0/+9
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-204-13/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-184-13/+26
| |\ \ \ \
| | * | | | Add new QSysInfo::symbianVersion() enumsMiikka Heikkinen2011-04-182-11/+23
| | * | | | Use FixNativeOrientation on Symbian when the application wants it.Laszlo Agocs2011-04-122-0/+3
| | * | | | Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-292-76/+20
| | |\ \ \ \
* | | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-191-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-191-0/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-074-136/+132
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-052-0/+45
| |\ \ \ \ \
| | * | | | | Add branch prediction macrosAlberto Mardegan2011-04-042-0/+45
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-314-136/+87
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-283-62/+69
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | QSysInfo support for next generation Symbian devices.Miikka Heikkinen2011-03-243-62/+65
| | | * | Call FixNativeOrientation on Symbian for certain fullscreen qml views.Laszlo Agocs2011-03-241-0/+4
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-223-5/+8
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-092-1/+6
| | |\ \ \ \
| | * \ \ \ \ Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-281-1/+6
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-232-0/+8
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'mimir' into 4.7David Boddie2011-02-231-73/+17
| | |\ \ \ \ \ \ \
| | | * | | | | | | qdoc: Added the \span command.Martin Smith2011-01-241-17/+17
| | | * | | | | | | qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-071-73/+17
| | * | | | | | | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-081-1/+1
* | | | | | | | | | moc: be able to compile if there are private classesOlivier Goffart2011-03-311-1/+8
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-241-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix declaration: it's QT_DECL_ALIGN, not QT_DECL_ALIGNEDThiago Macieira2011-03-221-1/+1
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-221-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bump Qt version to 4.7.4Timo Turunen2011-03-211-2/+2
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-211-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.Miikka Heikkinen2011-03-211-1/+1
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-152-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-142-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Support to build Qt for Symbian on Mac OS X with gcce compiler.axis2011-02-211-1/+1
| | | * | | | | | Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-181-1/+1
* | | | | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-175-80/+99
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge earth-team into masterOlivier Goffart2011-03-151-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Wrap qPrintable inside QStringOlivier Goffart2011-03-011-1/+1
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-03-142-13/+17
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream'Thierry Bastian2011-03-105-73/+135
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream'Gabriel de Dietrich2011-02-151-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \