Viewing all changes in revision 679.
- Committer: Olivier Tilloy
- Date: 2014-09-25 16:27:09 UTC
- mfrom: (677.1.95 oxide)
- Revision ID: olivier.tilloy@canonical.com-20140925162709-h8bai0f1nfaf7cfy
Merge the latest changes from trunk.
- files added:
- build/python/eventloop.py
- po
- qt/tests/qmltests/ssl
- qt/tests/ssldata
- qt/tests/ssldata/nss
- files removed:
- build/cmake
- qt/build/cmake
- files renamed:
- qt/quick/api/oxideqquickglobals.cc => qt/quick/api/oxideqquickglobal.cc
- qt/quick/api/oxideqquickglobals_p.h => qt/quick/api/oxideqquickglobal_p.h
- qt/run_qmlscene.sh.in => qt/run_qmlapp.sh.in
- qt/tests/qmltests/api/tst_WebView_loadUrl.qml => qt/tests/qmltests/api/tst_WebView_url.qml
- files modified:
- CHROMIUM_VERSION
expand all
collapse all
added
removed
qt/tests/qmltests/ssl/tst_SecurityStatus_image.png
qt/tests/qmltests/ssl/tst_WebPreferences_mixedContent.png
qt/tests/qmltests/ssl/tst_WebView_mixedContentOverrides.png
