← Back to branch summary

~ci-train-bot/qtubuntu/qtubuntu-ubuntu-vivid-proposed

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/integration.cpp

  • Committer: CI Train Bot
  • Author(s): Robert Carr, Alberto Aguirre, Daniel d'Andrada
  • Date: 2015-03-18 10:12:44 UTC
  • mfrom: (253.1.25 port-to-mirclient)
  • Revision ID: ci-train-bot@canonical.com-20150318101244-6gh1auh26778cvwt
Port qtubuntu to direct mirclient usage for window creation and input handling.
Approved by: Michał Sawicz, Daniel d'Andrada, Albert Astals Cid

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntumirclient/integration.cpp
1
1
/*
2
 
 * Copyright (C) 2014 Canonical, Ltd.
 
2
 * Copyright (C) 2014-2015 Canonical, Ltd.
3
3
 *
4
4
 * This program is free software: you can redistribute it and/or modify it under
5
5
 * the terms of the GNU Lesser General Public License version 3, as published by
156
156
QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window)
157
157
{
158
158
    QPlatformWindow* platformWindow = new UbuntuWindow(
159
 
            window, mClipboard, static_cast<UbuntuScreen*>(mScreen), mInput, mInstance);
 
159
            window, mClipboard, static_cast<UbuntuScreen*>(mScreen), mInput, u_application_instance_get_mir_connection(mInstance));
160
160
    platformWindow->requestActivateWindow();
161
161
    return platformWindow;
162
162
}