diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-03-12 10:56:52 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-12 10:56:52 +0100 |
| commit | 3bc622400df79536f93c8b616f9f23718970fab3 (patch) | |
| tree | c32234e4ccde9ae6feaf6a0ac4ed52f382098d48 /qtcreator.qbs | |
| parent | 67cc94fd7402d1ae223956dd13b0a0699468e0f7 (diff) | |
| parent | 513e226dc1be8f4201587cc5cc00773fb55a52f8 (diff) | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/debugger/gdb/gdbengine.cpp
Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
Diffstat (limited to 'qtcreator.qbs')
| -rw-r--r-- | qtcreator.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index 4648db53f1..13d154a315 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import qbs.fileinfo 1.0 as FileInfo +import qbs.fileinfo as FileInfo import "qbs/defaults.js" as Defaults Project { |