diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-12 07:42:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-12 07:42:07 (GMT) |
| commit | 2571913e70fc5059f3e52b153a64c85a0a6caf3a (patch) | |
| tree | 2d4232e93eef72e337f47c8c3d03074b3b45a221 /doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp | |
| parent | fc3ef51ef7344e189699e62ec54f3ce469c553f9 (diff) | |
| parent | 837e6acbda362da0e0130b784c90f765d6cd8c8e (diff) | |
| download | Qt-2571913e70fc5059f3e52b153a64c85a0a6caf3a.zip Qt-2571913e70fc5059f3e52b153a64c85a0a6caf3a.tar.gz Qt-2571913e70fc5059f3e52b153a64c85a0a6caf3a.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: (50 commits)
get known wifi networks a more complicated way, but without accessing
Only enable BM by default in QNAM for appropriate platforms.
fix crash on 10.6 with no wifi interface
Fix creation of QNetworkSession.
Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe.
remove qt_winQString2MB() and qt_winMB2QString()
Fix include() path in qimportbase.pri
Fix qmake crash on Windows
Compile
Revert some unfinished changes.
Fix compilation with namespaced Qt
Add a placeholder text into the new search lineedit
Ui improvements to QDBusViewer.
Make double-clicking a d-bus method work again
Changed Qdbusviewer to match D-Bus type signature in addition to method name when finding a method.
qdoc: Added debug code.
Update separate regions instead of their bounding box.
doc: Fixed three new qdoc errors.
Autotest: make the qabstractslider test pass on mac
Compile
...
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp')
0 files changed, 0 insertions, 0 deletions