← Back to branch summary

~macslow/ubuntu-ui-toolkit/add-search-path-to-giconprovider

~macslow/ubuntu-ui-toolkit/add-search-path-to-giconprovider

Viewing all changes in revision 499.

Committer: Mirco Müller
Date: 2013-05-31 08:36:12 UTC
mfrom: (494.1.32 trunk)
Revision ID: mirco.mueller@ubuntu.com-20130531083612-6msrrd6q90n5az1h

Re-merged with trunk

files added:
components.api

debian/qmlrunner.install

modules/Ubuntu/Components/plugin/ucargument.cpp

modules/Ubuntu/Components/plugin/ucargument.h

modules/Ubuntu/Components/plugin/ucarguments.cpp

modules/Ubuntu/Components/plugin/ucarguments.h

modules/Ubuntu/Components/plugin/ucfontutils.cpp

modules/Ubuntu/Components/plugin/ucfontutils.h

tests/qmlapicheck.py

tests/resources/toolbar/panels.qml

tests/unit/tst_argument

tests/unit/tst_argument/tst_argument.cpp

tests/unit/tst_argument/tst_argument.pro

tests/unit/tst_arguments

tests/unit/tst_arguments/tst_arguments.cpp

tests/unit/tst_arguments/tst_arguments.pro

tests/unit/tst_components/tst_fontutils.qml

tests/unit/tst_inversemousearea/InverseMouseAreaInWindow.qml

tests/unit/tst_inversemousearea/SensingAreaError.qml

tests/unit/tst_performance/TextWithImport.qml

tests/unit/tst_performance/TextWithImportGrid.qml

tests/unit/tst_performance/TextWithImportPopups.qml

tests/unit/tst_performance/TextWithImportPopupsGrid.qml

files removed:
documentation/generate_html.sh

modules/Ubuntu/Components/HudIntegration.qml

modules/Ubuntu/Components/componentUtils.js

modules/Ubuntu/Components/fontUtils.js

tests/unit/tst_components/tst_componentutils.qml

themes/Ambiance/qmltheme/ButtonStyle.qml

themes/Ambiance/qmltheme/CheckBoxStyle.qml

themes/Ambiance/qmltheme/EditorCursorStyle.qml

themes/Ambiance/qmltheme/NewTabsStyle.qml

themes/Ambiance/qmltheme/SwitchStyle.qml

themes/Ambiance/qmltheme/TabButtonStyle.qml

themes/Ambiance/qmltheme/TabsStyle.qml

themes/Ambiance/qmltheme/TextAreaStyle.qml

themes/Ambiance/qmltheme/TextFieldDelegate.qml

themes/Ambiance/qmltheme/TextFieldStyle.qml

themes/Ambiance/qmltheme/UbuntuShapeStyle.qml

themes/Ambiance/qmltheme/styleUtils.js

files modified:
CHANGES

debian/changelog

debian/control

debian/rules

documentation/documentation.pri

documentation/ubuntu-ui-toolkit-online.qdocconf

examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml

modules/Ubuntu/Components/AbstractButton.qml

modules/Ubuntu/Components/Button.qml

modules/Ubuntu/Components/CheckBox.qml

modules/Ubuntu/Components/Label.qml

modules/Ubuntu/Components/ListItems/Empty.qml

modules/Ubuntu/Components/ListItems/SingleValue.qml

modules/Ubuntu/Components/ListItems/Standard.qml

modules/Ubuntu/Components/MainView.qml

modules/Ubuntu/Components/Page.qml

modules/Ubuntu/Components/PageTreeNode.qml

modules/Ubuntu/Components/PageWrapperUtils.js

modules/Ubuntu/Components/Popups/Dialog.qml

modules/Ubuntu/Components/Popups/Popover.qml

modules/Ubuntu/Components/Popups/PopupBase.qml

modules/Ubuntu/Components/Popups/SheetBase.qml

modules/Ubuntu/Components/Popups/internalPopupUtils.js

modules/Ubuntu/Components/Popups/popupUtils.js

modules/Ubuntu/Components/Slider.qml

modules/Ubuntu/Components/Switch.qml

modules/Ubuntu/Components/Tab.qml

