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