diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 17:22:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 17:22:57 (GMT) |
| commit | a1a24e65985988984c385677116247559833e5d9 (patch) | |
| tree | 2c6cbffff92ae2f274897af4b1af309adfc12cb3 /doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp | |
| parent | 1745a0e7799774373ad6252a73d6e8af841db2a1 (diff) | |
| parent | 8f5ec08e2db08a0a2ed90e2e38b0f10151d7de6c (diff) | |
| download | Qt-a1a24e65985988984c385677116247559833e5d9.zip Qt-a1a24e65985988984c385677116247559833e5d9.tar.gz Qt-a1a24e65985988984c385677116247559833e5d9.tar.bz2 | |
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:
Revert "Explicitly inherit QNSOpenSavePanelDelegate from NSOpenSavePanelDelegate"
Fix the build on Mac OS X after 24e0f64b8a3
removed obsolete -qt-gif configure option
Apply WebKit revision 60451 manually to fix Clang build issue
Rename a few QtScript debugger-classes in anonymouse namespaces
Don't assign id<NSApplicationDelegate> to NSObject*, use id instead
Phonon: Export ObjectDescriptionModel to prevent link errors with Clang
Don't use 'id' as variable name, it has special meaning in Objctive-C
Don't redeclare voidPtr, it's already declared in CarbonCore's Thread.h
Explicitly inherit QNSOpenSavePanelDelegate from NSOpenSavePanelDelegate
Don't assing 'const Foo*' to a 'Foo*'
Diffstat (limited to 'doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp')
0 files changed, 0 insertions, 0 deletions