diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-09-15 11:50:24 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-09-15 11:50:24 +0200 |
| commit | 9bcfd348454267db1cb98425260774248a90f60a (patch) | |
| tree | c7653823fd1c2ed34adaf8cdac97cbf08744b17d | |
| parent | e4de305b029efbbbfdf3dd9d0b4677db6b8796d5 (diff) | |
| download | qt-creator-9bcfd348454267db1cb98425260774248a90f60a.tar.gz | |
Renamed two cplusplus projects to not conflict with the autotests.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | src/tools/gen-cpp-ast/gen-cpp-ast.pro (renamed from src/tools/cplusplus/cplusplus.pro) | 0 | ||||
| -rwxr-xr-x | src/tools/gen-cpp-ast/generate-ast | bin | 0 -> 3779220 bytes | |||
| -rw-r--r-- | src/tools/gen-cpp-ast/generate-ast.cpp (renamed from src/tools/cplusplus/generate-ast.cpp) | 0 | ||||
| -rwxr-xr-x | tests/manual/cplusplus-frontend/c++ (renamed from tests/manual/cplusplus/c++) | 0 | ||||
| -rw-r--r-- | tests/manual/cplusplus-frontend/conf.c++ (renamed from tests/manual/cplusplus/conf.c++) | 0 | ||||
| -rw-r--r-- | tests/manual/cplusplus-frontend/cplusplus-frontend.pro (renamed from tests/manual/cplusplus/cplusplus.pro) | 0 | ||||
| -rw-r--r-- | tests/manual/cplusplus-frontend/main.cpp (renamed from tests/manual/cplusplus/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/cplusplus-frontend/tests/t1.cpp (renamed from tests/manual/cplusplus/tests/t1.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 2 |
10 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 85fa07df95..e234d69e01 100644 --- a/.gitignore +++ b/.gitignore @@ -76,7 +76,7 @@ bin/qtcreator bin/qtcreator_process_stub* bin/qtcreator.exe share/doc/qtcreator/qtcreator.qch -tests/manual/cplusplus/cplusplus0 +tests/manual/cplusplus-frontend/cplusplus0 tests/manual/cplusplus-dump/cplusplus0 tests/manual/qml-ast2dot/qml-ast2dot tests/auto/cplusplus/codegen/tst_codegen @@ -84,5 +84,5 @@ tests/auto/qml/qmldesigner/bauhaustests/tst_bauhaus tests/auto/qml/qmldesigner/coretests/tst_qmldesigner_core tests/auto/qml/qmldesigner/propertyeditortests/tst_propertyeditor tests/auto/profilewriter/tst_profilewriter -src/tools/cplusplus/generate-ast +src/tools/gen-cpp-ast/generate-ast src/tools/qml/qmldump/qmldump diff --git a/src/tools/cplusplus/cplusplus.pro b/src/tools/gen-cpp-ast/gen-cpp-ast.pro index 24a8b74c4e..24a8b74c4e 100644 --- a/src/tools/cplusplus/cplusplus.pro +++ b/src/tools/gen-cpp-ast/gen-cpp-ast.pro diff --git a/src/tools/gen-cpp-ast/generate-ast b/src/tools/gen-cpp-ast/generate-ast Binary files differnew file mode 100755 index 0000000000..1e5e8f458d --- /dev/null +++ b/src/tools/gen-cpp-ast/generate-ast diff --git a/src/tools/cplusplus/generate-ast.cpp b/src/tools/gen-cpp-ast/generate-ast.cpp index 27e5d451fb..27e5d451fb 100644 --- a/src/tools/cplusplus/generate-ast.cpp +++ b/src/tools/gen-cpp-ast/generate-ast.cpp diff --git a/tests/manual/cplusplus/c++ b/tests/manual/cplusplus-frontend/c++ index a5908b79ff..a5908b79ff 100755 --- a/tests/manual/cplusplus/c++ +++ b/tests/manual/cplusplus-frontend/c++ diff --git a/tests/manual/cplusplus/conf.c++ b/tests/manual/cplusplus-frontend/conf.c++ index 69bafe0459..69bafe0459 100644 --- a/tests/manual/cplusplus/conf.c++ +++ b/tests/manual/cplusplus-frontend/conf.c++ diff --git a/tests/manual/cplusplus/cplusplus.pro b/tests/manual/cplusplus-frontend/cplusplus-frontend.pro index 4964d9c5ea..4964d9c5ea 100644 --- a/tests/manual/cplusplus/cplusplus.pro +++ b/tests/manual/cplusplus-frontend/cplusplus-frontend.pro diff --git a/tests/manual/cplusplus/main.cpp b/tests/manual/cplusplus-frontend/main.cpp index b4b937b7d3..b4b937b7d3 100644 --- a/tests/manual/cplusplus/main.cpp +++ b/tests/manual/cplusplus-frontend/main.cpp diff --git a/tests/manual/cplusplus/tests/t1.cpp b/tests/manual/cplusplus-frontend/tests/t1.cpp index c489dd3b07..c489dd3b07 100644 --- a/tests/manual/cplusplus/tests/t1.cpp +++ b/tests/manual/cplusplus-frontend/tests/t1.cpp diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index ae8192130d..e0fd58773a 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -1,7 +1,7 @@ TEMPLATE=subdirs SUBDIRS= \ -cplusplus \ +cplusplus-frontend \ cplusplus-dump \ fakevim \ gdbdebugger \ |