summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-251-2/+3
|\
| * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-1919-876/+1220
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-181-2/+3
| |\ \
| | * | qmake: fix to create proper install target in Makefile at first runZeno Albisser2010-03-171-2/+3
* | | | cetest build fixJoerg Bornemann2010-03-251-0/+2
| |_|/ |/| |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-182-0/+4
|\ \ \
| * | | Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles.Rohan McGovern2010-03-182-0/+4
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-1719-876/+1216
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-1719-876/+1216
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-165-15/+80
| | |\ \
| | * | | Moved UID2 processing from cpp code to profiles.axis2010-03-151-17/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1124-189/+271
| | |\ \ \
| | * | | | Enabled dependencies for .dso and .lib libraries only.axis2010-03-091-1/+3
| | * | | | Merge branch 'defFilesAndMisc'axis2010-03-081-0/+4
| | |\ \ \ \
| | | * | | | Added dso dependencies to Symbian targets.axis2010-03-021-0/+4
| | * | | | | Fix src!=build issueThomas Zander2010-03-041-1/+2
| | * | | | | Merge branch 'master' into gcceThomas Zander2010-03-0221-372/+243
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Corrected a mismerge by Git.axis2010-03-011-1/+1
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-0110-104/+147
| | | |\ \ \ \
| | | * | | | | Removed restrictions on file names from the Symbian makefile system.axis2010-02-264-9/+19
| | | * | | | | Fixed a bug where the library extension would be embedded in pkg nameaxis2010-02-251-4/+12
| | | * | | | | Added missing header after merge with master.axis2010-02-231-0/+3
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2314-257/+64
| | | |\ \ \ \ \
| | * | | | | | | Make gcce xcompiler for symbian compile+link QtCoreThomas Zander2010-02-241-2/+2
| | |/ / / / / /
| | * | | | | | Fixed copy/paste error after commit a31e40295d.axis2010-02-231-1/+1
| | * | | | | | Prevented pkg generation unless there are files to deploy.axis2010-02-221-1/+17
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-195-134/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1816-1420/+23
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-165-32/+108
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-1212-64/+208
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Made some changes after code review.axis2010-02-123-5/+33
| | * | | | | | | | | | More src!=builddir fixes for symbian makefile generatorThomas Zander2010-02-111-3/+10
| | * | | | | | | | | | Place the generated pkg file in the build dir.Thomas Zander2010-02-101-3/+3
| | * | | | | | | | | | Implemented rss file generator for Linux.axis2010-02-096-433/+499
| | * | | | | | | | | | Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-0416-266/+479
| | * | | | | | | | | | Fixed path separators in the plugin stub generator.axis2010-02-011-2/+2
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2149-79/+173
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Better fix for build!=src Makefile generationThomas Zander2010-01-191-5/+3
| | * | | | | | | | | | | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-191-8/+8
| | * | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-189-118/+190
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Added support for QT_*_STATICLIB variables in qmake.axis2009-12-111-6/+10
| | * | | | | | | | | | | | Switched to using ABIv2 format to generate Symbian binaries.axis2009-12-111-5/+1
| | * | | | | | | | | | | | Merge branch 'qmakeShlibFixes'axis2009-12-112-19/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Switched Symbian away from the Linux lib$(TARGET).4.6.0 naming schemeaxis2009-10-231-3/+21
| | | * | | | | | | | | | | | Added QMAKE_PREFIX_SHLIB and QMAKE_SYMBIAN_SHLIB support.axis2009-10-231-16/+29
| | * | | | | | | | | | | | | Disable the forced profile recursion on Qt's Symbian build system.axis2009-12-111-2/+3
| | * | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-061-2/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Made qmake support mkspecs under the symbian directory.axis2009-10-231-3/+6
| | * | | | | | | | | | | | | Fix symbian builds on Linux.Simon Hausmann2009-10-232-2/+3
| | * | | | | | | | | | | | | Enabled Symbian scope when compiling with linux-armcc.axis2009-10-231-1/+4