diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 00:49:55 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 00:49:55 +1000 |
commit | 1355da4b0f212921aeff201960a11ef8de6625a0 (patch) | |
tree | 2036c10022df49b2908eeb50ac9d8f4c98f625f8 /doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp | |
parent | 1a1af689fcaea5952794ceb74d6be0aa4638d6d1 (diff) | |
parent | 9d1a7b21c056fa986e5dd03dffa6dec192aae47f (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:
update def files
emit QNetWorkAccessManager::finished on QNetworkReply::abort()
Don't run XLib check if -no-gui is used
don't ignore create_prl for static plugins
make QLibraryInfo return clean paths
make relative paths in qt.conf work inside qmake
Sockets: Fix potential null pointer usages
QNAM: Re-order checks in migrateBackend()
Fix initial main window dimensions for "fullscreen with softkeys" case
Fix spelling mistake
Fixes crash in QWidget::effectiveWinId.
Fix crash when QSocketNotifier used with an invalid descriptor
Optimisation - buffer packet read in pendingDatagramSize
Remove warnings when disabling notifications on a closed socket
Fix some warnings in symbian network tests
Diffstat (limited to 'doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp')
0 files changed, 0 insertions, 0 deletions