NOISSUE Various changes from multiauth that are unrelated to it

This commit is contained in:
Jan Dalheimer 2015-05-28 19:38:29 +02:00 committed by Petr Mrázek
parent 161dc66c2c
commit 3a8b238052
65 changed files with 2661 additions and 333 deletions

View file

@ -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)