From def0972bf32bb22d5123f409e17f9e92f3809bf4 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 23 Jan 2020 13:45:58 +0100 Subject: Stop using QDateTime's locale-specific APIs Use QLocale's date-time APIs, instead. Task-number: QTBUG-80441 Change-Id: I75453a002e0eea299d0527c0fa9431dc8bc53c7f Reviewed-by: Friedemann Kleint --- examples/quickcontrols/controls/filesystembrowser/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/quickcontrols/controls/filesystembrowser/main.cpp b/examples/quickcontrols/controls/filesystembrowser/main.cpp index d8599a2e..3a49215d 100644 --- a/examples/quickcontrols/controls/filesystembrowser/main.cpp +++ b/examples/quickcontrols/controls/filesystembrowser/main.cpp @@ -120,7 +120,7 @@ public: case DisplayableFilePermissionsRole: return QVariant(permissionString(fileInfo(index))); case LastModifiedRole: - return QVariant(fileInfo(index).lastModified().toString(Qt::SystemLocaleShortDate)); + return QVariant(QLocale::system().toString(fileInfo(index).lastModified(), QLocale::ShortFormat)); case UrlStringRole: return QVariant(QUrl::fromLocalFile(filePath(index)).toString()); default: -- cgit v1.2.1 From caecffab98cb2c47140579712e5b7bc7f7ce3070 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Sun, 2 Feb 2020 13:42:19 +0100 Subject: Bump version Change-Id: I2adee7799f1c8d762cdea06f9bcd4edb51d783ca --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index a3300d24..df2fb45e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.14.1 +MODULE_VERSION = 5.14.2 -- cgit v1.2.1 From 7a806347167607172ee38c60d30808b298224a8b Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 30 Jan 2020 11:11:49 +0200 Subject: Combine repeated logic to get Dialogs QML files into one function Add fileLocation() function to return the path of each dialog type. Change-Id: I7213e8cd09f61eca000f481b1cae58e9e5b3405e Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/dialogs/plugin.cpp | 66 +++++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 46 deletions(-) diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 601412d3..68b4cf3b 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -108,20 +108,9 @@ public: if (qmlDir.exists(QString("DefaultFileDialog.qml"))) m_useResources = false; #endif -#endif -#ifdef Q_OS_ANDROID - const QString prefix = QLatin1String("qrc:/android_rcc_bundle/qml/"); -#else - const QString prefix = QLatin1String("qrc:/"); #endif - QQuickAbstractDialog::m_decorationComponentUrl = m_useResources ? - QUrl(prefix + QString("QtQuick/Dialogs/qml/DefaultWindowDecoration.qml")) : -#ifndef QT_STATIC - QUrl::fromLocalFile(qmlDir.filePath(QString("qml/DefaultWindowDecoration.qml"))); -#else - QUrl("qrc:/qt-project.org/imports/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml"); -#endif + QQuickAbstractDialog::m_decorationComponentUrl = fileLocation("DefaultWindowDecoration"); // Prefer the QPA dialog helpers if the platform supports them. // Else if there is a QWidget-based implementation, check whether it's // possible to instantiate it from Qt Quick. @@ -170,13 +159,7 @@ public: { // @uri QtQuick.Dialogs.AbstractDialog qmlRegisterType(uri, 1, 2, "AbstractDialog"); // implementation wrapper - QUrl dialogQmlPath = m_useResources ? - QUrl(prefix + QString("QtQuick/Dialogs/DefaultDialogWrapper.qml")) : -#ifndef QT_STATIC - QUrl::fromLocalFile(qmlDir.filePath("DefaultDialogWrapper.qml")); -#else - QUrl("qrc:/qt-project.org/imports/QtQuick/Dialogs/DefaultDialogWrapper.qml"); -#endif + QUrl dialogQmlPath = fileLocation("DefaultDialogWrapper"); qCDebug(lcRegistration) << " registering" << dialogQmlPath << "as Dialog"; qmlRegisterType(dialogQmlPath, uri, 1, 2, "Dialog"); qmlRegisterType(dialogQmlPath, uri, 1, 3, "Dialog"); @@ -204,7 +187,7 @@ protected: bool registerWidgetImplementation(const QDir &widgetsDir, const QDir &qmlDir, const char *qmlName, const char *uri, bool hasTopLevelWindows, int versionMajor, int versionMinor) { - + Q_UNUSED(qmlDir) bool mobileTouchPlatform = false; #if defined(Q_OS_IOS) mobileTouchPlatform = true; @@ -215,12 +198,6 @@ protected: mobileTouchPlatform = true; #endif -#ifdef Q_OS_ANDROID - const QString prefix = QLatin1String("qrc:/android_rcc_bundle/qml/"); -#else - const QString prefix = QLatin1String("qrc:/"); -#endif - // If there is a qmldir and we have a QApplication instance (as opposed to a // widget-free QGuiApplication), and this isn't a mobile touch-based platform, // assume that the widget-based dialog will work. Otherwise an application developer @@ -228,14 +205,7 @@ protected: // dialogs won't be used. if (!mobileTouchPlatform && hasTopLevelWindows && widgetsDir.exists("qmldir") && QCoreApplication::instance()->inherits("QApplication")) { - QUrl dialogQmlPath = m_useResources ? - QUrl(prefix + QString("QtQuick/Dialogs/Widget%1.qml").arg(qmlName)) : -#ifndef QT_STATIC - QUrl::fromLocalFile(qmlDir.filePath(QString("Widget%1.qml").arg(qmlName))); -#else - QUrl(QString("qrc:/qt-project.org/imports/QtQuick/Dialogs/Widget%1.qml").arg(qmlName)); - Q_UNUSED(qmlDir); -#endif + QUrl dialogQmlPath = fileLocation(QString("Widget%1").arg(qmlName)); if (qmlRegisterType(dialogQmlPath, uri, versionMajor, versionMinor, qmlName) >= 0) { qCDebug(lcRegistration) << " registering" << qmlName << " as " << dialogQmlPath; return true; @@ -247,25 +217,29 @@ protected: template void registerQmlImplementation(const QDir &qmlDir, const char *qmlName, const char *uri , int versionMajor, int versionMinor) { -#ifdef Q_OS_ANDROID - const QString prefix = QLatin1String("qrc:/android_rcc_bundle/qml/"); -#else - const QString prefix = QLatin1String("qrc:/"); -#endif + Q_UNUSED(qmlDir) qCDebug(lcRegistration) << "Register QML version for" << qmlName << "with uri:" << uri; QByteArray abstractTypeName = QByteArray("Abstract") + qmlName; qmlRegisterType(uri, versionMajor, versionMinor, abstractTypeName); - QUrl dialogQmlPath = m_useResources ? - QUrl(prefix + QString("QtQuick/Dialogs/Default%1.qml").arg(qmlName)) : + QUrl dialogQmlPath = fileLocation(QString("Default%1").arg(qmlName)); + qCDebug(lcRegistration) << " registering" << qmlName << " as " << dialogQmlPath; + qmlRegisterType(dialogQmlPath, uri, versionMajor, versionMinor, qmlName); + } + + QUrl fileLocation(const QString &moduleName) const + { + return m_useResources ? +#ifdef Q_OS_ANDROID + QUrl(QString("qrc:/android_rcc_bundle/qml/QtQuick/Dialogs/%1.qml").arg(moduleName)) : +#else + QUrl(QString("qrc:/QtQuick/Dialogs/%1.qml").arg(moduleName)) : +#endif #ifndef QT_STATIC - QUrl::fromLocalFile(qmlDir.filePath(QString("Default%1.qml").arg(qmlName))); + QUrl::fromLocalFile(QDir(baseUrl().toLocalFile()).filePath(moduleName + ".qml")); #else - QUrl(QString("qrc:/qt-project.org/imports/QtQuick/Dialogs/Default%1.qml").arg(qmlName)); - Q_UNUSED(qmlDir); + QUrl(QString("qrc:/qt-project.org/imports/QtQuick/Dialogs/%1.qml").arg(moduleName)); #endif - qCDebug(lcRegistration) << " registering" << qmlName << " as " << dialogQmlPath; - qmlRegisterType(dialogQmlPath, uri, versionMajor, versionMinor, qmlName); } bool m_useResources; -- cgit v1.2.1 From d286adc5c7c27fdbbb7887f3a77212a49726cede Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 25 Feb 2020 11:43:36 +0200 Subject: Update plugins.qmltypes for 5.15 Task-number: QTBUG-82253 Change-Id: Ia4f49f7923d266e669d257d14319f3537105a1ac Reviewed-by: Kai Koehne --- src/controls/plugins.qmltypes | 110 +++++++++++++++++++++--------------------- src/dialogs/plugins.qmltypes | 5 -- src/extras/plugins.qmltypes | 13 ++--- 3 files changed, 59 insertions(+), 69 deletions(-) diff --git a/src/controls/plugins.qmltypes b/src/controls/plugins.qmltypes index 8515aafd..0242497c 100644 --- a/src/controls/plugins.qmltypes +++ b/src/controls/plugins.qmltypes @@ -984,7 +984,7 @@ Module { isComposite: true Property { name: "control" - type: "ApplicationWindow_QMLTYPE_12" + type: "ApplicationWindow_QMLTYPE_14" isReadonly: true isPointer: true } @@ -1012,7 +1012,7 @@ Module { exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "BusyIndicator_QMLTYPE_19"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "BusyIndicator_QMLTYPE_21"; isReadonly: true; isPointer: true } Property { name: "indicator"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } } @@ -1024,7 +1024,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_51"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_55"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -1057,7 +1057,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Button_QMLTYPE_53"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Button_QMLTYPE_60"; isReadonly: true; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } @@ -1191,7 +1191,7 @@ Module { exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Calendar_QMLTYPE_57"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Calendar_QMLTYPE_65"; isReadonly: true; isPointer: true } Property { name: "gridColor"; type: "QColor" } Property { name: "gridVisible"; type: "bool" } Property { name: "__gridLineWidth"; type: "double" } @@ -1248,7 +1248,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "CheckBox_QMLTYPE_77"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "CheckBox_QMLTYPE_88"; isReadonly: true; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "spacing"; type: "int" } @@ -1264,11 +1264,11 @@ Module { defaultProperty: "data" Property { name: "__buttonHelper" - type: "CircularButtonStyleHelper_QMLTYPE_82" + type: "CircularButtonStyleHelper_QMLTYPE_93" isReadonly: true isPointer: true } - Property { name: "control"; type: "Button_QMLTYPE_53"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Button_QMLTYPE_60"; isReadonly: true; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } @@ -1280,7 +1280,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "CircularGauge_QMLTYPE_94"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "CircularGauge_QMLTYPE_97"; isReadonly: true; isPointer: true } Property { name: "outerRadius"; type: "double"; isReadonly: true } Property { name: "minimumValueAngle"; type: "double" } Property { name: "maximumValueAngle"; type: "double" } @@ -1383,7 +1383,7 @@ Module { Property { name: "textColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } Property { name: "selectedTextColor"; type: "QColor" } - Property { name: "control"; type: "ComboBox_QMLTYPE_106"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "ComboBox_QMLTYPE_120"; isReadonly: true; isPointer: true } Property { name: "dropDownButtonWidth"; type: "int" } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "__editor"; type: "QQmlComponent"; isPointer: true } @@ -1425,13 +1425,13 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "DelayButton_QMLTYPE_138"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "DelayButton_QMLTYPE_159"; isReadonly: true; isPointer: true } Property { name: "progressBarGradient"; type: "QQuickGradient"; isPointer: true } Property { name: "progressBarDropShadowColor"; type: "QColor" } Property { name: "foreground"; type: "QQmlComponent"; isPointer: true } Property { name: "__buttonHelper" - type: "CircularButtonStyleHelper_QMLTYPE_82" + type: "CircularButtonStyleHelper_QMLTYPE_93" isReadonly: true isPointer: true } @@ -1446,7 +1446,7 @@ Module { exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Dial_QMLTYPE_147"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Dial_QMLTYPE_165"; isReadonly: true; isPointer: true } Property { name: "outerRadius"; type: "double"; isReadonly: true } Property { name: "handleInset"; type: "double" } Property { name: "tickmarkStepSize"; type: "double" } @@ -1479,7 +1479,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Gauge_QMLTYPE_155"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Gauge_QMLTYPE_173"; isReadonly: true; isPointer: true } Property { name: "valuePosition"; type: "double"; isReadonly: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "tickmark"; type: "QQmlComponent"; isPointer: true } @@ -1503,7 +1503,7 @@ Module { Property { name: "checked"; type: "bool" } Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "__checkbox"; type: "CheckBox_QMLTYPE_77"; isReadonly: true; isPointer: true } + Property { name: "__checkbox"; type: "CheckBox_QMLTYPE_88"; isReadonly: true; isPointer: true } Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } } Component { @@ -1633,7 +1633,7 @@ Module { Property { name: "menuItemPanel"; type: "QQmlComponent"; isPointer: true } Property { name: "itemDelegate" - type: "MenuItemSubControls_QMLTYPE_124" + type: "MenuItemSubControls_QMLTYPE_125" isReadonly: true isPointer: true } @@ -1652,7 +1652,7 @@ Module { exportMetaObjectRevisions: [3] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "PieMenu_QMLTYPE_174"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "PieMenu_QMLTYPE_192"; isReadonly: true; isPointer: true } Property { name: "backgroundColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } Property { name: "shadowColor"; type: "QColor" } @@ -1719,7 +1719,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "ProgressBar_QMLTYPE_187"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "ProgressBar_QMLTYPE_207"; isReadonly: true; isPointer: true } Property { name: "currentProgress"; type: "double"; isReadonly: true } Property { name: "progress"; type: "QQmlComponent"; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } @@ -1754,7 +1754,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "RadioButton_QMLTYPE_194"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "RadioButton_QMLTYPE_214"; isReadonly: true; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "spacing"; type: "int" } @@ -1781,7 +1781,7 @@ Module { Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_31" + type: "ScrollViewHelper_QMLTYPE_32" isReadonly: true isPointer: true } @@ -1789,13 +1789,13 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } @@ -1807,7 +1807,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "ScrollView_QMLTYPE_35"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "ScrollView_QMLTYPE_37"; isReadonly: true; isPointer: true } Property { name: "corner"; type: "QQmlComponent"; isPointer: true } Property { name: "scrollToClickedPosition"; type: "bool" } Property { name: "transientScrollBars"; type: "bool" } @@ -1888,7 +1888,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Slider_QMLTYPE_198"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Slider_QMLTYPE_218"; isReadonly: true; isPointer: true } Property { name: "handle"; type: "QQmlComponent"; isPointer: true } Property { name: "groove"; type: "QQmlComponent"; isPointer: true } Property { name: "tickmarks"; type: "QQmlComponent"; isPointer: true } @@ -1934,7 +1934,7 @@ Module { exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "SpinBox_QMLTYPE_218"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "SpinBox_QMLTYPE_238"; isReadonly: true; isPointer: true } Property { name: "horizontalAlignment"; type: "int" } Property { name: "textColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } @@ -1982,7 +1982,7 @@ Module { defaultProperty: "data" Property { name: "initialItem"; type: "QVariant" } Property { name: "busy"; type: "bool"; isReadonly: true } - Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_232"; isPointer: true } + Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_252"; isPointer: true } Property { name: "__currentItem"; type: "QQuickItem"; isPointer: true } Property { name: "__depth"; type: "int" } Property { name: "__currentTransition"; type: "QVariant" } @@ -2120,7 +2120,7 @@ Module { defaultProperty: "data" Property { name: "control" - type: "StatusIndicator_QMLTYPE_241" + type: "StatusIndicator_QMLTYPE_261" isReadonly: true isPointer: true } @@ -2234,7 +2234,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TabView_QMLTYPE_257"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TabView_QMLTYPE_280"; isReadonly: true; isPointer: true } Property { name: "tabsMovable"; type: "bool" } Property { name: "tabsAlignment"; type: "int" } Property { name: "tabOverlap"; type: "int" } @@ -2257,7 +2257,7 @@ Module { Property { name: "currentRow"; type: "int" } Property { name: "selection" - type: "TableViewSelection_QMLTYPE_285" + type: "TableViewSelection_QMLTYPE_308" isReadonly: true isPointer: true } @@ -2354,7 +2354,7 @@ Module { Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_31" + type: "ScrollViewHelper_QMLTYPE_32" isReadonly: true isPointer: true } @@ -2362,13 +2362,13 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } @@ -2399,7 +2399,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TableView_QMLTYPE_289"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TableView_QMLTYPE_312"; isReadonly: true; isPointer: true } Property { name: "textColor"; type: "QColor" } Property { name: "backgroundColor"; type: "QColor" } Property { name: "alternateBackgroundColor"; type: "QColor" } @@ -2556,7 +2556,7 @@ Module { Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_31" + type: "ScrollViewHelper_QMLTYPE_32" isReadonly: true isPointer: true } @@ -2564,13 +2564,13 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } @@ -2704,7 +2704,7 @@ Module { Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_31" + type: "ScrollViewHelper_QMLTYPE_32" isReadonly: true isPointer: true } @@ -2712,13 +2712,13 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } @@ -2852,7 +2852,7 @@ Module { Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_31" + type: "ScrollViewHelper_QMLTYPE_32" isReadonly: true isPointer: true } @@ -2860,13 +2860,13 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } @@ -2878,7 +2878,7 @@ Module { exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TextArea_QMLTYPE_295"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TextArea_QMLTYPE_318"; isReadonly: true; isPointer: true } Property { name: "font"; type: "QFont" } Property { name: "textColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } @@ -2999,7 +2999,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TextField_QMLTYPE_300"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TextField_QMLTYPE_324"; isReadonly: true; isPointer: true } Property { name: "font"; type: "QFont" } Property { name: "textColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } @@ -3021,7 +3021,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "ToggleButton_QMLTYPE_303"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "ToggleButton_QMLTYPE_327"; isReadonly: true; isPointer: true } Property { name: "inactiveGradient"; type: "QQuickGradient"; isPointer: true } Property { name: "checkedGradient"; type: "QQuickGradient"; isPointer: true } Property { name: "uncheckedGradient"; type: "QQuickGradient"; isPointer: true } @@ -3029,7 +3029,7 @@ Module { Property { name: "uncheckedDropShadowColor"; type: "QColor" } Property { name: "__buttonHelper" - type: "CircularButtonStyleHelper_QMLTYPE_82" + type: "CircularButtonStyleHelper_QMLTYPE_93" isReadonly: true isPointer: true } @@ -3071,7 +3071,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_51"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_55"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -3218,7 +3218,7 @@ Module { Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_31" + type: "ScrollViewHelper_QMLTYPE_32" isReadonly: true isPointer: true } @@ -3226,13 +3226,13 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } @@ -3358,7 +3358,7 @@ Module { Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_31" + type: "ScrollViewHelper_QMLTYPE_32" isReadonly: true isPointer: true } @@ -3366,13 +3366,13 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_27" + type: "ScrollBar_QMLTYPE_28" isReadonly: true isPointer: true } @@ -3384,7 +3384,7 @@ Module { exportMetaObjectRevisions: [4] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TreeView_QMLTYPE_321"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TreeView_QMLTYPE_350"; isReadonly: true; isPointer: true } Property { name: "indentation"; type: "int" } Property { name: "branchDelegate"; type: "QQmlComponent"; isPointer: true } Property { name: "textColor"; type: "QColor" } @@ -3421,7 +3421,7 @@ Module { exportMetaObjectRevisions: [2] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Tumbler_QMLTYPE_324"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Tumbler_QMLTYPE_353"; isReadonly: true; isPointer: true } Property { name: "spacing"; type: "double" } Property { name: "visibleItemCount"; type: "int" } Property { name: "__padding"; type: "double"; isReadonly: true } diff --git a/src/dialogs/plugins.qmltypes b/src/dialogs/plugins.qmltypes index e698dc6c..559bb48a 100644 --- a/src/dialogs/plugins.qmltypes +++ b/src/dialogs/plugins.qmltypes @@ -325,11 +325,6 @@ Module { exportMetaObjectRevisions: [0] Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } } - Component { - name: "QQuickControlsPrivate1Attached" - prototype: "QObject" - Property { name: "window"; type: "QQuickWindow"; isReadonly: true; isPointer: true } - } Component { name: "QQuickDialog1" defaultProperty: "contentItem" diff --git a/src/extras/plugins.qmltypes b/src/extras/plugins.qmltypes index 8bb14246..f16f0b5c 100644 --- a/src/extras/plugins.qmltypes +++ b/src/extras/plugins.qmltypes @@ -75,11 +75,6 @@ Module { } Method { name: "redraw" } } - Component { - name: "QQuickControlsPrivate1Attached" - prototype: "QObject" - Property { name: "window"; type: "QQuickWindow"; isReadonly: true; isPointer: true } - } Component { name: "QQuickFlatProgressBar" defaultProperty: "data" @@ -216,7 +211,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_38"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -352,7 +347,7 @@ Module { Property { name: "progress"; type: "double"; isReadonly: true } Signal { name: "activated" } Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_38"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -499,7 +494,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "PieMenu_QMLTYPE_87"; isPointer: true } + Property { name: "control"; type: "PieMenu_QMLTYPE_98"; isPointer: true } Property { name: "styleData"; type: "QObject"; isPointer: true } Property { name: "iconSource"; type: "string"; isReadonly: true } } @@ -553,7 +548,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_38"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } -- cgit v1.2.1