summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-07-09 13:54:46 +0200
committerEike Ziller <eike.ziller@digia.com>2013-07-09 16:21:24 +0200
commitf71bb6d348e788645e3b975bc7e3a0f4dd99b977 (patch)
treee2b145d580d1e9c094cea0cd4e45d7be8465bfa5
parentfe296e2b25885515f5ded8814d7731fac3645959 (diff)
downloadqt-creator-f71bb6d348e788645e3b975bc7e3a0f4dd99b977.tar.gz
Adapt qbs files to qbs.fileinfo renaming.
Also update qbs submodule so Creator can open itself. Change-Id: Iaa70d5e83d07a1120e795046ebbd8995159aa2db Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--qbs/pluginspec/pluginspec.qbs2
-rw-r--r--src/plugins/QtcPlugin.qbs2
-rw-r--r--src/plugins/cppeditor/cppeditor.qbs2
-rw-r--r--src/plugins/cpptools/cpptools.qbs2
m---------src/shared/qbs0
5 files changed, 4 insertions, 4 deletions
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs
index c852d1082d..0a8a7686aa 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" }
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index d1b52ddf58..6af280cb2d 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -1,5 +1,5 @@
import qbs.base 1.0
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
import "../../qbs/defaults.js" as Defaults
Product {
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index b767890c12..079025a112 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -1,5 +1,5 @@
import qbs.base 1.0
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin
import "../../../qbs/defaults.js" as Defaults
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 2275812162..cf23e66920 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -1,5 +1,5 @@
import qbs.base 1.0
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin
import "../../../qbs/defaults.js" as Defaults
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject 6e432eef926e40278bca6c0281a6f36c56b099a
+Subproject 4051b5f9c81c40123c68ac5b7774d1dcb212348