diff options
author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-06-02 16:40:24 +0300 |
---|---|---|
committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-06-02 16:40:24 +0300 |
commit | 3fdbd475202703530ca4b8f7f2a0e731d5f87f8b (patch) | |
tree | 516a9c48a004fc471fe8bc5dedd4efa72550cab9 /src/libs/installer/scriptengine.cpp | |
parent | 35f79da9cb99c7c0456f002829dc0fdfe55b4f8d (diff) | |
parent | 45e77c3a1eb790d89f2ded5b7fbe556ed4b5271c (diff) |
Merge remote-tracking branch 'origin/4.1'
Change-Id: I86049138466399411ba36791330f4a94faad8c52
Diffstat (limited to 'src/libs/installer/scriptengine.cpp')
-rw-r--r-- | src/libs/installer/scriptengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp index 5dd56939c..c8fc65d34 100644 --- a/src/libs/installer/scriptengine.cpp +++ b/src/libs/installer/scriptengine.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -75,10 +75,10 @@ namespace QInstaller { \internal */ -QJSValue InstallerProxy::components() const +QJSValue InstallerProxy::components(const QString ®exp) const { if (m_core) { - const QList<Component*> all = m_core->components(PackageManagerCore::ComponentType::All); + const QList<Component*> all = m_core->components(PackageManagerCore::ComponentType::All, regexp); QJSValue scriptComponentsObject = m_engine->newArray(all.count()); for (int i = 0; i < all.count(); ++i) { Component *const component = all.at(i); |