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 | |
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')
-rw-r--r-- | src/plugins/accessible/quick/qaccessiblequickview.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp | 4 | ||||
-rw-r--r-- | src/qmltest/quicktest.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 35 |
4 files changed, 32 insertions, 13 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); diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index d622ac9497..614dde3f6c 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -269,7 +269,7 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD // Scan through all of the "tst_*.qml" files and run each of them // in turn with a QQuickView. QQuickView *view = new QQuickView; - view->setWindowFlags(Qt::Window | Qt::WindowSystemMenuHint + view->setFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); QTestRootObject rootobj; @@ -288,7 +288,7 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD continue; view->setObjectName(fi.baseName()); - view->setWindowTitle(view->objectName()); + view->setTitle(view->objectName()); rootobj.setHasTestCase(false); rootobj.setWindowShown(false); rootobj.hasQuit = false; diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index f1cfdf8597..890474a415 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1093,14 +1093,6 @@ QQuickItem *QQuickWindow::mouseGrabberItem() const } -/*! - \qmlproperty color QtQuick.Window2::Window::color - - The background color for the window. - - Setting this property is more efficient than using a separate Rectangle. -*/ - bool QQuickWindowPrivate::clearHover() { Q_Q(QQuickWindow); @@ -2759,6 +2751,14 @@ QSGTexture *QQuickWindow::createTextureFromId(uint id, const QSize &size, Create } /*! + \qmlproperty color QtQuick.Window2::Window::color + + The background color for the window. + + Setting this property is more efficient than using a separate Rectangle. +*/ + +/*! \property QQuickWindow::color \brief The color used to clear the OpenGL context. @@ -2783,7 +2783,26 @@ QColor QQuickWindow::color() const return d_func()->clearColor; } +/*! + \qmlproperty string QtQuick.Window2::Window::title + + The window's title in the windowing system. + The window title might appear in the title area of the window decorations, + depending on the windowing system and the window flags. It might also + be used by the windowing system to identify the window in other contexts, + such as in the task switcher. + */ + +/*! + \qmlproperty string QtQuick.Window2::Window::modality + + The modality of the window. + + A modal window prevents other windows from receiving input events. + Possible values are Qt.NonModal (the default), Qt.WindowModal, + and Qt.ApplicationModal. + */ #include "moc_qquickwindow.cpp" |