diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-21 11:11:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-21 11:11:07 (GMT) |
| commit | ae23dff04aefa4f3aabb841278ce24de2318c390 (patch) | |
| tree | 3be373c346511086609089f8917690bbbe8fa805 /doc/src/snippets/code/doc_src_qaxserver.cpp | |
| parent | d5631f115c2e32f8201e98813613010c9d7cb590 (diff) | |
| parent | 6122f0746cac1008d967c19a8b609d7c92fbc8a5 (diff) | |
| download | Qt-ae23dff04aefa4f3aabb841278ce24de2318c390.zip Qt-ae23dff04aefa4f3aabb841278ce24de2318c390.tar.gz Qt-ae23dff04aefa4f3aabb841278ce24de2318c390.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Adding debug output for not supported gl features
Compile fix in network for ios
Make it possible to compile in a screen plugin name in QWS
Don't redefine EGL defines
Compile fixes in corelib for ios
Export IPHONEOS_DEPLOYMENT_TARGET from qmake
Adding arm armv6 and armv7 as valid archs for mac builds
reset certain global variables on deletion
Made tst_QWidget::repaintWhenChildDeleted() pass.
Diffstat (limited to 'doc/src/snippets/code/doc_src_qaxserver.cpp')
0 files changed, 0 insertions, 0 deletions