diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-26 15:13:07 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-26 16:51:22 +0200 |
| commit | b8cd87dea027f54957373a10c77a506ec2509b10 (patch) | |
| tree | ab7b00b4be9a46c1a0c89afaab7016444a257633 /tests | |
| parent | 97ac63b4012ab55def11a58ee6bd7b6878dc37e1 (diff) | |
| parent | 5a06305ffe054287f55cba4c5d860ea73fccf684 (diff) | |
Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Conflicts:
src/plugins/clangformat/clangformatplugin.cpp
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
src/plugins/qmldesigner/qmldesigner.qbs
Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/mockup/projectexplorer/project.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/mockup/projectexplorer/project.h b/tests/unit/mockup/projectexplorer/project.h index e193ad404d..9e8e6a5311 100644 --- a/tests/unit/mockup/projectexplorer/project.h +++ b/tests/unit/mockup/projectexplorer/project.h @@ -44,7 +44,7 @@ public: Target *activeTarget() const { return {}; } - QVariant namedSettings(const QString &name) const { return settings.at(name); } + QVariant namedSettings(const QString &name) const { return settings[name]; } void setNamedSettings(const QString &name, const QVariant &value) { settings[name] = value; } Utils::FilePath rootProjectDirectoryPath; |