diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-01-14 16:04:55 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-01-14 18:37:59 +0100 |
| commit | 056981eb0451d78279551a17adc6404fff9545b0 (patch) | |
| tree | 850ae98918cabd714e922f87038a2a9991081768 /static.pro | |
| parent | 3ce9ac15d1c4fde58f83ab7b8dfb96845d29e56e (diff) | |
Fix shadow build with Qt 5.
qmake code copied over from Qt Creator.
Change-Id: Ib2100a5dd3a85d7e7b96daac41be4c98bb5d82cb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'static.pro')
| -rw-r--r-- | static.pro | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/static.pro b/static.pro index c4f24f881..bba40c0d3 100644 --- a/static.pro +++ b/static.pro @@ -38,6 +38,11 @@ defineReplace(cleanPath) { } # For use in custom compilers which just copy files +isEqual(QT_MAJOR_VERSION, 5) { +defineReplace(stripSrcDir) { + return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_)) +} +} else { # qt5 win32:i_flag = i defineReplace(stripSrcDir) { win32 { @@ -46,9 +51,10 @@ defineReplace(stripSrcDir) { !contains(1, ^/.*):1 = $$OUT_PWD/$$1 } out = $$cleanPath($$1) - out ~= s|^$$re_escape($$PWD/)||$$i_flag + out ~= s|^$$re_escape($$_PRO_FILE_PWD_/)||$$i_flag return($$out) } +} # qt5 for(data_dir, DATA_DIRS) { files = $$files($$PWD/$$data_dir/*, true) |