diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-16 02:59:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-16 02:59:44 (GMT) |
| commit | 0c204981816f626a091f28f91cd25f49d7b74528 (patch) | |
| tree | 0f67931ff94feafa8b76cfd22064220ee4986fe0 /src/declarative/qml/qperformancetimer_p.h | |
| parent | 758a4446810e96eb4e2f0b0099b996701945422b (diff) | |
| parent | 82ae515e52e3811d3b2aec588e0dd777350c1c33 (diff) | |
| download | Qt-0c204981816f626a091f28f91cd25f49d7b74528.zip Qt-0c204981816f626a091f28f91cd25f49d7b74528.tar.gz Qt-0c204981816f626a091f28f91cd25f49d7b74528.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (345 commits)
QS60Style: QTreeView::indexRowSizeHint returns incorrect value
Fix TextEdit mouseSelectionMode overriding selectByMouse.
Deprecate QScriptValue::UserRange
Deprecate QScriptValue::QObjectMember
Fix static text item positioning GL2 paint engine
Fix combining marks handling in Core Text shaper
Update QML "What's New" docs.
Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.
Fix ListView boundary extents for RTL layout.
Fix compiler warning.
Update copyright year to 2011.
Fix for major regression in OpenVG clipping
Fix QGraphicsScene returning incorrect focus item.
Cast int to HALData::TAttribute for QT_HALData_ENumCpus and compile with RVCT4.
Not requiring valid QTextBlock in previous()
Don't use EGL surfaces for translucency with 32MB GPU chip.
Fix for fromSymbianCFbsBitmap changing the source data unexpectedly.
Background app visible after split view closed
Configuring a static Qt build did not exclude WebKit if the -webkit option was given.
Get the number of cores from HAL on Symbian.
...
Diffstat (limited to 'src/declarative/qml/qperformancetimer_p.h')
| -rw-r--r-- | src/declarative/qml/qperformancetimer_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qperformancetimer_p.h b/src/declarative/qml/qperformancetimer_p.h index 14310bf..2787921 100644 --- a/src/declarative/qml/qperformancetimer_p.h +++ b/src/declarative/qml/qperformancetimer_p.h @@ -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) ** |