← Back to branch summary

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

« back to all changes in this revision

Viewing changes to examples/quick/particles/itemparticle/delegates.qml

  • Committer: Package Import Robot
  • Author(s): Timo Jyrinki, Timo Jyrinki, Lisandro Damián Nicanor Pérez Meyer
  • Date: 2013-04-29 16:27:13 UTC
  • mfrom: (1.1.1) (4.1.1 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130429162713-i256sus3j079dzs0
Tags: 5.0.2-1ubuntu1
https://launchpad.net/bugs/1176199
https://launchpad.net/bugs/1176962
[ Timo Jyrinki ]  
* debian/patches/we_do_want_the_mouse_event_to_ourselves.patch:
  - Drop, merged upstream
* debian/patches/fix_lp1087643.patch:
  - Drop, merged upstream
* Merge with Debian experimental, remaining changes:
  - Keep architecture restrictions
  - Keep debian/patches/rendering_performance_fix_lp1092358.patch
* Add libgl1-mesa-dri dependency for the quick2 plugin (LP: #1176199) 
* Cherry-pick listview crasher fixes from upstream 5.1 branch (LP: #1176962):
  - debian/patches/01_8563adb737cec5d440197ddbd514fe201c5f18ff_backport.patch
  - debian/patches/02_53e317468626284fe26877659dff551ce3bc0e55_backport.patch
  - debian/patches/03_51665a9ecaebaef2382c1e76ebedfeffacb4b3de_backport.patch
  - debian/patches/04_9d6cd72353e4862592c016951810abf9a7ab8079_backport.patch

[ Lisandro Damián Nicanor Pérez Meyer ]
* Fix wrong permissions of examples.

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/quick/particles/itemparticle/delegates.qml
1
1
/****************************************************************************
2
2
**
3
 
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 
3
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
4
4
** Contact: http://www.qt-project.org/legal
5
5
**
6
6
** This file is part of the examples of the Qt Toolkit.