diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 08:51:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 10:03:21 +0200 |
| commit | 3cb7302480390e5149a9cf6f49ac1ca94ef63f97 (patch) | |
| tree | 831134f1053214ab0d5ba4d406cf7b860ed7c578 /.gitignore | |
| parent | 2ff1557937c398a7fb5cc7ba120e7ca3b5eacd36 (diff) | |
| parent | f24cc53cc27d8ed4be4c1d0d2df059dd6a6909a9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/widgets/itemviews/qabstractitemview.cpp
src/widgets/itemviews/qabstractitemview_p.h
Change-Id: I54589b1365103cb1749186af92aab03a49c94b64
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1beec5c3ec..a48134a899 100644 --- a/.gitignore +++ b/.gitignore @@ -147,6 +147,8 @@ tools/activeqt/testcon/testcon.tlb translations/*.qm translations/*_untranslated.ts qrc_*.cpp +*.version +*.version.in # Test generated files QObject.log |