diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-29 01:15:47 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-29 01:15:47 +0200 |
| commit | b1072c19a7fe549a138dc6e8f51030e0352bbef4 (patch) | |
| tree | ce70c0a931d95ede0e689183545dbdf859a1babb /doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp | |
| parent | 6c6c76553e424291bb3b3d2112d09c96604850d9 (diff) | |
| parent | f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2 (diff) | |
| download | qt4-tools-b1072c19a7fe549a138dc6e8f51030e0352bbef4.tar.gz | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
tst_qtextcodec: Fix broken merge conflict resolution
tst_qtextcodec: Fix broken merge conflict resolution
Added some changes for 4.6.3
Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
Allow auto-test to compile when using namespaces
Fix regression in QVarLengthArray::operator=
Removed unnecessary PlatSec capabilities from spectrum demo DLL
Make test work with shadow builds again.
Added missing PlatSec capabilities to spectrum demo DLL
My 4.6.3 changes
Tidy changes file for 4.6.3.
My 4.6.3 changes
My 4.6.3 changes
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Build fix for spectrum demo when -qtnamespace is used
Fixed license headers in spectrum demo
Qt app draws background incorrectly when animated wallpaper is used
Don't use QAtomicInt in statics because they are non-POD.
QTBUG-5955: Qt fails to build on alpha architecture
Diffstat (limited to 'doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp')
0 files changed, 0 insertions, 0 deletions