~timo-jyrinki/ubuntu/saucy/qtdeclarative-opensource-src/merge_continued

Viewing all changes in revision 6.

  • Committer: Package Import Robot
  • Author(s): Ken VanDine, Timo Jyrinki
  • Date: 2013-06-20 15:24:17 UTC
  • mfrom: (4.1.2 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130620152417-ymba99bnqwwsvj61
Tags: 5.0.2-1ubuntu2
[ Timo Jyrinki ]
* debian/patches/8a3d48915c29484c9ffb2fb8f0e3b569a9fe9b44_backport.patch:
  - Cherry-pick from upstream
    https://codereview.qt-project.org/#change,56583 (LP: #1183350)
* debian/patches/0001-Fallback-to-QMetaObject-for-properties-not-in-QQmlPr.patch:
  - Cherry-pick from upstream
    https://codereview.qt-project.org/#change,57392 (LP: #1187746)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: