diff options
Diffstat (limited to 'src/quickcontrolsimpl')
24 files changed, 60 insertions, 111 deletions
diff --git a/src/quickcontrolsimpl/CMakeLists.txt b/src/quickcontrolsimpl/CMakeLists.txt index acbc91b15e..f50e671ce9 100644 --- a/src/quickcontrolsimpl/CMakeLists.txt +++ b/src/quickcontrolsimpl/CMakeLists.txt @@ -30,7 +30,6 @@ qt_internal_add_qml_module(QuickControls2Impl qquickpaddedrectangle.cpp qquickpaddedrectangle_p.h qquickplaceholdertext.cpp qquickplaceholdertext_p.h qquickplatformtheme.cpp qquickplatformtheme_p.h - qtquickcontrols2foreign.cpp qtquickcontrols2foreign_p.h qtquickcontrols2implglobal_p.h DEFINES QT_NO_CAST_FROM_ASCII @@ -45,9 +44,7 @@ qt_internal_add_qml_module(QuickControls2Impl Qt::Core Qt::Gui Qt::Quick - GENERATE_CPP_EXPORTS - GENERATE_PRIVATE_CPP_EXPORTS -) + ) qt_internal_extend_target(QuickControls2Impl CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview SOURCES diff --git a/src/quickcontrolsimpl/qquickanimatednode_p.h b/src/quickcontrolsimpl/qquickanimatednode_p.h index a893e7eecc..8a79512865 100644 --- a/src/quickcontrolsimpl/qquickanimatednode_p.h +++ b/src/quickcontrolsimpl/qquickanimatednode_p.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE class QQuickItem; class QQuickWindow; -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickAnimatedNode : public QObject, public QSGTransformNode +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickAnimatedNode : public QObject, public QSGTransformNode { Q_OBJECT diff --git a/src/quickcontrolsimpl/qquickchecklabel_p.h b/src/quickcontrolsimpl/qquickchecklabel_p.h index 2419433c68..a9e26e4ddd 100644 --- a/src/quickcontrolsimpl/qquickchecklabel_p.h +++ b/src/quickcontrolsimpl/qquickchecklabel_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickCheckLabel : public QQuickText +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickCheckLabel : public QQuickText { Q_OBJECT QML_NAMED_ELEMENT(CheckLabel) @@ -40,6 +40,4 @@ struct QQuickTextForeign QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickCheckLabel) - #endif // QQUICKCHECKLABEL_P_H diff --git a/src/quickcontrolsimpl/qquickclippedtext_p.h b/src/quickcontrolsimpl/qquickclippedtext_p.h index 4ae1c05f3f..53d1eb8aac 100644 --- a/src/quickcontrolsimpl/qquickclippedtext_p.h +++ b/src/quickcontrolsimpl/qquickclippedtext_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickClippedText : public QQuickText +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickClippedText : public QQuickText { Q_OBJECT Q_PROPERTY(qreal clipX READ clipX WRITE setClipX FINAL) @@ -60,6 +60,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickClippedText) - #endif // QQUICKCLIPPEDTEXT_P_H diff --git a/src/quickcontrolsimpl/qquickcolor_p.h b/src/quickcontrolsimpl/qquickcolor_p.h index 994b3e988d..eae1440126 100644 --- a/src/quickcontrolsimpl/qquickcolor_p.h +++ b/src/quickcontrolsimpl/qquickcolor_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickColor : public QObject +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickColor : public QObject { Q_OBJECT QML_NAMED_ELEMENT(Color) diff --git a/src/quickcontrolsimpl/qquickcolorimage.cpp b/src/quickcontrolsimpl/qquickcolorimage.cpp index 5ad6d7d296..dcd87b5e72 100644 --- a/src/quickcontrolsimpl/qquickcolorimage.cpp +++ b/src/quickcontrolsimpl/qquickcolorimage.cpp @@ -57,12 +57,12 @@ void QQuickColorImage::pixmapChange() QQuickImage::pixmapChange(); if (m_color.alpha() > 0 && m_color != m_defaultColor) { QQuickImageBasePrivate *d = static_cast<QQuickImageBasePrivate *>(QQuickItemPrivate::get(this)); - QImage image = d->pix.image(); + QImage image = d->currentPix->image(); if (!image.isNull()) { QPainter painter(&image); painter.setCompositionMode(QPainter::CompositionMode_SourceIn); painter.fillRect(image.rect(), m_color); - d->pix.setImage(image); + d->currentPix->setImage(image); } } } diff --git a/src/quickcontrolsimpl/qquickcolorimage_p.h b/src/quickcontrolsimpl/qquickcolorimage_p.h index c321438d8c..f2506733d6 100644 --- a/src/quickcontrolsimpl/qquickcolorimage_p.h +++ b/src/quickcontrolsimpl/qquickcolorimage_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickColorImage : public QQuickImage +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickColorImage : public QQuickImage { Q_OBJECT Q_PROPERTY(QColor color READ color WRITE setColor RESET resetColor NOTIFY colorChanged FINAL) diff --git a/src/quickcontrolsimpl/qquickiconimage.cpp b/src/quickcontrolsimpl/qquickiconimage.cpp index f5a14f3110..c2af3e0539 100644 --- a/src/quickcontrolsimpl/qquickiconimage.cpp +++ b/src/quickcontrolsimpl/qquickiconimage.cpp @@ -50,11 +50,22 @@ void QQuickIconImagePrivate::updateIcon() const QUrl entryUrl = QUrl::fromLocalFile(entry->filename); url = context ? context->resolvedUrl(entryUrl) : entryUrl; isThemeIcon = true; + } else if (source.isEmpty()) { + std::unique_ptr<QIconEngine> iconEngine(QIconLoader::instance()->iconEngine(icon.iconName)); + if (iconEngine && !iconEngine->isNull()) { + // ### TODO that's the best we can do for now to select different pixmaps based on the + // QuickItem's state. QQuickIconImage cannot know about the state of the control that + // uses it without adding more properties that are then synced up with the control. + const QIcon::Mode mode = q->isEnabled() ? QIcon::Normal : QIcon::Disabled; + const QImage image = iconEngine->scaledPixmap(size, mode, QIcon::Off, dpr).toImage(); + setImage(image); + } } else { url = source; isThemeIcon = false; } - q->load(); + if (!url.isEmpty()) + q->load(); updatingIcon = false; } @@ -71,7 +82,7 @@ void QQuickIconImagePrivate::updateFillMode() updatingFillMode = true; - const QSize pixmapSize = QSize(pix.width(), pix.height()) / calculateDevicePixelRatio(); + const QSize pixmapSize = QSize(currentPix->width(), currentPix->height()) / calculateDevicePixelRatio(); if (pixmapSize.width() > q->width() || pixmapSize.height() > q->height()) q->setFillMode(QQuickImage::PreserveAspectFit); else @@ -106,6 +117,8 @@ void QQuickIconImage::setName(const QString &name) d->icon.entries.clear(); d->icon = QIconLoader::instance()->loadIcon(name); + if (d->icon.iconName.isEmpty()) + d->icon.iconName = name; if (isComponentComplete()) d->updateIcon(); emit nameChanged(); @@ -173,12 +186,12 @@ void QQuickIconImage::pixmapChange() // Don't apply the color if we're recursing (updateFillMode() can cause us to recurse). if (!d->updatingFillMode && d->color.alpha() > 0) { - QImage image = d->pix.image(); + QImage image = d->currentPix->image(); if (!image.isNull()) { QPainter painter(&image); painter.setCompositionMode(QPainter::CompositionMode_SourceIn); painter.fillRect(image.rect(), d->color); - d->pix.setImage(image); + d->currentPix->setImage(image); } } } diff --git a/src/quickcontrolsimpl/qquickiconimage_p.h b/src/quickcontrolsimpl/qquickiconimage_p.h index d46bbab9f4..18a3c4d831 100644 --- a/src/quickcontrolsimpl/qquickiconimage_p.h +++ b/src/quickcontrolsimpl/qquickiconimage_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE class QQuickIconImagePrivate; -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickIconImage : public QQuickImage +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickIconImage : public QQuickImage { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged FINAL) @@ -58,6 +58,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickIconImage) - #endif // QQUICKICONIMAGE_P_H diff --git a/src/quickcontrolsimpl/qquickiconimage_p_p.h b/src/quickcontrolsimpl/qquickiconimage_p_p.h index 6b468fa15e..905760ed7b 100644 --- a/src/quickcontrolsimpl/qquickiconimage_p_p.h +++ b/src/quickcontrolsimpl/qquickiconimage_p_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickIconImagePrivate : public QQuickImagePrivate +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickIconImagePrivate : public QQuickImagePrivate { public: Q_DECLARE_PUBLIC(QQuickIconImage) diff --git a/src/quickcontrolsimpl/qquickiconlabel_p.h b/src/quickcontrolsimpl/qquickiconlabel_p.h index ac3e452c74..2fd129f4ad 100644 --- a/src/quickcontrolsimpl/qquickiconlabel_p.h +++ b/src/quickcontrolsimpl/qquickiconlabel_p.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE class QQuickIconLabelPrivate; -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickIconLabel : public QQuickItem +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickIconLabel : public QQuickItem { Q_OBJECT Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon FINAL) @@ -104,6 +104,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickIconLabel) - #endif // QQUICKICONLABEL_P_H diff --git a/src/quickcontrolsimpl/qquickimageselector_p.h b/src/quickcontrolsimpl/qquickimageselector_p.h index 02eab385fb..c5ddf7de50 100644 --- a/src/quickcontrolsimpl/qquickimageselector_p.h +++ b/src/quickcontrolsimpl/qquickimageselector_p.h @@ -118,7 +118,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickImageSelector) -QML_DECLARE_TYPE(QQuickAnimatedImageSelector) - #endif // QQUICKIMAGESELECTOR_P_H diff --git a/src/quickcontrolsimpl/qquickitemgroup_p.h b/src/quickcontrolsimpl/qquickitemgroup_p.h index a1ce320d1c..644c535a43 100644 --- a/src/quickcontrolsimpl/qquickitemgroup_p.h +++ b/src/quickcontrolsimpl/qquickitemgroup_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickItemGroup : public QQuickImplicitSizeItem, protected QQuickItemChangeListener +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickItemGroup : public QQuickImplicitSizeItem, protected QQuickItemChangeListener { Q_OBJECT QML_NAMED_ELEMENT(ItemGroup) @@ -47,6 +47,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickItemGroup) - #endif // QQUICKITEMGROUP_P_H diff --git a/src/quickcontrolsimpl/qquickmnemoniclabel_p.h b/src/quickcontrolsimpl/qquickmnemoniclabel_p.h index 825df61e9c..537103bcd4 100644 --- a/src/quickcontrolsimpl/qquickmnemoniclabel_p.h +++ b/src/quickcontrolsimpl/qquickmnemoniclabel_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickMnemonicLabel : public QQuickText +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickMnemonicLabel : public QQuickText { Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText FINAL) @@ -46,6 +46,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMnemonicLabel) - #endif // QQUICKMNEMONICLABEL_P_H diff --git a/src/quickcontrolsimpl/qquickninepatchimage.cpp b/src/quickcontrolsimpl/qquickninepatchimage.cpp index 3f8a9e03e9..4d34123014 100644 --- a/src/quickcontrolsimpl/qquickninepatchimage.cpp +++ b/src/quickcontrolsimpl/qquickninepatchimage.cpp @@ -399,13 +399,13 @@ void QQuickNinePatchImage::pixmapChange() if (!d->resetNode) d->resetNode = d->ninePatch.isNull(); - d->ninePatch = d->pix.image(); + d->ninePatch = d->currentPix->image(); if (d->ninePatch.depth() != 32) - d->ninePatch = d->ninePatch.convertToFormat(QImage::Format_ARGB32); + d->ninePatch = std::move(d->ninePatch).convertToFormat(QImage::Format_ARGB32); int w = d->ninePatch.width(); int h = d->ninePatch.height(); - d->pix.setImage(QImage(d->ninePatch.constBits() + 4 * (w + 1), w - 2, h - 2, d->ninePatch.bytesPerLine(), d->ninePatch.format())); + d->currentPix->setImage(QImage(d->ninePatch.constBits() + 4 * (w + 1), w - 2, h - 2, d->ninePatch.bytesPerLine(), d->ninePatch.format())); d->updatePatches(); } else { @@ -443,8 +443,11 @@ QSGNode *QQuickNinePatchImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNode d->resetNode = false; } + if (d->ninePatch.isNull()) + return QQuickImage::updatePaintNode(oldNode, data); + QSizeF sz = size(); - QImage image = d->pix.image(); + QImage image = d->currentPix->image(); if (!sz.isValid() || image.isNull()) { if (d->provider) d->provider->updateTexture(nullptr); @@ -452,9 +455,6 @@ QSGNode *QQuickNinePatchImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNode return nullptr; } - if (d->ninePatch.isNull()) - return QQuickImage::updatePaintNode(oldNode, data); - QQuickNinePatchNode *patchNode = static_cast<QQuickNinePatchNode *>(oldNode); if (!patchNode) patchNode = new QQuickNinePatchNode; diff --git a/src/quickcontrolsimpl/qquickninepatchimage_p.h b/src/quickcontrolsimpl/qquickninepatchimage_p.h index 0c5777bcfa..7ca5ae951e 100644 --- a/src/quickcontrolsimpl/qquickninepatchimage_p.h +++ b/src/quickcontrolsimpl/qquickninepatchimage_p.h @@ -70,6 +70,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickNinePatchImage) - #endif // QQUICKNINEPATCHIMAGE_P_H diff --git a/src/quickcontrolsimpl/qquickpaddedrectangle_p.h b/src/quickcontrolsimpl/qquickpaddedrectangle_p.h index c7cec6fe52..fff3964a85 100644 --- a/src/quickcontrolsimpl/qquickpaddedrectangle_p.h +++ b/src/quickcontrolsimpl/qquickpaddedrectangle_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickPaddedRectangle : public QQuickRectangle +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickPaddedRectangle : public QQuickRectangle { Q_OBJECT Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL) @@ -83,6 +83,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPaddedRectangle) - #endif // QQUICKPADDEDRECTANGLE_P_H diff --git a/src/quickcontrolsimpl/qquickplaceholdertext.cpp b/src/quickcontrolsimpl/qquickplaceholdertext.cpp index 5f47a4087d..4a1fb0db00 100644 --- a/src/quickcontrolsimpl/qquickplaceholdertext.cpp +++ b/src/quickcontrolsimpl/qquickplaceholdertext.cpp @@ -16,10 +16,25 @@ QQuickPlaceholderText::QQuickPlaceholderText(QQuickItem *parent) : QQuickText(pa void QQuickPlaceholderText::componentComplete() { QQuickText::componentComplete(); - connect(parentItem(), SIGNAL(effectiveHorizontalAlignmentChanged()), this, SLOT(updateAlignment())); + + auto control = textControl(); + if (control) + connect(control, SIGNAL(effectiveHorizontalAlignmentChanged()), this, SLOT(updateAlignment())); updateAlignment(); } +/*! + \internal + + The control that we're representing. This exists because + parentItem() is not always the control - it may be a Flickable + in the case of TextArea. +*/ +QQuickItem *QQuickPlaceholderText::textControl() const +{ + return qobject_cast<QQuickItem *>(parent()); +} + void QQuickPlaceholderText::updateAlignment() { if (QQuickTextInput *input = qobject_cast<QQuickTextInput *>(parentItem())) { diff --git a/src/quickcontrolsimpl/qquickplaceholdertext_p.h b/src/quickcontrolsimpl/qquickplaceholdertext_p.h index 81434cc65c..53bd01756c 100644 --- a/src/quickcontrolsimpl/qquickplaceholdertext_p.h +++ b/src/quickcontrolsimpl/qquickplaceholdertext_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickPlaceholderText : public QQuickText +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickPlaceholderText : public QQuickText { Q_OBJECT QML_NAMED_ELEMENT(PlaceholderText) @@ -32,12 +32,12 @@ public: protected: void componentComplete() override; + QQuickItem *textControl() const; + private Q_SLOTS: void updateAlignment(); }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPlaceholderText) - #endif // QQUICKPLACEHOLDERTEXT_P_H diff --git a/src/quickcontrolsimpl/qquickplatformtheme_p.h b/src/quickcontrolsimpl/qquickplatformtheme_p.h index 85cd81f50c..c5284f58bf 100644 --- a/src/quickcontrolsimpl/qquickplatformtheme_p.h +++ b/src/quickcontrolsimpl/qquickplatformtheme_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickPlatformTheme : public QObject +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickPlatformTheme : public QObject { Q_OBJECT // This exposes the enums in QPlatformTheme to QML. We can't use QML_EXTENDED diff --git a/src/quickcontrolsimpl/qquicktumblerview_p.h b/src/quickcontrolsimpl/qquicktumblerview_p.h index f9e01f2821..123511d121 100644 --- a/src/quickcontrolsimpl/qquicktumblerview_p.h +++ b/src/quickcontrolsimpl/qquicktumblerview_p.h @@ -26,7 +26,7 @@ class QQuickPathView; class QQuickTumbler; -class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickTumblerView : public QQuickItem +class Q_QUICKCONTROLS2IMPL_EXPORT QQuickTumblerView : public QQuickItem { Q_OBJECT Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged) diff --git a/src/quickcontrolsimpl/qtquickcontrols2foreign.cpp b/src/quickcontrolsimpl/qtquickcontrols2foreign.cpp deleted file mode 100644 index e55cd304c3..0000000000 --- a/src/quickcontrolsimpl/qtquickcontrols2foreign.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#include "qtquickcontrols2foreign_p.h" - -QT_BEGIN_NAMESPACE - -QT_END_NAMESPACE - -#include "moc_qtquickcontrols2foreign_p.cpp" diff --git a/src/quickcontrolsimpl/qtquickcontrols2foreign_p.h b/src/quickcontrolsimpl/qtquickcontrols2foreign_p.h deleted file mode 100644 index b447478cd8..0000000000 --- a/src/quickcontrolsimpl/qtquickcontrols2foreign_p.h +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (C) 2020 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef QTQUICKCONTROLS2FOREIGN_P_H -#define QTQUICKCONTROLS2FOREIGN_P_H - -#include <QtQml/qqml.h> -#include <QtQuickTemplates2/private/qquickoverlay_p.h> -#include <QtQuickTemplates2/private/qquicksplitview_p.h> - -QT_BEGIN_NAMESPACE - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -// These are necessary in order to use C++ types in a file where only QtQuick.Controls has been imported. -// Control types like Button don't need this done for them, as each style module provides a Button type, -// and QtQuick.Controls is a sort of alias for the active style import. - -struct QQuickOverlayAttachedForeign -{ - Q_GADGET - QML_NAMED_ELEMENT(Overlay) - QML_FOREIGN(QQuickOverlay) - QML_UNCREATABLE("") - QML_ADDED_IN_VERSION(2, 3) -}; - -struct QQuickSplitHandleAttachedForeign -{ - Q_GADGET - QML_NAMED_ELEMENT(SplitHandle) - QML_FOREIGN(QQuickSplitHandleAttached) - QML_UNCREATABLE("") - QML_ADDED_IN_VERSION(2, 13) -}; - -QT_END_NAMESPACE - -#endif // QTQUICKCONTROLS2FOREIGN_P_H diff --git a/src/quickcontrolsimpl/qtquickcontrols2implglobal_p.h b/src/quickcontrolsimpl/qtquickcontrols2implglobal_p.h index 45214c88ec..c11bdf4ea2 100644 --- a/src/quickcontrolsimpl/qtquickcontrols2implglobal_p.h +++ b/src/quickcontrolsimpl/qtquickcontrols2implglobal_p.h @@ -16,6 +16,6 @@ // #include <QtCore/qglobal.h> -#include <QtQuickControls2Impl/private/qtquickcontrols2implexports_p.h> +#include <QtQuickControls2Impl/qtquickcontrols2implexports.h> #endif // QTQUICKCONTROLS2IMPLGLOBAL_H |