diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:32:04 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:32:04 (GMT) |
| commit | 8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e (patch) | |
| tree | b8b69f812095df8bf780f88302c7784c4d2e18e0 /tests/benchmarks/gui/graphicsview | |
| parent | 34450eb48e56677395601bf155a6a05752b326ad (diff) | |
| parent | dbfe5f81e300de3a43311197826f23ff031b4b23 (diff) | |
| download | Qt-8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e.zip Qt-8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e.tar.gz Qt-8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e.tar.bz2 | |
Merge remote branch 'origin/master' into bearermanagement/integration
Conflicts:
configure
Diffstat (limited to 'tests/benchmarks/gui/graphicsview')
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index faacec4..01285d1 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |