qbs project files: Rename defaults.js to functions.js.

The old name does not fit anymore.

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

6 files changed, 13 insertions, 13 deletions

diff --git a/qbs/defaults.js b/qbs/functions.js
index 23a51f80e8..23a51f80e8 100644
--- a/qbs/defaults.js
+++ b/qbs/functions.js
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 50301ae962..270b35207c 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../../qbs/defaults.js" as Defaults
+import "../../qbs/functions.js" as QtcFunctions
 
 DynamicLibrary {
     Depends { name: "cpp" }
@@ -8,7 +8,7 @@ DynamicLibrary {
         name: "Qt.test"
     }
 
-    targetName: Defaults.qtLibraryName(qbs, name)
+    targetName: QtcFunctions.qtLibraryName(qbs, name)
     destinationDirectory: project.ide_library_path
 
     cpp.defines: project.generalDefines
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index e41cbe14a5..1188239109 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -1,6 +1,6 @@
 import qbs.base 1.0
 import qbs.FileInfo
-import "../../qbs/defaults.js" as Defaults
+import "../../qbs/functions.js" as QtcFunctions
 
 Product {
     type: ["dynamiclibrary", "pluginSpec"]
@@ -10,9 +10,9 @@ Product {
 
     Depends { name: "Qt.core" }
     property string minimumQtVersion: "4.8"
-    condition: Defaults.versionIsAtLeast(Qt.core.version, minimumQtVersion)
+    condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion)
 
-    targetName: Defaults.qtLibraryName(qbs, name)
+    targetName: QtcFunctions.qtLibraryName(qbs, name)
     destinationDirectory: project.ide_plugin_path + '/' + provider
 
     Depends { name: "ExtensionSystem" }
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 6fdefb189d..7b9ba5a07d 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -1,13 +1,13 @@
 import qbs.base 1.0
 
-import "../../../qbs/defaults.js" as Defaults
+import "../../../qbs/functions.js" as QtcFunctions
 import "../QtcPlugin.qbs" as QtcPlugin
 
 QtcPlugin {
     name: "ProjectExplorer"
 
     Depends { name: "Qt"; submodules: ["core", "widgets", "xml", "network", "script"] }
-    Depends { name: "Qt.quick"; condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1"); }
+    Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
     Depends { name: "Core" }
     Depends { name: "Locator" }
     Depends { name: "Find" }
@@ -142,7 +142,7 @@ QtcPlugin {
 
     Group {
         name: "Project Welcome Page"
-        condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1")
+        condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1")
         files: [
             "projectwelcomepage.cpp",
             "projectwelcomepage.h"
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 8f88499c73..e1ea0710ab 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -1,13 +1,13 @@
 import qbs.base 1.0
 
-import "../../../qbs/defaults.js" as Defaults
+import "../../../qbs/functions.js" as QtcFunctions
 import "../QtcPlugin.qbs" as QtcPlugin
 
 QtcPlugin {
     name: "QtSupport"
 
     Depends { name: "Qt"; submodules: ["core", "widgets"]; }
-    Depends { name: "Qt.quick"; condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1"); }
+    Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
@@ -114,7 +114,7 @@ QtcPlugin {
 
     Group {
         name: "Getting Started Welcome Page"
-        condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1")
+        condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1")
         files: [
             "gettingstartedwelcomepage.cpp",
             "gettingstartedwelcomepage.h"
diff --git a/tests/auto/extensionsystem/plugin.qbs b/tests/auto/extensionsystem/plugin.qbs
index 2d285cb890..6be51f8859 100644
--- a/tests/auto/extensionsystem/plugin.qbs
+++ b/tests/auto/extensionsystem/plugin.qbs
@@ -2,14 +2,14 @@ import qbs
 import qbs.File
 import qbs.FileInfo
 import "./copytransformer.qbs" as CopyTransformer
-import "../../../qbs/defaults.js" as Defaults
+import "../../../qbs/functions.js" as QtcFunctions
 
 DynamicLibrary {
     Depends { name: "Aggregation" }
     Depends { name: "ExtensionSystem" }
     Depends { name: "cpp" }
     Depends { name: "Qt.core" }
-    targetName: Defaults.qtLibraryName(qbs, name.split('_')[1])
+    targetName: QtcFunctions.qtLibraryName(qbs, name.split('_')[1])
     destinationDirectory: FileInfo.relativePath(project.ide_source_tree, sourceDirectory)
     cpp.rpaths: [
         buildDirectory + "/lib/qtcreator",