diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
| commit | db9837fa6c9401e898ac8e7492081a6e21c71790 (patch) | |
| tree | d542a089711257402ac4fe70813fa0e7de825f2e /src/libs/botan/botan_dependencies.pri | |
| parent | 7bc14bf3498ea6b1c19abacf85a5103772da26bc (diff) | |
| parent | 58747b2de107e8f6ac00daeb431ecbf3e603fd34 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/clangtools/clangtoolruncontrol.cpp
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
Diffstat (limited to 'src/libs/botan/botan_dependencies.pri')
| -rw-r--r-- | src/libs/botan/botan_dependencies.pri | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/libs/botan/botan_dependencies.pri b/src/libs/botan/botan_dependencies.pri new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/src/libs/botan/botan_dependencies.pri |