diff options
52 files changed, 197 insertions, 1305 deletions
@@ -59,6 +59,7 @@ ui_*.h qrc_*.cpp /src/controls/controls.qrc /src/dialogs/dialogs.qrc +*.qmlc # xemacs temporary files *.flc diff --git a/.qmake.conf b/.qmake.conf index acb1e728..a7b7ec16 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop -MODULE_VERSION = 5.8.1 +MODULE_VERSION = 5.9.0 diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml index d2eec87e..0206c72f 100644 --- a/src/controls/Private/BasicButton.qml +++ b/src/controls/Private/BasicButton.qml @@ -122,6 +122,8 @@ Control { /*! The image label source as theme name. When an icon from the platform icon theme is found, this takes precedence over iconSource. + + \include icons.qdocinc iconName */ property string iconName: action ? action.iconName : "" diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index a2fb824c..99310c13 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -249,6 +249,7 @@ QQuickControlSettings1::QQuickControlSettings1(QQmlEngine *engine) bool QQuickControlSettings1::resolveCurrentStylePath() { +#if QT_CONFIG(library) if (!m_styleMap.contains(m_name)) { qWarning() << "WARNING: Cannot find style" << m_name; return false; @@ -279,7 +280,7 @@ bool QQuickControlSettings1::resolveCurrentStylePath() m_styleMap[m_name] = styleData; m_path = styleData.m_styleDirPath; } - +#endif // QT_CONFIG(library) return true; } @@ -294,7 +295,7 @@ void QQuickControlSettings1::findStyle(QQmlEngine *engine, const QString &styleN StyleData styleData; -#ifndef QT_STATIC +#if QT_CONFIG(library) && !defined(QT_STATIC) const auto list = dir.entryList(); for (const QString &fileName : list) { // This assumes that there is only one library in the style directory, diff --git a/src/controls/Private/qquickspinboxvalidator.cpp b/src/controls/Private/qquickspinboxvalidator.cpp index 6723defe..0806523a 100644 --- a/src/controls/Private/qquickspinboxvalidator.cpp +++ b/src/controls/Private/qquickspinboxvalidator.cpp @@ -39,6 +39,8 @@ #include "qquickspinboxvalidator_p.h" +#if QT_CONFIG(validator) + QT_BEGIN_NAMESPACE QQuickSpinBoxValidator1::QQuickSpinBoxValidator1(QObject *parent) @@ -242,3 +244,5 @@ QString QQuickSpinBoxValidator1::textFromValue(qreal value) const } QT_END_NAMESPACE + +#endif // QT_CONFIG(validator) diff --git a/src/controls/Private/qquickspinboxvalidator_p.h b/src/controls/Private/qquickspinboxvalidator_p.h index 7ca6901e..baaeb1b3 100644 --- a/src/controls/Private/qquickspinboxvalidator_p.h +++ b/src/controls/Private/qquickspinboxvalidator_p.h @@ -43,6 +43,8 @@ #include <QtGui/qvalidator.h> #include <QtQml/qqml.h> +#if QT_CONFIG(validator) + QT_BEGIN_NAMESPACE class QQuickSpinBoxValidator1 : public QValidator, public QQmlParserStatus @@ -123,4 +125,5 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickSpinBoxValidator1) +#endif // QT_CONFIG(validator) #endif // QQUICKSPINBOXVALIDATOR_P_H diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index 1d79d634..4167f2ed 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -163,30 +163,42 @@ QQuickStyleItem1::~QQuickStyleItem1() { if (const QStyleOptionButton *aux = qstyleoption_cast<const QStyleOptionButton*>(m_styleoption)) delete aux; +#if QT_CONFIG(itemviews) else if (const QStyleOptionViewItem *aux = qstyleoption_cast<const QStyleOptionViewItem*>(m_styleoption)) delete aux; +#endif else if (const QStyleOptionHeader *aux = qstyleoption_cast<const QStyleOptionHeader*>(m_styleoption)) delete aux; else if (const QStyleOptionToolButton *aux = qstyleoption_cast<const QStyleOptionToolButton*>(m_styleoption)) delete aux; +#if QT_CONFIG(toolbar) else if (const QStyleOptionToolBar *aux = qstyleoption_cast<const QStyleOptionToolBar*>(m_styleoption)) delete aux; +#endif +#if QT_CONFIG(tabbar) else if (const QStyleOptionTab *aux = qstyleoption_cast<const QStyleOptionTab*>(m_styleoption)) delete aux; +#endif else if (const QStyleOptionFrame *aux = qstyleoption_cast<const QStyleOptionFrame*>(m_styleoption)) delete aux; else if (const QStyleOptionFocusRect *aux = qstyleoption_cast<const QStyleOptionFocusRect*>(m_styleoption)) delete aux; +#if QT_CONFIG(tabwidget) else if (const QStyleOptionTabWidgetFrame *aux = qstyleoption_cast<const QStyleOptionTabWidgetFrame*>(m_styleoption)) delete aux; +#endif else if (const QStyleOptionMenuItem *aux = qstyleoption_cast<const QStyleOptionMenuItem*>(m_styleoption)) delete aux; else if (const QStyleOptionComboBox *aux = qstyleoption_cast<const QStyleOptionComboBox*>(m_styleoption)) delete aux; +#if QT_CONFIG(spinbox) else if (const QStyleOptionSpinBox *aux = qstyleoption_cast<const QStyleOptionSpinBox*>(m_styleoption)) delete aux; +#endif +#if QT_CONFIG(slider) else if (const QStyleOptionSlider *aux = qstyleoption_cast<const QStyleOptionSlider*>(m_styleoption)) delete aux; +#endif else if (const QStyleOptionProgressBar *aux = qstyleoption_cast<const QStyleOptionProgressBar*>(m_styleoption)) delete aux; else if (const QStyleOptionGroupBox *aux = qstyleoption_cast<const QStyleOptionGroupBox*>(m_styleoption)) @@ -249,6 +261,7 @@ void QQuickStyleItem1::initStyleOption() } } break; +#if QT_CONFIG(itemviews) case ItemRow: { if (!m_styleoption) m_styleoption = new QStyleOptionViewItem(); @@ -259,14 +272,14 @@ void QQuickStyleItem1::initStyleOption() opt->features |= QStyleOptionViewItem::Alternate; } break; - +#endif // QT_CONFIG(itemviews) case Splitter: { if (!m_styleoption) { m_styleoption = new QStyleOption; } } break; - +#if QT_CONFIG(itemviews) case Item: { if (!m_styleoption) { m_styleoption = new QStyleOptionViewItem(); @@ -288,6 +301,7 @@ void QQuickStyleItem1::initStyleOption() } } break; +#endif // QT_CONFIG(itemviews) case ItemBranchIndicator: { if (!m_styleoption) m_styleoption = new QStyleOption; @@ -357,11 +371,14 @@ void QQuickStyleItem1::initStyleOption() } break; +#if QT_CONFIG(toolbar) case ToolBar: { if (!m_styleoption) m_styleoption = new QStyleOptionToolBar(); } break; +#endif +#if QT_CONFIG(tabbar) case Tab: { if (!m_styleoption) m_styleoption = new QStyleOptionTab(); @@ -395,7 +412,7 @@ void QQuickStyleItem1::initStyleOption() } break; - +#endif // QT_CONFIG(tabbar) case Frame: { if (!m_styleoption) m_styleoption = new QStyleOptionFrame(); @@ -413,6 +430,7 @@ void QQuickStyleItem1::initStyleOption() m_styleoption->state |= QStyle::State_KeyboardFocusChange; } break; +#if QT_CONFIG(tabwidget) case TabFrame: { if (!m_styleoption) m_styleoption = new QStyleOptionTabWidgetFrame(); @@ -427,6 +445,7 @@ void QQuickStyleItem1::initStyleOption() opt->leftCornerWidgetSize = QSize(value(), 0); } break; +#endif // QT_CONFIG(tabwidget) case MenuBar: if (!m_styleoption) { QStyleOptionMenuItem *menuOpt = new QStyleOptionMenuItem(); @@ -562,6 +581,7 @@ void QQuickStyleItem1::initStyleOption() #endif } break; +#if QT_CONFIG(spinbox) case SpinBox: { if (!m_styleoption) m_styleoption = new QStyleOptionSpinBox(); @@ -581,6 +601,8 @@ void QQuickStyleItem1::initStyleOption() opt->stepEnabled |= QAbstractSpinBox::StepDownEnabled; } break; +#endif // QT_CONFIG(spinbox) +#if QT_CONFIG(slider) case Slider: case Dial: { @@ -617,6 +639,7 @@ void QQuickStyleItem1::initStyleOption() opt->activeSubControls = QStyle::SC_SliderHandle; } break; +#endif // QT_CONFIG(slider) case ProgressBar: { if (!m_styleoption) m_styleoption = new QStyleOptionProgressBar(); @@ -647,6 +670,7 @@ void QQuickStyleItem1::initStyleOption() } break; +#if QT_CONFIG(slider) case ScrollBar: { if (!m_styleoption) m_styleoption = new QStyleOptionSlider(); @@ -672,6 +696,7 @@ void QQuickStyleItem1::initStyleOption() setTransient(qApp->style()->styleHint(QStyle::SH_ScrollBar_Transient, m_styleoption)); break; } +#endif // QT_CONFIG(slider) default: break; } @@ -1050,12 +1075,14 @@ qreal QQuickStyleItem1::baselineOffset() r.adjust(0,0,0,1); } break; +#if QT_CONFIG(spinbox) case SpinBox: if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(m_styleoption)) { r = qApp->style()->subControlRect(QStyle::CC_SpinBox, spinbox, QStyle::SC_SpinBoxEditField); ceilResult = false; } break; +#endif default: break; } @@ -1197,8 +1224,10 @@ QVariant QQuickStyleItem1::styleHint(const QString &metric) return qApp->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick); else if (metric == QLatin1String("submenupopupdelay")) return qApp->style()->styleHint(QStyle::SH_Menu_SubMenuPopupDelay, m_styleoption); +#if QT_CONFIG(wheelevent) else if (metric == QLatin1String("wheelScrollLines")) return qApp->wheelScrollLines(); +#endif return 0; // Add SH_Menu_SpaceActivatesItem @@ -1792,7 +1821,7 @@ QPixmap QQuickTableRowImageProvider1::requestPixmap(const QString &id, QSize *si *size = QSize(width, height); QPixmap pixmap(width, height); - +#if QT_CONFIG(itemviews) QStyleOptionViewItem opt; opt.state |= QStyle::State_Enabled; opt.rect = QRect(0, 0, width, height); @@ -1821,6 +1850,7 @@ QPixmap QQuickTableRowImageProvider1::requestPixmap(const QString &id, QSize *si QPainter pixpainter(&pixmap); qApp->style()->drawPrimitive(QStyle::PE_PanelItemViewRow, &opt, &pixpainter); } +#endif return pixmap; } diff --git a/src/controls/Private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp index aa09ea6b..c8eb81f6 100644 --- a/src/controls/Private/qquicktooltip.cpp +++ b/src/controls/Private/qquicktooltip.cpp @@ -44,7 +44,7 @@ #include <qpa/qplatformintegration.h> #include <QtQuick/QQuickRenderControl> -#ifdef QT_WIDGETS_LIB +#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP) #include <qtooltip.h> #endif @@ -60,7 +60,7 @@ void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QStrin { if (!item || !item->window()) return; -#ifdef QT_WIDGETS_LIB +#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP) if (QGuiApplicationPrivate::platformIntegration()-> hasCapability(QPlatformIntegration::MultipleWindows) && QCoreApplication::instance()->inherits("QApplication")) { @@ -80,7 +80,7 @@ void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QStrin void QQuickTooltip1::hideText() { -#ifdef QT_WIDGETS_LIB +#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP) QToolTip::hideText(); #endif } diff --git a/src/controls/Styles/Base/TumblerStyle.qml b/src/controls/Styles/Base/TumblerStyle.qml index 4228c6f1..c70aea6c 100644 --- a/src/controls/Styles/Base/TumblerStyle.qml +++ b/src/controls/Styles/Base/TumblerStyle.qml @@ -77,7 +77,11 @@ Style { readonly property Tumbler control: __control /*! + \obsolete + This property holds the spacing between each delegate. + + This property has no effect. */ property real spacing: 0 diff --git a/src/controls/Styles/WinRT/Phone/ApplicationWindowStyle.qml b/src/controls/Styles/WinRT/Phone/ApplicationWindowStyle.qml deleted file mode 100644 index 455cafb9..00000000 --- a/src/controls/Styles/WinRT/Phone/ApplicationWindowStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -ApplicationWindowStyle { } diff --git a/src/controls/Styles/WinRT/Phone/BusyIndicatorStyle.qml b/src/controls/Styles/WinRT/Phone/BusyIndicatorStyle.qml deleted file mode 100644 index 87590af0..00000000 --- a/src/controls/Styles/WinRT/Phone/BusyIndicatorStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -BusyIndicatorStyle { } diff --git a/src/controls/Styles/WinRT/Phone/ButtonStyle.qml b/src/controls/Styles/WinRT/Phone/ButtonStyle.qml deleted file mode 100644 index b5c3eeb0..00000000 --- a/src/controls/Styles/WinRT/Phone/ButtonStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -ButtonStyle { } diff --git a/src/controls/Styles/WinRT/Phone/CalendarStyle.qml b/src/controls/Styles/WinRT/Phone/CalendarStyle.qml deleted file mode 100644 index 69f4bd79..00000000 --- a/src/controls/Styles/WinRT/Phone/CalendarStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -CalendarStyle { } diff --git a/src/controls/Styles/WinRT/Phone/CheckBoxStyle.qml b/src/controls/Styles/WinRT/Phone/CheckBoxStyle.qml deleted file mode 100644 index e82d416c..00000000 --- a/src/controls/Styles/WinRT/Phone/CheckBoxStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -CheckBoxStyle { } diff --git a/src/controls/Styles/WinRT/Phone/ComboBoxStyle.qml b/src/controls/Styles/WinRT/Phone/ComboBoxStyle.qml deleted file mode 100644 index d0e499c6..00000000 --- a/src/controls/Styles/WinRT/Phone/ComboBoxStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -ComboBoxStyle { } diff --git a/src/controls/Styles/WinRT/Phone/FocusFrameStyle.qml b/src/controls/Styles/WinRT/Phone/FocusFrameStyle.qml deleted file mode 100644 index dba527ad..00000000 --- a/src/controls/Styles/WinRT/Phone/FocusFrameStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Private 1.0 - -FocusFrameStyle { } diff --git a/src/controls/Styles/WinRT/Phone/GroupBoxStyle.qml b/src/controls/Styles/WinRT/Phone/GroupBoxStyle.qml deleted file mode 100644 index 6a420942..00000000 --- a/src/controls/Styles/WinRT/Phone/GroupBoxStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Private 1.0 - -GroupBoxStyle { } diff --git a/src/controls/Styles/WinRT/Phone/MenuBarStyle.qml b/src/controls/Styles/WinRT/Phone/MenuBarStyle.qml deleted file mode 100644 index fc7ce38f..00000000 --- a/src/controls/Styles/WinRT/Phone/MenuBarStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -MenuBarStyle { } diff --git a/src/controls/Styles/WinRT/Phone/MenuStyle.qml b/src/controls/Styles/WinRT/Phone/MenuStyle.qml deleted file mode 100644 index bd6c25ed..00000000 --- a/src/controls/Styles/WinRT/Phone/MenuStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -MenuStyle { } diff --git a/src/controls/Styles/WinRT/Phone/ProgressBarStyle.qml b/src/controls/Styles/WinRT/Phone/ProgressBarStyle.qml deleted file mode 100644 index 8cd45c86..00000000 --- a/src/controls/Styles/WinRT/Phone/ProgressBarStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -ProgressBarStyle { } diff --git a/src/controls/Styles/WinRT/Phone/RadioButtonStyle.qml b/src/controls/Styles/WinRT/Phone/RadioButtonStyle.qml deleted file mode 100644 index eb2b014c..00000000 --- a/src/controls/Styles/WinRT/Phone/RadioButtonStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -RadioButtonStyle { } diff --git a/src/controls/Styles/WinRT/Phone/ScrollViewStyle.qml b/src/controls/Styles/WinRT/Phone/ScrollViewStyle.qml deleted file mode 100644 index 8174e275..00000000 --- a/src/controls/Styles/WinRT/Phone/ScrollViewStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -ScrollViewStyle { } diff --git a/src/controls/Styles/WinRT/Phone/SliderStyle.qml b/src/controls/Styles/WinRT/Phone/SliderStyle.qml deleted file mode 100644 index c7e38512..00000000 --- a/src/controls/Styles/WinRT/Phone/SliderStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -SliderStyle { } diff --git a/src/controls/Styles/WinRT/Phone/SpinBoxStyle.qml b/src/controls/Styles/WinRT/Phone/SpinBoxStyle.qml deleted file mode 100644 index a8434188..00000000 --- a/src/controls/Styles/WinRT/Phone/SpinBoxStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -SpinBoxStyle { } diff --git a/src/controls/Styles/WinRT/Phone/StatusBarStyle.qml b/src/controls/Styles/WinRT/Phone/StatusBarStyle.qml deleted file mode 100644 index 35b2db7f..00000000 --- a/src/controls/Styles/WinRT/Phone/StatusBarStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -StatusBarStyle { } diff --git a/src/controls/Styles/WinRT/Phone/SwitchStyle.qml b/src/controls/Styles/WinRT/Phone/SwitchStyle.qml deleted file mode 100644 index 6dcd403a..00000000 --- a/src/controls/Styles/WinRT/Phone/SwitchStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -SwitchStyle { } diff --git a/src/controls/Styles/WinRT/Phone/TabViewStyle.qml b/src/controls/Styles/WinRT/Phone/TabViewStyle.qml deleted file mode 100644 index 3ac383d2..00000000 --- a/src/controls/Styles/WinRT/Phone/TabViewStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -TabViewStyle { } diff --git a/src/controls/Styles/WinRT/Phone/TableViewStyle.qml b/src/controls/Styles/WinRT/Phone/TableViewStyle.qml deleted file mode 100644 index d2316818..00000000 --- a/src/controls/Styles/WinRT/Phone/TableViewStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -TableViewStyle { } diff --git a/src/controls/Styles/WinRT/Phone/TextAreaStyle.qml b/src/controls/Styles/WinRT/Phone/TextAreaStyle.qml deleted file mode 100644 index 577810b0..00000000 --- a/src/controls/Styles/WinRT/Phone/TextAreaStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -TextAreaStyle { } diff --git a/src/controls/Styles/WinRT/Phone/TextFieldStyle.qml b/src/controls/Styles/WinRT/Phone/TextFieldStyle.qml deleted file mode 100644 index 64df01da..00000000 --- a/src/controls/Styles/WinRT/Phone/TextFieldStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -TextFieldStyle { } diff --git a/src/controls/Styles/WinRT/Phone/ToolBarStyle.qml b/src/controls/Styles/WinRT/Phone/ToolBarStyle.qml deleted file mode 100644 index c9f1e823..00000000 --- a/src/controls/Styles/WinRT/Phone/ToolBarStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Styles 1.3 - -ToolBarStyle { } diff --git a/src/controls/Styles/WinRT/Phone/ToolButtonStyle.qml b/src/controls/Styles/WinRT/Phone/ToolButtonStyle.qml deleted file mode 100644 index 8421860e..00000000 --- a/src/controls/Styles/WinRT/Phone/ToolButtonStyle.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Controls.Private 1.0 - -ToolButtonStyle { } diff --git a/src/controls/Styles/WinRT/Phone/WinRT.qrc b/src/controls/Styles/WinRT/Phone/WinRT.qrc deleted file mode 100644 index f4402a17..00000000 --- a/src/controls/Styles/WinRT/Phone/WinRT.qrc +++ /dev/null @@ -1,27 +0,0 @@ -<RCC> - <qresource prefix="/QtQuick/Controls/Styles/WinRT"> - <file>ApplicationWindowStyle.qml</file> - <file>BusyIndicatorStyle.qml</file> - <file>ButtonStyle.qml</file> - <file>CalendarStyle.qml</file> - <file>CheckBoxStyle.qml</file> - <file>ComboBoxStyle.qml</file> - <file>FocusFrameStyle.qml</file> - <file>GroupBoxStyle.qml</file> - <file>MenuBarStyle.qml</file> - <file>MenuStyle.qml</file> - <file>ProgressBarStyle.qml</file> - <file>RadioButtonStyle.qml</file> - <file>ScrollViewStyle.qml</file> - <file>SliderStyle.qml</file> - <file>SpinBoxStyle.qml</file> - <file>StatusBarStyle.qml</file> - <file>SwitchStyle.qml</file> - <file>TableViewStyle.qml</file> - <file>TabViewStyle.qml</file> - <file>TextAreaStyle.qml</file> - <file>TextFieldStyle.qml</file> - <file>ToolBarStyle.qml</file> - <file>ToolButtonStyle.qml</file> - </qresource> -</RCC> diff --git a/src/controls/Styles/WinRT/WinRT.pro b/src/controls/Styles/WinRT/WinRT.pro index 504362f9..a35328e8 100644 --- a/src/controls/Styles/WinRT/WinRT.pro +++ b/src/controls/Styles/WinRT/WinRT.pro @@ -1,7 +1,6 @@ TARGET = qtquickcontrolswinrtstyleplugin TARGETPATH = QtQuick/Controls/Styles/WinRT -!winphone: { OTHER_FILES += \ $$PWD/PC/ApplicationWindowStyle.qml \ $$PWD/PC/BusyIndicatorStyle.qml \ @@ -29,35 +28,6 @@ OTHER_FILES += \ RESOURCES += \ $$PWD/PC/WinRT.qrc -} else { -OTHER_FILES += \ - $$PWD/Phone/ApplicationWindowStyle.qml \ - $$PWD/Phone/BusyIndicatorStyle.qml \ - $$PWD/Phone/ButtonStyle.qml \ - $$PWD/Phone/CalendarStyle.qml \ - $$PWD/Phone/CheckBoxStyle.qml \ - $$PWD/Phone/ComboBoxStyle.qml \ - $$PWD/Phone/FocusFrameStyle.qml \ - $$PWD/Phone/GroupBoxStyle.qml \ - $$PWD/Phone/MenuBarStyle.qml \ - $$PWD/Phone/MenuStyle.qml \ - $$PWD/Phone/ProgressBarStyle.qml \ - $$PWD/Phone/RadioButtonStyle.qml \ - $$PWD/Phone/ScrollViewStyle.qml\ - $$PWD/Phone/SliderStyle.qml \ - $$PWD/Phone/SpinBoxStyle.qml \ - $$PWD/Phone/StatusBarStyle.qml \ - $$PWD/Phone/SwitchStyle.qml \ - $$PWD/Phone/TableViewStyle.qml \ - $$PWD/Phone/TabViewStyle.qml \ - $$PWD/Phone/TextAreaStyle.qml \ - $$PWD/Phone/TextFieldStyle.qml \ - $$PWD/Phone/ToolBarStyle.qml \ - $$PWD/Phone/ToolButtonStyle.qml - -RESOURCES += \ - $$PWD/Phone/WinRT.qrc -} SOURCES += \ $$PWD/plugin.cpp diff --git a/src/controls/doc/includes/icons.qdocinc b/src/controls/doc/includes/icons.qdocinc new file mode 100644 index 00000000..37bc3758 --- /dev/null +++ b/src/controls/doc/includes/icons.qdocinc @@ -0,0 +1,3 @@ +//! [iconName] +\note This property requires \l QApplication. +//! [iconName] diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 528f05a8..8a79cbe3 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -162,7 +162,9 @@ void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *ur qmlRegisterType<QQuickRangedDate1>(private_uri, 1, 0, "RangedDate"); qmlRegisterType<QQuickRangeModel1>(private_uri, 1, 0, "RangeModel"); qmlRegisterType<QQuickWheelArea1>(private_uri, 1, 0, "WheelArea"); +#if QT_CONFIG(validator) qmlRegisterType<QQuickSpinBoxValidator1>(private_uri, 1, 0, "SpinBoxValidator"); +#endif qmlRegisterSingletonType<QQuickTooltip1>(private_uri, 1, 0, "Tooltip", QQuickControlsPrivate1::registerTooltipModule); qmlRegisterSingletonType<QQuickControlSettings1>(private_uri, 1, 0, "Settings", QQuickControlsPrivate1::registerSettingsModule); diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp index f04b13ab..836c02da 100644 --- a/src/controls/qquickaction.cpp +++ b/src/controls/qquickaction.cpp @@ -86,13 +86,13 @@ QT_BEGIN_NAMESPACE For instance, \c "\&Open" will bind the \c Alt-O shortcut to the \c "Open" menu item. Note that not all platforms support mnemonics. - Defaults to the empty string. + Defaults to an empty string. */ /*! \qmlproperty url Action::iconSource - Sets the icon file or resource url for the action. Defaults to the empty URL. + Sets the icon file or resource url for the action. Defaults to an empty URL. */ /*! @@ -101,7 +101,9 @@ QT_BEGIN_NAMESPACE Sets the icon name for the action. This will pick the icon with the given name from the current theme. - Defaults to the empty string. + Defaults to an empty string. + + \include icons.qdocinc iconName */ /*! @@ -110,7 +112,7 @@ QT_BEGIN_NAMESPACE Tooltip to be shown when hovering the control bound to this action. Not all controls support tooltips on all platforms, especially \l MenuItem. - Defaults to the empty string. + Defaults to an empty string. */ /*! @@ -280,11 +282,16 @@ bool qMnemonicContextMatcher(QObject *o, Qt::ShortcutContext context) QVariant QQuickAction1::shortcut() const { +#if QT_CONFIG(shortcut) return m_shortcut.toString(QKeySequence::NativeText); +#else + return QString(); +#endif } void QQuickAction1::setShortcut(const QVariant &arg) { +#if QT_CONFIG(shortcut) QKeySequence sequence; if (arg.type() == QVariant::Int) sequence = QKeySequence(static_cast<QKeySequence::StandardKey>(arg.toInt())); @@ -304,10 +311,12 @@ void QQuickAction1::setShortcut(const QVariant &arg) QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(this, m_shortcut, context, qShortcutContextMatcher); } emit shortcutChanged(shortcut()); +#endif // QT_CONFIG(shortcut) } void QQuickAction1::setMnemonicFromText(const QString &text) { +#if QT_CONFIG(shortcut) QKeySequence sequence = QKeySequence::mnemonic(text); if (m_mnemonic == sequence) return; @@ -321,6 +330,7 @@ void QQuickAction1::setMnemonicFromText(const QString &text) Qt::ShortcutContext context = Qt::WindowShortcut; QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(this, m_mnemonic, context, qMnemonicContextMatcher); } +#endif // QT_CONFIG(shortcut) } void QQuickAction1::setIconSource(const QUrl &iconSource) @@ -416,6 +426,7 @@ void QQuickAction1::setExclusiveGroup(QQuickExclusiveGroup1 *eg) bool QQuickAction1::event(QEvent *e) { +#if QT_CONFIG(shortcut) if (!m_enabled) return false; @@ -435,6 +446,9 @@ bool QQuickAction1::event(QEvent *e) trigger(); return true; +#else + return false; +#endif // QT_CONFIG(shortcut) } void QQuickAction1::trigger(QObject *source) diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index 67682ad3..d309b67e 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -133,7 +133,7 @@ QT_BEGIN_NAMESPACE For instance, \c "\&File" will bind the \c Alt-F shortcut to the \c "File" menu. Note that not all platforms support mnemonics. - Its value defaults to the empty string. + Its value defaults to an empty string. */ /*! @@ -147,7 +147,7 @@ QT_BEGIN_NAMESPACE \qmlproperty url Menu::iconSource Sets the icon file or resource url for the menu icon as a submenu. - Defaults to the empty URL. + Defaults to an empty URL. \sa iconName */ @@ -158,7 +158,7 @@ QT_BEGIN_NAMESPACE Sets the icon name for the menu icon. This will pick the icon with the given name from the current theme. Only works as a submenu. - Its value defaults to the empty string. + Its value defaults to an empty string. \sa iconSource */ diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp index 33acff9e..60aa0f6f 100644 --- a/src/controls/qquickmenuitem.cpp +++ b/src/controls/qquickmenuitem.cpp @@ -343,7 +343,7 @@ void QQuickMenuText1::updateIcon() For instance, \c "\&Open" will bind the \c Alt-O shortcut to the \c "Open" menu item. Note that not all platforms support mnemonics. - Defaults to the empty string. + Defaults to an empty string. \sa Action::text */ @@ -358,7 +358,7 @@ void QQuickMenuText1::updateIcon() \qmlproperty url MenuItem::iconSource Sets the icon file or resource url for the \l MenuItem icon. - Overrides the item's bound action \c iconSource property. Defaults to the empty URL. + Overrides the item's bound action \c iconSource property. Defaults to an empty URL. \sa iconName, Action::iconSource */ @@ -368,7 +368,9 @@ void QQuickMenuText1::updateIcon() Sets the icon name for the \l MenuItem icon. This will pick the icon with the given name from the current theme. Overrides the item's bound - action \c iconName property. Defaults to the empty string. + action \c iconName property. Defaults to an empty string. + + \include icons.qdocinc iconName \sa iconSource, Action::iconName */ @@ -604,6 +606,7 @@ void QQuickMenuItem1::setShortcut(const QVariant &shortcut) void QQuickMenuItem1::updateShortcut() { +#if QT_CONFIG(shortcut) if (platformItem()) { QKeySequence sequence; QVariant var = shortcut(); @@ -615,6 +618,7 @@ void QQuickMenuItem1::updateShortcut() syncWithPlatformMenu(); } emit shortcutChanged(); +#endif // QT_CONFIG(shortcut) } bool QQuickMenuItem1::checkable() const diff --git a/src/dialogs/qquickabstractfiledialog.cpp b/src/dialogs/qquickabstractfiledialog.cpp index c0b3400c..49d98a1a 100644 --- a/src/dialogs/qquickabstractfiledialog.cpp +++ b/src/dialogs/qquickabstractfiledialog.cpp @@ -186,6 +186,7 @@ QStringList QQuickAbstractFileDialog::selectedNameFilterExtensions() const { QString filterRaw = selectedNameFilter(); QStringList ret; +#if QT_CONFIG(regularexpression) if (filterRaw.isEmpty()) { ret << "*"; return ret; @@ -194,6 +195,7 @@ QStringList QQuickAbstractFileDialog::selectedNameFilterExtensions() const QRegularExpressionMatchIterator i = re.globalMatch(filterRaw); while (i.hasNext()) ret << i.next().captured(1); +#endif // QT_CONFIG(regularexpression) if (ret.isEmpty()) ret << filterRaw; return ret; diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp index 2d99ae1e..ab228d1f 100644 --- a/src/dialogs/qquickplatformfiledialog.cpp +++ b/src/dialogs/qquickplatformfiledialog.cpp @@ -213,7 +213,6 @@ QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper() if (!m_dlgHelper) return m_dlgHelper; m_dlgHelper->setOptions(m_options); - connect(m_dlgHelper, SIGNAL(directoryEntered(QUrl)), this, SLOT(updateFolder(QUrl))); connect(m_dlgHelper, SIGNAL(filterSelected(QString)), this, SIGNAL(filterSelected())); connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept())); connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject())); @@ -222,6 +221,12 @@ QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper() return m_dlgHelper; } +void QQuickPlatformFileDialog::accept() +{ + updateFolder(folder()); + QQuickFileDialog::accept(); +} + /*! \qmlproperty bool FileDialog::visible diff --git a/src/dialogs/qquickplatformfiledialog_p.h b/src/dialogs/qquickplatformfiledialog_p.h index 42e59332..419843f4 100644 --- a/src/dialogs/qquickplatformfiledialog_p.h +++ b/src/dialogs/qquickplatformfiledialog_p.h @@ -67,6 +67,7 @@ public: protected: QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE; + virtual void accept() override; Q_DISABLE_COPY(QQuickPlatformFileDialog) }; diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp index 960102ab..a9e23321 100644 --- a/src/extras/plugin.cpp +++ b/src/extras/plugin.cpp @@ -98,7 +98,9 @@ void QtQuickExtrasPlugin::registerTypes(const char *uri) // register 1.3 qmlRegisterUncreatableType<QQuickTriggerMode>(uri, 1, 3, "TriggerMode", QLatin1String("Do not create objects of type TriggerMode")); // register 1.4 +#if QT_CONFIG(picture) qmlRegisterType<QQuickPicture>(uri, 1, 4, "Picture"); +#endif } void QtQuickExtrasPlugin::initializeEngine(QQmlEngine *engine, const char *uri) diff --git a/src/extras/qquickpicture.cpp b/src/extras/qquickpicture.cpp index 0a145b53..0a778288 100644 --- a/src/extras/qquickpicture.cpp +++ b/src/extras/qquickpicture.cpp @@ -39,6 +39,8 @@ #include "qquickpicture_p.h" +#if QT_CONFIG(picture) + #include <QQmlFile> #include <QDebug> @@ -157,3 +159,4 @@ void QQuickPicture::resetColor() setColor(QColor()); } +#endif // QT_CONFIG(picture) diff --git a/src/extras/qquickpicture_p.h b/src/extras/qquickpicture_p.h index 986dcc38..9c16a232 100644 --- a/src/extras/qquickpicture_p.h +++ b/src/extras/qquickpicture_p.h @@ -44,6 +44,8 @@ #include <QPainter> #include <QPicture> +#if QT_CONFIG(picture) + class QQuickPicture : public QQuickPaintedItem { Q_OBJECT @@ -72,4 +74,6 @@ private: QPicture mPicture; }; +#endif // QT_CONFIG(picture) + #endif // QQUICKPICTURE_H diff --git a/src/widgets/qmessageboxhelper_p.h b/src/widgets/qmessageboxhelper_p.h index d0a5c40f..cdc4b9e2 100644 --- a/src/widgets/qmessageboxhelper_p.h +++ b/src/widgets/qmessageboxhelper_p.h @@ -103,8 +103,10 @@ public: m_dialog.setText(QPlatformMessageDialogHelper::options()->text()); if (!QPlatformMessageDialogHelper::options()->informativeText().isNull()) m_dialog.setInformativeText(QPlatformMessageDialogHelper::options()->informativeText()); +#if QT_CONFIG(textedit) if (!QPlatformMessageDialogHelper::options()->detailedText().isNull()) m_dialog.setDetailedText(QPlatformMessageDialogHelper::options()->detailedText()); +#endif m_dialog.setStandardButtons(static_cast<QMessageBox::StandardButtons>(static_cast<int>( QPlatformMessageDialogHelper::options()->standardButtons()))); m_dialog.show(); diff --git a/tests/auto/controls/data/layout/Container.qml b/tests/auto/controls/data/layout/Container.qml deleted file mode 100644 index db3d68c4..00000000 --- a/tests/auto/controls/data/layout/Container.qml +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.5 -import QtQuick.Layouts 1.2 - -Item { - objectName: "qtbug51927-window" - visible: true - - default property alias _contents: customContent.data - - ColumnLayout { - id: customContent - objectName: "qtbug51927-columnLayout" - anchors.fill: parent - } -} diff --git a/tests/auto/controls/data/layout/ContainerUser.qml b/tests/auto/controls/data/layout/ContainerUser.qml deleted file mode 100644 index ff7ce622..00000000 --- a/tests/auto/controls/data/layout/ContainerUser.qml +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Window 2.2 - -Container { - visible: true - - Text { - objectName: "qtbug51927-text" - text: qsTr("Hello World") - anchors.centerIn: parent - renderType: Text.QtRendering - } -} diff --git a/tests/auto/controls/data/tst_layout.qml b/tests/auto/controls/data/tst_layout.qml deleted file mode 100644 index e5ac7728..00000000 --- a/tests/auto/controls/data/tst_layout.qml +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.2 -import QtTest 1.0 - -TestCase { - id: testCase - name: "Tests_Layout" - when:windowShown - width:400 - height:400 - - function test_invalidParent() { - ignoreWarning('Layout must be attached to Item elements') - var object = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Layouts 1.0; QtObject { Layout.fillWidth: true }', testCase, ''); - object.destroy() - } - - function test_defaultPropertyAliasCrash() { - var containerUserComponent = Qt.createComponent("layout/ContainerUser.qml"); - compare(containerUserComponent.status, Component.Ready); - - var containerUser = containerUserComponent.createObject(testCase); - verify(containerUser); - - // Shouldn't crash. - containerUser.destroy(); - } -} - diff --git a/tests/auto/extras/data/tst_gauge.qml b/tests/auto/extras/data/tst_gauge.qml index 6fdd6be6..77dd099d 100644 --- a/tests/auto/extras/data/tst_gauge.qml +++ b/tests/auto/extras/data/tst_gauge.qml @@ -254,28 +254,26 @@ TestCase { gauge.height = gaugeHeightFor100PixelHighValueBar(gauge); compare(gauge.__panel.barLength, 100); - // Give stuff time to re-layout after the new control height, etc., - // otherwise we'll be comparing against incorrect pixel positions. - wait(0); - for (var tickmarkIndex = 0; tickmarkIndex < data.expectedTickmarkValues.length; ++tickmarkIndex) { var tickmark = TestUtils.findChild(gauge, "tickmark" + tickmarkIndex); - compare(tickmark.value, data.expectedTickmarkValues[tickmarkIndex], - "Value of tickmark at index " + tickmarkIndex + " is " + data.expectedTickmarkValues[tickmarkIndex]); + // QTBUG-58859: give stuff time to re-layout after the new control height, etc., + // otherwise we'll be comparing against incorrect pixel positions. + tryCompare(tickmark, "value", data.expectedTickmarkValues[tickmarkIndex], undefined, + "Value of tickmark at index " + tickmarkIndex + " should be " + data.expectedTickmarkValues[tickmarkIndex]); var expectedValuePos = data.expectedTickmarkValuePositions[tickmarkIndex]; - compare(tickmark.valuePosition, expectedValuePos, - "Value position of tickmark at index " + tickmarkIndex + " is " + expectedValuePos); + tryCompare(tickmark, "valuePosition", expectedValuePos, undefined, + "Value position of tickmark at index " + tickmarkIndex + " should be " + expectedValuePos); } for (var minorTickmarkIndex = 0; minorTickmarkIndex < data.expectedMinorTickmarkValues.length; ++minorTickmarkIndex) { var minorTickmark = TestUtils.findChild(gauge, "minorTickmark" + minorTickmarkIndex); compare(minorTickmark.value, data.expectedMinorTickmarkValues[minorTickmarkIndex], - "Value of minor tickmark at index " + minorTickmarkIndex + " is " + data.expectedMinorTickmarkValues[minorTickmarkIndex]); + "Value of minor tickmark at index " + minorTickmarkIndex + " should be " + data.expectedMinorTickmarkValues[minorTickmarkIndex]); expectedValuePos = data.expectedMinorTickmarkValuePositions[minorTickmarkIndex]; compare(minorTickmark.valuePosition, expectedValuePos, - "Value position of minor tickmark at index " + minorTickmarkIndex + " is " + expectedValuePos); + "Value position of minor tickmark at index " + minorTickmarkIndex + " should be " + expectedValuePos); } } diff --git a/tests/auto/extras/data/tst_piemenu.qml b/tests/auto/extras/data/tst_piemenu.qml index 1e0e224e..3b0be526 100644 --- a/tests/auto/extras/data/tst_piemenu.qml +++ b/tests/auto/extras/data/tst_piemenu.qml @@ -71,11 +71,6 @@ Item { readonly property real menuWidth: 200 readonly property real menuHeight: 200 - // The root item for each test, if one exists. - property Item root - // The pie menu for each test, if no root is created. - property Item pieMenu - SignalSpy { id: currentIndexSignalSpy } @@ -88,15 +83,16 @@ Item { id: selectedAngleChangedSpy } + Component { + id: pieMenuComponent + + PieMenu {} + } + function cleanup() { currentIndexSignalSpy.clear(); actionSignalSpy.clear(); selectedAngleChangedSpy.clear(); - - if (root) - root.destroy(); - if (pieMenu) - pieMenu.destroy(); } function mouseButtonToString(button) { @@ -109,24 +105,24 @@ Item { } function test_instance() { - var pieMenu = Qt.createQmlObject("import QtQuick.Extras 1.4; PieMenu { }", container, ""); + var pieMenu = createTemporaryObject(pieMenuComponent, container); verify(pieMenu, "PieMenu: failed to create an instance"); verify(pieMenu.__style); compare(pieMenu.triggerMode, TriggerMode.TriggerOnClick); pieMenu.destroy(); // Ensure setting visible = true; visible = false; in onCompleted doesn't cause any problems. - var pieMenuComponent = Qt.createComponent("PieMenuVisibleOnCompleted.qml"); - tryCompare(pieMenuComponent, "status", Component.Ready); - pieMenu = pieMenuComponent.createObject(container); + var visibleOnCompletedComponent = Qt.createComponent("PieMenuVisibleOnCompleted.qml"); + tryCompare(visibleOnCompletedComponent, "status", Component.Ready); + pieMenu = createTemporaryObject(visibleOnCompletedComponent, container); verify(pieMenu, "PieMenu: failed to create an instance"); pieMenu.destroy(); // Ensure constructing a menu as a property (and hence no parent) // with visible = true doesn't cause any problems. - pieMenuComponent = Qt.createComponent("PieMenuVisibleButNoParent.qml"); - tryCompare(pieMenuComponent, "status", Component.Ready); - pieMenu = pieMenuComponent.createObject(container); + var visibleButNoParentComponent = Qt.createComponent("PieMenuVisibleButNoParent.qml"); + tryCompare(visibleButNoParentComponent, "status", Component.Ready); + pieMenu = createTemporaryObject(visibleButNoParentComponent, container); verify(pieMenu, "PieMenu: failed to create an instance"); pieMenu.destroy(); } @@ -134,7 +130,7 @@ Item { function test_triggerMode() { var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var mouseArea = root.mouseArea; var pieMenu = root.pieMenu; currentIndexSignalSpy.signalName = "currentIndexChanged" @@ -371,7 +367,7 @@ Item { skip("Fails with touch screens"); var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var mouseArea = root.mouseArea; var pieMenu = root.pieMenu; @@ -425,7 +421,7 @@ Item { function test_sectionAngles(data) { var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var pieMenu = root.pieMenu; pieMenu.__style.startAngle = data.startAngle; @@ -481,7 +477,7 @@ Item { function test_bounds(data) { var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var mouseArea = root.mouseArea; var pieMenu = root.pieMenu; @@ -530,7 +526,7 @@ Item { skip("Fails with touch screens"); var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var mouseArea = root.mouseArea; var pieMenu = root.pieMenu; @@ -584,7 +580,8 @@ Item { } function test_addItem() { - pieMenu = Qt.createQmlObject("import QtQuick.Extras 1.1; PieMenu {}", container); + var pieMenu = createTemporaryObject(pieMenuComponent, container); + verify(pieMenu); compare(pieMenu.menuItems.length, 0); pieMenu.addItem("Action 1"); @@ -592,7 +589,8 @@ Item { } function test_insertItem() { - pieMenu = Qt.createQmlObject("import QtQuick.Extras 1.1; PieMenu {}", container); + var pieMenu = createTemporaryObject(pieMenuComponent, container); + verify(pieMenu); compare(pieMenu.menuItems.length, 0); pieMenu.insertItem(0, "Action 1"); @@ -608,7 +606,7 @@ Item { function test_removeItem() { var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var pieMenu = root.pieMenu; var originalLength = pieMenu.menuItems.length; @@ -621,11 +619,11 @@ Item { } function debugMousePosition(pieMenu, mouseX, mouseY, positionText) { - var rectItem = Qt.createQmlObject("import QtQuick 2.0; Rectangle { width: 10; height: 10; radius: 5; color: 'red' }", pieMenu); + var rectItem = createTemporaryQmlObject("import QtQuick 2.0; Rectangle { width: 10; height: 10; radius: 5; color: 'red' }", pieMenu); rectItem.x = mouseX - rectItem.width / 2; rectItem.y = mouseY - rectItem.height / 2; - var textItem = Qt.createQmlObject("import QtQuick 2.0; Text {}", rectItem); + var textItem = createTemporaryQmlObject("import QtQuick 2.0; Text {}", rectItem); textItem.text = positionText; textItem.font.pixelSize = 8; textItem.anchors.centerIn = textItem.parent; @@ -638,9 +636,9 @@ Item { // as expected and the current item is cleared when the mouse moves outside the menu var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var mouseArea = root.mouseArea; - pieMenu = root.pieMenu; + var pieMenu = root.pieMenu; // Make the menu visible at (0,0) waitForRendering(root); @@ -711,7 +709,7 @@ Item { skip("Fails with touch screens"); var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var mouseArea = root.mouseArea; var pieMenu = root.pieMenu; @@ -741,7 +739,7 @@ Item { skip("Fails with touch screens"); var pieMenuComponent = Qt.createComponent("PieMenuRotatedBoundingItem.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var mouseArea = root.mouseArea; var pieMenu = root.pieMenu; @@ -771,7 +769,7 @@ Item { // Tests boundingItem when there are nested margins. var pieMenuComponent = Qt.createComponent("PieMenuBoundingItem.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var mouseArea = root.mouseArea; var pieMenu = root.pieMenu; @@ -801,7 +799,7 @@ Item { // press before the release (TriggerOnClick). var pieMenuComponent = Qt.createComponent("PieMenu3ItemsLongPress.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var pieMenu = root.pieMenu; mousePress(root, 0, 0, Qt.LeftButton); @@ -831,7 +829,7 @@ Item { // This functionality is used in the flat example. var pieMenuComponent = Qt.createComponent("PieMenu3ItemsKeepOpen.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); + var root = createTemporaryObject(pieMenuComponent, container); var pieMenu = root.pieMenu; actionSignalSpy.signalName = "actionTriggered"; actionSignalSpy.target = root; @@ -862,8 +860,8 @@ Item { function test_pressedIndex() { var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml"); tryCompare(pieMenuComponent, "status", Component.Ready); - root = pieMenuComponent.createObject(container); - pieMenu = root.pieMenu; + var root = createTemporaryObject(pieMenuComponent, container); + var pieMenu = root.pieMenu; actionSignalSpy.signalName = "actionTriggered"; actionSignalSpy.target = root; diff --git a/tests/auto/extras/data/tst_tumbler.qml b/tests/auto/extras/data/tst_tumbler.qml index e307ea35..5585b5db 100644 --- a/tests/auto/extras/data/tst_tumbler.qml +++ b/tests/auto/extras/data/tst_tumbler.qml @@ -67,7 +67,11 @@ Item { when: windowShown anchors.fill: parent - property var tumbler: null + Component { + id: tumblerComponent + + Tumbler {} + } property Component simpleColumn: TumblerColumn { model: ListModel { @@ -89,47 +93,45 @@ Item { } } - function init() { - tumbler = Qt.createQmlObject("import QtQuick.Extras 1.4; Tumbler { }", container, ""); - verify(tumbler, "Tumbler: failed to create an instance"); - } - - function cleanup() { - tumbler.destroy(); - } - function test_instance() { - // Tests instance creation via init() => cleanup(). + var tumbler = createTemporaryObject(tumblerComponent, container); + verify(tumbler); } - function columnXCenter(columnIndex) { + function columnXCenter(tumbler, columnIndex) { var columnWidth = tumbler.width / tumbler.columnCount; var halfColumnWidth = (columnWidth) / 2; return tumbler.__style.padding.left + halfColumnWidth + (columnWidth * columnIndex); } // visualItemIndex is from 0 to the amount of visible items. - function itemCenterPos(columnIndex, visualItemIndex) { + function itemCenterPos(tumbler, columnIndex, visualItemIndex) { var halfDelegateHeight = tumbler.__style.__delegateHeight / 2; var yCenter = tumbler.y + tumbler.__style.padding.top + halfDelegateHeight + (tumbler.__style.__delegateHeight * visualItemIndex); - return Qt.point(columnXCenter(columnIndex), yCenter); + return Qt.point(columnXCenter(tumbler, columnIndex), yCenter); } function test_currentIndex() { + var tumbler = createTemporaryObject(tumblerComponent, container); + verify(tumbler); + var column = simpleColumn.createObject(tumbler); compare(tumbler.addColumn(column), column); compare(tumbler.currentIndexAt(0), 0); compare(column.currentIndex, 0); waitForRendering(tumbler); - var pos = Qt.point(columnXCenter(0), tumbler.height / 2); + var pos = Qt.point(columnXCenter(tumbler, 0), tumbler.height / 2); mouseDrag(tumbler, pos.x, pos.y, 0, -tumbler.__style.__delegateHeight / 2, Qt.LeftButton, Qt.NoModifier, 200); compare(tumbler.currentIndexAt(0), 1); compare(column.currentIndex, 1); } function test_setCurrentIndexAt() { + var tumbler = createTemporaryObject(tumblerComponent, container); + verify(tumbler); + var column = simpleColumn.createObject(tumbler); compare(tumbler.addColumn(column), column); compare(tumbler.currentIndexAt(0), 0); @@ -169,6 +171,9 @@ Item { } function test_visible() { + var tumbler = createTemporaryObject(tumblerComponent, container); + verify(tumbler); + var column = simpleColumn.createObject(tumbler); compare(tumbler.addColumn(column), column); column = simpleColumn.createObject(tumbler); @@ -194,6 +199,9 @@ Item { if (Qt.platform.os === "osx") skip("OS X doesn't allow tab focus for certain controls by default"); + var tumbler = createTemporaryObject(tumblerComponent, container); + verify(tumbler); + var column = simpleColumn.createObject(tumbler); compare(tumbler.addColumn(column), column); column = simpleColumn.createObject(tumbler); @@ -273,6 +281,9 @@ Item { if (Settings.styleName === "Flat") skip("Not a valid test case as the model count is less than the visibleItemCount"); + var tumbler = createTemporaryObject(tumblerComponent, container); + verify(tumbler); + tumbler.height = 120; // By default, the delegate height is based on the height of the tumbler, // but it starts off at 0. @@ -287,7 +298,7 @@ Item { keyClick(Qt.Key_Tab) verify(tumbler.__viewAt(0).activeFocus); - var firstItemCenterPos = itemCenterPos(0, 1); + var firstItemCenterPos = itemCenterPos(tumbler, 0, 1); var firstItem = tumbler.__viewAt(0).itemAt(firstItemCenterPos.x, firstItemCenterPos.y); var actualPos = container.mapFromItem(firstItem, 0, 0); compare(actualPos.x, tumbler.__style.padding.left); @@ -295,7 +306,7 @@ Item { keyClick(Qt.Key_Down); tryCompare(tumbler.__viewAt(0), "offset", 3.0); - firstItemCenterPos = itemCenterPos(0, 0); + firstItemCenterPos = itemCenterPos(tumbler, 0, 0); firstItem = tumbler.__viewAt(0).itemAt(firstItemCenterPos.x, firstItemCenterPos.y); verify(firstItem); // Test QTBUG-40298. @@ -303,12 +314,12 @@ Item { compare(actualPos.x, tumbler.__style.padding.left); compare(actualPos.y, tumbler.__style.padding.top); - var secondItemCenterPos = itemCenterPos(0, 1); + var secondItemCenterPos = itemCenterPos(tumbler, 0, 1); var secondItem = tumbler.__viewAt(0).itemAt(secondItemCenterPos.x, secondItemCenterPos.y); verify(secondItem); verify(firstItem.y < secondItem.y); - var thirdItemCenterPos = itemCenterPos(0, 2); + var thirdItemCenterPos = itemCenterPos(tumbler, 0, 2); var thirdItem = tumbler.__viewAt(0).itemAt(thirdItemCenterPos.x, thirdItemCenterPos.y); verify(thirdItem); verify(firstItem.y < thirdItem.y); @@ -326,13 +337,16 @@ Item { } function test_resizeAfterFlicking() { + var tumbler = createTemporaryObject(tumblerComponent, container); + verify(tumbler); + // Test QTBUG-40367 (which is actually invalid because it was my fault :)). var column = oneHundredItemColumn.createObject(tumbler); compare(tumbler.addColumn(column), column); waitForRendering(tumbler); // Flick in some direction. - var pos = Qt.point(columnXCenter(0), tumbler.__style.padding.top); + var pos = Qt.point(columnXCenter(tumbler, 0), tumbler.__style.padding.top); mouseDrag(tumbler, pos.x, pos.y, 0, tumbler.height - tumbler.__style.padding.bottom, Qt.LeftButton, Qt.NoModifier, 300); tryCompare(tumbler.__viewAt(0), "offset", Settings.styleName === "Flat" ? 6.0 : 4.0); @@ -342,7 +356,7 @@ Item { compare(tumbler.__style.__delegateHeight, (tumbler.height - padding.top - padding.bottom) / tumbler.__style.visibleItemCount); waitForRendering(tumbler); - pos = itemCenterPos(0, 1); + pos = itemCenterPos(tumbler, 0, 1); var ninetyEighthItem = tumbler.__viewAt(0).itemAt(pos.x, pos.y); verify(ninetyEighthItem); } @@ -371,13 +385,17 @@ Item { if (Qt.platform.os === "osx") skip("OS X doesn't allow tab focus for certain controls by default"); + var tumbler = createTemporaryObject(tumblerComponent, container); + verify(tumbler); + var column = dayOfMonthColumn.createObject(tumbler); compare(tumbler.addColumn(column), column); column = yearColumn.createObject(tumbler); compare(tumbler.addColumn(column), column); - var mouseArea = Qt.createQmlObject( + var mouseArea = createTemporaryQmlObject( "import QtQuick 2.2; MouseArea { activeFocusOnTab: true; width: 50; height: 50 }", container, ""); + verify(mouseArea); keyClick(Qt.Key_Tab); verify(tumbler.__viewAt(0).activeFocus); @@ -397,16 +415,13 @@ Item { verify(!tumbler.__viewAt(1).activeFocus); verify(!tumbler.getColumn(1).activeFocus); verify(mouseArea.activeFocus); - - mouseArea.destroy(); } function test_datePicker() { - tumbler.destroy(); - var component = Qt.createComponent("TumblerDatePicker.qml"); compare(component.status, Component.Ready); - tumbler = component.createObject(container); + var tumbler = createTemporaryObject(component, container); + verify(tumbler); // Should not be any warnings. // March. @@ -478,7 +493,8 @@ Item { } function test_displacement(data) { - tumbler.style = displacementStyle; + var tumbler = createTemporaryObject(tumblerComponent, container, { style: displacementStyle }); + verify(tumbler); var column = simpleColumn6Items.createObject(tumbler); compare(tumbler.addColumn(column), column); @@ -510,7 +526,9 @@ Item { } function test_visibleItemCount(data) { - tumbler.style = displacementStyle; + var tumbler = createTemporaryObject(tumblerComponent, container, { style: displacementStyle }); + verify(tumbler); + tumbler.__style.visibleItemCount = data.visibleItemCount; var column = simpleColumn.createObject(tumbler); |