diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index 9ad4f96a..d0888886 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -202,6 +202,23 @@ TRANSLATIONS = yacreader_es.ts \ LRELEASE_DIR = ../release/languages/ CONFIG += lrelease +win32 { + CONFIG(release, debug|release) { + SOURCE_QM_DIR = $$OUT_PWD/release/*.qm + } + CONFIG(debug, debug|release) { + SOURCE_QM_DIR = $$OUT_PWD/debug/*.qm + } + + DEPLOYMENT_OUT_QM_DIR = ../release/languages/ + OUT_QM_DIR = $${DESTDIR}/languages/ + + QMAKE_POST_LINK += $(MKDIR) $$shell_path($${OUT_QM_DIR}) 2> NULL & \ + $(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${OUT_QM_DIR}) & \ + $(MKDIR) $$shell_path($${DEPLOYMENT_OUT_QM_DIR}) 2> NULL & \ + $(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR}) +} + unix:!macx { # set install prefix if it's empty isEmpty(PREFIX) { diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index b8b9fb04..604f845d 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -291,6 +291,23 @@ TRANSLATIONS = yacreaderlibrary_es.ts \ LRELEASE_DIR = ../release/languages/ CONFIG += lrelease +win32 { + CONFIG(release, debug|release) { + SOURCE_QM_DIR = $$OUT_PWD/release/*.qm + } + CONFIG(debug, debug|release) { + SOURCE_QM_DIR = $$OUT_PWD/debug/*.qm + } + + DEPLOYMENT_OUT_QM_DIR = ../release/languages/ + OUT_QM_DIR = $${DESTDIR}/languages/ + + QMAKE_POST_LINK += $(MKDIR) $$shell_path($${OUT_QM_DIR}) 2> NULL & \ + $(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${OUT_QM_DIR}) & \ + $(MKDIR) $$shell_path($${DEPLOYMENT_OUT_QM_DIR}) 2> NULL & \ + $(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR}) +} + #QML/GridView QT += quick qml quickwidgets diff --git a/config.pri b/config.pri index 1a9e410c..033c486d 100644 --- a/config.pri +++ b/config.pri @@ -7,8 +7,6 @@ CONFIG += c++17 win32 { #enable c++17 explicitly in msvc QMAKE_CXXFLAGS += /std:c++17 /Zc:__cplusplus /permissive- - CONFIG -= debug_and_release - !CONFIG(Release):!CONFIG(Debug):CONFIG += Release } DEFINES += NOMINMAX