Commit 1b3bb5cb authored by Eike Ziller's avatar Eike Ziller Committed by Joerg Bornemann

Consistently give qbs groups a name.

These nicely show up in the project tree in Qt Creator then.

Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 5e407c08
......@@ -4,6 +4,7 @@ Product {
name: "QtComponents"
Group {
name: "Resources"
qbs.install: true
qbs.installDir: (qbs.targetOS == "windows" ? "lib/qtcreator" : project.ide_library_path)
+ "/qtcomponents"
......
......@@ -204,6 +204,7 @@ Project {
]
Group {
name: "qtcreator.sh"
condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
files: "bin/qtcreator.sh"
qbs.install: true
......@@ -211,6 +212,7 @@ Project {
}
Group {
name: "QtLockedFile_unix"
condition: qbs.targetPlatform.indexOf("unix") != -1
files: [
"src/shared/qtlockedfile/qtlockedfile_unix.cpp"
......@@ -218,6 +220,7 @@ Project {
}
Group {
name: "QtLockedFile_win"
condition: qbs.targetOS == "windows"
files: [
"src/shared/qtlockedfile/qtlockedfile_win.cpp"
......
import qbs.base 1.0
Product {
name: "Translations"
type: "qm"
name: "translations"
Depends { name: "Qt.core" }
files: "*.ts"
......
......@@ -4,6 +4,7 @@ Product {
name: "SharedContent"
Group {
name: "Unconditional"
qbs.install: true
qbs.installDir: project.ide_data_path
prefix: "qtcreator/"
......@@ -25,6 +26,7 @@ Product {
}
Group {
name: "Conditional"
qbs.install: true
qbs.installDir: project.ide_data_path + "/externaltools"
prefix: "../src/share/qtcreator/externaltools/"
......
......@@ -14,6 +14,7 @@ QtcLibrary {
Depends { name: "Qt.widgets" }
Group {
name: "ThirdPartyCPlusPlus"
prefix: "../3rdparty/cplusplus/"
files: [
"AST.cpp",
......
......@@ -181,6 +181,7 @@ QtcLibrary {
]
Group {
name: "Tooltip"
prefix: "tooltip/"
files: [
"effects.h",
......@@ -195,6 +196,7 @@ QtcLibrary {
}
Group {
name: "WindowsUtils"
condition: qbs.targetOS == "windows"
files: [
"consoleprocess_win.cpp",
......@@ -204,6 +206,7 @@ QtcLibrary {
}
Group {
name: "ConsoleProcess_unix"
condition: qbs.targetPlatform.indexOf("unix") != -1
files: [
"consoleprocess_unix.cpp",
......
......@@ -232,6 +232,7 @@ QtcPlugin {
]
Group {
name: "ProgressManager_win"
condition: qbs.targetOS == "windows"
files: [
"progressmanager/progressmanager_win.cpp",
......@@ -239,6 +240,7 @@ QtcPlugin {
}
Group {
name: "ProgressManager_mac"
condition: qbs.targetOS == "mac"
files: [
"macfullscreen.h",
......@@ -248,6 +250,7 @@ QtcPlugin {
}
Group {
name: "ProgressManager_x11"
condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
files: [
"progressmanager/progressmanager_x11.cpp",
......
......@@ -5,48 +5,56 @@ Product {
name: "LogoImages"
Group {
name: "16x16"
qbs.install: true
qbs.installDir: "share/icons/hicolor/16x16/apps"
files: ["16/QtProject-qtcreator.png"]
}
Group {
name: "24x24"
qbs.install: true
qbs.installDir: "share/icons/hicolor/24x24/apps"
files: ["24/QtProject-qtcreator.png"]
}
Group {
name: "32x32"
qbs.install: true
qbs.installDir: "share/icons/hicolor/32x32/apps"
files: ["32/QtProject-qtcreator.png"]
}
Group {
name: "48x48"
qbs.install: true
qbs.installDir: "share/icons/hicolor/48x48/apps"
files: ["48/QtProject-qtcreator.png"]
}
Group {
name: "64x64"
qbs.install: true
qbs.installDir: "share/icons/hicolor/64x64/apps"
files: ["64/QtProject-qtcreator.png"]
}
Group {
name: "128x128"
qbs.install: true
qbs.installDir: "share/icons/hicolor/128x128/apps"
files: ["128/QtProject-qtcreator.png"]
}
Group {
name: "256x256"
qbs.install: true
qbs.installDir: "share/icons/hicolor/256x256/apps"
files: ["256/QtProject-qtcreator.png"]
}
Group {
name: "512x512"
qbs.install: true
qbs.installDir: "share/icons/hicolor/512x512/apps"
files: ["512/QtProject-qtcreator.png"]
......
......@@ -51,6 +51,7 @@ QtcPlugin {
]
Group {
name: "Shared"
prefix: "../../shared/cpaster/"
files: [
"cgi.cpp",
......
......@@ -55,6 +55,7 @@ QtcPlugin {
]
Group {
name: "Tests"
condition: Defaults.testsEnabled(qbs)
files: [
"cppdoxygen_test.cpp",
......
......@@ -111,6 +111,7 @@ QtcPlugin {
]
Group {
name: "Tests"
condition: Defaults.testsEnabled(qbs)
files: [
"cppcodegen_test.cpp",
......
......@@ -29,6 +29,7 @@ QtcPlugin {
]
Group {
name: "Tests"
condition: Defaults.testsEnabled(qbs)
qbs.install: true
qbs.installDir: "tests/manual/debugger/simple/"
......@@ -266,6 +267,7 @@ QtcPlugin {
]
Group {
name: "RegistryAccess"
condition: qbs.targetOS == "windows"
prefix: "../../shared/registryaccess/"
files: [
......@@ -275,6 +277,7 @@ QtcPlugin {
}
Group {
name: "RegisterPostMortem"
condition: qbs.targetOS == "windows"
files: [
"registerpostmortemaction.cpp",
......@@ -283,6 +286,7 @@ QtcPlugin {
}
Group {
name: "LLDBOptions"
condition: qbs.targetOS == "mac"
files: [
"lldblib/lldboptionspage.cpp",
......
......@@ -22,6 +22,7 @@ QtcPlugin {
]
Group {
name: "Tests"
condition: Defaults.testsEnabled(qbs)
files: ["fakevim_test.cpp"]
}
......
......@@ -76,6 +76,7 @@ QtcPlugin {
]
Group {
name: "Gitorious"
prefix: "gitorious/"
files: [
"gitorious.cpp",
......@@ -99,6 +100,7 @@ QtcPlugin {
}
Group {
name: "Gerrit"
prefix: "gerrit/"
files: [
"gerritdialog.cpp",
......
......@@ -333,6 +333,7 @@ QtcPlugin {
]
Group {
name: "WindowsToolChains"
condition: qbs.targetOS == "windows" || Defaults.testsEnabled(qbs)
files: [
"abstractmsvctoolchain.cpp",
......@@ -349,6 +350,7 @@ QtcPlugin {
}
Group {
name: "Tests"
condition: Defaults.testsEnabled(qbs)
files: ["outputparser_test.h", "outputparser_test.cpp"]
}
......
......@@ -74,6 +74,7 @@ QtcPlugin {
]
Group {
name: "Tests"
condition: Defaults.testsEnabled(qbs)
files: ["qmljstools_test.cpp"]
}
......
......@@ -27,6 +27,7 @@ QtcPlugin {
])
Group {
name: "Shared"
prefix: "../../shared/proparser/"
files: [
"ioutils.cpp",
......
......@@ -149,6 +149,7 @@ QtcPlugin {
]
Group {
name: "CodeAssist"
prefix: "codeassist/"
files: [
"assistenums.h",
......@@ -200,6 +201,7 @@ QtcPlugin {
}
Group {
name: "GenericHighlighter"
prefix: "generichighlighter/"
files: [
"context.cpp",
......@@ -243,6 +245,7 @@ QtcPlugin {
}
Group {
name: "Snippets"
prefix: "snippets/"
files: [
"isnippetprovider.cpp",
......
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