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 | |
| 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>
| -rw-r--r-- | qtcreatordata.pri (renamed from share/qtcreator/static.pri) | 2 | ||||
| -rw-r--r-- | share/qtcreator/static.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/static.pri b/qtcreatordata.pri index 63807050f0..27a21263f1 100644 --- a/share/qtcreator/static.pri +++ b/qtcreatordata.pri @@ -7,7 +7,7 @@ # STATIC_BASE - base directory for the files listed in STATIC_FILES # STATIC_FILES - list of files to be deployed -include(../../qtcreator.pri) +include(qtcreator.pri) # used in custom compilers which just copy files defineReplace(stripStaticBase) { 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) { |