diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-08 06:49:17 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-08 06:49:17 (GMT) | 
| commit | 4c17c3b244f443cc103d14fc26d845dc95b08012 (patch) | |
| tree | 74a6cc3c7f4e3eef2a5293b9f1abee7bc5f019ae /doc/src/snippets/code/src_script_qscriptcontext.cpp | |
| parent | 118e7a807d0764dee97612589fe5d7072d271e1e (diff) | |
| parent | a25fbb9afdda4315a501ebf10c9fede8905b4329 (diff) | |
| download | Qt-4c17c3b244f443cc103d14fc26d845dc95b08012.zip Qt-4c17c3b244f443cc103d14fc26d845dc95b08012.tar.gz Qt-4c17c3b244f443cc103d14fc26d845dc95b08012.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  fix test under windows
  don't complain about unresolved base when the reference is absolute
  make the lupdate tests more verbose in case of failure
  don't use qmake for test setup
  move equivalent of output_ts test to good/
  look for the .result file in the dir where the output is expected to go
  fix sametext and number heuristics
  fix number heuristics, part 1
  no point in specifying -ts when a .pro file is specified
  clean up the lupdatecmd files
  tidy up the test .pro files
  remove dead code
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptcontext.cpp')
0 files changed, 0 insertions, 0 deletions
