diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-03-13 14:01:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 11:14:28 +0100 |
| commit | e82487177bbfbf5b6c219d40547706f50b3b73ab (patch) | |
| tree | eee93f61c0970ab1cc4b76e5a90136f684c6e1c9 /.gitignore | |
| parent | c117207e9c0b554c4f505ba01ec92e60eb15017b (diff) | |
Update .gitignore
Adapt to the move of out/(Debug|Release) to src/core/(Debug|Release)
This also changes individual tests binary rules into a tst_* rule
and a negating tst_*.* to unmatched non target binaries.
Move more general file globs at the end of the list so that the
negation doesn't also negate those general rules (e.g. *.o).
Change-Id: Ie953da6cf255adfee7d4b04e91a6528558918ebc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore index 02461bca5..9bc536d97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,22 @@ -*.o -Makefile -Makefile.* -out/ +.qmake.cache +.qmake.stash +src/3rdparty_upstream/ninja +src/3rdparty_upstream/chromium +src/core/Debug +src/core/Release src/core/core_generated.gyp +src/core/qmake_extras.gypi +examples/webengine/quicknanobrowser/quicknanobrowser +examples/webenginewidgets/browser/browser +examples/webenginewidgets/fancybrowser/fancybrowser +tests/quicktestbrowser/quicktestbrowser + +tests/**/tst_* +!tests/**/tst_*.* + +*.o +Makefile* *.pro.user* -.qmake.cache *.moc moc_*.cpp *.orig @@ -12,13 +24,4 @@ moc_*.cpp *.pak .uic .rcc -*nanobrowser -examples/widgets/browser/browser -examples/widgets/fancybrowser/fancybrowser -tests/auto/widgets/qwebenginehistoryinterface/tst_qwebenginehistoryinterface -tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory -tests/auto/widgets/qwebengineinspector/tst_qwebengineinspector -tests/auto/widgets/qwebenginepage/tst_qwebenginepage -tests/auto/widgets/qwebengineframe/tst_qwebengineframe -tests/auto/widgets/qwebengineview/tst_qwebengineview -tools/**/*.pyc +*.pyc |