summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qendian.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-05 01:53:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-05 01:53:34 (GMT)
commitc3e903409b96fede96cb4a7b95ba308663c88879 (patch)
tree58d70c5c1a5af72aa5220b1132786e065cb56154 /src/corelib/global/qendian.h
parent3840002c93cadb22a67b1f06475d5c1708f507df (diff)
parent3290e4c1956bc6df63af669523391565c67e8c42 (diff)
downloadQt-c3e903409b96fede96cb4a7b95ba308663c88879.zip
Qt-c3e903409b96fede96cb4a7b95ba308663c88879.tar.gz
Qt-c3e903409b96fede96cb4a7b95ba308663c88879.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add branch prediction macros Add methods for traversing and combining QProcessEnvironment. Handle the HTTP 418 reply properly in QNAM absorb translations.pri into translations.pro let generated flag control SQL generation Add version attributes as per ODF specification
Diffstat (limited to 'src/corelib/global/qendian.h')
0 files changed, 0 insertions, 0 deletions