summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-031-7/+16
|\
| * Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.Samuel Rødal2011-02-021-7/+16
* | Allow the user to select imageformats to be built as plugin vs internalBernhard Rosenkraenzer2011-02-021-1/+23
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-271-1/+6
|\ \
| * \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-261-1/+1
| |\ \
| * | | Add wayland lighthouse pluginKristian Høgsberg2011-01-251-0/+5
| * | | Configure: allow -no-framework for lighthouse.Morten Johan Sørvig2011-01-141-1/+1
* | | | configure: fixed configure on mac.Rohan McGovern2011-01-271-1/+2
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-75/+34
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | don't accidentaly enable egl when disabling openvgRitt Konstantin2011-01-201-1/+3
| * | be more consistent about CFG_EGL_GLES_INCLUDES interpretationRitt Konstantin2011-01-201-1/+1
| * | fix build with -opengl es1 in some casesRitt Konstantin2011-01-201-5/+5
| * | don't ignore return code from syncqtOswald Buddenhagen2011-01-171-2/+2
| * | clean up platform detection logicOswald Buddenhagen2011-01-171-48/+12
| * | accept -declarative-debug under unixOswald Buddenhagen2011-01-171-2/+2
| * | don't claim declarative debugging support without having declarativeOswald Buddenhagen2011-01-171-1/+3
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-1/+1
|\ \ | |/
| * Add extra type of embedded license.Jason McDonald2010-12-151-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-1/+3
|\ \ | |/
| * fix -dont-process for mingw cross-buildOswald Buddenhagen2010-12-101-1/+3
| * fix nonsense conditionOswald Buddenhagen2010-12-101-1/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-14/+58
|\ \ | |/
| * Enable Phonon on Symbian by default.Oleh Vasyura2010-12-031-0/+3
| * Disable OpenGL on Symbian only by default instead of alwaysOleh Vasyura2010-12-031-2/+4
| * VFP type on ARM option in Linux configure scriptOleh Vasyura2010-12-031-2/+27
| * Adding -dont-process option to Unix configure scriptOleh Vasyura2010-12-031-7/+20
| * build lrelease as part of the "libs" part.Oswald Buddenhagen2010-12-031-2/+2
* | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-291-5/+6
|\ \
| * \ Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-251-1/+1
| |\ \
| | * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+1
| | |\ \ | | | |/
| | | * Prevent compilers optimizing eval timebomb code out of existence.Jason McDonald2010-11-241-1/+1
| * | | Allow setting LD, RANLIB, OBJDUMP, and STRIP as one can do with autoconf scri...Sam Magnuson2010-11-251-1/+3
| |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-3/+2
| |\ \ | | |/
| | * Don't set -mfpu=neon globally if the compiler supports neon.Samuel Rødal2010-11-111-3/+2
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-191-28/+30
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-5/+3
| |\ \ | | |/
| | * Fixed a shell syntax error in configureDenis Dzyubenko2010-11-101-6/+3
| * | 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
* | | Fix cross-compilation for Lighthouse after 3d86d2a8e5e3c68f9e0022e67629Paul Olav Tvete2010-11-011-1/+1
* | | Disable the ./configure -qpa [platform] flagJørgen Lind2010-10-281-5/+3
|/ /
* | 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