« back to all changes in this revision
Viewing changes to qt/tests/qmltests/qmldir
- Committer: Olivier Tilloy
- Date: 2014-04-08 10:03:11 UTC
- mfrom: (312.2.173 oxide)
- Revision ID: olivier.tilloy@canonical.com-20140408100311-b3zb7q1jfrevbrf1
Merge the latest changes from trunk.
- files added:
- build/scripts/repack_locales.py
- qt/tests/qmltests/api/directory
- qt/tests/qmltests/api/directory/subdirectory
- files removed:
- patches/disable-mojo.patch
- files renamed:
- patches/dont-use-egl-create-context-robustness.patch => patches/dont-use-gl-create-context-robustness.patch
- qt/core/glue/private/oxide_qt_web_view_adapter_p.cc => qt/core/browser/oxide_qt_web_view.cc
- qt/core/glue/private/oxide_qt_web_view_adapter_p.h => qt/core/browser/oxide_qt_web_view.h
- files modified:
- CMakeLists.txt
added
removed
qt/tests/qmltests/qmldir
