← Back to branch summary

~gerboland/qtubuntu/enable-debug-mode

~gerboland/qtubuntu/enable-debug-mode

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/integration.h

Committer: Gerry Boland
Date: 2016-04-12 13:10:43 UTC
mfrom: (280.2.34 enable-debug-mode)
Revision ID: gerry.boland@canonical.com-20160412131043-t14zmcbheuxclmhr

Merge lp:~dandrader/qtubuntu/enable-debug-mode, he kindly fixed merging this with trunk

files added:
src/ubuntumirclient/cursor.cpp

src/ubuntumirclient/cursor.h

src/ubuntumirclient/offscreensurface.cpp

src/ubuntumirclient/offscreensurface.h

files modified:
README

debian/changelog

debian/control

src/ubuntumirclient/clipboard.cpp

src/ubuntumirclient/glcontext.cpp

src/ubuntumirclient/glcontext.h

src/ubuntumirclient/input.cpp

src/ubuntumirclient/input.h

src/ubuntumirclient/integration.cpp

src/ubuntumirclient/integration.h

src/ubuntumirclient/logging.h

src/ubuntumirclient/nativeinterface.cpp

src/ubuntumirclient/plugin.cpp

src/ubuntumirclient/screen.cpp

src/ubuntumirclient/screen.h

src/ubuntumirclient/ubuntumirclient.pro

src/ubuntumirclient/window.cpp

src/ubuntumirclient/window.h

Show diffs side-by-side

added added

removed removed

src/ubuntumirclient/integration.h

57

57

UbuntuScreen* screen() const { return mScreen; }

58

58

UbuntuDebugExtension* debugExtension() const { return mDebugExtension.data(); }

59

59

60

QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;

61

60

62

private:

61

63

void setupOptions();

62

64

void setupDescription();

Older »