diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-03-23 13:31:04 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 12:30:33 +0000 |
commit | 2a3e342740bd09099198890072296ef3be221ec1 (patch) | |
tree | d2763873e79593c6d8a893d42d64695d8dd0c029 /src/share | |
parent | 3a7ce3f5be9af510634ae018e27d3b1a2970063a (diff) | |
download | qt-creator-2a3e342740bd09099198890072296ef3be221ec1.tar.gz |
Remove code duplication for copying resources.
qtcreatordata.pri was created for "conditional" copying of resources to the
build tree. Adapt it a bit and use it for the "unconditionally" copied
resources as well.
A side effect is, that the unconditionally copied resources now are
also installed file by file instead of the directory as a whole,
which doesn't make a difference in the end result though.
Change-Id: I6da3eeaadcb48c19987858bbb8c2d42ee149f6f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/share')
-rw-r--r-- | src/share/README | 2 | ||||
-rw-r--r-- | src/share/qtcreator/data.pro | 22 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/share/README b/src/share/README deleted file mode 100644 index 6b930079d4..0000000000 --- a/src/share/README +++ /dev/null @@ -1,2 +0,0 @@ -This directory contains *only* data files which are installed conditionally. -The installation code is in ../../share/qtcreator/static.pro diff --git a/src/share/qtcreator/data.pro b/src/share/qtcreator/data.pro new file mode 100644 index 0000000000..5ae7d1d269 --- /dev/null +++ b/src/share/qtcreator/data.pro @@ -0,0 +1,22 @@ +TEMPLATE = aux + +include(../../../qtcreator.pri) + +STATIC_BASE = $$PWD +STATIC_OUTPUT_BASE = $$IDE_DATA_PATH +STATIC_INSTALL_BASE = $$INSTALL_DATA_PATH + +STATIC_FILES = \ + $$PWD/externaltools/lrelease.xml \ + $$PWD/externaltools/lupdate.xml \ + $$PWD/externaltools/sort.xml \ + $$PWD/externaltools/qmlviewer.xml \ + $$PWD/externaltools/qmlscene.xml +unix { + osx:STATIC_FILES += $$PWD/externaltools/vi_mac.xml + else:STATIC_FILES += $$PWD/externaltools/vi.xml +} else { + STATIC_FILES += $$PWD/externaltools/notepad_win.xml +} + +include(../../../qtcreatordata.pri) |