← Back to branch summary

~alan-griffiths/qtmir/MirServer-is-an-implementation-detail

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/nativeinterface.cpp

  • Committer: Alan Griffiths
  • Date: 2016-05-06 09:19:51 UTC
  • mfrom: (484.1.11 qtmir0)
  • Revision ID: alan@octopull.co.uk-20160506091951-7uhw9quu2kd2jyso
merge lp:~alan-griffiths/qtmir/MirServer-is-not-a-context-object

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platforms/mirserver/nativeinterface.cpp
15
15
 */
16
16
 
17
17
#include "nativeinterface.h"
18
 
 
19
18
#include "mirserver.h"
 
19
 
 
20
#include "qmirserver.h"
20
21
#include "screen.h"
21
22
 
22
23
NativeInterface::NativeInterface(QMirServer *server)
90
91
        return returnVal;
91
92
    }
92
93
}
 
94
 
 
95
QWeakPointer<MirServer> NativeInterface::mirServer()
 
96
{
 
97
    return m_qMirServer->mirServer();
 
98
}