summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-021-2/+2
|\
| * Use "if (1) {} else" instead of "if (1); else" to silence compiler.Volker Hilsheimer2009-10-011-2/+2
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-291-0/+1
|\ \ | |/
| * Compile fix for platforms prior to Symbian^3.Jason Barron2009-09-231-0/+1
* | Merge commit 'origin/4.6' into kinetic-declarativeuiLars Knoll2009-09-181-1/+4
|\ \ | |/
| * Adding support for symbian graphics resources.Aleksandar Sasha Babic2009-09-181-1/+3
| * Introduce native Symbian bitmap support to QPixmapJani Hautakangas2009-09-181-0/+1
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-151-0/+5
|\ \ | |/
| * QCursor support for Symbian OSShane Kearns2009-09-151-0/+5
* | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-151-6/+6
|\ \ | |/
| * Fix -Wconversion warnings where possible.David Faure2009-09-131-2/+2
| * Update license headers again.Jason McDonald2009-09-091-4/+4
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Martin Jones2009-09-081-1/+1
|\ \ | |/
| * Fix warning when compiling with QT_NO_EXCEPTIONSOlivier Goffart2009-09-071-1/+1
| * Fix QDialog test compilation on MacOlivier Goffart2009-09-041-1/+1
* | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-031-1/+1
|\ \ | |/
| * Fix tst_Moc::oldStyleCastsOlivier Goffart2009-09-021-1/+1
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kai Koehne2009-09-021-22/+20
| |\
| * | Fix gcc compiler warning about unsigned/signed integer comparisonKai Koehne2009-09-021-1/+1
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-011-0/+3
|\ \ \ | | |/ | |/|
| * | Define QT_NO_EXCEPTIONS if we detect that we are building without exceptions ...Olivier Goffart2009-09-011-0/+3
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-311-13/+13
|\ \ \ | |/ /
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
| |\ \
| | * | Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | * | Eliminate some mentions of Trolltech.Jason McDonald2009-08-111-1/+1
| | * | Update license headers.Jason McDonald2009-08-111-1/+1
| | * | Build on snow leopard.Morten Sorvig2009-08-041-1/+1
| | * | QFlags::testFlag(): handle the zero case appropriately.Frans Englich2009-07-131-1/+1
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-311-9/+4
|\ \ \ \ | |/ / /
| * | | Enable Q_OBJECT usage across DLL boundary on Symbian OSShane Kearns2009-08-281-0/+4
| * | | reverting the definition of WINVER and _WIN32_WINNT in qglobal.hJoerg Bornemann2009-08-261-9/+0
| | |/ | |/|
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-251-38/+190
|\ \ \ | |/ /
| * | define WINVER and _WIN32_WINNT in qglobal.hJoerg Bornemann2009-08-241-0/+9
| * | Merge commit 'origin/master' into symbolVisibilityIain2009-08-211-1/+1
| |\ \
| | * | Fix Q_DECLARE_SHARED macroHarald Fernengel2009-08-201-1/+1
| * | | Merge commit 'origin/master' into symbolVisibilityIain2009-08-201-20/+12
| |\ \ \ | | |/ /
| | * | Cosmetic fix: Unify the Q_DISABLE_COPY macroHarald Fernengel2009-08-191-10/+3
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-1/+1
| | |\ \
| | * | | Did some cleanups after review of the S60 branch.axis2009-08-191-9/+8
| * | | | New definition for ...EXPORT_INLINE to deal with the way we drive RVCTIain2009-08-191-0/+6
| |/ / /
| * | | Merge commit 'qt/master'Jason Barron2009-08-181-22/+11
| |\ \ \
| * | | | Changed to SymbianVersion enum after review.axis2009-08-171-2/+2
| * | | | Changing names of Symbian leave <-> qt throw translation functionsmread2009-08-131-5/+5
| * | | | Merge commit 'qt/master'Jason Barron2009-08-131-2/+2
| |\ \ \ \
| * | | | | Enable symbol visibility when compiling with RVCT.axis2009-08-061-2/+2
| * | | | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-061-7/+5
| * | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-061-5/+16
| |\ \ \ \ \
| * \ \ \ \ \ 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