diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:13:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:13:00 +0200 |
| commit | 3fd3ffade59c923014e02d5d6b07288b24c9493d (patch) | |
| tree | e3a0fac8dcb36931d870f93805acfe43a6d86f9f /examples/activeqt/hierarchy/objects.h | |
| parent | ed8d0964b81186824bca5771da224a60a6ccb4e3 (diff) | |
| parent | 70c22cb89f1c923c71cbc1a477c862fd947161e6 (diff) | |
| download | qtactiveqt-3fd3ffade59c923014e02d5d6b07288b24c9493d.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qtactiveqt.pro
Change-Id: Ie6deaadc8cf69e111a0ae7ebef420b4f47e3b9a3
Diffstat (limited to 'examples/activeqt/hierarchy/objects.h')
0 files changed, 0 insertions, 0 deletions