summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-044-12/+14
|\
| * Fixed wrong static library extension on Symbian.axis2011-02-031-2/+0
| * Remove dependencies to pre-Symbian3 platforms from Symbian3 packagesMiikka Heikkinen2011-02-031-6/+8
| * Make emulator deployment depend on post linking in symbian-sbsv2.Miikka Heikkinen2011-01-312-4/+6
* | 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-012-58/+59
|\ \ \ | |/ / |/| / | |/
| * 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-272-57/+58
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-272-2/+2
|\ \
| * \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-26146-147/+155
| |\ \
| * | | Compile on OS X.Morten Johan Sørvig2011-01-051-1/+1
| * | | 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-257-17/+16
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.Miikka Heikkinen2011-01-212-3/+3
| * | 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
| * | fix -enable-stdcall-fixup usageOswald Buddenhagen2011-01-171-2/+2
* | | Add comctl32 v6 assembly dependency to applications only (not libraries)miniak2011-01-245-5/+10
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17139-140/+143
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-111-2/+2
| |\ \
| | * | Allow use of command line parameters with RApaLsSession::StartApp.Miikka Heikkinen2011-01-111-2/+2
| * | | 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
| |/ /
| * | Update copyright year to 2011.Jason McDonald2011-01-10138-138/+138
* | | Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higherminiak2011-01-073-3/+3
* | | 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-213-16/+15
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-212-47/+47
|\ \
| | \
| | \
| *-. \ 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-202-5/+5
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Fix incorrect file name case for OpenGL libraries in symbian.conf.Miikka Heikkinen2010-12-171-4/+4
| * | | ICC: Don't print warning 1259 since it's too annoying.Thiago Macieira2010-12-151-1/+1
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-141-1/+1
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+1
* | | | | Fix comctl32 v6 dependency generation in Visual Studio 2005 and higherminiak2010-12-133-9/+9
|/ / / /
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-074-54/+80
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-064-54/+80
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Cleaned up sis_targets.prfMiikka Heikkinen2010-12-021-48/+36
| | * | Updated language map in localize_deployment.prfMiikka Heikkinen2010-11-292-2/+33
| | * | Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-291-4/+11
* | | | Add library prefixes for Cygwinİsmail Dönmez2010-12-071-0/+3
|/ / /
* | | Changed various DEPLOYMENT variable ".sources" suffixes to ".files"Miikka Heikkinen2010-12-021-3/+3
| |/ |/|
* | gdb_dwarf_index: change version constraint from 72 to 73Arvid Ephraim Picciani2010-11-261-1/+1