← Back to branch summary

~kalikiana/ubuntu-ui-toolkit/appsettings

« back to all changes in this revision

Viewing changes to modules/Ubuntu/Layouts/plugin/ulplugin.cpp

  • Committer: Zsombor Egri
  • Date: 2014-04-20 19:25:12 UTC
  • mto: (700.276.32 combobutton)
  • mto: This revision was merged to the branch mainline in revision 770.
  • Revision ID: zsombor.egri@canonical.com-20140420192512-o0juovm3r2a3myyj
version set to 1.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/Ubuntu/Layouts/plugin/ulplugin.cpp
23
23
 
24
24
#include <qqml.h>
25
25
 
 
26
void PluginPlugin::registerTypeVersions(const char *uri, int major, int minor)
 
27
{
 
28
    qmlRegisterType<ULLayouts>(uri, major, minor, "Layouts");
 
29
    qmlRegisterType<ULConditionalLayout>(uri, major, minor, "ConditionalLayout");
 
30
    qmlRegisterType<ULItemLayout>(uri, major, minor, "ItemLayout");
 
31
}
 
32
 
26
33
void PluginPlugin::registerTypes(const char *uri)
27
34
{
28
35
    // @uri Ubuntu.Layouts
29
 
    qmlRegisterType<ULLayouts>(uri, 0, 1, "Layouts");
30
 
    qmlRegisterType<ULConditionalLayout>(uri, 0, 1, "ConditionalLayout");
31
 
    qmlRegisterType<ULItemLayout>(uri, 0, 1, "ItemLayout");
 
36
    registerTypeVersions(uri, 0, 1);
 
37
    registerTypeVersions(uri, 1, 0);
32
38
}