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 /examples/graphicsview/chip/mainwindow.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 'examples/graphicsview/chip/mainwindow.cpp')
| -rw-r--r-- | examples/graphicsview/chip/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/graphicsview/chip/mainwindow.cpp b/examples/graphicsview/chip/mainwindow.cpp index dd33f0fc56..a8f4675c13 100644 --- a/examples/graphicsview/chip/mainwindow.cpp +++ b/examples/graphicsview/chip/mainwindow.cpp @@ -78,7 +78,7 @@ MainWindow::MainWindow(QWidget *parent) layout->addWidget(vSplitter); setLayout(layout); - setWindowTitle(tr("Chip Demo")); + setWindowTitle(tr("Chip Example")); } void MainWindow::populateScene() |