diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-28 12:50:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-28 12:50:03 +0200 |
| commit | 10098b2508abe6e8df59b7e27ea64e9483f1f8be (patch) | |
| tree | b73815f1e8ca7aa12c347706b410050e3eb22caa /src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | |
| parent | 5dbfd46bcfe177b8308c70a66f7d404429249f6b (diff) | |
| parent | a111f251261159b50e92d6866f2058c66b43e390 (diff) | |
| download | qt-creator-10098b2508abe6e8df59b7e27ea64e9483f1f8be.tar.gz | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
CMakeLists.txt
tests/unit/unittest/unittest.pro
Change-Id: I64296ad31502d9b35012da129a28e9277e9fcf8e
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakekitinformation.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index 623b20a1a4..95b7c8eb5b 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -164,7 +164,7 @@ KitAspect::ItemList QmakeKitAspect::toUserOutput(const Kit *k) const void QmakeKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const { - expander->registerVariable("Qmake:mkspec", tr("Mkspec configured for qmake by the Kit."), + expander->registerVariable("Qmake:mkspec", tr("Mkspec configured for qmake by the kit."), [kit]() -> QString { return QDir::toNativeSeparators(mkspec(kit)); }); |