diff options
| author | hjk <hjk@qt.io> | 2019-06-21 08:40:47 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-07-02 12:48:54 +0000 |
| commit | 36fcd5213667d04008c39c38f9d8787dc6b839fd (patch) | |
| tree | aa9c23a7b50221cbda6c3f1aad34fe0ed013e84f /src/libs/qmljs | |
| parent | a6d5da5af2d62e6f4d32ee4fb84e969b8bad0cd9 (diff) | |
| download | qt-creator-36fcd5213667d04008c39c38f9d8787dc6b839fd.tar.gz | |
Utils: Add toSet/toList functions
As replacement for functionality that's being deprecated
in Qt but still useful or needed, or that cannot easily be handled
without resorting to #if QT_VERSION checks in user code.
Change-Id: Id3575a54ff944bf0e89d452d13944fcaee270208
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/libs/qmljs')
| -rw-r--r-- | src/libs/qmljs/qmljsplugindumper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index aeef89372f..2c6afb61c0 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -29,8 +29,8 @@ #include <qmljs/qmljsinterpreter.h> #include <qmljs/qmljsviewercontext.h> -//#include <projectexplorer/session.h> -//#include <coreplugin/messagemanager.h> + +#include <utils/algorithm.h> #include <utils/filesystemwatcher.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> @@ -437,7 +437,7 @@ void PluginDumper::loadDependencies(const QStringList &dependencies, } QStringList newDependencies; loadQmlTypeDescription(dependenciesPaths, errors, warnings, objects, 0, &newDependencies); - newDependencies = (newDependencies.toSet() - *visitedPtr).toList(); + newDependencies = Utils::toList(Utils::toSet(newDependencies) - *visitedPtr); if (!newDependencies.isEmpty()) loadDependencies(newDependencies, errors, warnings, objects, visitedPtr.take()); } |