]>
Commit | Line | Data |
---|---|---|
8c4879e8 JB |
1 | --- cppcheck-1.72/gui/CMakeLists.txt.orig 2016-01-11 15:46:49.455670218 +0100 |
2 | +++ cppcheck-1.72/gui/CMakeLists.txt 2016-01-11 15:50:01.915662141 +0100 | |
3 | @@ -29,7 +29,7 @@ | |
4 | ||
5 | ||
6 | install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) | |
7 | - install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) | |
4338603d JR |
8 | + install(FILES ${qms} DESTINATION share/${PROJECT_NAME}/lang/ COMPONENT applications) |
9 | ||
10 | set(CMAKE_AUTOMOC OFF) | |
11 | ||
12 | diff -up cppcheck-1.70/gui/translationhandler.cpp.translations cppcheck-1.70/gui/translationhandler.cpp | |
13 | --- cppcheck-1.70/gui/translationhandler.cpp.translations 2015-09-04 11:04:31.000000000 -0700 | |
14 | +++ cppcheck-1.70/gui/translationhandler.cpp 2015-11-05 11:38:34.991299374 -0800 | |
15 | @@ -106,15 +106,7 @@ bool TranslationHandler::SetLanguage(con | |
16 | if (datadir.isEmpty()) | |
17 | datadir = appPath; | |
18 | ||
19 | - QString translationFile; | |
20 | - if (QFile::exists(datadir + "/lang/" + mTranslations[index].mFilename + ".qm")) | |
21 | - translationFile = datadir + "/lang/" + mTranslations[index].mFilename + ".qm"; | |
22 | - | |
23 | - else if (QFile::exists(datadir + "/" + mTranslations[index].mFilename + ".qm")) | |
24 | - translationFile = datadir + "/" + mTranslations[index].mFilename + ".qm"; | |
25 | - | |
26 | - else | |
27 | - translationFile = appPath + "/" + mTranslations[index].mFilename + ".qm"; | |
28 | + QString translationFile("/usr/share/CppCheck/lang/" + mTranslations[index].mFilename + ".qm"); | |
29 | ||
30 | if (!mTranslator->load(translationFile) && !failure) { | |
31 | translationFile += ".qm"; |