Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update tech preview license header for files that are new in 4.6. | Jason McDonald | 2009-08-31 | 1 | -13/+13 |
* | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-08-31 | 141 | -1833/+1833 |
|\ | |||||
| * | Update tech preview license header. | Jason McDonald | 2009-08-31 | 140 | -1820/+1820 |
* | | Compile fix after merge. | Rhys Weatherley | 2009-08-24 | 1 | -1/+2 |
* | | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-08-24 | 6 | -13/+14 |
|\ \ | |/ | |||||
| * | Make assorted constructors follow good coding practice | Keith Isdale | 2009-08-24 | 6 | -13/+14 |
| * | Update license headers. | Jason McDonald | 2009-08-11 | 140 | -140/+140 |
* | | Merge commit 'qt/master' | Jason Barron | 2009-08-21 | 8 | -14/+30 |
|\ \ | |||||
| * | | provide filename in stack view if we have it | Kent Hansen | 2009-08-20 | 1 | -4/+7 |
| * | | disable executable line number info since we don't have it yet | Kent Hansen | 2009-08-20 | 2 | -4/+15 |
| * | | make sure we have a message handler | Kent Hansen | 2009-08-19 | 1 | -0/+3 |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-18 | 2 | -4/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-17 | 1 | -12/+1 |
| |\ \ \ | |||||
| * | | | | comment out assert | Kent Hansen | 2009-08-13 | 1 | -1/+1 |
| * | | | | Build fix. | Jedrzej Nowacki | 2009-08-13 | 3 | -5/+3 |
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-08-12 | 142 | -142/+142 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-07-28 | 2 | -10/+10 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-06-29 | 142 | -311/+355 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Import JSC-based Qt Script from Kent's tree. | Simon Hausmann | 2009-06-16 | 1 | -1/+2 |
* | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-18 | 3 | -16/+5 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Restructure the documentation, both on a file and on a content level. | Volker Hilsheimer | 2009-08-17 | 2 | -4/+4 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Fixed coverity warnings | Thierry Bastian | 2009-08-14 | 1 | -12/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-13 | 142 | -142/+142 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 142 | -142/+142 |
| | |_|/ / | |/| | | | |||||
* | | | | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE | Harald Fernengel | 2009-08-06 | 53 | -53/+53 |
* | | | | | Merge commit 'origin/master' | Jason Barron | 2009-08-04 | 53 | -53/+53 |
|\ \ \ \ \ | |||||
| * | | | | | Squashed commit of the topic/exceptions branch. | Harald Fernengel | 2009-08-03 | 53 | -53/+53 |
* | | | | | | Merge commit 'qt/master-stable' | Jason Barron | 2009-07-27 | 2 | -10/+10 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | doc: Changed several \reimp to \internal | Martin Smith | 2009-07-20 | 1 | -1/+1 |
| * | | | | doc: Changed several \reimp to \internal | Martin Smith | 2009-07-20 | 1 | -9/+9 |
| | |/ / | |/| | | |||||
* | | | | Merge commit 'qt/master-stable' into 4.6-merged | Jason Barron | 2009-06-30 | 142 | -351/+416 |
|\ \ \ \ | |/ / / | |||||
| * | | | make sure __FILE__ and __LINE__ properties are restored correctly | Kent Hansen | 2009-06-17 | 1 | -4/+6 |
| * | | | fix crash when detach()ing a debugger and then evaluating script print() func... | Joel Nordell | 2009-06-17 | 2 | -7/+14 |
| * | | | reset debugger's state correctly when previous engine was deleted | Kent Hansen | 2009-06-17 | 1 | -15/+15 |
| * | | | kill some includes not needed anymore | Kent Hansen | 2009-06-17 | 1 | -4/+0 |
| * | | | fix the QScriptEngineDebugger::state() logic, add test, improve docs | Kent Hansen | 2009-06-17 | 1 | -2/+5 |
| * | | | add a state() function to QScriptEngineDebugger for determining whether the debu | Joel Nordell | 2009-06-17 | 4 | -0/+36 |
| * | | | Update license headers in files that are new in 4.6. | Jason McDonald | 2009-06-17 | 1 | -2/+2 |
| * | | | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 141 | -282/+282 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 140 | -280/+280 |
| * | | | attempt to compile on solaris | Kent Hansen | 2009-06-16 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | small refactoring so remote debugger can use the same code | Kent Hansen | 2009-06-15 | 3 | -33/+52 |
| * | | don't try to delete script object snapshots when debugger front-end is deleted | Kent Hansen | 2009-06-15 | 1 | -1/+0 |
| * | | small refactoring | Kent Hansen | 2009-06-15 | 1 | -7/+10 |
* | | | Merge commit 'qt/master-stable' into 4.6-stable | Jason Barron | 2009-06-25 | 22 | -318/+702 |
|\ \ \ | |/ / | |||||
| * | | Fixed compile of scripttools with MSVC 2003. | Rohan McGovern | 2009-06-13 | 1 | -0/+1 |
| * | | refactor some script debugger internals | Kent Hansen | 2009-06-12 | 7 | -148/+363 |
| * | | make debugger console's auto-completion asynchronous | Kent Hansen | 2009-06-12 | 8 | -103/+196 |
| * | | make debugger's tooltip handling asynchronous | Kent Hansen | 2009-06-12 | 8 | -56/+110 |
| * | | fix bugs in the completion+tooltip providers | Kent Hansen | 2009-06-12 | 2 | -3/+2 |