diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-25 08:04:58 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-25 08:34:20 +0100 |
| commit | 1d6b43c44b68d1983a77a7368c6cfff78f2d4cd0 (patch) | |
| tree | b5d752c2ded6c4ee2c3e32cee7aabe88bb881a44 /tests/manual/stretchingcustom.qml | |
| parent | 716ca066c7f07371aaae79029c60996bc6e57118 (diff) | |
| parent | 2e52c497f205460ee61e6f6940849c057adc7adb (diff) | |
| download | qtquickcontrols-1d6b43c44b68d1983a77a7368c6cfff78f2d4cd0.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
src/qtdesktop/CheckBox.qml
src/qtdesktop/doc/qtdesktopcomponents.qdocconf
Change-Id: Ic3799053a18b0a3f97e251354ad8433438b08a7a
Diffstat (limited to 'tests/manual/stretchingcustom.qml')
| -rw-r--r-- | tests/manual/stretchingcustom.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml index 81b4d474..fa56757f 100644 --- a/tests/manual/stretchingcustom.qml +++ b/tests/manual/stretchingcustom.qml @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt Components project. +** This file is part of the Qt Quick Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -38,15 +38,15 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtDesktop 1.0 -import QtDesktop.Styles 1.0 +import QtQuick 2.1 +import QtQuick.Controls 1.0 +import QtQuick.Controls.Styles 1.0 Rectangle { width: 600 height: 400 - TabFrame { + TabView { anchors.fill: parent Tab { title: "Height" |