← Back to branch summary

~dandrader/qtubuntu/cursor

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/integration.cpp

  • Committer: CI Train Bot
  • Author(s): Daniel d'Andrada
  • Date: 2015-09-14 13:12:16 UTC
  • mfrom: (274.3.1 provideMirConnection)
  • Revision ID: ci-train-bot@canonical.com-20150914131216-vybw4n8nyvwnid26
Add QPlatformNativeInterface::nativeResourceForIntegration("mirConnection")

Allow Qt applications to access the underlying MirConnection.
Approved by: PS Jenkins bot, Gerry Boland

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntumirclient/integration.cpp
84
84
               "running, and the correct socket is being used and is accessible. The shell may have\n"
85
85
               "rejected the incoming connection, so check its log file");
86
86
 
 
87
    mNativeInterface->setMirConnection(u_application_instance_get_mir_connection(mInstance));
 
88
 
87
89
    // Create default screen.
88
90
    mScreen = new UbuntuScreen(u_application_instance_get_mir_connection(mInstance));
89
91
    screenAdded(mScreen);
246
248
{
247
249
    return mClipboard.data();
248
250
}
 
251
 
 
252
QPlatformNativeInterface* UbuntuClientIntegration::nativeInterface() const
 
253
{
 
254
    return mNativeInterface;
 
255
}