diff options
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/winextras/qquickiconloader_p.h | 4 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplist_p.h | 3 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplistcategory_p.h | 3 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbar_p.h | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/imports/winextras/qquickiconloader_p.h b/src/imports/winextras/qquickiconloader_p.h index bc23581..22aaae6 100644 --- a/src/imports/winextras/qquickiconloader_p.h +++ b/src/imports/winextras/qquickiconloader_p.h @@ -118,7 +118,7 @@ QQuickIconLoader::LoadResult Object *receiver, void (Object::*function)(const QVariant &)) { const QString scheme = url.scheme(); - if (scheme.startsWith(QLatin1String("http"))) { + if (scheme.startsWith(u"http")) { if (QNetworkReply *reply = QQuickIconLoader::loadFromNetwork(url, engine)) { auto *handler = new QQuickIconLoaderNetworkReplyHandler(reply, type); QObject::connect(handler, &QQuickIconLoaderNetworkReplyHandler::finished, receiver, function); @@ -126,7 +126,7 @@ QQuickIconLoader::LoadResult } return LoadError; } - const QVariant resource = scheme == QLatin1String("image") + const QVariant resource = scheme == u"image" ? QQuickIconLoader::loadFromImageProvider(url, engine, type, requestedSize) : QQuickIconLoader::loadFromFile(url, type); // qrc, file if (resource.isValid()) { diff --git a/src/imports/winextras/qquickjumplist_p.h b/src/imports/winextras/qquickjumplist_p.h index c686294..7b475be 100644 --- a/src/imports/winextras/qquickjumplist_p.h +++ b/src/imports/winextras/qquickjumplist_p.h @@ -55,6 +55,7 @@ #include <QObject> #include <QQmlParserStatus> #include <QQmlListProperty> +#include <QVector> QT_BEGIN_NAMESPACE @@ -102,7 +103,7 @@ private: QQuickJumpListCategory *m_recent = nullptr; QQuickJumpListCategory *m_frequent = nullptr; QQuickJumpListCategory *m_tasks = nullptr; - QList<QQuickJumpListCategory *> m_categories; + QVector<QQuickJumpListCategory *> m_categories; }; QT_END_NAMESPACE diff --git a/src/imports/winextras/qquickjumplistcategory_p.h b/src/imports/winextras/qquickjumplistcategory_p.h index 69663f8..19fb65a 100644 --- a/src/imports/winextras/qquickjumplistcategory_p.h +++ b/src/imports/winextras/qquickjumplistcategory_p.h @@ -55,6 +55,7 @@ #include "qquickjumplistitem_p.h" #include <QObject> +#include <QVector> #include <QQmlListProperty> #include <QWinJumpListCategory> #include <QWinJumpListItem> @@ -97,7 +98,7 @@ private: bool m_visible = true; QString m_title; - QList<QQuickJumpListItem *> m_items; + QVector<QQuickJumpListItem *> m_items; }; QT_END_NAMESPACE diff --git a/src/imports/winextras/qquickthumbnailtoolbar_p.h b/src/imports/winextras/qquickthumbnailtoolbar_p.h index 12a9d27..0ea47af 100644 --- a/src/imports/winextras/qquickthumbnailtoolbar_p.h +++ b/src/imports/winextras/qquickthumbnailtoolbar_p.h @@ -55,6 +55,7 @@ #include <QQuickItem> #include <QWinThumbnailToolBar> #include <QUrl> +#include <QVector> QT_BEGIN_NAMESPACE @@ -117,7 +118,7 @@ private: static QQuickThumbnailToolButton *buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property, int index); QWinThumbnailToolBar m_toolbar; - QList<QQuickThumbnailToolButton *> m_buttons; + QVector<QQuickThumbnailToolButton *> m_buttons; QUrl m_iconicThumbnailSource; QUrl m_iconicLivePreviewSource; }; |