diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-18 09:22:19 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-18 09:22:19 +0200 |
| commit | 44931c098583ee5365ec7e3de716c0c6a74b8372 (patch) | |
| tree | c2944dc59e6c1c679de1bfbb2880b4e129317b6c /qtcreator.qbs | |
| parent | ea75b0d18312cd1eb8caf139413dc2a064f1d788 (diff) | |
| parent | 1526011f32ae5becdedcf4ee55e32bbcf5724bcb (diff) | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/pythoneditor/tools/lexical/pythonformattoken.h
Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
Diffstat (limited to 'qtcreator.qbs')
| -rw-r--r-- | qtcreator.qbs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index 13d154a315b..02b36a2066f 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -162,7 +162,6 @@ Project { Depends { name: "Qt"; submodules: ["widgets", "network"] } Depends { name: "Utils" } Depends { name: "ExtensionSystem" } - Depends { name: "Core" } files: [ "src/app/main.cpp", |