summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* mkspecs: Include gcc-base-unix.conf from g++.conf to match old behaviorTor Arne Vestbø2010-11-051-2/+3
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-0519-45/+73
|\
| * There is no predefined qmake x11 scope for x11 builds.Robert Griebl2010-11-031-0/+3
| * Don't use scopes in mkspecs as configure does not support themTor Arne Vestbø2010-11-029-13/+28
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-2914-38/+48
| |\
| | * Merge remote branch 'scm/qt/master'Tor Arne Vestbø2010-10-282-1/+2
| | |\
| | * | mkspecs: Emit warning when including g++.conf directlyTor Arne Vestbø2010-10-2714-37/+48
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-044-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | msvc: enable unreferenced code elimination in release with debuginfo buildsOswald Buddenhagen2010-11-034-4/+4
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-291-2/+2
|\ \ \ \
| * | | | Correct RVCT4 parameter so it applies to all 4.x versions, not just 4.0Iain2010-10-291-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-10-298-5/+588
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the license in files for LighthouseJørgen Lind2010-10-282-78/+78
| * | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2711-38/+67
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2611-12/+317
| |\ \ \
| * \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2262-604/+461
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-1/+1
| |\ \ \ \ \
| | * | | | | Fix QWS generic mac mkspecJørgen Lind2010-10-201-1/+1
| | * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-0515-57/+211
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-1317-93/+114
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-08-262-1/+27
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-055-51/+79
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2715-41/+168
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-1329-104/+139
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-262-1/+27
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-192-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-1920-43/+102
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-1964-84/+144
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-037-35/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-1421-101/+135
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-244-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-1851-209/+584
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Say hello to Qt for Native Client.Morten Johan Sørvig2010-05-145-2/+523
| * | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-1061-81/+216
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-2142-383/+1087
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | 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 remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-114-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-01158-3846/+1223
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-106-18/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-14142-342/+457
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Add experimental OpenKODE supportHarald Fernengel2009-12-042-0/+64
* | | | | | | | | | | | | | | | | | | | | | | | | | Fix some build issues for building Qt for Symbian on Mac OS X.Liang Qi2010-10-272-1/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-2611-38/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Got rid of some "duplicate library" warnings.axis2010-10-211-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | Changed various qmake constructs to support Windows.axis2010-10-212-9/+28
| * | | | | | | | | | | | | | | | | | | | | | | | Fixed various quotation problems when porting to Windows.axis2010-10-212-8/+13
| * | | | | | | | | | | | | | | | | | | | | | | | Fixed some preprocessor parameters for Mac support.axis2010-10-211-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | Added detection of bat files to the qtPrepareTool function.axis2010-10-211-1/+7
| * | | | | | | | | | | | | | | | | | | | | | | | Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-218-18/+18
generated by cgit v0.12 at 2024-11-12 15:37:07 (GMT)