summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Stub out QtOpenGL on Lighthouse & get it compilingTom Cooksey2010-03-311-4/+0
* Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-186-57/+141
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-152-0/+7
| |\
| | * Only enable BM by default in QNAM for appropriate platforms.Aaron McCarthy2010-03-122-0/+7
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-155-57/+134
| |\ \ | | |/ | |/|
| | * Fixed RSS_RULES statement in application_icon.prfMiikka Heikkinen2010-03-111-1/+1
| | * Add '.' dir as the first include directory in SymbianMiikka Heikkinen2010-03-101-2/+5
| | * Added forwarding headers for qplatformdefs.h in Symbian mkspecsMiikka Heikkinen2010-03-102-0/+86
| | * Added some missing IBY export paths to platform_path.prfMiikka Heikkinen2010-03-101-54/+42
* | | Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-114-2/+13
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-063-1/+7
| |\ \ | | |/
| | * Make `make check' build the checked project.Rohan McGovern2010-03-032-1/+5
| | * Allow platform specific values for the double click radius.Raino Priha2010-03-021-0/+2
| * | Change WINSCW include paths to use same rules as ARMCCShane Kearns2010-03-041-1/+6
* | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-01158-3846/+1223
|\ \ \ | |/ /
| * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2769-0/+69
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-2669-0/+69
| | |\ \
| | | * | add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIXOswald Buddenhagen2010-02-2667-0/+67
| | | * | instead of hard-coding recursion for symbian, add it to the specsOswald Buddenhagen2010-02-262-0/+2
| | * | | Merge branch '4.6'Miikka Heikkinen2010-02-262-0/+34
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-268-18/+40
| | |\ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-269-18/+74
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Added addMMPRules for adding conditional MMP_RULESMiikka Heikkinen2010-02-262-0/+34
| | |/
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-255-13/+4
| | |\
| | | * Misc fixes to FLM filesMiikka Heikkinen2010-02-255-13/+4
| | * | Define a GNU-style `check' target for all projects.Rohan McGovern2010-02-251-0/+11
| | |/
| | * enable bytepair compression for S60 3.2 and newerLars Knoll2010-02-231-3/+3
| | * Fixes: make check not checking that target is up to dateBill King2010-02-221-2/+22
| * | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-202-17/+24
| |\ \
| | * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-206-201/+101
| | |\ \
| | * \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-201-6/+13
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fixed libstdcpp.dll version autodetection for SymbianMiikka Heikkinen2010-02-191-6/+13
| | * | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1812-4/+14
| | |\ \ \
| | * \ \ \ Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-11/+11
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Only use unix-like tools when not building for Symbian in Windows.Miikka Heikkinen2010-02-161-9/+9
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-201-0/+114
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Added exception to destdir location for abld and sbsv2.axis2010-02-191-3/+7
| | * | | | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-191-0/+110
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-194-7/+101
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-184-7/+101
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | amend "purge msvc.net and msvc2002 makespecs"Oswald Buddenhagen2010-02-174-7/+101
| | | |/ /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1811-3/+13
| |\ \ \ \ | | |/ / /
| | * | | Fix copyright year.Jason McDonald2010-02-163-3/+3
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-139-1/+11
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-139-1/+11
| | | |\ \
| | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-129-1/+11
| | | | |\ \
| | | | | * | readdir64 is not available on HP-UXJoão Abecasis2010-02-129-1/+11
| * | | | | | Remove linux-g++-x11egl mkspec.Michael Brasser2010-02-162-194/+0
| |/ / / / /
| * | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1313-550/+221
| |\ \ \ \ \ | | |/ / / /
| | * | | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-121-0/+2