Merge branch 'Plasma/5.2'
This commit is contained in:
commit
a6583b0f25
1 changed files with 5 additions and 1 deletions
|
@ -36,7 +36,11 @@ Connection *Connection::s_self = nullptr;
|
||||||
|
|
||||||
static Context *s_context = nullptr;
|
static Context *s_context = nullptr;
|
||||||
|
|
||||||
Connection::Connection(QObject *parent) = delete;
|
Connection::Connection(QObject *parent)
|
||||||
|
: Connection(nullptr, parent)
|
||||||
|
{
|
||||||
|
// only here to fix build, using will crash, BUG 343529
|
||||||
|
}
|
||||||
|
|
||||||
Connection *Connection::create(QObject *parent)
|
Connection *Connection::create(QObject *parent)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue