Do not use an "as" specifier for URI imports.

Also rename "fileinfo" to "FileInfo" and "probes" to "Probes", to
make the default name more conventional.

Change-Id: I86ed29e299b8a9c2f40244c098d57a3ec8b68397
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

16 files changed, 11 insertions, 11 deletions

diff --git a/share/qbs/imports/qbs/fileinfo/fileinfo.js b/share/qbs/imports/qbs/FileInfo/fileinfo.js
index fb241f8ff..fb241f8ff 100644
--- a/share/qbs/imports/qbs/fileinfo/fileinfo.js
+++ b/share/qbs/imports/qbs/FileInfo/fileinfo.js
diff --git a/share/qbs/imports/qbs/probes/BinaryProbe.qbs b/share/qbs/imports/qbs/Probes/BinaryProbe.qbs
index 2b00f52d4..2b00f52d4 100644
--- a/share/qbs/imports/qbs/probes/BinaryProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/BinaryProbe.qbs
diff --git a/share/qbs/imports/qbs/probes/FrameworkProbe.qbs b/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
index 987af28eb..987af28eb 100644
--- a/share/qbs/imports/qbs/probes/FrameworkProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
diff --git a/share/qbs/imports/qbs/probes/IncludeProbe.qbs b/share/qbs/imports/qbs/Probes/IncludeProbe.qbs
index 1018bf222..1018bf222 100644
--- a/share/qbs/imports/qbs/probes/IncludeProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/IncludeProbe.qbs
diff --git a/share/qbs/imports/qbs/probes/PathProbe.qbs b/share/qbs/imports/qbs/Probes/PathProbe.qbs
index dff8a10e8..1d8211359 100644
--- a/share/qbs/imports/qbs/probes/PathProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/PathProbe.qbs
@@ -1,6 +1,6 @@
 import qbs 1.0
 import qbs.File
-import qbs.fileinfo as FileInfo
+import qbs.Fileinfo
 import "utils.js" as Utils
 
 Probe {
diff --git a/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs b/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
index 3339b0a44..33b539d1f 100644
--- a/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
@@ -1,6 +1,6 @@
 import qbs 1.0
 import qbs.Process
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 import "utils.js" as Utils
 
 Probe {
diff --git a/share/qbs/imports/qbs/probes/utils.js b/share/qbs/imports/qbs/Probes/utils.js
index f8b7e28c5..f8b7e28c5 100644
--- a/share/qbs/imports/qbs/probes/utils.js
+++ b/share/qbs/imports/qbs/Probes/utils.js
diff --git a/share/qbs/modules/Qt/QtModule.qbs b/share/qbs/modules/Qt/QtModule.qbs
index a30729494..f71e39e8a 100644
--- a/share/qbs/modules/Qt/QtModule.qbs
+++ b/share/qbs/modules/Qt/QtModule.qbs
@@ -1,5 +1,5 @@
 import qbs 1.0
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 import 'qtfunctions.js' as QtFunctions
 
 Module {
diff --git a/share/qbs/modules/Qt/core/core.qbs b/share/qbs/modules/Qt/core/core.qbs
index 5df779916..7c7cc96fe 100644
--- a/share/qbs/modules/Qt/core/core.qbs
+++ b/share/qbs/modules/Qt/core/core.qbs
@@ -1,5 +1,5 @@
 import qbs 1.0
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 import '../../utils.js' as ModUtils
 import "moc.js" as Moc
 import '../qtfunctions.js' as QtFunctions
diff --git a/share/qbs/modules/Qt/gui/gui.qbs b/share/qbs/modules/Qt/gui/gui.qbs
index 619d22ce6..6aaca4dd8 100644
--- a/share/qbs/modules/Qt/gui/gui.qbs
+++ b/share/qbs/modules/Qt/gui/gui.qbs
@@ -1,5 +1,5 @@
 import qbs 1.0
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 import '../QtModule.qbs' as QtModule
 import '../../utils.js' as ModUtils
 
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs
index b7f793f5f..9ef0cbb76 100644
--- a/share/qbs/modules/cpp/DarwinGCC.qbs
+++ b/share/qbs/modules/cpp/DarwinGCC.qbs
@@ -1,7 +1,7 @@
 import qbs 1.0
 import qbs.Process
 import qbs.TextFile
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 import '../utils.js' as ModUtils
 import "bundle-tools.js" as BundleTools
 import "darwin-tools.js" as DarwinTools
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 69a9c0630..59bb5c294 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -1,5 +1,5 @@
 import qbs 1.0
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 import 'windows.js' as Windows
 import 'gcc.js' as Gcc
 import '../utils.js' as ModUtils
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs
index e8aa01cd7..9ce4a4efc 100644
--- a/share/qbs/modules/cpp/ios-gcc.qbs
+++ b/share/qbs/modules/cpp/ios-gcc.qbs
@@ -1,6 +1,6 @@
 import qbs 1.0
 import qbs.File
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 import '../utils.js' as ModUtils
 import 'darwin-tools.js' as DarwinTools
 import 'bundle-tools.js' as BundleTools
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index dc4347264..81a7659fa 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -1,5 +1,5 @@
 import qbs 1.0
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 import '../utils.js' as ModUtils
 import "windows.js" as Windows
 
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 5fe6d0739..877b48482 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -1,6 +1,6 @@
 import qbs 1.0
 import qbs.File
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 import '../utils.js' as ModUtils
 import 'windows.js' as Windows
 import 'msvc.js' as MSVC
diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs
index 6b80649dc..f48ddffc8 100644
--- a/share/qbs/modules/qbs/common.qbs
+++ b/share/qbs/modules/qbs/common.qbs
@@ -1,5 +1,5 @@
 import qbs 1.0
-import qbs.fileinfo as FileInfo
+import qbs.FileInfo
 
 Module {
     property string buildVariant: "debug"