diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
| commit | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (patch) | |
| tree | cbaa212790b49e024dae18ecbcead3bbf16a18cf /qmake/generators/unix/unixmake.cpp | |
| parent | 5b739a5b8cfbbedd9265b192d08b346d9b265590 (diff) | |
| parent | 0c5fbd397ceda4d9f0046f1204b5e49229d04312 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/global/qglobal.h
Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0
Diffstat (limited to 'qmake/generators/unix/unixmake.cpp')
0 files changed, 0 insertions, 0 deletions