diff --git a/common.pri b/common.pri index 6979d08de..698b31d95 100644 --- a/common.pri +++ b/common.pri @@ -37,16 +37,23 @@ defineTest(copyToDestdir) { message("Copy to" $$DDIR "after link") for(FILE, files) { - # Replace slashes in paths with backslashes for Windows - win32{ - FILE ~= s,/,\\,g - DDIR ~= s,/,\\,g + !exists($$DDIR/$$basename(FILE)) { + # Replace slashes in paths with backslashes for Windows + win32{ + FILE ~= s,/,\\,g + DDIR ~= s,/,\\,g + } + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) + message("Command:" $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR)) + } else { + message("File:" $$DDIR/$$basename(FILE) "already exist") } - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) - message("Command:" $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR)) + + QMAKE_CLEAN += $$DDIR/$$basename(FILE) } export(QMAKE_POST_LINK) + export(QMAKE_CLEAN) message("----------------------------------------------end---------------------------------------------------") } diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 291d671c7..78f539d2a 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -50,7 +50,6 @@ DATA_RESOURCE = share/resources/diagrams.qrc # External Binary Resource # Compilation will fail without this files after we added them to this section. OTHER_FILES += \ - share/resources/tape.rc \ # For Windows system. share/resources/tapeicon/64x64/logo.ico \ # Tape's logo. $$DATA_RESOURCE @@ -347,6 +346,8 @@ diagrams.commands = $$shell_path($$[QT_INSTALL_BINS]/rcc) --binary --no-compress QMAKE_EXTRA_COMPILERS += diagrams +QMAKE_CLEAN += $${OUT_PWD}/$${DESTDIR}/diagrams.rcc + noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { @@ -368,6 +369,10 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols QMAKE_POST_LINK += objcopy --strip-debug ${TARGET} && QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET} } + + !macx{ + QMAKE_DISTCLEAN += bin/${TARGET}.dbg + } } } } diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 11ed49c3f..4f62df83a 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -54,7 +54,6 @@ RESOURCES += \ # Compilation will fail without this files after we added them to this section. OTHER_FILES += \ - share/resources/valentina.rc \ # For Windows system. share/resources/icon/64x64/icon64x64.ico # Valentina's logo. # Set using ccache. Function enable_ccache() defined in common.pri. @@ -1999,7 +1998,10 @@ for(_translation_name, INSTALL_TRANSLATIONS) { _translation_name_qm = $$basename(_translation_name) _translation_name_ts = $$section(_translation_name_qm, ".", 0, 0).ts - system($$shell_path($$[QT_INSTALL_BINS]/$$LRELEASE) -removeidentical -nounfinished $$shell_path($${PWD}/$${TRANSLATIONS_PATH}/$$_translation_name_ts) -qm $$shell_path($${PWD}/$$_translation_name)) + !exists($${PWD}/$$_translation_name) { + system($$shell_path($$[QT_INSTALL_BINS]/$$LRELEASE) -removeidentical -nounfinished $$shell_path($${PWD}/$${TRANSLATIONS_PATH}/$$_translation_name_ts) -qm $$shell_path($${PWD}/$$_translation_name)) + } + QMAKE_CLEAN += $${PWD}/$$_translation_name } for(DIR, INSTALL_TRANSLATIONS) { @@ -2160,6 +2162,10 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols QMAKE_POST_LINK += objcopy --strip-debug ${TARGET} && QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET} } + + !macx{ + QMAKE_DISTCLEAN += bin/${TARGET}.dbg + } } } } diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index ab733a909..f2f5ca062 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -126,6 +126,8 @@ CONFIG(debug, debug|release){ QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} && QMAKE_POST_LINK += objcopy --add-gnu-debuglink="bin/${TARGET}.dbg" bin/${TARGET} } + + QMAKE_DISTCLEAN += bin/${TARGET}.dbg } } } diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index cc91aa533..4d6a1b77b 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -132,6 +132,8 @@ CONFIG(debug, debug|release){ QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} && QMAKE_POST_LINK += objcopy --add-gnu-debuglink="bin/${TARGET}.dbg" bin/${TARGET} } + + QMAKE_DISTCLEAN += bin/${TARGET}.dbg } } } diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index 4b068a97e..3cf5a820a 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -113,6 +113,8 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols QMAKE_POST_LINK += objcopy --only-keep-debug $(TARGET) $(TARGET).debug && QMAKE_POST_LINK += strip --strip-debug --strip-unneeded $(TARGET) && QMAKE_POST_LINK += objcopy --add-gnu-debuglink $(TARGET).debug $(TARGET) + + QMAKE_DISTCLEAN += bin/${TARGET}.dbg } } }