diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 10:34:08 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 10:34:08 +1000 |
| commit | fad9bc150608768923cf15a4478c9c8c93697e02 (patch) | |
| tree | 1791aa4aa7d6edaefdf976d1d496e0b3c4ffba72 /src/network/socket/qhttpsocketengine.cpp | |
| parent | 0c637cb07ba3c9b353e7e483a209537485cc4e2a (diff) | |
| parent | 1a2345ec198114890571478d38a8fbd3e5236401 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (46 commits)
Add Q_UNIMPLEMENTED() macro
Fix build error on Mac
Build fix
BC cleanup in uitools.
Fix framework absolute path issue
Remove QFontEngineFT::loadGlyphMetrics
Add required font metrics functions to QRawFont
Include pixel size of font in exported HTML from QTextDocument
Make it possible for animation driver to specify the advance time delta
Compile on Windows
Remove warnings
Fix Wayland plugin so it works with the wayland bind api
wayland: Track wayland changes
Support GL ES 2 with uikit.
Lighthouse: Fix virtual desktopwidget
Support gamma correction of text on GL
Added .tag file with Git revision.
new configure.exe binary
qmake nmake generator: pass MAKEFLAGS to sub-make calls
Move private headers into versioned subdirectory
...
Diffstat (limited to 'src/network/socket/qhttpsocketengine.cpp')
0 files changed, 0 insertions, 0 deletions