diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-04-16 13:07:28 +0200 |
---|---|---|
committer | Ivan Komissarov <abbapoh@gmail.com> | 2020-04-16 13:07:28 +0200 |
commit | 04240d47225f06eb36df4eec2270813a78a44344 (patch) | |
tree | 06dc4ad265583413912a23ccfaaf1fdee04ed2ac /src/app/qbs-setup-toolchains/clangclprobe.h | |
parent | ebda20ac2677085d79f5a6fab31a282cbcd958d5 (diff) | |
parent | 99d009c0ae5558d86159206e7a27d4ed7e8ade28 (diff) |
Merge branch 'master' into wip/ci-ios
Change-Id: Ifef75a0227267a161b821f40f0fde149823120ab
Diffstat (limited to 'src/app/qbs-setup-toolchains/clangclprobe.h')
-rw-r--r-- | src/app/qbs-setup-toolchains/clangclprobe.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/app/qbs-setup-toolchains/clangclprobe.h b/src/app/qbs-setup-toolchains/clangclprobe.h index 1afbbb1b8..2de1c0a64 100644 --- a/src/app/qbs-setup-toolchains/clangclprobe.h +++ b/src/app/qbs-setup-toolchains/clangclprobe.h @@ -40,7 +40,9 @@ #ifndef QBS_SETUPTOOLCHAINS_CLANGCLPROBE_H #define QBS_SETUPTOOLCHAINS_CLANGCLPROBE_H -#include <QtCore/qlist.h> +#include <QString> + +#include <vector> QT_BEGIN_NAMESPACE class QFileInfo; @@ -54,6 +56,6 @@ class Settings; void createClangClProfile(const QFileInfo &compiler, qbs::Settings *settings, const QString &profileName); -void clangClProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles); +void clangClProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles); #endif // Header guard |