diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
| commit | 868428cc634f0e2c6d5ace84555675cb80363d3f (patch) | |
| tree | 98d321520f31107067ca45e5b5806d92551b2f3d /src/plugins/bineditor | |
| parent | 0d303db8c2e79c772cd216bfc07b42637c37e1bd (diff) | |
| parent | 93184f7959bd18ba6f77e8d8b312f0e3be95d70c (diff) | |
| download | qt-creator-868428cc634f0e2c6d5ace84555675cb80363d3f.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qbs/imports/QtcTool.qbs
src/plugins/git/giteditor.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
Diffstat (limited to 'src/plugins/bineditor')
| -rw-r--r-- | src/plugins/bineditor/bineditor.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs index 2e3109aa85..7951c1180e 100644 --- a/src/plugins/bineditor/bineditor.qbs +++ b/src/plugins/bineditor/bineditor.qbs @@ -1,4 +1,4 @@ -import qbs.base 1.0 +import qbs 1.0 import QtcPlugin |