diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
| commit | 2371147354d4436bb54c588662ac315dd4c2f940 (patch) | |
| tree | 5c90b1dd18de394cff2fb4e1bedc628da3c7d341 /tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp | |
| parent | 54ec6d177e0e8fb04cd01e70461484a80ca1f7a4 (diff) | |
| parent | 82454b6014a7ee0b048b4db8d64a21de849d4ab9 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/image/qicon.cpp
src/gui/image/qicon.h
src/gui/image/qicon_p.h
src/gui/text/qfontdatabase.cpp
src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
sync.profile
Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
Diffstat (limited to 'tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp')
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp index 994b53e382..c6167e50cb 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp @@ -60,7 +60,7 @@ ChipTester::ChipTester(QWidget *parent) populateScene(); setScene(scene); - setWindowTitle(tr("Chip Demo")); + setWindowTitle(tr("Chip Example")); } void ChipTester::setAntialias(bool enabled) |