diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-07-11 08:02:41 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-11 08:02:41 +0200 |
| commit | ab0c3da08ffffa8bd1dcdef19b12e2736bea528a (patch) | |
| tree | 4e3f52dad8631ad4247f39206072541887ba0815 /qbs | |
| parent | 113c5600c909791ddfea3d424a41d982dcdda6b7 (diff) | |
| parent | 8b390350dfb7116cb554f736756f1815a798779e (diff) | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/projectexplorer/projectexplorer.cpp
Change-Id: I37e550646f877b50693043894976a693ac22ad5e
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/pluginspec/pluginspec.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index 41ad0ebb0e..ca8fdae8f4 100644 --- a/qbs/pluginspec/pluginspec.qbs +++ b/qbs/pluginspec/pluginspec.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 import qbs.TextFile -import qbs.fileinfo as FileInfo +import qbs.FileInfo Module { Depends { id: qtcore; name: "Qt.core" } |