diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2015-05-28 19:38:29 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-06-06 21:23:05 +0200 |
| commit | 3a8b238052163952831fb5924b2483a375e86ebd (patch) | |
| tree | ab120b4fac3a5345a20e7a09e1e7477e67d9ed6f /logic/QObjectPtr.h | |
| parent | 161dc66c2c8d5f973ee69dab36c3969a7efd7495 (diff) | |
| download | MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.tar MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.tar.gz MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.tar.lz MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.tar.xz MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.zip | |
NOISSUE Various changes from multiauth that are unrelated to it
Diffstat (limited to 'logic/QObjectPtr.h')
| -rw-r--r-- | logic/QObjectPtr.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/logic/QObjectPtr.h b/logic/QObjectPtr.h index 2bde1bd8..32e59bd9 100644 --- a/logic/QObjectPtr.h +++ b/logic/QObjectPtr.h @@ -19,6 +19,11 @@ public: { m_ptr = other.m_ptr; } + template<typename Derived> + QObjectPtr(const QObjectPtr<Derived> &other) + { + m_ptr = other.unwrap(); + } public: void reset(T * wrap) |