diff --git a/resources/swift_resources.pri b/resources/swift_resources.pri index 5639b524c..11eb971f6 100644 --- a/resources/swift_resources.pri +++ b/resources/swift_resources.pri @@ -2,11 +2,13 @@ win32:isEmpty(MINGW_IN_SHELL): COPY = xcopy /yis else: COPY = cp -r win32 { - QMAKE_PRE_LINK += $$COPY $$shell_path($$PWD/data) \ - $$shell_path($$OUT_PWD/../../bin/resources) + QMAKE_PRE_LINK += $$COPY $$shell_path($$PWD/data) \ + $$shell_path($$OUT_PWD/../../bin/resources) \ + & $$COPY $$shell_path($$PWD/swiftDB) \ + $$shell_path($$OUT_PWD/../../bin/resources/swiftDB) } else { - QMAKE_PRE_LINK += mkdir -p $$shell_path($$OUT_PWD/../../bin) && \ - $$COPY $$shell_path($$PWD/data) \ - $$shell_path($$OUT_PWD/../../bin) + QMAKE_PRE_LINK += mkdir -p $$shell_path($$OUT_PWD/../../bin) \ + && $$COPY $$shell_path($$PWD/data) $$shell_path($$PWD/swiftDB) \ + $$shell_path($$OUT_PWD/../../bin) } diff --git a/src/blackmisc/project.cpp b/src/blackmisc/project.cpp index 664be15ba..ddffdf9b5 100644 --- a/src/blackmisc/project.cpp +++ b/src/blackmisc/project.cpp @@ -233,7 +233,6 @@ namespace BlackMisc QString CProject::getSwiftResourceDir() { QDir dir(getApplicationDir()); - if (!dir.cdUp()) { return ""; } if (dir.cd("resources")) { return dir.absolutePath(); } return ""; }