diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-05 16:48:06 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-05 16:48:06 +0100 |
| commit | 463e46245543540652168861b3d6c65980fb7b05 (patch) | |
| tree | 5c548c6b989b9f88182b4e2611c13bc51d9c1ad0 /.gitignore | |
| parent | 2d1c8c4d136cbe6194a5faef971359e00dae366d (diff) | |
| parent | 4f7ec6143afce84804a230306008caefaa86a05b (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
examples/quickcontrols2/quickcontrols2.pro
Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -12,6 +12,7 @@ /examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models /examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling /examples/quickcontrols2/contactlist/contactlist +/examples/quickcontrols2/flatstyle/flatstyle /examples/quickcontrols2/gallery/gallery /examples/quickcontrols2/sidepanel/sidepanel /examples/quickcontrols2/swipetoremove/swipetoremove |