diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-25 10:27:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-25 10:27:39 +0200 |
| commit | 91caf7531476d16c1c7a6d22705cb36ac93c5ab7 (patch) | |
| tree | e4f67bcd61c55ba2b8cb4a4d01b10f69837c74e8 /src/controls/ApplicationWindow.qml | |
| parent | 1f0def9e8feca180680c1344cef6cf250b7630ba (diff) | |
| parent | 6b876b21cd23f2af879543edf773dac41b4d0e97 (diff) | |
| download | qtquickcontrols-91caf7531476d16c1c7a6d22705cb36ac93c5ab7.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
src/controls/Styles/Desktop/SpinBoxStyle.qml
Change-Id: Ia501c1388a2af9f273ec2742abbfc766717ad9e6
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index f0a42e93..5ac73fbe 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -182,7 +182,7 @@ Window { /*! \internal */ default property alias data: contentArea.data - color: syspal.window + color: SystemPaletteSingleton.window(true) flags: Qt.Window | Qt.WindowFullscreenButtonHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint | @@ -190,8 +190,6 @@ Window { // QTBUG-35049: Windows is removing features we didn't ask for, even though Qt::CustomizeWindowHint is not set // Otherwise Qt.Window | Qt.WindowFullscreenButtonHint would be enough - SystemPalette {id: syspal} - Item { id: backgroundItem anchors.fill: parent |