Merge with develop

--HG--
branch : feature
This commit is contained in:
dismine 2014-01-20 13:16:34 +02:00
commit 34de600fed
2 changed files with 3452 additions and 2 deletions

View File

@ -53,7 +53,8 @@ OTHER_FILES += share/resources/valentina.rc \
TRANSLATIONS += share/translations/valentina.ts \ TRANSLATIONS += share/translations/valentina.ts \
share/translations/valentina_ru.ts \ share/translations/valentina_ru.ts \
share/translations/valentina_uk.ts \ share/translations/valentina_uk.ts \
share/translations/valentina_de.ts share/translations/valentina_de.ts \
share/translations/valentina_cs.ts
unix { unix {
QMAKE_CXX = ccache g++ QMAKE_CXX = ccache g++
@ -136,7 +137,8 @@ pixmaps.path = $$DATADIR/pixmaps/
pixmaps.files += dist/$${TARGET}.png pixmaps.files += dist/$${TARGET}.png
INSTALL_TRANSLATIONS += share/translations/valentina_ru.qm \ INSTALL_TRANSLATIONS += share/translations/valentina_ru.qm \
share/translations/valentina_uk.qm \ share/translations/valentina_uk.qm \
share/translations/valentina_de.qm share/translations/valentina_de.qm \
share/translations/valentina_cs.qm
translations.path = $$DATADIR/$${TARGET}/translations/ translations.path = $$DATADIR/$${TARGET}/translations/
translations.files = $$INSTALL_TRANSLATIONS translations.files = $$INSTALL_TRANSLATIONS
INSTALLS += target \ INSTALLS += target \

File diff suppressed because it is too large Load Diff