feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0' into 4.1

Browse Source 
Change-Id: Ice4824c6148c8b960f9a61c6685387727627b38d
This commit is contained in:
Eike Ziller
2016-06-30 09:33:13 +02:00
parent 1ccec9882d ccc46bbe46
commit a99d529a93
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -195,7 +195,7 @@ public:
void operator=(Runnable other) { d = std::move(other.d); } void operator=(Runnable other) { d = std::move(other.d); }
template <class T> bool is() const { template <class T> bool is() const {
return d.get()->typeId() == T::staticTypeId; return d.get() && (d.get()->typeId() == T::staticTypeId);
} }
template <class T> const T &as() const { template <class T> const T &as() const {
@@ -235,7 +235,7 @@ public:
void operator=(Connection other) { d = std::move(other.d); } void operator=(Connection other) { d = std::move(other.d); }
template <class T> bool is() const { template <class T> bool is() const {
return d.get()->typeId() == T::staticTypeId; return d.get() && (d.get()->typeId() == T::staticTypeId);
} }
template <class T> const T &as() const { template <class T> const T &as() const {