lp://staging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify

Branch merges

Propose for merging

1 branch dependent on this one.

On hold for merging into lp://staging/ubuntu-ui-toolkit/staging

ubuntu-sdk-build-bot: Needs Fixing (continuous-integration) on 2016-01-18

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-11-03

Zsombor Egri: Pending requested 2015-07-29

Diff: 1611 lines (+862/-480)

29 files modified

.bzrignore (+2/-0)
.qmake.conf (+100/-0)
debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install (+6/-15)
features/ubuntu_default_build.prf (+29/-0)
features/ubuntu_qml_plugin.prf (+7/-0)
features/ubuntu_qrc_build.prf (+66/-0)
src/Ubuntu/Components/ComponentModule.pro (+175/-133)
src/Ubuntu/Components/ListItems/ListItems.pro (+18/-41)
src/Ubuntu/Components/ListItems/listitemplugin.cpp (+26/-0)
src/Ubuntu/Components/ListItems/listitemplugin.h (+32/-0)
src/Ubuntu/Components/ListItems/listitems.qrc (+42/-0)
src/Ubuntu/Components/ListItems/qmldir (+46/-45)
src/Ubuntu/Components/Pickers/Pickers.pro (+19/-33)
src/Ubuntu/Components/Pickers/pickers.qrc (+34/-0)
src/Ubuntu/Components/Pickers/pickersplugin.cpp (+27/-0)
src/Ubuntu/Components/Pickers/pickersplugin.h (+32/-0)
src/Ubuntu/Components/Pickers/qmldir (+20/-18)
src/Ubuntu/Components/Popups/Popups.pro (+18/-21)
src/Ubuntu/Components/Popups/popups.qrc (+22/-0)
src/Ubuntu/Components/Popups/popupsplugin.cpp (+26/-0)
src/Ubuntu/Components/Popups/popupsplugin.h (+32/-0)
src/Ubuntu/Components/Popups/qmldir (+27/-26)
src/Ubuntu/Components/plugin/plugin.cpp (+28/-0)
src/Ubuntu/Components/plugin/plugin.h (+5/-0)
src/Ubuntu/Components/plugin/uchaptics.cpp (+1/-1)
src/Ubuntu/Components/plugin/uclistitem.cpp (+1/-1)
src/Ubuntu/Components/qmldir (+0/-144)
tests/apicheck/apicheck.cpp (+19/-2)
ubuntu-sdk.pro (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1595. By Benjamin Zeller on 2015-11-03

Add missing files

1594. By Benjamin Zeller on 2015-10-30

wrong mode

1593. By Benjamin Zeller on 2015-10-30

- Implement switch between normal and qrcified build

1592. By Benjamin Zeller on 2015-10-28

Resolve qml file paths in qrc with an option to fallback to fs lookup

1591. By Benjamin Zeller on 2015-10-27

Make packaging working again

1590. By Benjamin Zeller on 2015-10-27

Merge with trunk

1589. By Benjamin Zeller on 2015-10-27

Add missing copyright

1588. By Benjamin Zeller on 2015-10-26

Resolve

1587. By Benjamin Zeller on 2015-09-10

Remove unused var, use qrc to load Haptics.qml

1586. By Benjamin Zeller on 2015-09-10

Merge staging