summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-061-5/+16
|\
| * Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+14
| * Remove the "preliminary support" warning for 10.6Morten Sorvig2009-08-041-4/+1
| * Build on snow leopard.Morten Sorvig2009-08-041-1/+1
* | Merge commit 'origin/master'Jason Barron2009-08-041-19/+26
|\ \
| * | Trailing whitespace and tab/space fixes for src/corelibJanne Anttila2009-08-041-2/+2
| * | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-17/+24
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-041-22/+46
|\ \ \ | | |/ | |/|
| * | Port of Qt to QNXHarald Fernengel2009-07-291-21/+11
| * | Port of Qt to VxWorksRobert Griebl2009-07-291-1/+35
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-0/+3
|\ \ \ | |/ /
| * | Sun CC 5.9 does not support template friendsThiago Macieira2009-07-281-0/+3
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-291-3/+1
|\ \ \ | |/ /
| * | Sun CC 5.9 still doesn't support Template-Template ParametersThiago Macieira2009-07-271-3/+1
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-281-4/+0
|\ \ \ | |/ /
| * | Remove all the last vestiges of QuickDraw in Qt/Mac.Norwegian Rock Cat2009-07-241-4/+0
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-271-36/+25
|\ \ \ | |/ / | | / | |/ |/|
| * Use the configure script to enable/disable QtConcurrent and QtXmlPatternsThiago Macieira2009-07-211-18/+5
| * Disable visibility on CC 5.9 since the compiler doesn't like itThiago Macieira2009-07-211-1/+2
| * Fix HPUX compilationRobert Griebl2009-07-151-1/+1
| * QFlags::testFlag(): handle the zero case appropriately.Frans Englich2009-07-131-1/+1
| * support for id-based translationsOswald Buddenhagen2009-07-061-0/+12
| * Make the macros QT_WA & QT_WA_INLINE only use the unicode partMarius Storm-Olsen2009-07-011-10/+2
| * src/corelib: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT s...miniak2009-07-011-2/+2
* | Make S60 integration optional.Jason Barron2009-07-151-7/+8
* | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-3/+3
|\ \
| * \ Merge branch 'warningRemovals'axis2009-07-061-1/+1
| |\ \
| | * | Proper Q_UNUSED() macro for RVCT.axis2009-07-061-1/+1
| * | | Rectified simple typo.Aleksandar Sasha Babic2009-07-061-1/+1
| |/ /
| * | Merge branch 'warningRemovals'axis2009-06-301-1/+1
| |\ \
| | * | Fixed a warning on Symbian.axis2009-06-301-1/+1
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-291-4/+8
| |\ \ \ | | |/ / | |/| |
| | * | Bump Qt version number.Jason McDonald2009-06-251-2/+2
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-3/+48
|\ \ \ \ | | |_|/ | |/| |
| * | | Add some macro expressions to qglobal.h for typeof, alignof and aligned().Thiago Macieira2009-06-261-1/+30
| * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-231-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | Add an error message for building architecture mismatchNorwegian Rock Cat2009-06-231-0/+4
| * | | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+12
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\ \ \ | | |/ /
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-15/+32
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | handle qreal properties correctly in the meta-object systemKent Hansen2009-06-051-0/+1
| * | introduce Q_WS_WINCEMaurice Kalinowski2009-04-291-1/+6
| * | Merge branch '4.5'Thiago Macieira2009-04-201-2/+2
| |\ \
| * | | Condense this code into one single case. Avoid duplicating code.Thiago Macieira2009-04-161-11/+6
| * | | Rename qIsFuzzyNull to qFuzzyIsNullBjoern Erik Nilsen2009-04-081-2/+2
| * | | Add an internal qIsFuzzyNull(double) methodLars Knoll2009-04-071-0/+16
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-011-1/+5
| |\ \ \
| * | | | Long live Qt!Lars Knoll2009-03-231-0/+2371
| / / /
* | | | make qglobal.h compile when inlcuded from c-filesJanne Koskinen2009-06-171-5/+6