modules/Ubuntu/Components/Tabs.qml

modules/Ubuntu/Components/TextArea.qml

modules/Ubuntu/Components/TextField.qml

modules/Ubuntu/Components/Toolbar.qml

modules/Ubuntu/Components/ToolbarActions.qml

modules/Ubuntu/Components/overview.qdoc

modules/Ubuntu/Components/plugin/i18n.cpp

modules/Ubuntu/Components/plugin/i18n.h

modules/Ubuntu/Components/plugin/inversemouseareatype.cpp

modules/Ubuntu/Components/plugin/inversemouseareatype.h

modules/Ubuntu/Components/plugin/itemstyleattached.cpp

modules/Ubuntu/Components/plugin/plugin.cpp

modules/Ubuntu/Components/plugin/plugin.pro

modules/Ubuntu/Components/plugin/quickutils.cpp

modules/Ubuntu/Components/plugin/quickutils.h

modules/Ubuntu/Components/qmldir

modules/Ubuntu/Components/scrollbarUtils.js

modules/Ubuntu/Components/stack.js

tests/autopilot/UbuntuUiToolkit/tests/gallery/test_gallery.py

tests/unit/add_qmlmakecheck.pri

tests/unit/tst_components/tst_abstractbutton.qml

tests/unit/tst_components/tst_button.qml

tests/unit/tst_components/tst_inversemousearea.qml

tests/unit/tst_components/tst_page.qml

tests/unit/tst_components/tst_pagestack.qml

tests/unit/tst_components/tst_quickutils.qml

tests/unit/tst_components/tst_tabs.qml

tests/unit/tst_components/tst_textfield.qml

tests/unit/tst_components/tst_toolbar.qml

tests/unit/tst_inversemousearea/InverseMouseAreaDoNotPropagateEvents.qml

tests/unit/tst_inversemousearea/InverseMouseAreaPropagateEvents.qml

tests/unit/tst_inversemousearea/tst_inversemousearea.pro

tests/unit/tst_inversemousearea/tst_inversemouseareatest.cpp

tests/unit/tst_performance/tst_performance.cpp

tests/unit/tst_performance/tst_performance.pro

tests/unit/unit.pro

themes/Ambiance/qmltheme/EditorCursorDelegate.qml

themes/Ambiance/qmltheme/TabsDelegate.qml

themes/Ambiance/qmltheme/default.qmltheme

themes/Ambiance/qmltheme/qmldir

ubuntu-sdk.pro

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/qmlrunner.install

documentation/documentation.pri

documentation/generate_html.sh

documentation/ubuntu-ui-toolkit-online.qdocconf

examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml

modules/Ubuntu/Components/AbstractButton.qml

modules/Ubuntu/Components/Button.qml

modules/Ubuntu/Components/CheckBox.qml

modules/Ubuntu/Components/HudIntegration.qml

modules/Ubuntu/Components/Label.qml

modules/Ubuntu/Components/ListItems/Empty.qml

modules/Ubuntu/Components/ListItems/SingleValue.qml

modules/Ubuntu/Components/ListItems/Standard.qml

modules/Ubuntu/Components/MainView.qml

modules/Ubuntu/Components/Page.qml

modules/Ubuntu/Components/PageTreeNode.qml

modules/Ubuntu/Components/PageWrapperUtils.js

modules/Ubuntu/Components/Popups/Dialog.qml

modules/Ubuntu/Components/Popups/Popover.qml

modules/Ubuntu/Components/Popups/PopupBase.qml

modules/Ubuntu/Components/Popups/SheetBase.qml

modules/Ubuntu/Components/Popups/internalPopupUtils.js

modules/Ubuntu/Components/Popups/popupUtils.js

modules/Ubuntu/Components/Slider.qml

modules/Ubuntu/Components/Switch.qml

modules/Ubuntu/Components/Tab.qml

modules/Ubuntu/Components/Tabs.qml

modules/Ubuntu/Components/TextArea.qml

modules/Ubuntu/Components/TextField.qml

modules/Ubuntu/Components/ToolbarActions.qml

modules/Ubuntu/Components/componentUtils.js

modules/Ubuntu/Components/fontUtils.js

