← Back to branch summary

~dandrader/qtmir/keyState

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/mirbuffersgtexture.cpp

  • Committer: Gerry Boland
  • Date: 2014-07-01 13:38:06 UTC
  • mto: This revision was merged to the branch mainline in revision 158.
  • Revision ID: gerry.boland@canonical.com-20140701133806-lwfnplkijthydzj4
Update QML plugin: rename to Unity.Application, merge latest unity-mir changes, add tests (not passing yet) and use category logging

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/mirbuffersgtexture.cpp
1
1
/*
2
 
 * Copyright (C) 2013 Canonical, Ltd.
 
2
 * Copyright (C) 2013-2014 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
24
24
#include <mir/graphics/buffer.h>
25
25
#include <mir/geometry/size.h>
26
26
 
27
 
#include <QDebug>
28
 
 
29
27
#if QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
 
28
#define emit Q_EMIT
 
29
#define signals Q_SIGNALS
 
30
#define slots Q_SLOTS
30
31
#include <private/qquickprofiler_p.h>
 
32
#undef emit
 
33
#undef signals
 
34
#undef slots
31
35
#include <QElapsedTimer>
32
36
static QElapsedTimer qsg_renderer_timer;
33
37
static bool qsg_render_timing = !qgetenv("QSG_RENDER_TIMING").isEmpty();
117
121
            0,  // swizzle (not relevant)
118
122
            0,  // upload (not relevant)
119
123
            0)); // mipmap (not used ever...)
 
124
}
120
125
#endif
121
 
}