diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-01-20 13:38:54 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-01-20 13:38:54 +0100 |
| commit | 1678d1b5d654da694755c71c91d6b2efc381107a (patch) | |
| tree | e47d3b3e35a478523c5adb45c156ab2920aa5dd8 /tests/auto/api/testdata/export-with-recursive-depends | |
| parent | c75737e4c0178a25b5ae4827dc07f2a8f5492c9f (diff) | |
| parent | 0d477159e67ef4e0dd665b8c5ba8850b11145afe (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
src/lib/corelib/language/projectresolver.cpp
src/lib/corelib/language/projectresolver.h
tests/auto/api/testdata/export-with-recursive-depends/qbs/modules/module1/module1.qbs
tests/auto/api/testdata/export-with-recursive-depends/qbs/modules/module2/module2.qbs
tests/auto/blackbox/testdata/exportWithRecursiveDepends/modules/module1/module1.qbs
tests/auto/blackbox/testdata/exportWithRecursiveDepends/modules/module2/module2.qbs
tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/modules/module1/module1.qbs
tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/modules/module2/module2.qbs
tests/auto/blackbox/tst_blackbox.cpp
Change-Id: I8d0acb4fb9b89ee1f1ffeaefdc572b21758f1a1e
Diffstat (limited to 'tests/auto/api/testdata/export-with-recursive-depends')
| -rw-r--r-- | tests/auto/api/testdata/export-with-recursive-depends/modules/module1/module1.qbs (renamed from tests/auto/api/testdata/export-with-recursive-depends/qbs/modules/module1/module1.qbs) | 0 | ||||
| -rw-r--r-- | tests/auto/api/testdata/export-with-recursive-depends/modules/module2/module2.qbs (renamed from tests/auto/api/testdata/export-with-recursive-depends/qbs/modules/module2/module2.qbs) | 0 | ||||
| -rw-r--r-- | tests/auto/api/testdata/export-with-recursive-depends/project.qbs | 1 |
3 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/api/testdata/export-with-recursive-depends/qbs/modules/module1/module1.qbs b/tests/auto/api/testdata/export-with-recursive-depends/modules/module1/module1.qbs index c1c4ad358..c1c4ad358 100644 --- a/tests/auto/api/testdata/export-with-recursive-depends/qbs/modules/module1/module1.qbs +++ b/tests/auto/api/testdata/export-with-recursive-depends/modules/module1/module1.qbs diff --git a/tests/auto/api/testdata/export-with-recursive-depends/qbs/modules/module2/module2.qbs b/tests/auto/api/testdata/export-with-recursive-depends/modules/module2/module2.qbs index 75a274631..75a274631 100644 --- a/tests/auto/api/testdata/export-with-recursive-depends/qbs/modules/module2/module2.qbs +++ b/tests/auto/api/testdata/export-with-recursive-depends/modules/module2/module2.qbs diff --git a/tests/auto/api/testdata/export-with-recursive-depends/project.qbs b/tests/auto/api/testdata/export-with-recursive-depends/project.qbs index 045e65133..d5f5f79e5 100644 --- a/tests/auto/api/testdata/export-with-recursive-depends/project.qbs +++ b/tests/auto/api/testdata/export-with-recursive-depends/project.qbs @@ -12,5 +12,4 @@ Project { Depends { name: "app1" } files: "main2.cpp" } - qbsSearchPaths: "qbs" } |