diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /tools/easingcurveeditor/resources.qrc | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'tools/easingcurveeditor/resources.qrc')
| -rw-r--r-- | tools/easingcurveeditor/resources.qrc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/easingcurveeditor/resources.qrc b/tools/easingcurveeditor/resources.qrc new file mode 100644 index 0000000000..c184af4662 --- /dev/null +++ b/tools/easingcurveeditor/resources.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/"> + <file>preview.qml</file> + <file>Button.qml</file> + </qresource> +</RCC> |