diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:19:56 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:19:56 +0200 |
| commit | 955c8d6deaa04f4541c935c39a9273e7f6e47546 (patch) | |
| tree | 5ffa321729df792c8817656994f5418d92f8cc48 /src/controls/ApplicationWindow.qml | |
| parent | 6500876779574a317ffe289958746bbd348074b9 (diff) | |
| parent | 53fca456b2d5c4d290592846c0a14242ac218e1d (diff) | |
| download | qtquickcontrols-955c8d6deaa04f4541c935c39a9273e7f6e47546.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/controls/ApplicationWindow.qml
Change-Id: I2ab8efb4e04006724410da0f6ed03bd2672c5eb6
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index ff8b0728..f0a42e93 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick.Window 2.2 -import QtQuick 2.1 -import QtQuick.Controls 1.1 +import QtQuick 2.2 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 |