Move 3rdparty resources into 3rdparty subdirectory

Change-Id: Ib6363629ef3e4d10bca64936a46147b5defc048b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

21 files changed, 29 insertions, 3 deletions

diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index 9b3b102b9e..068ec0039d 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -22,7 +22,6 @@ DATA_DIRS = \
     qml \
     qml-type-descriptions \
     modeleditor \
-    generic-highlighter \
     glsl \
     cplusplus
 macx: DATA_DIRS += scripts
diff --git a/share/share.qbs b/share/share.qbs
index f00a8e7697..9a51fea6a9 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -13,7 +13,6 @@ Product {
             "cplusplus/**/*",
             "debugger/**/*",
             "designer/**/*",
-            "generic-highlighter/**/*",
             "glsl/**/*",
             "modeleditor/**/*",
             "qml/**/*",
@@ -30,6 +29,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 {
         name: "Conditional"
         qbs.install: true
         qbs.installDir: project.ide_data_path + "/externaltools"
diff --git a/src/share/3rdparty/data.pro b/src/share/3rdparty/data.pro
new file mode 100644
index 0000000000..3f3b5d905c
--- /dev/null
+++ b/src/share/3rdparty/data.pro
@@ -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)
diff --git a/share/qtcreator/generic-highlighter/alert.xml b/src/share/3rdparty/generic-highlighter/alert.xml
index 8ac5296fc8..8ac5296fc8 100644
--- a/share/qtcreator/generic-highlighter/alert.xml
+++ b/src/share/3rdparty/generic-highlighter/alert.xml
diff --git a/share/qtcreator/generic-highlighter/autoconf.xml b/src/share/3rdparty/generic-highlighter/autoconf.xml
index 71740f8a8c..71740f8a8c 100644
--- a/share/qtcreator/generic-highlighter/autoconf.xml
+++ b/src/share/3rdparty/generic-highlighter/autoconf.xml
diff --git a/share/qtcreator/generic-highlighter/bash.xml b/src/share/3rdparty/generic-highlighter/bash.xml
index 2eaec955e0..2eaec955e0 100644
--- a/share/qtcreator/generic-highlighter/bash.xml
+++ b/src/share/3rdparty/generic-highlighter/bash.xml
diff --git a/share/qtcreator/generic-highlighter/cmake.xml b/src/share/3rdparty/generic-highlighter/cmake.xml
index de8194e642..de8194e642 100644
--- a/share/qtcreator/generic-highlighter/cmake.xml
+++ b/src/share/3rdparty/generic-highlighter/cmake.xml
diff --git a/share/qtcreator/generic-highlighter/css.xml b/src/share/3rdparty/generic-highlighter/css.xml
index 552b259a92..552b259a92 100644
--- a/share/qtcreator/generic-highlighter/css.xml
+++ b/src/share/3rdparty/generic-highlighter/css.xml
diff --git a/share/qtcreator/generic-highlighter/doxygen.xml b/src/share/3rdparty/generic-highlighter/doxygen.xml
index 5128903e91..5128903e91 100644
--- a/share/qtcreator/generic-highlighter/doxygen.xml
+++ b/src/share/3rdparty/generic-highlighter/doxygen.xml
diff --git a/share/qtcreator/generic-highlighter/dtd.xml b/src/share/3rdparty/generic-highlighter/dtd.xml
index 75d07234d9..75d07234d9 100644
--- a/share/qtcreator/generic-highlighter/dtd.xml
+++ b/src/share/3rdparty/generic-highlighter/dtd.xml
diff --git a/share/qtcreator/generic-highlighter/html.xml b/src/share/3rdparty/generic-highlighter/html.xml
index 741423f866..741423f866 100644
--- a/share/qtcreator/generic-highlighter/html.xml
+++ b/src/share/3rdparty/generic-highlighter/html.xml
diff --git a/share/qtcreator/generic-highlighter/ini.xml b/src/share/3rdparty/generic-highlighter/ini.xml
index f6f55e2ebe..f6f55e2ebe 100644
--- a/share/qtcreator/generic-highlighter/ini.xml
+++ b/src/share/3rdparty/generic-highlighter/ini.xml
diff --git a/share/qtcreator/generic-highlighter/java.xml b/src/share/3rdparty/generic-highlighter/java.xml
index e06ec6bd86..e06ec6bd86 100644
--- a/share/qtcreator/generic-highlighter/java.xml
+++ b/src/share/3rdparty/generic-highlighter/java.xml
diff --git a/share/qtcreator/generic-highlighter/javadoc.xml b/src/share/3rdparty/generic-highlighter/javadoc.xml
index 25eab95e11..25eab95e11 100644
--- a/share/qtcreator/generic-highlighter/javadoc.xml
+++ b/src/share/3rdparty/generic-highlighter/javadoc.xml
diff --git a/share/qtcreator/generic-highlighter/makefile.xml b/src/share/3rdparty/generic-highlighter/makefile.xml
index fbf96eae92..fbf96eae92 100644
--- a/share/qtcreator/generic-highlighter/makefile.xml
+++ b/src/share/3rdparty/generic-highlighter/makefile.xml
diff --git a/share/qtcreator/generic-highlighter/perl.xml b/src/share/3rdparty/generic-highlighter/perl.xml
index 2f6e823bfb..2f6e823bfb 100644
--- a/share/qtcreator/generic-highlighter/perl.xml
+++ b/src/share/3rdparty/generic-highlighter/perl.xml
diff --git a/share/qtcreator/generic-highlighter/ruby.xml b/src/share/3rdparty/generic-highlighter/ruby.xml
index c4110ccd75..c4110ccd75 100644
--- a/share/qtcreator/generic-highlighter/ruby.xml
+++ b/src/share/3rdparty/generic-highlighter/ruby.xml
diff --git a/share/qtcreator/generic-highlighter/valgrind-suppression.xml b/src/share/3rdparty/generic-highlighter/valgrind-suppression.xml
index 6ba52085c3..6ba52085c3 100644
--- a/share/qtcreator/generic-highlighter/valgrind-suppression.xml
+++ b/src/share/3rdparty/generic-highlighter/valgrind-suppression.xml
diff --git a/share/qtcreator/generic-highlighter/xml.xml b/src/share/3rdparty/generic-highlighter/xml.xml
index 3d92a563cd..3d92a563cd 100644
--- a/share/qtcreator/generic-highlighter/xml.xml
+++ b/src/share/3rdparty/generic-highlighter/xml.xml
diff --git a/share/qtcreator/generic-highlighter/yacc.xml b/src/share/3rdparty/generic-highlighter/yacc.xml
index add68e96a8..add68e96a8 100644
--- a/share/qtcreator/generic-highlighter/yacc.xml
+++ b/src/share/3rdparty/generic-highlighter/yacc.xml
diff --git a/src/src.pro b/src/src.pro
index 0cbba619fd..496c500dbd 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -32,4 +32,5 @@ SUBDIRS += \
     app \
     plugins \
     tools \
-    share/qtcreator/data.pro
+    share/qtcreator/data.pro \
+    share/3rdparty/data.pro