summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-171-0/+9
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-0/+9
| |\
| | * Implement language fallback logic for localize_deploymentMiikka Heikkinen2011-03-091-0/+9
* | | Objective-c prf may not override OBJECTIVE_CFLAGS settings.con2011-03-101-9/+0
|/ /
* | don't add extraneous empty command linesOswald Buddenhagen2011-03-012-2/+2
* | minor cleanup of the QMAKE_POST_LINK command line constructionOswald Buddenhagen2011-03-011-2/+2
* | silence qmake warning about unbalanced parenthesesOswald Buddenhagen2011-03-011-1/+1
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-3/+3
|\ \ | |/
| * Only add NetworkServices capability automatically if no caps are set.Miikka Heikkinen2011-02-211-3/+3
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-171-3/+3
|\ \ | |/
| * Apply the gcce link rules for LIBS_PRIVATE too.Liang Qi2011-02-111-3/+3
| * Added missing edllstub.lib for GCCE.axis2011-02-041-0/+1
| * Revert "Implement Symbian support for enable_backup CONFIG value"Miikka Heikkinen2011-02-041-15/+0
| * Implement Symbian support for enable_backup CONFIG valueMiikka Heikkinen2011-02-041-0/+15
* | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-163-52/+112
|\ \
| * | Workaround public header depending on private in symbian^3Shane Kearns2011-02-081-1/+6
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-317-16/+20
| |\ \
| * \ \ Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-281-6/+6
| |\ \ \
| | * | | Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-01-281-6/+6
| * | | | Added Symbian deployment localization for makefile build system.axis2011-01-271-44/+80
| * | | | Use packagesExist() macro to bail if a nonexistant package is requested.Robin Burchell2011-01-171-0/+4
| * | | | Add packagesExist() function to qmake.Robin Burchell2011-01-172-1/+16
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-6/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Remove dependencies to pre-Symbian3 platforms from Symbian3 packagesMiikka Heikkinen2011-02-031-6/+8
* | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Olivier Goffart2011-02-031-1/+5
|\ \ \ \ \
| * | | | | Load modules from QMAKEPATHYury G. Kudryashov2011-02-021-1/+5
| | |_|_|/ | |/| | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-011-51/+57
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix generated mif file cleaning in symbian-abldMiikka Heikkinen2011-01-281-1/+1
| * | | No longer replace dash and dot in TARGET with underscore in SymbianMiikka Heikkinen2011-01-271-50/+56
* | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-271-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-265-5/+10
| |\ \ \ \
| * | | | | Fix gstreamer phonon build on X11Jørgen Lind2011-01-041-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-254-12/+11
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | don't assign MANIFEST_DIR if we don't need itOswald Buddenhagen2011-01-202-4/+4
| * | | Generate createpackage calls with absolute path.Miikka Heikkinen2011-01-181-7/+6
| * | | Added detection of bat files to the qtPrepareTool function.axis2011-01-181-1/+7
| * | | don't misdetect powermac host systems when determining target archKonstantin Tokarev2011-01-171-1/+1
* | | | Add comctl32 v6 assembly dependency to applications only (not libraries)miniak2011-01-242-2/+4
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+4
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Install each test in a separate directoryAdrian Constantin2011-01-111-1/+1
| * | Do not override the target path if already definedLucian Varlan2011-01-111-1/+4
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-052-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Fix def file names for libinfixed testlibMiikka Heikkinen2011-01-041-1/+1
| * Ignore static_and_shared in Symbian builds.Miikka Heikkinen2011-01-031-1/+1
* | Fixed PREPEND_INCLUDEPATH being executed too early.axis2010-12-212-15/+14
| |
| \
*-. \ Merge branches 'nonQtApps-fix' and 'merge-request-2516' into master-s60axis2010-12-202-47/+47
|\ \ \
| * | | Moved the default dependency targets to default_post.prf.axis2010-12-202-47/+47
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-063-53/+75
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Cleaned up sis_targets.prfMiikka Heikkinen2010-12-021-48/+36
| * | Updated language map in localize_deployment.prfMiikka Heikkinen2010-11-291-1/+28