diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-21 13:41:39 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-22 05:12:13 +0000 |
commit | e0efb1d2b09b7979162f4933193b1a247e393814 (patch) | |
tree | 93ba4be075b7455bffccd06866765f4749a8dbe7 /share/qbs/imports/qbs/base | |
parent | 812a3cf1a5ede5cfc4ce02d8bd495dda92e633c3 (diff) |
Remove the base module import from shared imports and modules
Change-Id: I5270e033dc41b5bd76a417099514c69cc073008b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/base')
-rw-r--r-- | share/qbs/imports/qbs/base/AndroidApk.qbs | 1 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/Application.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/ApplicationExtension.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/AutotestRunner.qbs | 1 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/CppApplication.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/DynamicLibrary.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/InnoSetup.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/InstallPackage.qbs | 1 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/Library.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/LoadableModule.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/NSISSetup.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/NativeBinary.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/QtApplication.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/QtGuiApplication.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/StaticLibrary.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs | 2 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/XPCService.qbs | 2 |
17 files changed, 0 insertions, 31 deletions
diff --git a/share/qbs/imports/qbs/base/AndroidApk.qbs b/share/qbs/imports/qbs/base/AndroidApk.qbs index d881b791f..1f123827d 100644 --- a/share/qbs/imports/qbs/base/AndroidApk.qbs +++ b/share/qbs/imports/qbs/base/AndroidApk.qbs @@ -28,7 +28,6 @@ ** ****************************************************************************/ -import qbs import qbs.File import qbs.FileInfo diff --git a/share/qbs/imports/qbs/base/Application.qbs b/share/qbs/imports/qbs/base/Application.qbs index 7f26279c8..ddc824756 100644 --- a/share/qbs/imports/qbs/base/Application.qbs +++ b/share/qbs/imports/qbs/base/Application.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - NativeBinary { type: { if (isForAndroid && !consoleApplication) diff --git a/share/qbs/imports/qbs/base/ApplicationExtension.qbs b/share/qbs/imports/qbs/base/ApplicationExtension.qbs index e02c7c7e5..140475909 100644 --- a/share/qbs/imports/qbs/base/ApplicationExtension.qbs +++ b/share/qbs/imports/qbs/base/ApplicationExtension.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - XPCService { Depends { name: "xcode" } diff --git a/share/qbs/imports/qbs/base/AutotestRunner.qbs b/share/qbs/imports/qbs/base/AutotestRunner.qbs index 3b8461167..ab9ba15f7 100644 --- a/share/qbs/imports/qbs/base/AutotestRunner.qbs +++ b/share/qbs/imports/qbs/base/AutotestRunner.qbs @@ -28,7 +28,6 @@ ** ****************************************************************************/ -import qbs import qbs.File import qbs.FileInfo import qbs.ModUtils diff --git a/share/qbs/imports/qbs/base/CppApplication.qbs b/share/qbs/imports/qbs/base/CppApplication.qbs index 9b7de2bf8..bc7ba50e6 100644 --- a/share/qbs/imports/qbs/base/CppApplication.qbs +++ b/share/qbs/imports/qbs/base/CppApplication.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs 1.0 - Application { Depends { name: "cpp" } } diff --git a/share/qbs/imports/qbs/base/DynamicLibrary.qbs b/share/qbs/imports/qbs/base/DynamicLibrary.qbs index 4853b9598..267519a42 100644 --- a/share/qbs/imports/qbs/base/DynamicLibrary.qbs +++ b/share/qbs/imports/qbs/base/DynamicLibrary.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - Library { type: ["dynamiclibrary"].concat(isForAndroid ? ["android.nativelibrary"] : []) diff --git a/share/qbs/imports/qbs/base/InnoSetup.qbs b/share/qbs/imports/qbs/base/InnoSetup.qbs index c4873412a..5ea076eb3 100644 --- a/share/qbs/imports/qbs/base/InnoSetup.qbs +++ b/share/qbs/imports/qbs/base/InnoSetup.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - Product { Depends { name: "innosetup"; condition: qbs.targetOS.contains("windows") } type: ["innosetup.exe"] diff --git a/share/qbs/imports/qbs/base/InstallPackage.qbs b/share/qbs/imports/qbs/base/InstallPackage.qbs index 9e621aed0..e85fe3821 100644 --- a/share/qbs/imports/qbs/base/InstallPackage.qbs +++ b/share/qbs/imports/qbs/base/InstallPackage.qbs @@ -28,7 +28,6 @@ ** ****************************************************************************/ -import qbs import qbs.FileInfo import qbs.ModUtils import qbs.TextFile diff --git a/share/qbs/imports/qbs/base/Library.qbs b/share/qbs/imports/qbs/base/Library.qbs index 4f0b45789..615c2319f 100644 --- a/share/qbs/imports/qbs/base/Library.qbs +++ b/share/qbs/imports/qbs/base/Library.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - NativeBinary { type: { if (qbs.targetOS.contains("ios") && parseInt(cpp.minimumIosVersion, 10) < 8) diff --git a/share/qbs/imports/qbs/base/LoadableModule.qbs b/share/qbs/imports/qbs/base/LoadableModule.qbs index 607a7d8d2..34579e4de 100644 --- a/share/qbs/imports/qbs/base/LoadableModule.qbs +++ b/share/qbs/imports/qbs/base/LoadableModule.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - DynamicLibrary { type: isForDarwin ? ["loadablemodule"] : base } diff --git a/share/qbs/imports/qbs/base/NSISSetup.qbs b/share/qbs/imports/qbs/base/NSISSetup.qbs index 6401a17c4..1362f2713 100644 --- a/share/qbs/imports/qbs/base/NSISSetup.qbs +++ b/share/qbs/imports/qbs/base/NSISSetup.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - Product { Depends { name: "nsis"; condition: qbs.targetOS.contains("windows") } type: ["nsissetup"] diff --git a/share/qbs/imports/qbs/base/NativeBinary.qbs b/share/qbs/imports/qbs/base/NativeBinary.qbs index ce8f458f4..5b0435153 100644 --- a/share/qbs/imports/qbs/base/NativeBinary.qbs +++ b/share/qbs/imports/qbs/base/NativeBinary.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - Product { property bool isForAndroid: qbs.targetOS.contains("android") property bool isForDarwin: qbs.targetOS.contains("darwin") diff --git a/share/qbs/imports/qbs/base/QtApplication.qbs b/share/qbs/imports/qbs/base/QtApplication.qbs index b9e8f2603..32800d294 100644 --- a/share/qbs/imports/qbs/base/QtApplication.qbs +++ b/share/qbs/imports/qbs/base/QtApplication.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { Depends { name: "Qt.core" } } diff --git a/share/qbs/imports/qbs/base/QtGuiApplication.qbs b/share/qbs/imports/qbs/base/QtGuiApplication.qbs index 1d92142fa..ead671efb 100644 --- a/share/qbs/imports/qbs/base/QtGuiApplication.qbs +++ b/share/qbs/imports/qbs/base/QtGuiApplication.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - CppApplication { Depends { name: "Qt.gui" } Depends { diff --git a/share/qbs/imports/qbs/base/StaticLibrary.qbs b/share/qbs/imports/qbs/base/StaticLibrary.qbs index be5f7a7c4..4eea3c991 100644 --- a/share/qbs/imports/qbs/base/StaticLibrary.qbs +++ b/share/qbs/imports/qbs/base/StaticLibrary.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - Library { type: ["staticlibrary"] diff --git a/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs b/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs index d624be864..791fc9473 100644 --- a/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs +++ b/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - Product { Depends { name: "wix"; condition: qbs.targetOS.contains("windows") } type: ["msi"] diff --git a/share/qbs/imports/qbs/base/XPCService.qbs b/share/qbs/imports/qbs/base/XPCService.qbs index 0e8e1eb7c..16c25900c 100644 --- a/share/qbs/imports/qbs/base/XPCService.qbs +++ b/share/qbs/imports/qbs/base/XPCService.qbs @@ -28,8 +28,6 @@ ** ****************************************************************************/ -import qbs - Application { type: base.concat(["xpcservice"]) |