From 6b8a0dabdc750052512446ee6db06d4033320d48 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 6 Aug 2014 14:29:17 +0200 Subject: Fix ApplicationWindow state / content size QML Window is not a plain QQuickWindow, but QQuickWindowQmlImpl that does delayed visibility handling and shows the window in appropriate state. Thus, ApplicationWindow cannot inherit QQuickWindow or it would lose all that magic. QQuickApplicationWindow was added in order for ApplicationWindowStyle to be able to know whether a custom window color had been set. This change gets rid of the QQuickWindow subclass and simply compares the window color to white, which is the default fill color of QQuickWindow. Change-Id: Ibd95ef0717c2db51246c6a71585e9286e61cef0b Reviewed-by: Richard Moe Gustavsen Reviewed-by: Gabriel de Dietrich --- src/controls/plugin.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/controls/plugin.cpp') diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index aaf9fd8e..43831769 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -49,7 +49,6 @@ #include "qquickstack_p.h" #include "qquickdesktopiconprovider_p.h" #include "qquickselectionmode_p.h" -#include "qquickapplicationwindow_p.h" #include "Private/qquickcalendarmodel_p.h" #include "Private/qquickrangeddate_p.h" @@ -151,7 +150,6 @@ void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri qmlRegisterType(private_uri, 1, 0, "MenuPrivate"); qmlRegisterType(private_uri, 1, 0, "MenuBarPrivate"); qmlRegisterType(private_uri, 1, 0, "PopupWindow"); - qmlRegisterType(private_uri, 1, 0, "ApplicationWindowPrivate"); #ifdef QT_WIDGETS_LIB qmlRegisterType(private_uri, 1, 0, "StyleItem"); -- cgit v1.2.1