diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-08 20:58:32 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-08 20:58:32 +1000 |
commit | d8755b9b246cce66cace5225ad04f6a1d0b99e14 (patch) | |
tree | c5d63557b3d861e6075f72634ec8b354508fb013 /doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp | |
parent | c22daf60d6b2360271f1ed50510749b2ae401c7b (diff) | |
parent | 695ef14f443ef992f62203949fc1565b11fdf621 (diff) | |
download | qt4-tools-d8755b9b246cce66cace5225ad04f6a1d0b99e14.tar.gz |
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:
update the proxy info before session is opened in QNAM by Aapo Makela
Diffstat (limited to 'doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp')
0 files changed, 0 insertions, 0 deletions