← Back to branch summary

~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-private-shapes

« back to all changes in this revision

Viewing changes to modules/Ubuntu/Components/plugin/uctheme.cpp

  • Committer: Christian Dywan
  • Date: 2014-04-30 10:22:44 UTC
  • mfrom: (1000.17.3 staging)
  • mto: (1000.41.5 staging)
  • mto: This revision was merged to the branch mainline in revision 1022.
  • Revision ID: christian.dywan@canonical.com-20140430102244-uti97msd0thmk31d
Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/Ubuntu/Components/plugin/uctheme.cpp
36
36
/*!
37
37
    \qmltype Theme
38
38
    \instantiates UCTheme
39
 
    \inqmlmodule Ubuntu.Components 0.1
 
39
    \inqmlmodule Ubuntu.Components 1.1
40
40
    \ingroup theming
41
41
    \brief The Theme class provides facilities to interact with the current theme.
42
42
 
48
48
 
49
49
    \qml
50
50
    import QtQuick 2.0
51
 
    import Ubuntu.Components 0.1
 
51
    import Ubuntu.Components 1.1
52
52
 
53
53
    Item {
54
54
        Button {
61
61
 
62
62
    \qml
63
63
    import QtQuick 2.0
64
 
    import Ubuntu.Components 0.1
 
64
    import Ubuntu.Components 1.1
65
65
 
66
66
    StyledItem {
67
67
        id: myItem