diff options
Diffstat (limited to 'src/imports/layouts')
-rw-r--r-- | src/imports/layouts/plugins.qmltypes | 4 | ||||
-rw-r--r-- | src/imports/layouts/qquickstacklayout.cpp | 4 | ||||
-rw-r--r-- | src/imports/layouts/qquickstacklayout_p.h | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/imports/layouts/plugins.qmltypes b/src/imports/layouts/plugins.qmltypes index f8d7b9acfe..22e8d79ece 100644 --- a/src/imports/layouts/plugins.qmltypes +++ b/src/imports/layouts/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Layouts 1.12' +// 'qmlplugindump -nonrelocatable QtQuick.Layouts 1.13' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] Component { name: "QQuickColumnLayout" defaultProperty: "data" diff --git a/src/imports/layouts/qquickstacklayout.cpp b/src/imports/layouts/qquickstacklayout.cpp index 0b51d79bef..116e162aa9 100644 --- a/src/imports/layouts/qquickstacklayout.cpp +++ b/src/imports/layouts/qquickstacklayout.cpp @@ -97,6 +97,8 @@ \sa StackView */ +QT_BEGIN_NAMESPACE + QQuickStackLayout::QQuickStackLayout(QQuickItem *parent) : QQuickLayout(*new QQuickStackLayoutPrivate, parent) { @@ -345,4 +347,6 @@ bool QQuickStackLayout::shouldIgnoreItem(QQuickItem *item) const return ignored; } +QT_END_NAMESPACE + #include "moc_qquickstacklayout_p.cpp" diff --git a/src/imports/layouts/qquickstacklayout_p.h b/src/imports/layouts/qquickstacklayout_p.h index 8ba41720aa..46181c6f50 100644 --- a/src/imports/layouts/qquickstacklayout_p.h +++ b/src/imports/layouts/qquickstacklayout_p.h @@ -42,6 +42,8 @@ #include <qquicklayout_p.h> +QT_BEGIN_NAMESPACE + class QQuickStackLayoutPrivate; class QQuickStackLayout : public QQuickLayout @@ -105,4 +107,6 @@ private: bool explicitCurrentIndex; }; +QT_END_NAMESPACE + #endif // QQUICKSTACKLAYOUT_H |