← Back to branch summary

~ubuntu-branches/ubuntu/trusty/avogadro/trusty-proposed

« back to all changes in this revision

Viewing changes to libavogadro/src/engine.h

  • Committer: Bazaar Package Importer
  • Author(s): Rohan Garg
  • Date: 2011-05-20 18:55:49 UTC
  • mfrom: (3.2.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110520185549-berzu8h9f9330xji
Tags: 1.0.3-1ubuntu1
https://launchpad.net/bugs/787458
https://launchpad.net/bugs/784267
* Merge from debian, remaining changes (LP: #787458, #784267)
  - Disable builds for ARM as build dependency on libOpenGL and 
    libQtOpenGL

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavogadro/src/engine.h
54
54
 
55
55
#define AVOGADRO_ENGINE_FACTORY(c)                           \
56
56
  public: \
57
 
    Plugin *createInstance(QObject *parent = 0) { return new c(parent); } \
58
 
    Plugin::Type type() const { return Plugin::EngineType; } \
 
57
    Avogadro::Plugin *createInstance(QObject *parent = 0) { return new c(parent); } \
 
58
    Avogadro::Plugin::Type type() const { return Avogadro::Plugin::EngineType; } \
59
59
    QString identifier() const { return c::staticIdentifier(); } \
60
60
    QString name() const { return c::staticName(); }         \
61
61
    QString description() const { return c::staticDescription(); }