diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-09 02:27:12 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-09 02:27:12 +1000 |
| commit | 3b4400e9a8a4cc1851344b057d4c4f0bcfcc0400 (patch) | |
| tree | 05c11c5636d44b7e8afaa5982cc48fe2eb45726d /doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp | |
| parent | 260005374b9b930aa583cd117aba96f8f4b34131 (diff) | |
| parent | 2a1e82452a192c88bcf0250f5976492f6dc3b65f (diff) | |
| download | qt4-tools-3b4400e9a8a4cc1851344b057d4c4f0bcfcc0400.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Split CFLAGS from pkg-config properly
Ensure that the proxystyle is used over the style's own functions
runonphone: Add a missing space between a message and the file name
Perl check for windows configure.
QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
QSettings: use the common appdata dir when bootstrapping qmake on win
Replace explicit surrogate handlers by inline methods of QChar class
Diffstat (limited to 'doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp')
0 files changed, 0 insertions, 0 deletions