diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-02-12 12:49:22 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-02-13 08:46:35 +0000 |
| commit | 3874b6b6ece1904a6e2a5e2c920a59a399a64454 (patch) | |
| tree | d1c4fd551d80fd2ffd6fd2c55989f3a7620c9922 /src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | |
| parent | d5c449575e47d846a3d7bc62719267a33779c49e (diff) | |
| download | qt-creator-3874b6b6ece1904a6e2a5e2c920a59a399a64454.tar.gz | |
KitInformation: Improve robustness to nullptr passed as kit
All the KitInformation methods need to gracefully handle a kit that is
a nullptr. Ensure this is indeed the case.
This might fix the actual trigger for QTCREATORBUG-19469.
Change-Id: Id78ac8a26c1be908f41a425ff1935b86888e4b8b
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakekitinformation.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index 57550e2e52..4946c2e8ed 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -34,6 +34,7 @@ #include <qtsupport/qtkitinformation.h> #include <utils/algorithm.h> +#include <utils/qtcassert.h> using namespace ProjectExplorer; using namespace Utils; @@ -143,6 +144,7 @@ FileName QmakeKitInformation::effectiveMkspec(const Kit *k) void QmakeKitInformation::setMkspec(Kit *k, const FileName &fn) { + QTC_ASSERT(k, return); k->setValue(QmakeKitInformation::id(), fn == defaultMkspec(k) ? QString() : fn.toString()); } |