diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-11 11:06:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 06:46:31 +0000 |
| commit | 69a406c37fce103c9efe8294ad79db8ff9254aea (patch) | |
| tree | 1187cc26dd5b4cea2acb4c16d540ad59b508f199 /share | |
| parent | 46739bcdf332362a1d3825cd348a4ca68dc5f85b (diff) | |
Rename static.pri to qtcreatordata.pri and move to base directory
Preparation for using it at other places than static.pro as well.
Change-Id: I8b3f55fdd2a90bc793f4bbc584e3e96f80231ce5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/static.pri | 39 | ||||
| -rw-r--r-- | share/qtcreator/static.pro | 2 |
2 files changed, 1 insertions, 40 deletions
diff --git a/share/qtcreator/static.pri b/share/qtcreator/static.pri deleted file mode 100644 index 63807050f0..0000000000 --- a/share/qtcreator/static.pri +++ /dev/null @@ -1,39 +0,0 @@ -# This pri file is used to deploy files that are not compiled while building -# Qt Creator. It handles copying of files into the build directory if using -# a shadow build and adds the respective install target as well. -# -# Usage: Define variables (details below) and include this pri file afterwards. -# -# STATIC_BASE - base directory for the files listed in STATIC_FILES -# STATIC_FILES - list of files to be deployed - -include(../../qtcreator.pri) - -# used in custom compilers which just copy files -defineReplace(stripStaticBase) { - return($$relative_path($$1, $$STATIC_BASE)) -} - -# handle conditional copying; copydata will be set by qtcreator.pri -!isEmpty(STATIC_FILES) { - isEmpty(STATIC_BASE): \ - error("Using STATIC_FILES without having STATIC_BASE set") - - !isEmpty(copydata) { - copy2build.input += STATIC_FILES - copy2build.output = $$IDE_DATA_PATH/${QMAKE_FUNC_FILE_IN_stripStaticBase} - isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS - win32:copy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\" - unix:copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - copy2build.name = COPY ${QMAKE_FILE_IN} - copy2build.config += no_link - QMAKE_EXTRA_COMPILERS += copy2build - } - - !osx { - static.files = $$STATIC_FILES - static.base = $$STATIC_BASE - static.path = $$INSTALL_DATA_PATH - INSTALLS += static - } -} diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index 42664508cf..ec7a5a9839 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -31,7 +31,7 @@ for(data_dir, DATA_DIRS) { STATIC_FILES += $$file } -include(static.pri) +include(../../qtcreatordata.pri) SRCRESOURCEDIR = $$IDE_SOURCE_TREE/src/share/qtcreator/ defineReplace(stripSrcResourceDir) { |