summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
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 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-201-3/+6
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-3/+6
| |\ \
| | * | Add new QSysInfo::symbianVersion() enumsMiikka Heikkinen2011-04-181-3/+6
| | * | Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-291-2/+2
| | |\ \
* | | \ \ 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-071-3/+18
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-051-0/+11
| |\ \ \
| | * | | Add branch prediction macrosAlberto Mardegan2011-04-041-0/+11
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-3/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-281-3/+7
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * QSysInfo support for next generation Symbian devices.Miikka Heikkinen2011-03-241-3/+3
| | | * Call FixNativeOrientation on Symbian for certain fullscreen qml views.Laszlo Agocs2011-03-241-0/+4
| | * | 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-151-1/+1
| | |\ \ | | | |/
| | | * Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-141-1/+1
| | | |\
| | | | * Support to build Qt for Symbian on Mac OS X with gcce compiler.axis2011-02-211-1/+1
* | | | | moc: be able to compile if there are private classesOlivier Goffart2011-03-311-1/+8
|/ / / /
* | | | Fix declaration: it's QT_DECL_ALIGN, not QT_DECL_ALIGNEDThiago Macieira2011-03-221-1/+1
* | | | 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