summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Expand)AuthorAgeFilesLines
* configure: Deal with multiple redefinitions of qmake variablesTor Arne Vestbø2010-11-051-14/+24
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-051-1/+1
|\
| * Don't use scopes in mkspecs as configure does not support themTor Arne Vestbø2010-11-021-1/+1
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-8/+2
|\ \ | |/ |/|
| * simplify recursive symlinkingOswald Buddenhagen2010-11-021-8/+2
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-271-83/+77
|\ \
| * \ Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-261-83/+77
| |\ \
| | * | Support to build Qt for Symbian on Mac OS X with gcce compiler.Liang Qi2010-10-261-82/+76
| | * | Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-211-1/+1
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-12/+21
|\ \ \ \ | |/ / /
| * | | configure: Don't use character class when looking for QMAKE_CONF_COMPILERTor Arne Vestbø2010-10-191-1/+1
| * | | removed obsolete -qt-gif configure optionMark Brand2010-10-151-5/+2
| * | | configure: Don't assume that QMAKE_CXX will be found at the start of lineTor Arne Vestbø2010-10-131-1/+1
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-071-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Fix the icd auto config test after restructuring the icd plugin dependenciesAdrian Constantin2010-10-071-2/+2
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-4/+10
| |\ \ \ | | |/ /
| | * | Made scripttools disabled on Symbian by default, like on Windows.axis2010-10-041-1/+8
| | * | Got rid of "No such directory" warning when shadow building.axis2010-10-041-3/+2
| * | | Issue a warning and disable webkit build when xrender is disabled on X11Christian Strømme2010-10-051-0/+6
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-0/+6
|\ \ \ \
| * | | | Lighthouse on OS X.Morten Johan Sørvig2010-10-201-0/+6
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-051-21/+53
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-4/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-4/+4
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | Invert the buildkey logic for compilers.Thiago Macieira2010-09-281-4/+4
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-291-6/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Lighthouse: Remove auto building platform pluginsJørgen Lind2010-09-161-6/+0
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-19/+79
|\ \ \ \ | | |/ / | |/| |
| * | | Merge the armv6 and arm architecturesBradley T. Hughes2010-09-231-4/+32
| | |/ | |/|
| * | Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-201-19/+31
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-171-2/+22
| |\ \
| | * | Make qml debugging work with command line argumentsLasse Holmstedt2010-09-171-2/+22
| * | | Ensure building of WebKit and QtConcurrent are disabled with SunCC.Pierre Rossi2010-09-161-1/+1
| |/ /
* | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-131-0/+24
|\ \ \ | | |/ | |/|
| * | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-131-19/+66
| |\ \ | | |/
| * | Initial pluggable fontdatabaseJørgen Lind2010-09-021-0/+24
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-19/+66
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-081-0/+1
| |\ \
| | * | explicitly remove qt_webkit_version.pri when building with -no-webkitOswald Buddenhagen2010-09-071-0/+1
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-4/+1
| |\ \ \ | | |/ / | |/| |
| | * | Some small Solaris fixes.Pierre Rossi2010-08-311-4/+1
| * | | make shadow builds not write into the source dirOswald Buddenhagen2010-09-061-9/+17
| * | | Symbian: Disable IPv6 for nowMarkus Goetz2010-09-031-3/+7
| * | | fix MinGW cross compilation with -debug-and-releaseMark Brand2010-08-301-2/+6
| * | | Introduce a second compatibility build key to Qt.Thiago Macieira2010-08-241-0/+32
| * | | fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-1/+2
| * | | let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-231-1/+1
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-191-5/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-191-24/+69
| |\ \ \ | | |/ /
| | * | fix shadow builds with scratchboxOswald Buddenhagen2010-08-181-3/+8