Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 4.6 | Janne Anttila | 2009-08-31 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Anttila | 2009-08-28 | 1 | -1/+1 |
| |\ | |||||
| * | | Updated docs to reflect current 'createpackage' and 'make sisx' syntax. | Janne Anttila | 2009-08-28 | 1 | -1/+1 |
* | | | Merge branch 'master' into 4.6 | Janne Anttila | 2009-08-28 | 6 | -62/+133 |
|\ \ \ | | |/ | |/| | |||||
| * | | Minor fix to space usage in makefile. | Janne Anttila | 2009-08-28 | 1 | -1/+1 |
| |/ | |||||
| * | Changed createpackage parameters to be more consistent with make targets. | Janne Anttila | 2009-08-28 | 2 | -6/+11 |
| * | Minor fix to MAKEFILE variable in SBSv2 generated makefiles. | Janne Anttila | 2009-08-28 | 1 | -4/+1 |
| * | Various small fixes and cleanups for symbian qmake generator. | Janne Anttila | 2009-08-28 | 3 | -37/+40 |
| * | Bug fix for store_build target when using subdirs project template. | Janne Anttila | 2009-08-27 | 1 | -2/+4 |
| * | Fixed createpackage.bat params to be more consistent with make targets. | Janne Anttila | 2009-08-27 | 1 | -1/+1 |
| * | Added support for 'make sisx' target in Symbian OS. | Janne Anttila | 2009-08-27 | 5 | -4/+79 |
| * | Support for template PKG file. | Janne Anttila | 2009-08-27 | 3 | -19/+8 |
* | | Remove last vestiges of the qtusagereporter. | Jason McDonald | 2009-08-24 | 1 | -11/+0 |
* | | Fix obsolete license headers. | Jason McDonald | 2009-08-21 | 1 | -1/+1 |
|/ | |||||
* | Merge commit 'qt/master' | Jason Barron | 2009-08-21 | 8 | -806/+14 |
|\ | |||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-20 | 1 | -11/+8 |
| |\ | |||||
| * | | remove QtScript from includepath | Kent Hansen | 2009-08-19 | 4 | -4/+1 |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-19 | 1 | -1/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-18 | 5 | -15/+15 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-17 | 8 | -13/+27 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-14 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-12 | 40 | -40/+40 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-10 | 2 | -5/+16 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | remove final traces of qtscript from qmake | Kent Hansen | 2009-08-06 | 4 | -148/+3 |
| * | | | | | | | | merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-06 | 2 | -1/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-07-30 | 5 | -22/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-07-28 | 9 | -48/+81 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-07-14 | 4 | -53/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-06-29 | 40 | -80/+86 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Import JSC-based Qt Script from Kent's tree. | Simon Hausmann | 2009-06-16 | 5 | -648/+5 |
* | | | | | | | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-20 | 1 | -11/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Make the license test pass. | Frans Englich | 2009-08-19 | 1 | -11/+8 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Add support for LIBS_PRIVATE to the Symbian generators. | Jason Barron | 2009-08-20 | 1 | -1/+2 |
* | | | | | | | | | | | | | Fixed compile warning in qmake | Miikka Heikkinen | 2009-08-20 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-19 | 9 | -9/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-08-19 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Add support for LIBS_PRIVATE to the VCProject generator too. | Thiago Macieira | 2009-08-18 | 1 | -1/+3 |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Changed names and URLs to reflect name change. | axis | 2009-08-19 | 8 | -8/+8 |
* | | | | | | | | | | | | | Review fixes for qmake (project.cpp cleanup) | Miikka Heikkinen | 2009-08-19 | 7 | -172/+197 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Review fixes to qmake | Miikka Heikkinen | 2009-08-18 | 12 | -814/+17 |
* | | | | | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-18 | 13 | -29/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Compile | Anders Bakken | 2009-08-17 | 4 | -14/+14 |
| * | | | | | | | | | | | Rename qlistdata.cpp (back) to qlist.cpp. | Volker Hilsheimer | 2009-08-17 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Add LIBS_PRIVATE to qmake. | Thiago Macieira | 2009-08-17 | 8 | -13/+27 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not set | Tor Arne Vestbø | 2009-08-14 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-13 | 40 | -40/+40 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 40 | -40/+40 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-10 | 1 | -4/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Keith Isdale | 2009-08-10 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | In a .pro file the include() function does not warn if specified file | Keith Isdale | 2009-08-10 | 1 | -4/+9 |
| | |_|_|_|_|_|/ | |/| | | | | | |