diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-08-06 14:29:17 +0200 |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-08-06 18:41:41 +0200 |
commit | 6b8a0dabdc750052512446ee6db06d4033320d48 (patch) | |
tree | f8954ff6eb41d944a80941ea4dbf2bea281eed5b /src/controls/plugin.cpp | |
parent | 42a5930a75b5b05926da8895faa228da9d1e20e5 (diff) | |
download | qtquickcontrols-6b8a0dabdc750052512446ee6db06d4033320d48.tar.gz |
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 <richard.gustavsen@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/plugin.cpp')
-rw-r--r-- | src/controls/plugin.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
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<QQuickMenu>(private_uri, 1, 0, "MenuPrivate"); qmlRegisterType<QQuickMenuBar>(private_uri, 1, 0, "MenuBarPrivate"); qmlRegisterType<QQuickPopupWindow>(private_uri, 1, 0, "PopupWindow"); - qmlRegisterType<QQuickApplicationWindow>(private_uri, 1, 0, "ApplicationWindowPrivate"); #ifdef QT_WIDGETS_LIB qmlRegisterType<QQuickStyleItem>(private_uri, 1, 0, "StyleItem"); |