aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2012-10-19 18:05:01 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-08 19:04:56 +0100
commiteba5128f66718d33d48a98ae385b5c44569bc70e (patch)
tree633b2ea25561ce3e493542cb0da77571ce745878 /tools
parentb3b1c3a573979cac69a3932d1edf3a046c1d8b8a (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 'tools')
-rw-r--r--tools/easingcurveeditor/mainwindow.cpp2
-rw-r--r--tools/qmlscene/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/easingcurveeditor/mainwindow.cpp b/tools/easingcurveeditor/mainwindow.cpp
index c0e04e645a..546ecee83f 100644
--- a/tools/easingcurveeditor/mainwindow.cpp
+++ b/tools/easingcurveeditor/mainwindow.cpp
@@ -130,7 +130,7 @@ void MainWindow::resizeEvent(QResizeEvent *event)
void MainWindow::initQml()
{
- quickView.setWindowFlags(Qt::FramelessWindowHint);
+ quickView.setFlags(Qt::FramelessWindowHint);
quickView.rootContext()->setContextProperty(QLatin1String("editor"), m_splineEditor);
quickView.setSource(QUrl("qrc:/preview.qml"));
quickView.show();
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index a7f0eef352..55925a0523 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -476,7 +476,7 @@ int main(int argc, char ** argv)
if (contentItem) {
qxView = new QQuickView(&engine, NULL);
window = qxView;
- window->setWindowFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+ window->setFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
if (options.resizeViewToRootItem)
qxView->setResizeMode(QQuickView::SizeViewToRootObject);
else