diff options
author | Liang Qi <liang.qi@qt.io> | 2019-07-22 06:50:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-07-22 06:50:42 +0200 |
commit | 261a87f956f345d4064eb2eb64e0cf7c98ec7d92 (patch) | |
tree | 53d10a28cdaf526418f4419c99cb26485c047a0d /qmake/library/proitems.h | |
parent | 0652bdcf5e60461cd9a513d64be00b8830826fad (diff) | |
parent | 5f1cf8e0f5da36063202d46463c2d9e79d841a4d (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
qmake/generators/makefile.cpp
Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d
Diffstat (limited to 'qmake/library/proitems.h')
-rw-r--r-- | qmake/library/proitems.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h index ff7c8b92f7..4569d7c3ff 100644 --- a/qmake/library/proitems.h +++ b/qmake/library/proitems.h @@ -433,11 +433,12 @@ public: ProFunctionDef(const ProFunctionDef &o) : m_pro(o.m_pro), m_offset(o.m_offset) { m_pro->ref(); } ProFunctionDef(ProFunctionDef &&other) noexcept : m_pro(other.m_pro), m_offset(other.m_offset) { other.m_pro = nullptr; } - ~ProFunctionDef() { m_pro->deref(); } + ~ProFunctionDef() { if (m_pro) m_pro->deref(); } ProFunctionDef &operator=(const ProFunctionDef &o) { if (this != &o) { - m_pro->deref(); + if (m_pro) + m_pro->deref(); m_pro = o.m_pro; m_pro->ref(); m_offset = o.m_offset; |