diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-07 09:14:11 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-07 09:14:11 (GMT) | 
| commit | e8d7081e94ff6e0ce47d5cc0e993c28995278093 (patch) | |
| tree | f8ac6fb789a65815e003d789432855da7fa0240e /doc/src/snippets/code/doc_src_sql-driver.cpp | |
| parent | c4015c6a6ea663829b13596ebbbbcea3d9acb71f (diff) | |
| parent | a5416489043c985d62e5d22bf00f81d174f4605d (diff) | |
| download | Qt-e8d7081e94ff6e0ce47d5cc0e993c28995278093.zip Qt-e8d7081e94ff6e0ce47d5cc0e993c28995278093.tar.gz Qt-e8d7081e94ff6e0ce47d5cc0e993c28995278093.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (53 commits)
  Fixes: The "test: too many arguments" error after every make
  Fixed license headers for examples in master
  Fixed deployment problems with MSVC 2005 and 2008 SP1
  QLocalSocket/Win: handle ERROR_ACCESS_DENIED
  Add branch prediction macros
  Add methods for traversing and combining QProcessEnvironment.
  Designer [Qt Creator integration]: Fix integrated property editor.
  Handle the HTTP 418 reply properly in QNAM
  absorb translations.pri into translations.pro
  let generated flag control SQL generation
  Add version attributes as per ODF specification
  Fixed QFtp autotests not to crash in network time out situations
  Make createpackage and patch_capabilties scripts use tmp dir
  Fix for QTBUG-16985.
  Revert "QComboBox fix for QTBUG-16985"
  Moving Symbian CPU core detection to qthread_symbian.cpp
  QComboBox fix for QTBUG-16985
  Making Symbian helper threads exit cleanly at app exit
  Add ".make.cache" to the files to be cleaned for symbian-abld.
  Fix mismatched $$translations handling after merge
  ...
Diffstat (limited to 'doc/src/snippets/code/doc_src_sql-driver.cpp')
0 files changed, 0 insertions, 0 deletions
