Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into oslo-staging-1 | Aaron McCarthy | 2010-03-19 | 14 | -861/+1197 |
|\ | |||||
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60 | axis | 2010-03-18 | 2 | -0/+4 |
| |\ | |||||
| | * | Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles. | Rohan McGovern | 2010-03-18 | 2 | -0/+4 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 14 | -861/+1193 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 14 | -861/+1193 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60 | axis | 2010-03-16 | 5 | -15/+80 |
| | | |\ \ | |||||
| | | * | | | Moved UID2 processing from cpp code to profiles. | axis | 2010-03-15 | 1 | -17/+1 |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-11 | 17 | -40/+112 |
| | | |\ \ \ | |||||
| | | * | | | | Enabled dependencies for .dso and .lib libraries only. | axis | 2010-03-09 | 1 | -1/+3 |
| | | * | | | | Merge branch 'defFilesAndMisc' | axis | 2010-03-08 | 1 | -0/+4 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Added dso dependencies to Symbian targets. | axis | 2010-03-02 | 1 | -0/+4 |
| | | * | | | | | Fix src!=build issue | Thomas Zander | 2010-03-04 | 1 | -1/+2 |
| | | * | | | | | Merge branch 'master' into gcce | Thomas Zander | 2010-03-02 | 12 | -362/+187 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Corrected a mismerge by Git. | axis | 2010-03-01 | 1 | -1/+1 |
| | | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-01 | 8 | -103/+142 |
| | | | |\ \ \ \ | |||||
| | | | * | | | | | Removed restrictions on file names from the Symbian makefile system. | axis | 2010-02-26 | 4 | -9/+19 |
| | | | * | | | | | Fixed a bug where the library extension would be embedded in pkg name | axis | 2010-02-25 | 1 | -4/+12 |
| | | | * | | | | | Added missing header after merge with master. | axis | 2010-02-23 | 1 | -0/+3 |
| | | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-23 | 7 | -248/+13 |
| | | | |\ \ \ \ \ | |||||
| | | * | | | | | | | Make gcce xcompiler for symbian compile+link QtCore | Thomas Zander | 2010-02-24 | 1 | -2/+2 |
| | | |/ / / / / / | |||||
| | | * | | | | | | Fixed copy/paste error after commit a31e40295d. | axis | 2010-02-23 | 1 | -1/+1 |
| | | * | | | | | | Prevented pkg generation unless there are files to deploy. | axis | 2010-02-22 | 1 | -1/+17 |
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-19 | 5 | -134/+0 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-18 | 7 | -1375/+12 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 4 | -21/+83 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | axis | 2010-02-12 | 8 | -55/+192 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Made some changes after code review. | axis | 2010-02-12 | 3 | -5/+33 |
| | | * | | | | | | | | | | More src!=builddir fixes for symbian makefile generator | Thomas Zander | 2010-02-11 | 1 | -3/+10 |
| | | * | | | | | | | | | | Place the generated pkg file in the build dir. | Thomas Zander | 2010-02-10 | 1 | -3/+3 |
| | | * | | | | | | | | | | Implemented rss file generator for Linux. | axis | 2010-02-09 | 6 | -433/+499 |
| | | * | | | | | | | | | | Implemented pkg generator for the symbian/linux-armcc mkspec. | axis | 2010-02-04 | 12 | -258/+456 |
| | | * | | | | | | | | | | Fixed path separators in the plugin stub generator. | axis | 2010-02-01 | 1 | -2/+2 |
| | | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-01-21 | 38 | -67/+149 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | Better fix for build!=src Makefile generation | Thomas Zander | 2010-01-19 | 1 | -5/+3 |
| | | * | | | | | | | | | | | Fix rules for recreating the Makefile in a subdir | Thomas Zander | 2010-01-19 | 1 | -8/+8 |
| | | * | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2009-12-18 | 9 | -118/+190 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Added support for QT_*_STATICLIB variables in qmake. | axis | 2009-12-11 | 1 | -6/+10 |
| | | * | | | | | | | | | | | | Switched to using ABIv2 format to generate Symbian binaries. | axis | 2009-12-11 | 1 | -5/+1 |
| | | * | | | | | | | | | | | | Merge branch 'qmakeShlibFixes' | axis | 2009-12-11 | 2 | -19/+50 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | Switched Symbian away from the Linux lib$(TARGET).4.6.0 naming scheme | axis | 2009-10-23 | 1 | -3/+21 |
| | | | * | | | | | | | | | | | | Added QMAKE_PREFIX_SHLIB and QMAKE_SYMBIAN_SHLIB support. | axis | 2009-10-23 | 1 | -16/+29 |
| | | * | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-11-06 | 1 | -2/+42 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Fix symbian builds on Linux. | Simon Hausmann | 2009-10-23 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-18 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | qmake: fix to create proper install target in Makefile at first run | Zeno Albisser | 2010-03-17 | 1 | -2/+3 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix runonphone target due to changed name of sis files | Shane Kearns | 2010-03-15 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add DEFINES to mingw32/windres.exe command line. | Robert Griebl | 2010-03-12 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-15 | 2 | -14/+79 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / |