diff options
25 files changed, 20 insertions, 20 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" diff --git a/tests/auto/blackbox/testdata/codegen/codegen.qbs b/tests/auto/blackbox/testdata/codegen/codegen.qbs index 6fdcbbb46..d7210e21c 100644 --- a/tests/auto/blackbox/testdata/codegen/codegen.qbs +++ b/tests/auto/blackbox/testdata/codegen/codegen.qbs @@ -1,5 +1,5 @@ import qbs 1.0 -import qbs.fileinfo as FileInfo +import qbs.FileInfo Project { property string name: 'codegen' diff --git a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs index 136e3e032..052829c1b 100644 --- a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs +++ b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs @@ -1,6 +1,6 @@ import qbs 1.0 import qbs.TextFile -import qbs.fileinfo as FileInfo +import qbs.FileInfo Project { Product { diff --git a/tests/auto/blackbox/testdata/qt5plugin/plugin.qbs b/tests/auto/blackbox/testdata/qt5plugin/plugin.qbs index 14e2c49df..d80f2c562 100644 --- a/tests/auto/blackbox/testdata/qt5plugin/plugin.qbs +++ b/tests/auto/blackbox/testdata/qt5plugin/plugin.qbs @@ -1,6 +1,6 @@ import qbs.base import qbs.File -import qbs.fileinfo as FileInfo +import qbs.FileInfo DynamicLibrary { name: "echoplugin" diff --git a/tests/manual/configure/configure.qbs b/tests/manual/configure/configure.qbs index a5efd2790..e70d36a0b 100644 --- a/tests/manual/configure/configure.qbs +++ b/tests/manual/configure/configure.qbs @@ -1,5 +1,5 @@ import qbs 1.0 -import qbs.fileinfo as FileInfo +import qbs.FileInfo Project { property string name: 'configure' diff --git a/tests/manual/genmoc_cpp/moc_cpp.qbs b/tests/manual/genmoc_cpp/moc_cpp.qbs index ccbd70ba1..681a93f28 100644 --- a/tests/manual/genmoc_cpp/moc_cpp.qbs +++ b/tests/manual/genmoc_cpp/moc_cpp.qbs @@ -1,6 +1,6 @@ import qbs 1.0 import qbs.TextFile -import qbs.fileinfo as FileInfo +import qbs.FileInfo Project { Product { diff --git a/tests/manual/includeLookup/includeLookup.qbs b/tests/manual/includeLookup/includeLookup.qbs index 780b40ed2..a01afcdeb 100644 --- a/tests/manual/includeLookup/includeLookup.qbs +++ b/tests/manual/includeLookup/includeLookup.qbs @@ -1,5 +1,5 @@ import qbs 1.0 -import qbs.fileinfo as FileInfo +import qbs.FileInfo Project { property string name: 'includeLookup' diff --git a/tests/manual/includeLookup/modules/definition/module.qbs b/tests/manual/includeLookup/modules/definition/module.qbs index 0ee7bee18..87b0d0eab 100644 --- a/tests/manual/includeLookup/modules/definition/module.qbs +++ b/tests/manual/includeLookup/modules/definition/module.qbs @@ -1,5 +1,5 @@ import qbs 1.0 -import qbs.probes as Probes +import qbs.Probes Module { name: 'definition' diff --git a/tests/manual/pkgconfig/pkgconfig.qbs b/tests/manual/pkgconfig/pkgconfig.qbs index 20121a638..132ce337a 100644 --- a/tests/manual/pkgconfig/pkgconfig.qbs +++ b/tests/manual/pkgconfig/pkgconfig.qbs @@ -1,5 +1,5 @@ import qbs 1.0 -import qbs.probes as Probes +import qbs.Probes Project { property string name: 'pkgconfig' diff --git a/tests/manual/transformers/transformers.qbs b/tests/manual/transformers/transformers.qbs index 08444f975..7445bea15 100644 --- a/tests/manual/transformers/transformers.qbs +++ b/tests/manual/transformers/transformers.qbs @@ -2,7 +2,7 @@ import qbs 1.0 import qbs.File import qbs.TextFile import qbs.Xml -import qbs.fileinfo as FileInfo +import qbs.FileInfo Project { Product { |