diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-24 13:28:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-24 13:31:14 +0100 |
| commit | 1fadc7292b66d4b3984bf5ef36c70b46b07a1c6b (patch) | |
| tree | 7a54f6a2612dc469ddbc5afc2cc0010099b661fe /qmake/library/qmakeevaluator.cpp | |
| parent | ea711d0f59d6272f14b61cb2fd3dc1ede2cc1eb6 (diff) | |
| parent | d8e65d5756c937fc3d9be3e5c30b31914a437393 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
src/plugins/platforms/windows/qwindowsfontengine.cpp
src/plugins/platforms/windows/qwindowsnativeimage.cpp
tests/auto/gui/kernel/qwindow/BLACKLIST
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I649b32b260ce0ed2d6a5089021daa0d6a8db85f7
Diffstat (limited to 'qmake/library/qmakeevaluator.cpp')
0 files changed, 0 insertions, 0 deletions