Commit 203a7756 authored by Christian Kandeler's avatar Christian Kandeler

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

The old name does not fit anymore.

Change-Id: I9e270e6e55ee94edb3dd2dc58c01188be1f91793
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 7e9a4131
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
......
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" }
......
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"
......
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"
......
......@@ -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",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment