diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-10-19 18:13:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-13 16:50:51 +0100 |
| commit | 1ce13f86c7066721ce80258d6a89baccc4030066 (patch) | |
| tree | 8e0ce097ecf89a6b1c88375864d23f448b8f85b6 | |
| parent | e4d3ccac501a9ddba8432a962fc3f565818684e7 (diff) | |
All QWindow properties that have "window" in them have been renamed.
Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase.
Change-Id: I1c6c8a15f379768e0187d8dffd015cdb82c90c93
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| -rw-r--r-- | demos/qt3d/shapes/shapes.cpp | 2 | ||||
| -rw-r--r-- | examples/qt3d/basket/basketview.cpp | 2 | ||||
| -rw-r--r-- | examples/qt3d/tank/tankview.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/qt3d/shapes/shapes.cpp b/demos/qt3d/shapes/shapes.cpp index 8f3aa34b7..c1f6fe538 100644 --- a/demos/qt3d/shapes/shapes.cpp +++ b/demos/qt3d/shapes/shapes.cpp @@ -107,7 +107,7 @@ ShapesWidget::ShapesWidget(QWindow *parent) , context(0) , initialised(false) { - setWindowTitle(tr("GL Primitive Shapes")); + setTitle(tr("GL Primitive Shapes")); format.setSwapBehavior(QSurfaceFormat::DoubleBuffer); format.setDepthBufferSize(24); setSurfaceType(QWindow::OpenGLSurface); diff --git a/examples/qt3d/basket/basketview.cpp b/examples/qt3d/basket/basketview.cpp index f0142597b..db27cd2d9 100644 --- a/examples/qt3d/basket/basketview.cpp +++ b/examples/qt3d/basket/basketview.cpp @@ -49,7 +49,7 @@ BasketView::BasketView(QWindow *parent) : QGLView(parent) , m_angle(0) { - setWindowTitle(tr("Basket")); + setTitle(tr("Basket")); //! [1] QGLBuilder builder; diff --git a/examples/qt3d/tank/tankview.cpp b/examples/qt3d/tank/tankview.cpp index fc3a198ba..584aeff53 100644 --- a/examples/qt3d/tank/tankview.cpp +++ b/examples/qt3d/tank/tankview.cpp @@ -62,7 +62,7 @@ TankView::TankView(QWindow *parent) // TODO: setToolTip not implemented in QWindow // setToolTip(tr("Double-click to add more tanks")); - setWindowTitle(tr("Double-click Me!")); + setTitle(tr("Double-click Me!")); } TankView::~TankView() |