← Back to branch summary

~josharenson/unity8/slim_greeter_real_lightdm

« back to all changes in this revision

Viewing changes to plugins/Dash/abstractdashview.h

  • Committer: Josh Arenson
  • Date: 2016-06-29 14:44:41 UTC
  • mfrom: (1789.412.85 unity8)
  • Revision ID: joshua.arenson@canonical.com-20160629144441-du2vd7vu97b2n8pc
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Dash/abstractdashview.h
21
21
 
22
22
class QAbstractItemModel;
23
23
class QQmlComponent;
24
 
#pragma GCC diagnostic push
25
 
#pragma GCC diagnostic ignored "-pedantic"
 
24
 
26
25
#include <private/qqmldelegatemodel_p.h>
27
26
#include <qqmlinfo.h>
28
 
#pragma GCC diagnostic pop
29
27
 
30
28
class AbstractDashView : public QQuickItem
31
29
{