summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-171-65/+73
|\
| * Merge earth-team into masterOlivier Goffart2011-03-151-1/+1
| |\
| | * Wrap qPrintable inside QStringOlivier Goffart2011-03-011-1/+1
| * | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-111-64/+69
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-081-2/+7
| | |\ \
| | | * | Add support for Mac OS X 10.7 "Lion".Fabien Freling2011-03-041-2/+7
| | * | | 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
| | |/ /
* | | | Rename qnaclunimplemented -> qfunctions_naclMorten Sorvig2011-03-161-4/+0
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-281-2/+15
|\ \ \ | |_|/ |/| |
| * | Various INTEGRITY fixesRolland Dudemaine2011-02-221-2/+15
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-241-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
* | Add Intel Compiler's C++0x feature support macrosThiago Macieira2011-02-211-1/+16
* | Add experimental support for armCC on LinuxHarald Fernengel2011-02-111-0/+8
* | qRound: do not do operation with double when qreal is floatOlivier Goffart2011-01-171-2/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ | |/
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| * Bump Qt version to 4.7.2.Jason McDonald2010-11-121-2/+2
* | Fix compilation in qglobal.h when included from a .c fileOlivier Goffart2010-10-301-3/+4
* | Fix compilation in namespaceOlivier Goffart2010-10-291-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-291-3/+22
|\ \
| * | qSwap: use std::swap as implementation, and specialize std::swap for our cont...Olivier Goffart2010-10-291-3/+22
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-271-1/+1
|\ \ \ | |/ /
| * | Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-261-1/+1
| |\ \
| | * | Support to build Qt for Symbian on Mac OS X with gcce compiler.Liang Qi2010-10-261-1/+1
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-0/+5
|\ \ \ \ | |/ / /
| * | | Phonon: Export ObjectDescriptionModel to prevent link errors with ClangTor Arne Vestbø2010-10-151-0/+5
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-3/+2
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-1/+0
| |\ \ \ | | |/ / | |/| / | | |/
| | * moved fast allocator config to qt_hybridHeap_symbian_p.hmread2010-09-301-6/+0
| | * new allocator tidy up and winscw freezemread2010-09-301-1/+1
| | * Qt apps to use the Symbian^4 fast allocator in pre-Symbian^4 platformsmread2010-09-301-0/+2
| | * Add the new allocator to corelibShane Kearns2010-09-301-0/+3
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-2/+2
| |\ \ | | |/
| | * Improved Symbian4 platform detectionMiikka Heikkinen2010-09-231-2/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-221-1/+1
| | |\
| | | * Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QCharThiago Macieira2010-09-211-1/+1
| | * | Bump version to 4.7.1.Jason McDonald2010-09-211-2/+2
| | |/
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-0/+13
|\ \ \ | |/ /
| * | Fix usage of QT_ARCH_ARM* after a28ddf6Bradley T. Hughes2010-09-231-1/+1
| * | Adding C++0x support to MSVC2010Thierry Bastian2010-09-221-0/+13
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-0/+26
|\ \ \ | |/ /
| * | Add define for c++0x initilizer listsOlivier Goffart2010-09-031-0/+1