diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-06-15 18:01:40 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-06-16 12:27:02 +0000 |
| commit | d0024eaf8341d041d7de1a8e8da75fdd2fd92ad4 (patch) | |
| tree | f5f5b01678554636def76db4ce2a798502357f72 /src/lib/corelib/buildgraph/jscommandexecutor.cpp | |
| parent | 0e565ceb0f6142b04411944fbadbaf2b2acd2bb2 (diff) | |
Fix Qt 5.15 deprecation warnings
Change-Id: I1d6968de823c43e42ca53eb68972ba5e69dc29ed
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/jscommandexecutor.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/jscommandexecutor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp index aa72a7b5c..b7270c9a5 100644 --- a/src/lib/corelib/buildgraph/jscommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp @@ -53,6 +53,7 @@ #include <tools/codelocation.h> #include <tools/error.h> #include <tools/qbsassert.h> +#include <tools/qttools.h> #include <QtCore/qeventloop.h> #include <QtCore/qpointer.h> @@ -153,8 +154,8 @@ private: scriptEngine->setGlobalObject(scope.prototype()); transformer->propertiesRequestedInCommands += scriptEngine->propertiesRequestedInScript(); - transformer->propertiesRequestedFromArtifactInCommands - .unite(scriptEngine->propertiesRequestedFromArtifact()); + unite(transformer->propertiesRequestedFromArtifactInCommands, + scriptEngine->propertiesRequestedFromArtifact()); const std::vector<QString> &importFilesUsedInCommand = scriptEngine->importedFilesUsedInScript(); transformer->importedFilesUsedInCommands.insert( |