refs #482 Rationalized the copying of files from source tree to build tree.

This commit is contained in:
Mathew Sutcliffe
2015-10-06 18:09:23 +01:00
parent a5d8db2354
commit e4adad45d0
9 changed files with 54 additions and 55 deletions

View File

@@ -54,18 +54,6 @@ DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$DestRoot/bin
OTHER_FILES += ./qss/*.qss ./qss/*.css ./qss/*.ini *.ico *.rc
win32:isEmpty(MINGW_IN_SHELL): COPY = xcopy /yi
else: COPY = cp -r
win32 {
QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/qss) \
$$shell_path($$DestRoot/bin/qss)
}
else {
QMAKE_POST_LINK += mkdir -p $$shell_path($$DestRoot/bin) && \
$$COPY $$shell_path($$PWD/qss) \
$$shell_path($$DestRoot/bin)
}
COPY_FILES += $$PWD/qss/*
load(common_post)

View File

@@ -321,7 +321,7 @@ namespace BlackGui
{
QString dirPath = QCoreApplication::applicationDirPath();
if (!dirPath.endsWith('/')) dirPath.append('/');
dirPath.append("qss");
dirPath.append("../qss");
return dirPath;
}