summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-162-2/+4
|\
| * qmake vc(x)project generator: fix VC++ Express detectionJoerg Bornemann2012-04-121-1/+3
| * qmake vcxproj generator: properly escape XML attributesJoerg Bornemann2012-04-051-1/+1
* | Merge remote-tracking branch 'origin/master' into api_changesOswald Buddenhagen2012-04-104-2/+7
|\ \ | |/
| * Fix build all failed for 'TEMPLATE = aux'Yuchen Deng2012-04-023-0/+3
| * Fix qmake's use of Q_ASSERT with side-effects.Thiago Macieira2012-03-281-2/+4
* | Remove -DQT_NO_STL from the bootstrapped buildsThiago Macieira2012-04-074-4/+4
* | QHash security fix (1/2): add global QHash seedGiuseppe D'Angelo2012-04-031-0/+5
* | Compile QArrayData in bootstrap phase.Jędrzej Nowacki2012-03-294-2/+12
* | Disable QUrl support in QVariant in bootstrapped modeThiago Macieira2012-03-244-9/+2
* | Merge master into api_changesKent Hansen2012-03-192-1/+4
|\ \ | |/
| * Win32: Compile qmake when shadow-buildingMarius Storm-Olsen2012-03-181-1/+1
| * allow the unix generator to run in windows host modeOswald Buddenhagen2012-03-161-0/+3
* | Build qmake with QStringBuilder.Olivier Goffart2012-03-165-3/+9
* | Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-03-129-140/+105
|\ \ | |/
| * Allow qmake to find features when using mkspecs in nested dirsSean Harmer2012-03-121-6/+11
| * QT_RAW_INSTALL_FOO => QT_INSTALL_FOO/rawOswald Buddenhagen2012-03-122-19/+17
| * rip out -incremental from configureOswald Buddenhagen2012-03-121-1/+0
| * do not copy/symlink qmake to build dirOswald Buddenhagen2012-03-093-78/+77
| * remove support for QMAKE_PLATFORM_DIROswald Buddenhagen2012-03-083-36/+0
* | Merge remote-tracking branch 'origin/master' into api_changesJoão Abecasis2012-03-086-21/+25
|\ \ | |/
| * move postProcessProject() call to sane locationOswald Buddenhagen2012-03-072-1/+4
| * don't add bogus /mkspecs to QMAKE_MKSPECSOswald Buddenhagen2012-03-061-1/+2
| * Fix finding specs in the unsupported/ directory.Thomas McGuire2012-03-061-2/+5
| * escape *_script_file usages in MingwMakefileGenerator::writeObjectsPartMax Desyatov2012-03-061-4/+4
| * de-duplicate feature and mkspec root candidate listsOswald Buddenhagen2012-03-062-0/+2
| * do not re-evaluate spec+cache in build passesOswald Buddenhagen2012-03-062-5/+4
| * make QMakeProject's copy c'tor actually behave like oneOswald Buddenhagen2012-03-062-3/+3
| * give load()/include() with target and infile()/$$fromfile() a clean environmentOswald Buddenhagen2012-03-051-1/+1
| * remove injection of default_pre in infile()/$$fromfile()Oswald Buddenhagen2012-03-051-4/+0
* | Split up base class QFileDevice for open-file operations (read/write)David Faure2012-03-064-1/+8
|/
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-03-0412-82/+71
|\
| * revamp -sysroot and -hostprefix handlingOswald Buddenhagen2012-03-014-24/+42
| * optimize QMakePropertyOswald Buddenhagen2012-03-012-39/+31
| * don't duplicate QLibraryInfo declarationOswald Buddenhagen2012-02-291-22/+1
| * Merge master -> api_changesRohan McGovern2012-02-297-55/+76
| |\
| * | QByteArray: deprecate QT_NO_CAST_FROM_BYTEARRAY-protected operatorsMarc Mutz2012-02-266-12/+12
* | | get rid of Option::user_configsOswald Buddenhagen2012-03-025-17/+7
* | | remove now unused QMakeProject c'torsOswald Buddenhagen2012-03-022-9/+5
* | | make evaluation of spec+cache independent of build pass contextOswald Buddenhagen2012-03-023-3/+8
* | | clean up build pass project initializationOswald Buddenhagen2012-03-025-16/+24
* | | move finding the makespec to OptionOswald Buddenhagen2012-03-024-45/+48
* | | search for default spec just like for other onesOswald Buddenhagen2012-03-021-19/+5
* | | remove some bogus include locationsOswald Buddenhagen2012-03-013-5/+1
* | | use VPATH to locate sourcesOswald Buddenhagen2012-03-011-223/+11
* | | merge Makefile.win32-g++{,-sh}Oswald Buddenhagen2012-03-012-348/+31
* | | cosmetics: remove redundant conditional, add a comment & reshuffle codeOswald Buddenhagen2012-03-011-4/+6
* | | look for features relative to spec only in advertized placeOswald Buddenhagen2012-03-011-6/+3
* | | make default_pro.prf advertize dynamically created .qmake.cacheOswald Buddenhagen2012-03-011-0/+2
* | | Add support for XCode 4 into qmakeAndy Shaw2012-03-011-71/+172