forked from qt-creator/qt-creator
QmlDesigner: Replace SwipeView with StackLayout
In the designer we replace a SwipeView with a StackLayout. Form the perspektive of the designer they are the same and StackLayout is easier to handle. Change-Id: I308ec209024e22db9f56e363e27588a40283603c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
committed by
Tim Jenssen
parent
89f02cba2c
commit
567a99c5aa
@@ -0,0 +1,34 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of Qt Creator.
|
||||
**
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.6
|
||||
import QtQuick.Layouts 1.3
|
||||
|
||||
StackLayout {
|
||||
id: root
|
||||
//property alias index: root.currentIndex
|
||||
property bool interactive: true
|
||||
default property alias contentData: root.data
|
||||
}
|
||||
@@ -613,7 +613,14 @@ QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorN
|
||||
|| typeName == "QtQuick.Controls/ToolTip")
|
||||
polishTypeName = "QtQuick/Item";
|
||||
|
||||
QObject *object = QmlPrivateGate::createPrimitive(polishTypeName, majorNumber, minorNumber, context);
|
||||
const QHash<QString, QString> mockHash = {{"QtQuick.Controls/SwipeView","qrc:/qtquickplugin/mockfiles/SwipeView.qml"}};
|
||||
|
||||
QObject *object = nullptr;
|
||||
|
||||
if (mockHash.contains(typeName))
|
||||
object = QmlPrivateGate::createComponent(mockHash.value(typeName), context);
|
||||
else
|
||||
object = QmlPrivateGate::createPrimitive(polishTypeName, majorNumber, minorNumber, context);
|
||||
|
||||
/* Let's try to create the primitive from source, since with incomplete meta info this might be a pure
|
||||
* QML type. This is the case for example if a C++ type is mocked up with a QML file.
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
<file>html/welcome.html</file>
|
||||
<file>images/webkit.png</file>
|
||||
<file>mockfiles/Window.qml</file>
|
||||
<file>mockfiles/SwipeView.qml</file>
|
||||
<file>mockfiles/GenericBackend.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
Reference in New Issue
Block a user