From 400f87fa589da1fcd311e04a94d812757d48fb66 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@theqtcompany.com>
Date: Mon, 13 Jul 2015 10:13:35 +0200
Subject: [PATCH] Fix deployment of wizards on OSX

Task-number: QTCREATORBUG-14490
Change-Id: I41d214f96ce60b2e268585b1b740f47915b0d3df
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 shared/shared.pro                                   |  12 +++++++-----
 shared/{ => templates/wizards}/autotest/auto.pro    |   0
 .../wizards}/autotest/autotest_24.png               | Bin
 shared/{ => templates/wizards}/autotest/main.cpp    |   0
 shared/{ => templates/wizards}/autotest/src.pro     |   0
 shared/{ => templates/wizards}/autotest/tests.pro   |   0
 shared/{ => templates/wizards}/autotest/tmp.pro     |   0
 shared/{ => templates/wizards}/autotest/tst.pro     |   0
 shared/{ => templates/wizards}/autotest/tst_src.cpp |   0
 shared/{ => templates/wizards}/autotest/wizard.xml  |   0
 10 files changed, 7 insertions(+), 5 deletions(-)
 rename shared/{ => templates/wizards}/autotest/auto.pro (100%)
 rename shared/{ => templates/wizards}/autotest/autotest_24.png (100%)
 rename shared/{ => templates/wizards}/autotest/main.cpp (100%)
 rename shared/{ => templates/wizards}/autotest/src.pro (100%)
 rename shared/{ => templates/wizards}/autotest/tests.pro (100%)
 rename shared/{ => templates/wizards}/autotest/tmp.pro (100%)
 rename shared/{ => templates/wizards}/autotest/tst.pro (100%)
 rename shared/{ => templates/wizards}/autotest/tst_src.cpp (100%)
 rename shared/{ => templates/wizards}/autotest/wizard.xml (100%)

diff --git a/shared/shared.pro b/shared/shared.pro
index e74d4d09acd..05c3c34dbf6 100644
--- a/shared/shared.pro
+++ b/shared/shared.pro
@@ -1,10 +1,12 @@
 TEMPLATE = aux
 
-content.files = \
-    autotest
+STATIC_BASE = $$PWD
+STATIC_DIRS = templates
 
-content.path = $$QTC_PREFIX/share/qtcreator/templates/wizards
+for(data_dir, STATIC_DIRS) {
+    files = $$files($$STATIC_BASE/$$data_dir/*, true)
+    for(file, files): !exists($$file/*): STATIC_FILES += $$file
+}
 
-OTHER_FILES += $${content.files}
+include(../../qtcreator/share/qtcreator/static.pri)
 
-INSTALLS += content
diff --git a/shared/autotest/auto.pro b/shared/templates/wizards/autotest/auto.pro
similarity index 100%
rename from shared/autotest/auto.pro
rename to shared/templates/wizards/autotest/auto.pro
diff --git a/shared/autotest/autotest_24.png b/shared/templates/wizards/autotest/autotest_24.png
similarity index 100%
rename from shared/autotest/autotest_24.png
rename to shared/templates/wizards/autotest/autotest_24.png
diff --git a/shared/autotest/main.cpp b/shared/templates/wizards/autotest/main.cpp
similarity index 100%
rename from shared/autotest/main.cpp
rename to shared/templates/wizards/autotest/main.cpp
diff --git a/shared/autotest/src.pro b/shared/templates/wizards/autotest/src.pro
similarity index 100%
rename from shared/autotest/src.pro
rename to shared/templates/wizards/autotest/src.pro
diff --git a/shared/autotest/tests.pro b/shared/templates/wizards/autotest/tests.pro
similarity index 100%
rename from shared/autotest/tests.pro
rename to shared/templates/wizards/autotest/tests.pro
diff --git a/shared/autotest/tmp.pro b/shared/templates/wizards/autotest/tmp.pro
similarity index 100%
rename from shared/autotest/tmp.pro
rename to shared/templates/wizards/autotest/tmp.pro
diff --git a/shared/autotest/tst.pro b/shared/templates/wizards/autotest/tst.pro
similarity index 100%
rename from shared/autotest/tst.pro
rename to shared/templates/wizards/autotest/tst.pro
diff --git a/shared/autotest/tst_src.cpp b/shared/templates/wizards/autotest/tst_src.cpp
similarity index 100%
rename from shared/autotest/tst_src.cpp
rename to shared/templates/wizards/autotest/tst_src.cpp
diff --git a/shared/autotest/wizard.xml b/shared/templates/wizards/autotest/wizard.xml
similarity index 100%
rename from shared/autotest/wizard.xml
rename to shared/templates/wizards/autotest/wizard.xml