diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-02-28 11:20:27 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-28 17:15:11 +0100 |
| commit | 4996dba32a6792fc70a9374a67995394a3361a62 (patch) | |
| tree | d611f15db497e6b7ac80ebc20d261a4b6c8b10d4 /share | |
| parent | 7f5d54454373c6e4e50daf70a2be6c58d736076f (diff) | |
move import of bundle-tools.js to path-tools.js
And remove it from where it isn't needed.
Change-Id: I51dc33e1dce4fd43b7b3080ef6e277e7c6b9b725
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 1 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/path-tools.js | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 8f8124e31..ee5904454 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -4,7 +4,6 @@ import qbs.FileInfo import qbs.ModUtils import qbs.Process import 'gcc.js' as Gcc -import 'bundle-tools.js' as BundleTools import 'path-tools.js' as PathTools CppModule { diff --git a/share/qbs/modules/cpp/path-tools.js b/share/qbs/modules/cpp/path-tools.js index 01413cd67..17df91af5 100644 --- a/share/qbs/modules/cpp/path-tools.js +++ b/share/qbs/modules/cpp/path-tools.js @@ -1,3 +1,5 @@ +var BundleTools = loadFile("bundle-tools.js"); + function applicationFileName() { return ModUtils.moduleProperty(product, "executablePrefix") diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index 4e74ad034..ac7f81571 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -4,7 +4,6 @@ import qbs.FileInfo import qbs.ModUtils import 'windows.js' as Windows import 'msvc.js' as MSVC -import "bundle-tools.js" as BundleTools // needed for path-tools.js import 'path-tools.js' as PathTools CppModule { |