← Back to branch summary

~zsombi/ubuntu-ui-toolkit/10-viewitem

~zsombi/ubuntu-ui-toolkit/10-viewitem

« back to all changes in this revision

Viewing changes to modules/Ubuntu/Components/Colors/FIXME

Committer: Zsombor Egri
Date: 2014-09-04 05:48:23 UTC
mfrom: (1142.46.43 proper-qml-singletons)
Revision ID: zsombor.egri@canonical.com-20140904054823-dbbhyyexfx4vyuda

prereq merge

files removed:
modules/Ubuntu/Components/Colors

modules/Ubuntu/Components/Colors/Colors.pro

modules/Ubuntu/Components/Colors/FIXME

files renamed:
modules/Ubuntu/Components/Colors/UbuntuColors10.qml => modules/Ubuntu/Components/10/UbuntuColors10.qml

modules/Ubuntu/Components/Colors/UbuntuColors.qml => modules/Ubuntu/Components/11/UbuntuColors.qml

files modified:
components.api

debian/control

debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install

modules/Ubuntu/Components/Components.pro

modules/Ubuntu/Components/Icon10.qml

modules/Ubuntu/Components/Pickers/PickerPanel.qml

modules/Ubuntu/Components/Pickers/qmldir

modules/Ubuntu/Components/plugin/plugin.cpp

modules/Ubuntu/Components/plugin/plugin.h

modules/Ubuntu/Components/plugin/plugin.pro

modules/Ubuntu/Components/plugin/ucstyleditembase.cpp

modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp

modules/Ubuntu/Components/plugin/unitythemeiconprovider.h

modules/Ubuntu/Components/qmldir

tests/qmlapicheck.py

tests/qmlapicheck.sh

tests/unit_x11/tst_components/tst_components.cpp

tests/unit_x11/tst_components/tst_icon.qml

Show diffs side-by-side

added added

removed removed

modules/Ubuntu/Components/Colors/FIXME

1

UbuntuColors.qml is located in the Colors subdirectory because

2

QuickUtils::createQmlObject() fails if the QML file is located in a

3

folder that has a qmldir file with JavaScript modules.

4

5

UbuntuColors 1.1 is not in a file named UbuntuColors11.qml but in

6

UbuntuColors.qml so that qdoc can properly detect the component

7

name without a qmldir file.

Older »