summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-07 01:35:46 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-07 01:35:46 +0100
commitf0cd88c0d7af9a477bf90545975d289915e89033 (patch)
tree40d16da8a9d35a92b72d7612156a606b83dd7a12 /.gitignore
parent66487fec4c558d8b77dd0573e524a61d11e33c2a (diff)
parent4d0294352f975c3916dfbba48f21e5b76da432c0 (diff)
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts: src/imports/controls/universal/ToolButton.qml Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index bf6ecd8d..b377694e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,12 @@ android-*.so-deployment-settings.json
*_plugin_import.cpp
*_wrapper.sh
*_wrapper.bat
+*.mak
+*.xib
+*.plist
+*.pbxproj
+*_plugin_import.cpp
+*.xcsettings
+*.xcscheme
+*.xcodeproj
+qt.conf