summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-084-4/+10
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-073-97/+52
|\
| * Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-10-071-7/+14
| * Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-10-073-9/+37
| * Make default application deployment removableMiikka Heikkinen2010-10-071-81/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-077-88/+50
|\ \ | |/ |/|
| * fix regexp in "make custom command handling in vc(x)proj files sane"Oswald Buddenhagen2010-10-061-1/+1
| * qmake: Include -pthread when reducing duplicate library argumentsTor Arne Vestbø2010-10-051-1/+1
| * qmake: Ensure right library order when reducing duplicate librariesTor Arne Vestbø2010-10-051-4/+6
| * make QMAKE_POST_LINK handling in nmake generator saneOswald Buddenhagen2010-10-051-4/+1
| * make custom command handling in vc(x)proj files saneOswald Buddenhagen2010-10-057-89/+50
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-042-3/+11
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-301-0/+1
| |\
| | * Improve Qt/Symbian compatibility with unix shellsMartin Storsjo2010-09-281-0/+1
| * | Streamlined smart installer package creationMiikka Heikkinen2010-09-271-3/+10
| |/
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-224-141/+280
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-214-141/+280
| |\ \ | | |/
| | * qmake: Make smart library merge architecture-awareTor Arne Vestbø2010-09-201-14/+37
| | * Provide a way to compile with RVCT 4.0 using generated Makefile.Miikka Heikkinen2010-09-162-126/+240
| | * fix error messages when configuring QtJoerg Bornemann2010-09-151-1/+3
| | * run depend_command even if the binary has no absolute pathOswald Buddenhagen2010-09-131-1/+1
* | | qmake: introduction of QMAKE_PROJECT_NAMEJoerg Bornemann2010-09-212-3/+8
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-107-335/+128
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-081-1/+2
| |\
| | * Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.Miikka Heikkinen2010-09-081-1/+2
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-074-1/+15
| |\ \ | | |/ | |/|
| | * Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.Jan-Arve Sæther2010-09-062-0/+8
| | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-032-1/+7
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-061-307/+54
| |\ \
| | * | Fix compilation of qmake with MSVCAndy Shaw2010-09-061-2/+3
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-031-306/+52
| | |\ \
| | | * | Fix dependencies so JOM will handle parallellization properlyMarius Storm-Olsen2010-09-031-2/+7
| | | * | Turn Makefile.win32 into batch-mode, enable /MP and PCHMarius Storm-Olsen2010-09-021-308/+49
| * | | | Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2Miikka Heikkinen2010-09-061-8/+35
| |/ / /
| * | | Fix Symbian handling of projects with special characters in TARGETMiikka Heikkinen2010-09-031-12/+7
| |/ /
| * | Fix gcce building of apps using static libraries in symbian-sbsv2Miikka Heikkinen2010-08-311-7/+16
* | | Remove static vs dynamic library autodetection from qmake in SymbianMiikka Heikkinen2010-09-081-16/+4
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-08-304-13/+54
|\ \ \
| * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-304-13/+54
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-264-12/+36
| | |\ \
| | | * | fix generated makefile dependenciesOswald Buddenhagen2010-08-261-2/+2
| | | * | qmake vc[x]proj generators: support /MAP option without file nameJoerg Bornemann2010-08-242-2/+4
| | | * | qmake vcxproj generator: fix bug when using CharacterSet=1 in .pro fileJoerg Bornemann2010-08-241-1/+0
| | | * | add indirect input/output specification capability to QMAKE_SUBSTITUTESOswald Buddenhagen2010-08-231-7/+30
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-261-0/+14
| | |\ \ \
| | | * | | Added support for DEPLOYMENT.pkg_build_versionMiikka Heikkinen2010-08-261-0/+14
| | | |/ /
| | * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-3/+6
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * qmake: fix assertion on Windows when DESTDIR is empty in static libsJoerg Bornemann2010-08-171-3/+6
* | | | Allow pkg_prerules and pkg_postrules to be targeted to separate filesMiikka Heikkinen2010-08-302-79/+167
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-08-261-1/+1
|\ \ \