diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:26:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:26:55 +0100 |
| commit | 2353df997fee7ec6b99765762f21c925c33a53ab (patch) | |
| tree | ab433f3f7de43448297c4e4bfc670bc0c9ad86c7 /examples/macextras/mactoolbar/rasterwindow.cpp | |
| parent | 121006115468d77d508ea4749ef72d5986925891 (diff) | |
| parent | f9df923ce186fad00070af72cb8d9a7ef500fa21 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Icd08477652d6bea2f00a51f316c68f3e102053e1
Diffstat (limited to 'examples/macextras/mactoolbar/rasterwindow.cpp')
0 files changed, 0 insertions, 0 deletions