diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
| commit | 387f5a70065b6a21143f30a693b3946f43145aa1 (patch) | |
| tree | 19499220eb78ffc2b83174768e4db33f36d33242 /.gitignore | |
| parent | c9afad98efee2e9d7eb09407395c8ad00f175f17 (diff) | |
| parent | 9820278a708024cc1ae01372dfafabe4ff295b88 (diff) | |
| download | qt-creator-387f5a70065b6a21143f30a693b3946f43145aa1.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qtsupport/baseqtversion.cpp
tests/auto/cplusplus/findusages/tst_findusages.cpp
Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 9952e9f104..43083d931c 100644 --- a/.gitignore +++ b/.gitignore @@ -111,8 +111,10 @@ bin/qml2puppet.exe bin/qtpromaker bin/qtpromaker.exe share/doc/qtcreator/*.qch -src/tools/gen-cpp-ast/generate-ast -src/tools/mkvisitor/cplusplus0 +src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor +src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.exe +src/tools/cplusplus-update-frontend/cplusplus-update-frontend +src/tools/cplusplus-update-frontend/cplusplus-update-frontend.exe src/tools/qml/qmldump/qmldump src/tools/examplesscanner/examplesscanner src/tools/valgrindfake/valgrind-fake @@ -120,13 +122,15 @@ bin/*.exe # Tests #------ -tests/manual/cplusplus-frontend/cplusplus0 -tests/manual/cplusplus-dump/cplusplus0 +tests/manual/cplusplus-frontend/cplusplus-frontend +tests/manual/cplusplus-frontend/cplusplus-frontend.exe tests/manual/qml-ast2dot/qml-ast2dot tests/manual/debugger/simple/libsimple_test_plugin.*dylib tests/manual/debugger/simple/simple_test_app tests/manual/plain-cplusplus/plain-c++ tests/manual/preprocessor/pp +tests/tools/cplusplus-ast2png/cplusplus-ast2png +tests/tools/cplusplus-ast2png/cplusplus-ast2png.exe tests/auto/cplusplus/codegen/tst_codegen tests/auto/cplusplus/ast/tst_ast tests/auto/cplusplus/codeformatter/tst_codeformatter |