summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master-upstream'Gabriel de Dietrich2011-02-081-3/+10
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-2020-30/+30
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-151-3/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-264-0/+19
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Mention when the role was introducedAlbert Astals Cid2010-11-251-1/+2
| | * | | | | | | | | | | Add a way to set QHeaderView initial sort orderAlbert Astals Cid2010-11-252-13/+16
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-115-67/+74
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update copyright year to 2011.Rohan McGovern2011-03-103-3/+3
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-082-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-082-2/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Add support for Mac OS X 10.7 "Lion".Fabien Freling2011-03-042-2/+9
| | * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-071-62/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Improve Q_GLOBAL_STATIC macors.Jedrzej Nowacki2011-03-071-62/+62
| | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | / / / | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-101-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Bump Qt version to 4.7.3Timo Turunen2011-03-091-2/+2
| | * | | | | | | | | | | Fix for misplaced endif in qglobal.h.Laszlo Agocs2011-03-091-0/+1
| | * | | | | | | | | | | Multiple screen support for Symbian in QDeskopWidget.Laszlo Agocs2011-03-091-0/+2
| * | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-042-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | / / / / / / / / / | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-042-1/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-042-1/+6
* | | | | | | | | | | | Rename qnaclunimplemented -> qfunctions_naclMorten Sorvig2011-03-164-261/+0
* | | | | | | | | | | | Rename qconfig-minimal-system-depenencies.hMorten Sorvig2011-03-161-0/+0
* | | | | | | | | | | | Add QT_NO_FILESYSTEMITERATOR.Morten Johan Sørvig2011-03-162-0/+11
* | | | | | | | | | | | Compile.Morten Johan Sørvig2011-03-161-0/+2
* | | | | | | | | | | | Fix http in combination with QT_NO_NETWORKPROXY.con2011-03-102-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-282-3/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Various INTEGRITY fixesRolland Dudemaine2011-02-221-2/+15
| * | | | | | | | | | Compile with MinGW on WindowsRolland Dudemaine2011-02-221-1/+1
* | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-241-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-231-1/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTSJani Hautakangas2011-02-231-1/+6
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Unbreak compilation with ICC when in C++98 mode.Thiago Macieira2011-02-221-9/+11