modules/Ubuntu/Components/overview.qdoc

modules/Ubuntu/Components/plugin/i18n.cpp

modules/Ubuntu/Components/plugin/i18n.h

modules/Ubuntu/Components/plugin/inversemouseareatype.cpp

modules/Ubuntu/Components/plugin/inversemouseareatype.h

modules/Ubuntu/Components/plugin/itemstyleattached.cpp

modules/Ubuntu/Components/plugin/plugin.cpp

modules/Ubuntu/Components/plugin/plugin.pro

modules/Ubuntu/Components/plugin/quickutils.cpp

modules/Ubuntu/Components/plugin/quickutils.h

modules/Ubuntu/Components/plugin/ucargument.cpp

modules/Ubuntu/Components/plugin/ucargument.h

modules/Ubuntu/Components/plugin/ucarguments.cpp

modules/Ubuntu/Components/plugin/ucarguments.h

modules/Ubuntu/Components/plugin/ucfontutils.cpp

modules/Ubuntu/Components/plugin/ucfontutils.h

modules/Ubuntu/Components/qmldir

modules/Ubuntu/Components/scrollbarUtils.js

modules/Ubuntu/Components/stack.js

tests/autopilot/UbuntuUiToolkit/tests/gallery/test_gallery.py

tests/qmlapicheck.py

tests/unit/add_qmlmakecheck.pri

tests/unit/tst_argument/

tests/unit/tst_argument/tst_argument.cpp

tests/unit/tst_argument/tst_argument.pro

tests/unit/tst_arguments/

tests/unit/tst_arguments/tst_arguments.cpp

tests/unit/tst_arguments/tst_arguments.pro

tests/unit/tst_components/tst_abstractbutton.qml

tests/unit/tst_components/tst_button.qml

tests/unit/tst_components/tst_componentutils.qml

tests/unit/tst_components/tst_fontutils.qml

tests/unit/tst_components/tst_inversemousearea.qml

tests/unit/tst_components/tst_page.qml

tests/unit/tst_components/tst_pagestack.qml

tests/unit/tst_components/tst_quickutils.qml

tests/unit/tst_components/tst_tabs.qml

tests/unit/tst_components/tst_textfield.qml

tests/unit/tst_components/tst_toolbar.qml

tests/unit/tst_inversemousearea/InverseMouseAreaDoNotPropagateEvents.qml

tests/unit/tst_inversemousearea/InverseMouseAreaInWindow.qml

tests/unit/tst_inversemousearea/InverseMouseAreaPropagateEvents.qml

tests/unit/tst_inversemousearea/SensingAreaError.qml

tests/unit/tst_inversemousearea/tst_inversemousearea.pro

tests/unit/tst_inversemousearea/tst_inversemouseareatest.cpp

tests/unit/tst_performance/TextWithImport.qml

tests/unit/tst_performance/TextWithImportGrid.qml

tests/unit/tst_performance/TextWithImportPopups.qml

tests/unit/tst_performance/TextWithImportPopupsGrid.qml

tests/unit/tst_performance/tst_performance.cpp

tests/unit/tst_performance/tst_performance.pro

tests/unit/unit.pro

themes/Ambiance/qmltheme/ButtonStyle.qml

themes/Ambiance/qmltheme/CheckBoxStyle.qml

themes/Ambiance/qmltheme/EditorCursorDelegate.qml

themes/Ambiance/qmltheme/EditorCursorStyle.qml

themes/Ambiance/qmltheme/NewTabsStyle.qml

themes/Ambiance/qmltheme/SwitchStyle.qml

themes/Ambiance/qmltheme/TabButtonStyle.qml

themes/Ambiance/qmltheme/TabsDelegate.qml

themes/Ambiance/qmltheme/TabsStyle.qml

themes/Ambiance/qmltheme/TextAreaStyle.qml

themes/Ambiance/qmltheme/TextFieldDelegate.qml

themes/Ambiance/qmltheme/TextFieldStyle.qml

themes/Ambiance/qmltheme/UbuntuShapeStyle.qml

themes/Ambiance/qmltheme/default.qmltheme

themes/Ambiance/qmltheme/qmldir

themes/Ambiance/qmltheme/styleUtils.js

Older »