Move 3rdparty resources into 3rdparty subdirectory

Change-Id: Ib6363629ef3e4d10bca64936a46147b5defc048b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Eike Ziller
2016-03-24 12:46:10 +01:00
parent 2a3e342740
commit c320d3909a
21 changed files with 29 additions and 3 deletions

View File

@@ -22,7 +22,6 @@ DATA_DIRS = \
qml \ qml \
qml-type-descriptions \ qml-type-descriptions \
modeleditor \ modeleditor \
generic-highlighter \
glsl \ glsl \
cplusplus cplusplus
macx: DATA_DIRS += scripts macx: DATA_DIRS += scripts

View File

@@ -13,7 +13,6 @@ Product {
"cplusplus/**/*", "cplusplus/**/*",
"debugger/**/*", "debugger/**/*",
"designer/**/*", "designer/**/*",
"generic-highlighter/**/*",
"glsl/**/*", "glsl/**/*",
"modeleditor/**/*", "modeleditor/**/*",
"qml/**/*", "qml/**/*",
@@ -29,6 +28,17 @@ Product {
] ]
} }
Group {
name: "3rdparty"
qbs.install: true
qbs.installDir: project.ide_data_path
qbs.installSourceBase: project.ide_source_tree + "/src/share/3rdparty"
prefix: project.ide_source_tree + "/src/share/3rdparty/"
files: [
"generic-highlighter/**/*"
]
}
Group { Group {
name: "Conditional" name: "Conditional"
qbs.install: true qbs.install: true

16
src/share/3rdparty/data.pro vendored Normal file
View File

@@ -0,0 +1,16 @@
TEMPLATE = aux
include(../../../qtcreator.pri)
STATIC_BASE = $$PWD
STATIC_OUTPUT_BASE = $$IDE_DATA_PATH
STATIC_INSTALL_BASE = $$INSTALL_DATA_PATH
DATA_DIRS = \
generic-highlighter
for(data_dir, DATA_DIRS) {
STATIC_FILES += $$files($$PWD/$$data_dir/*, true)
}
include(../../../qtcreatordata.pri)

View File

@@ -32,4 +32,5 @@ SUBDIRS += \
app \ app \
plugins \ plugins \
tools \ tools \
share/qtcreator/data.pro share/qtcreator/data.pro \
share/3rdparty/data.pro