From ab1e4933925c57887712b08c4e31904be3a2a06f Mon Sep 17 00:00:00 2001 From: KoynovStas Date: Sun, 21 May 2017 10:56:56 +0400 Subject: [PATCH 1/2] add target_wrapper.* to Qt.gitignore This file is autogenerated by qmake for run auto(unit) tests. For Windows: target_wrapper.bat For Unix: target_wrapper.sh --- Qt.gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Qt.gitignore b/Qt.gitignore index 5a3ca953..4174403c 100644 --- a/Qt.gitignore +++ b/Qt.gitignore @@ -27,6 +27,11 @@ ui_*.h Makefile* *build-* + +# Qt unit tests +target_wrapper.* + + # QtCreator *.autosave From 91ae97083c2032785e6c53b1b5093d1bef2c3a29 Mon Sep 17 00:00:00 2001 From: KoynovStas Date: Sun, 21 May 2017 11:06:01 +0400 Subject: [PATCH 2/2] add object_script to Qt.gitignore For template rules (modern style) in Qt project file, this file is autogenerated by qmake. Example old style (pro file): SOURCES += src/1.cpp \ src/2.cpp Example new style, uses template rules (pro file): SOURCES += src/*.cpp qmake auto generate files with list of objects object_script.*.Debug object_script.*.Release --- Qt.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Qt.gitignore b/Qt.gitignore index 4174403c..5fa47c5a 100644 --- a/Qt.gitignore +++ b/Qt.gitignore @@ -12,6 +12,8 @@ # Qt-es +object_script.*.Release +object_script.*.Debug *_plugin_import.cpp /.qmake.cache /.qmake.stash