diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:27:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:29:14 +0200 |
| commit | f82e5085169876e0ec7c1b744d021b068c281cfe (patch) | |
| tree | a870e1f68ce62818a0793c4c78a67971e841e676 /qtbase.pro | |
| parent | f74d4fb1dacc682e2e6f4a44e4240f642a2c3b70 (diff) | |
| parent | ee47999333dde1d38b73d04e142e05f06f8c56ed (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
mkspecs/features/qt_common.prf
src/corelib/tools/qstring.cpp
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/widgets/widgets/qmainwindowlayout_p.h
Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65
Diffstat (limited to 'qtbase.pro')
0 files changed, 0 insertions, 0 deletions