diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-10-19 18:05:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-08 19:04:56 +0100 |
| commit | eba5128f66718d33d48a98ae385b5c44569bc70e (patch) | |
| tree | 633b2ea25561ce3e493542cb0da77571ce745878 /src/plugins | |
| parent | b3b1c3a573979cac69a3932d1edf3a046c1d8b8a (diff) | |
All QWindow properties that have "window" in them have been renamed.
Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase.
Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/accessible/quick/qaccessiblequickview.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/accessible/quick/qaccessiblequickview.cpp b/src/plugins/accessible/quick/qaccessiblequickview.cpp index 764db834d2..0106a3d68b 100644 --- a/src/plugins/accessible/quick/qaccessiblequickview.cpp +++ b/src/plugins/accessible/quick/qaccessiblequickview.cpp @@ -107,7 +107,7 @@ QString QAccessibleQuickView::text(QAccessible::Text text) const #else Q_UNUSED(text) #endif - return view()->windowTitle(); + return view()->title(); } diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp index 4f6ee51c5d..12550168f0 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp @@ -171,13 +171,13 @@ QWindow *getMasterWindow(QWindow *w) Qt::WindowFlags QQuickViewInspector::windowFlags() const { - return getMasterWindow(m_view)->windowFlags(); + return getMasterWindow(m_view)->flags(); } void QQuickViewInspector::setWindowFlags(Qt::WindowFlags flags) { QWindow *w = getMasterWindow(m_view); - w->setWindowFlags(flags); + w->setFlags(flags); // make flags are applied w->setVisible(false); w->setVisible(true); |