summaryrefslogtreecommitdiffstats
path: root/src/scripttools
Commit message (Expand)AuthorAgeFilesLines
* ifdefs to allow compilation with QT_NO_MAINWINDOW and QT_NO_TOOLBARJeremy Katz2009-09-255-1/+26
* Update license headers again.Jason McDonald2009-09-09142-568/+568
* QScriptDebuggerBackend crash fix.Jedrzej Nowacki2009-09-081-7/+1
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-31141-1833/+1833
|\
| * Update tech preview license header.Jason McDonald2009-08-31140-1820/+1820
* | Compile fix after merge.Rhys Weatherley2009-08-241-1/+2
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-246-13/+14
|\ \ | |/
| * Make assorted constructors follow good coding practiceKeith Isdale2009-08-246-13/+14
| * Update license headers.Jason McDonald2009-08-11140-140/+140
* | Merge commit 'qt/master'Jason Barron2009-08-219-14/+31
|\ \
| * | provide filename in stack view if we have itKent Hansen2009-08-201-4/+7
| * | disable executable line number info since we don't have it yetKent Hansen2009-08-202-4/+15
| * | make sure we have a message handlerKent Hansen2009-08-191-0/+3
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-182-4/+4
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-171-12/+1
| |\ \ \
| * | | | comment out assertKent Hansen2009-08-131-1/+1
| * | | | Build fix.Jedrzej Nowacki2009-08-134-6/+4
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-12142-142/+142
| |\ \ \ \
| * | | | | QtScript building system changeJedrzej Nowacki2009-08-111-0/+1
| * | | | | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-282-10/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-06-29142-311/+355
| |\ \ \ \ \ \
| * | | | | | | Import JSC-based Qt Script from Kent's tree.Simon Hausmann2009-06-161-1/+2
* | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-183-16/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-172-4/+4
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Fixed coverity warningsThierry Bastian2009-08-141-12/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge commit 'qt/master'Jason Barron2009-08-13142-142/+142
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update contact URL in license headers.Jason McDonald2009-08-12142-142/+142
| | |_|/ / | |/| | |
* | | | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-0653-53/+53
* | | | | Merge commit 'origin/master'Jason Barron2009-08-0453-53/+53
|\ \ \ \ \
| * | | | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-0353-53/+53
* | | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-272-10/+10
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | doc: Changed several \reimp to \internalMartin Smith2009-07-201-1/+1
| * | | | doc: Changed several \reimp to \internalMartin Smith2009-07-201-9/+9
| | |/ / | |/| |
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-30142-351/+416
|\ \ \ \ | |/ / /
| * | | make sure __FILE__ and __LINE__ properties are restored correctlyKent Hansen2009-06-171-4/+6
| * | | fix crash when detach()ing a debugger and then evaluating script print() func...Joel Nordell2009-06-172-7/+14
| * | | reset debugger's state correctly when previous engine was deletedKent Hansen2009-06-171-15/+15
| * | | kill some includes not needed anymoreKent Hansen2009-06-171-4/+0
| * | | fix the QScriptEngineDebugger::state() logic, add test, improve docsKent Hansen2009-06-171-2/+5
| * | | add a state() function to QScriptEngineDebugger for determining whether the debuJoel Nordell2009-06-174-0/+36
| * | | Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-16141-282/+282
| |\ \ \ | | | |/ | | |/|
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-16140-280/+280
| * | | attempt to compile on solarisKent Hansen2009-06-161-2/+2
| | |/ | |/|
| * | small refactoring so remote debugger can use the same codeKent Hansen2009-06-153-33/+52
| * | don't try to delete script object snapshots when debugger front-end is deletedKent Hansen2009-06-151-1/+0
| * | small refactoringKent Hansen2009-06-151-7/+10
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2522-318/+702
|\ \ \ | |/ /
| * | Fixed compile of scripttools with MSVC 2003.Rohan McGovern2009-06-131-0/+1