summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Always add QtNetwork include path when linking with QtWebkit in SymbianMiikka Heikkinen2010-06-181-1/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-161-0/+25
|\
| * Provide 'make unsigned_sis' target for Symbian mkspecsMiikka Heikkinen2010-06-161-0/+25
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-154-13/+157
|\ \ | |/ |/|
| * Fix symbian building of TARGET with a slashThomas Zander2010-06-151-2/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-143-11/+155
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-123-11/+155
| | |\
| | | * Revert "Attempt to fix build failure on Symbian."Aaron McCarthy2010-06-111-2/+2
| | | * Attempt to fix build failure on Symbian.Aaron McCarthy2010-06-111-2/+2
| | | * Merge remote branch 'mainline/4.7' into 4.7Oswald Buddenhagen2010-06-102-2/+3
| | | |\
| | | * | support for cross building Qt for MinGW (win32-g++) on UnixMark Brand2010-06-102-0/+143
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-091-11/+12
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-081-11/+12
| | | | |\ \
| | | | | * | Update the mkspec for linux-icc: don't use jump tables in shlibsThiago Macieira2010-06-071-3/+3
| | | | | * | Update the linux-icc mkspecThiago Macieira2010-06-071-8/+9
* | | | | | | Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbfSimon Hausmann2010-06-151-2/+4
|/ / / / / /
* | | | | | Added prependEpocroot replacement function to platform_paths.prfMiikka Heikkinen2010-06-141-1/+19
|/ / / / /
* | | | | Merge branch 'runonphone_targets' into 4.7-s60axis2010-06-113-7/+28
|\ \ \ \ \
| * | | | | Moved runonphone target to prf files for all build systems.axis2010-06-113-8/+24
| * | | | | Fixed destdir not being defined.axis2010-06-101-0/+4
| * | | | | Enable runonphone target for libraries as well.axis2010-06-101-2/+3
| | |_|_|/ | |/| | |
* | | | | Fix recursive 'make sis' for symbian buildsMiikka Heikkinen2010-06-111-2/+13
|/ / / /
* | | | Explicit EXPORTUNFROZEN will prevent default defBlock generationMiikka Heikkinen2010-06-102-2/+3
|/ / /
* | | Fixed DEPLOYMENT variable check in sis_targets.prfMiikka Heikkinen2010-06-091-1/+1
|/ /
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-081-3/+0
|\ \ | |/ |/|
| * Remove workarounds for -rpath-link optionsAdrian Constantin2010-06-011-3/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-052-1/+4
|\ \
| * \ Merge branch 'def_files_and_plugins' into 4.7-s60axis2010-06-042-1/+4
| |\ \
| | * | Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-042-1/+4
* | | | Fixed unescaped backslashes in testcase.prfRohan McGovern2010-06-041-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-042-35/+66
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-032-35/+66
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-032-35/+66
| | |\ \ \
| | | * | | Fix `make check' for debug-and-release on Windows.Rohan McGovern2010-06-021-2/+16
| | | * | | Move `check' target for autotests into testcase.prfRohan McGovern2010-06-022-35/+52
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-031-8/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fixed S60_VERSION variable exists checksMiikka Heikkinen2010-06-031-8/+14
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-031-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-011-0/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix versioning of pkg files on Symbian for apps linking against WebKitSimon Hausmann2010-06-011-0/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-032-8/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix Qt.sis content for Symbian^3 buildsMiikka Heikkinen2010-06-022-8/+11
| |/ / /
* | | | Make sure we don't pull inn /usr/X11 stuff in the qws mkspek confJørgen Lind2010-06-011-0/+4
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-284-4/+84
|\ \ \
| * | | Add missign license headers.Jason McDonald2010-05-282-0/+82
| * | | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-2725-67/+67
| |\ \ \
| * | | | Fix double slashes on few data caging pathsMiikka Heikkinen2010-05-251-2/+2
| * | | | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-215-1/+14
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix replacement functions in platform_paths.prfMiikka Heikkinen2010-05-201-2/+0
* | | | | fix escaping - by not using evalOswald Buddenhagen2010-05-271-3/+3
| |_|/ / |/| | |