diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 18:05:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 18:05:26 (GMT) |
| commit | f612cb0f6bf4dd06fa344b1a5862985209fa5533 (patch) | |
| tree | 61b4fcddf5e8427a789ee186fc06f1e4af181a19 /doc/src/snippets/code/src_script_qscriptcontext.cpp | |
| parent | 2479c1b17ca2399c9df94dd7e1b66d3a3a896a5c (diff) | |
| parent | 4d570be67303f5b80ed0377ac7307afd8bc18643 (diff) | |
| download | Qt-f612cb0f6bf4dd06fa344b1a5862985209fa5533.zip Qt-f612cb0f6bf4dd06fa344b1a5862985209fa5533.tar.gz Qt-f612cb0f6bf4dd06fa344b1a5862985209fa5533.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Make qvfb compile (and work) with libpng 1.5
Updates to Galician localization
don't misdetect powermac host systems when determining target arch
Implementation of QNetworkProxyFactory::systemProxyForQuery() for Symbian
make sure Option::dir_sep is initialized in time
don't ignore return code from syncqt
make qtlibinfix apply to QT_INSTALL_TRANSLATIONS
clean up platform detection logic
accept -declarative-debug under unix
Fix static build on Windows with MinGW.
fix -enable-stdcall-fixup usage
don't claim declarative debugging support without having declarative
installation of translations is now dealt with by translations.pro
German translation fixes
fix typo in error messages
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptcontext.cpp')
0 files changed, 0 insertions, 0 deletions