diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-07 02:05:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-07 02:05:27 (GMT) |
| commit | bb48602fde578c1bc444113b60806073c9a3dae9 (patch) | |
| tree | f36179e6ca163f9d63adcc0f9216ad42c5cbecee /src/sql/kernel/qsqldatabase.cpp | |
| parent | d37a3529ec883985b2967265f0797d749db74308 (diff) | |
| parent | 0d9d1e0b1c9826900c569a32efbf9179c8730a13 (diff) | |
| download | Qt-bb48602fde578c1bc444113b60806073c9a3dae9.zip Qt-bb48602fde578c1bc444113b60806073c9a3dae9.tar.gz Qt-bb48602fde578c1bc444113b60806073c9a3dae9.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (478 commits)
Fix the broken QPixmap::fromSymbianRSgImage().
Using a better flag to control the fast allocator
Using QElapesedTimer for Symbian idle detector
Idle detector thread improvements
Incorrect comparison result in QString::locale
Cocoa/Alien: fix qgraphicseffectsource autotest
Cocoa: fix qgraphicsview autotest
Cocoa: fix autotest, qgraphicsview::moveItemWhileScrolling
reduce some symbian-specific TS files for qt to RTL marker
configure: fixed configure on mac.
Fixed a stupid typo
Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.
Lighthouse: License headers to new files in testlite
Make sure we blit the fbo on flush in QGLWindowSurface
Lighthouse: Wayland. Make the wayland integration closer to Lighthosue
Lighthouse: Wayland, only make one fbo for the WaylandPaintDevice
Making clearer separation between responsibility of different classes
Make it possible to vertically mirror gl painting
Lighthouse:Wayland Moving some logic into files
Make sure QStateMachine stops when it's told to
...
Diffstat (limited to 'src/sql/kernel/qsqldatabase.cpp')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 1cf5fde..66808c8 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |