diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 11:06:02 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 11:06:02 (GMT) |
commit | 3ae7b648fb8531ca269bc44fffb52ba1aab75f97 (patch) | |
tree | 303fa2626e3c3260d9a31e4c8f28690ad38604b8 /doc/src/snippets/code/src_sql_kernel_qsqldatabase.cpp | |
parent | 6f736694461edc25b6e757f40ab9cad6a9207ad4 (diff) | |
parent | 0c9e624ead81aea836f3b65d9e719b6147a5115c (diff) | |
download | Qt-3ae7b648fb8531ca269bc44fffb52ba1aab75f97.zip Qt-3ae7b648fb8531ca269bc44fffb52ba1aab75f97.tar.gz Qt-3ae7b648fb8531ca269bc44fffb52ba1aab75f97.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: (58 commits)
make a partial build of linguist in no-gui config
make the code less of a trap
fix build from top level
Partially revert MR 543 changes to Linguist.
Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
Autotest: add some debugging, just in case there's something wrong
Autotest: fix the fix for the rounding error.
Fix compile error with QT_NO_LIBRARY in QtMultimedia
the _setmode() prototype is different on win ce
qdoc: Changed qdoc to output the new doc format.
Doc: update 'developing on mac'
fcntl.h doesn't seem to exist, either - contrary to an example on msdn
Autotest: fix paths on the test server after update.
Force the repaint during a window resize.
fix compile on wince
remove CONFIG += ordered again
Assistant: Check namespace and virtual folder syntax of help projects.
QtHelp: Fix auto tests.
Fix a crash when unloading libQtCore
Introduce a qconfig feature for QtDBus
...
Diffstat (limited to 'doc/src/snippets/code/src_sql_kernel_qsqldatabase.cpp')
0 files changed, 0 insertions, 0 deletions