← Back to branch summary

~tpeeters/ubuntu-ui-toolkit/tabBar-selectionMode-fix

~tpeeters/ubuntu-ui-toolkit/tabBar-selectionMode-fix

« back to all changes in this revision

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

Committer: tpeeters
Date: 2013-11-20 09:36:13 UTC
mfrom: (831.1.10 ubuntu-ui-toolkit)
Revision ID: tim.peeters@canonical.com-20131120093613-hpd8s03bbeqtwp4s

merge trunk

files added:
tests/unit_x11/tst_components/ExternalTab.qml

files modified:
debian/changelog

modules/Ubuntu/Components/ListItems/Empty.qml

modules/Ubuntu/Components/OrientationHelper.qml

modules/Ubuntu/Components/plugin/i18n.cpp

modules/Ubuntu/Components/plugin/inversemouseareatype.cpp

modules/Ubuntu/Components/plugin/listener.cpp

modules/Ubuntu/Components/plugin/listener.h

modules/Ubuntu/Components/plugin/plugin.cpp

modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp

modules/Ubuntu/Components/plugin/ucstatesaver.cpp

modules/Ubuntu/Components/plugin/ucstatesaver.h

modules/Ubuntu/Components/plugin/ucstatesaver_p.h

modules/Ubuntu/Components/plugin/uctheme.cpp

po/ca.po

po/de.po

po/es.po

po/fi.po

po/fr.po

po/gl.po

po/he.po

po/ko.po

po/my.po

po/nl.po

po/oc.po

po/sv.po

tests/autopilot/ubuntuuitoolkit/base.py

tests/autopilot/ubuntuuitoolkit/emulators.py

tests/autopilot/ubuntuuitoolkit/tests/__init__.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py

tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py

tests/unit_x11/tst_components/tst_tabs.qml

Show diffs side-by-side

added added

removed removed

modules/Ubuntu/Components/plugin/ucstatesaver.cpp

21

21

#include "statesaverbackend_p.h"

22

22

#include "i18n.h"

23

23

#include "quickutils.h"

24

#include <QtQml/QQmlComponent>

24

25

#include <QtQml/QQmlInfo>

26

#include <QtQml/QQmlProperty>

25

27

#include <QtGui/QGuiApplication>

26

28

#include "private/qqmldata_p.h"

27

29

#include "private/qqmlcontext_p.h"

Older »