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 /share | |
| parent | 3a7ce3f5be9af510634ae018e27d3b1a2970063a (diff) | |
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 'share')
| -rw-r--r-- | share/qtcreator/static.pro | 51 |
1 files changed, 4 insertions, 47 deletions
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index ec7a5a9839..9b3b102b9e 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -1,8 +1,11 @@ TEMPLATE = aux +include(../../qtcreator.pri) + STATIC_BASE = $$PWD +STATIC_OUTPUT_BASE = $$IDE_DATA_PATH +STATIC_INSTALL_BASE = $$INSTALL_DATA_PATH -# files/folders that are conditionally "deployed" to the build directory DATA_DIRS = \ welcomescreen \ examplebrowser \ @@ -32,49 +35,3 @@ for(data_dir, DATA_DIRS) { } include(../../qtcreatordata.pri) - -SRCRESOURCEDIR = $$IDE_SOURCE_TREE/src/share/qtcreator/ -defineReplace(stripSrcResourceDir) { - win32 { - !contains(1, ^.:.*):1 = $$OUT_PWD/$$1 - } else { - !contains(1, ^/.*):1 = $$OUT_PWD/$$1 - } - out = $$clean_path($$1) - out ~= s|^$$re_escape($$SRCRESOURCEDIR)||$$i_flag - return($$out) -} - -# files that are to be unconditionally "deployed" to the build dir from src/share to share -DATA_DIRS = \ - externaltools -DATA_FILES_SRC = \ - externaltools/lrelease.xml \ - externaltools/lupdate.xml \ - externaltools/sort.xml \ - externaltools/qmlviewer.xml \ - externaltools/qmlscene.xml -unix { - macx:DATA_FILES_SRC += externaltools/vi_mac.xml - else:DATA_FILES_SRC += externaltools/vi.xml -} else { - DATA_FILES_SRC += externaltools/notepad_win.xml -} -for(file, DATA_FILES_SRC):DATA_FILES += $${SRCRESOURCEDIR}$$file -unconditionalCopy2build.input = DATA_FILES -unconditionalCopy2build.output = $$IDE_DATA_PATH/${QMAKE_FUNC_FILE_IN_stripSrcResourceDir} -isEmpty(vcproj):unconditionalCopy2build.variable_out = PRE_TARGETDEPS -win32:unconditionalCopy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\" -unix:unconditionalCopy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -unconditionalCopy2build.name = COPY ${QMAKE_FILE_IN} -unconditionalCopy2build.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += unconditionalCopy2build - -!macx { - for(data_dir, DATA_DIRS) { - $${data_dir}.files = $$IDE_DATA_PATH/$$data_dir - $${data_dir}.path = $$INSTALL_DATA_PATH - $${data_dir}.CONFIG += no_check_exist - INSTALLS += $$data_dir - } -} |