summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@theqtcompany.com>2015-07-13 10:13:35 +0200
committerChristian Stenger <christian.stenger@theqtcompany.com>2015-07-17 15:35:40 +0300
commit400f87fa589da1fcd311e04a94d812757d48fb66 (patch)
tree81bca8676630d97da9b715ded15c81c44f77e638
parent08ab1b6d76c604960d0dbe9da85b2308508cf012 (diff)
downloadqt-creator-400f87fa589da1fcd311e04a94d812757d48fb66.tar.gz
Fix deployment of wizards on OSX
Task-number: QTCREATORBUG-14490 Change-Id: I41d214f96ce60b2e268585b1b740f47915b0d3df Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--shared/shared.pro12
-rw-r--r--shared/templates/wizards/autotest/auto.pro (renamed from shared/autotest/auto.pro)0
-rw-r--r--shared/templates/wizards/autotest/autotest_24.png (renamed from shared/autotest/autotest_24.png)bin683 -> 683 bytes
-rw-r--r--shared/templates/wizards/autotest/main.cpp (renamed from shared/autotest/main.cpp)0
-rw-r--r--shared/templates/wizards/autotest/src.pro (renamed from shared/autotest/src.pro)0
-rw-r--r--shared/templates/wizards/autotest/tests.pro (renamed from shared/autotest/tests.pro)0
-rw-r--r--shared/templates/wizards/autotest/tmp.pro (renamed from shared/autotest/tmp.pro)0
-rw-r--r--shared/templates/wizards/autotest/tst.pro (renamed from shared/autotest/tst.pro)0
-rw-r--r--shared/templates/wizards/autotest/tst_src.cpp (renamed from shared/autotest/tst_src.cpp)0
-rw-r--r--shared/templates/wizards/autotest/wizard.xml (renamed from shared/autotest/wizard.xml)0
10 files changed, 7 insertions, 5 deletions
diff --git a/shared/shared.pro b/shared/shared.pro
index e74d4d09ac..05c3c34dbf 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
index b39fef654c..b39fef654c 100644
--- a/shared/autotest/auto.pro
+++ b/shared/templates/wizards/autotest/auto.pro
diff --git a/shared/autotest/autotest_24.png b/shared/templates/wizards/autotest/autotest_24.png
index 3f52e9bf08..3f52e9bf08 100644
--- a/shared/autotest/autotest_24.png
+++ b/shared/templates/wizards/autotest/autotest_24.png
Binary files differ
diff --git a/shared/autotest/main.cpp b/shared/templates/wizards/autotest/main.cpp
index 3ff500decd..3ff500decd 100644
--- a/shared/autotest/main.cpp
+++ b/shared/templates/wizards/autotest/main.cpp
diff --git a/shared/autotest/src.pro b/shared/templates/wizards/autotest/src.pro
index 61fbe2a5bc..61fbe2a5bc 100644
--- a/shared/autotest/src.pro
+++ b/shared/templates/wizards/autotest/src.pro
diff --git a/shared/autotest/tests.pro b/shared/templates/wizards/autotest/tests.pro
index f927700008..f927700008 100644
--- a/shared/autotest/tests.pro
+++ b/shared/templates/wizards/autotest/tests.pro
diff --git a/shared/autotest/tmp.pro b/shared/templates/wizards/autotest/tmp.pro
index 1569bd45cb..1569bd45cb 100644
--- a/shared/autotest/tmp.pro
+++ b/shared/templates/wizards/autotest/tmp.pro
diff --git a/shared/autotest/tst.pro b/shared/templates/wizards/autotest/tst.pro
index 8aa61b767e..8aa61b767e 100644
--- a/shared/autotest/tst.pro
+++ b/shared/templates/wizards/autotest/tst.pro
diff --git a/shared/autotest/tst_src.cpp b/shared/templates/wizards/autotest/tst_src.cpp
index 65d49e9c18..65d49e9c18 100644
--- a/shared/autotest/tst_src.cpp
+++ b/shared/templates/wizards/autotest/tst_src.cpp
diff --git a/shared/autotest/wizard.xml b/shared/templates/wizards/autotest/wizard.xml
index a190405d38..a190405d38 100644
--- a/shared/autotest/wizard.xml
+++ b/shared/templates/wizards/autotest/wizard.xml