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 /qbs/imports | |
| 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 'qbs/imports')
| -rw-r--r-- | qbs/imports/QtcLibrary.qbs | 2 | ||||
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 2 | ||||
| -rw-r--r-- | qbs/imports/QtcTool.qbs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index aa27733aa6..806e796017 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -1,4 +1,4 @@ -import qbs.base 1.0 +import qbs 1.0 import QtcFunctions DynamicLibrary { diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 7527003539..88681b4b19 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -1,4 +1,4 @@ -import qbs.base 1.0 +import qbs 1.0 import qbs.FileInfo import QtcFunctions diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs index 181cf67451..2a30cfe8f9 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -1,4 +1,4 @@ -import qbs.base 1.0 +import qbs 1.0 import QtcFunctions Application { |