Attachment #144378 for bug #184112




                   DEPENDS ${QM_FILES})

INSTALL (FILES ${QM_FILES}
         DESTINATION share/qtemu/translations)
# translation end

SET(QT_USE_QTXML)

)

FILE(GLOB helpfiles "${CMAKE_CURRENT_SOURCE_DIR}/help/*.png")
INSTALL(FILES ${helpfiles} DESTINATION share/qtemu/help)

INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/main.htm DESTINATION share/qtemu/help)

FILE(GLOB helpfiles_de "${CMAKE_CURRENT_SOURCE_DIR}/help/de/*.png")
INSTALL(FILES ${helpfiles_de} DESTINATION share/qtemu/help/de)

INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/de/main.htm DESTINATION share/qtemu/help/de)

INSTALL(TARGETS qtemu DESTINATION bin)

Lines 80-86 Link Here

(-)qtemu-1.0.5.orig/helpwindow.cpp (-2 / +2 lines)
80	return testUrl;	80	return testUrl;
81		81
82	//check for case when qtemu executable is in bin/ (installed on linux)	82	//check for case when qtemu executable is in bin/ (installed on linux)
83	testUrl = QUrl(QCoreApplication::applicationDirPath()+"/../help/" + locale + "/main.htm");	83	testUrl = QUrl(QCoreApplication::applicationDirPath()+"/../share/qtemu/help/" + locale + "/main.htm");
84	if (QFile::exists(testUrl.toString()))	84	if (QFile::exists(testUrl.toString()))
85	return testUrl;	85	return testUrl;
86	}	86	}
Lines 96-102 Link Here
96	return testUrl;	96	return testUrl;
97		97
98	//check for case when qtemu executable is in bin/ (installed on linux)	98	//check for case when qtemu executable is in bin/ (installed on linux)
99	testUrl = QUrl(QCoreApplication::applicationDirPath()+"/../help/main.htm");	99	testUrl = QUrl(QCoreApplication::applicationDirPath()+"/../share/qtemu/help/main.htm");
100	if (QFile::exists(testUrl.toString()))	100	if (QFile::exists(testUrl.toString()))
101	return testUrl;	101	return testUrl;
102		102

Lines 45-51 Link Here

(-)qtemu-1.0.5.orig/main.cpp (-1 / +1 lines)
45	translator.load(path);	45	translator.load(path);
46	else	46	else
47	{	47	{
48	path = QCoreApplication::applicationDirPath()+"/../translations/qtemu_" + locale + ".qm";	48	path = QCoreApplication::applicationDirPath()+"/../share/qtemu/translations/qtemu_" + locale + ".qm";
49	if (QFile::exists(path))	49	if (QFile::exists(path))
50	translator.load(path);	50	translator.load(path);
51	}	51	}

Return to bug 184112

Lines 114-120 Link Here

(-)qtemu-1.0.5.orig/CMakeLists.txt (-5 / +5 lines)
114	DEPENDS ${QM_FILES})	114	DEPENDS ${QM_FILES})
115		115
116	INSTALL (FILES ${QM_FILES}	116	INSTALL (FILES ${QM_FILES}
117	DESTINATION translations)	117	DESTINATION share/qtemu/translations)
118	# translation end	118	# translation end
119		119
120	SET(QT_USE_QTXML)	120	SET(QT_USE_QTXML)
Lines 146-158 Link Here
146	)	146	)
147		147
148	FILE(GLOB helpfiles "${CMAKE_CURRENT_SOURCE_DIR}/help/*.png")	148	FILE(GLOB helpfiles "${CMAKE_CURRENT_SOURCE_DIR}/help/*.png")
149	INSTALL(FILES ${helpfiles} DESTINATION help)	149	INSTALL(FILES ${helpfiles} DESTINATION share/qtemu/help)
150		150
151	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/main.htm DESTINATION help)	151	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/main.htm DESTINATION share/qtemu/help)
152		152
153	FILE(GLOB helpfiles_de "${CMAKE_CURRENT_SOURCE_DIR}/help/de/*.png")	153	FILE(GLOB helpfiles_de "${CMAKE_CURRENT_SOURCE_DIR}/help/de/*.png")
154	INSTALL(FILES ${helpfiles_de} DESTINATION help/de)	154	INSTALL(FILES ${helpfiles_de} DESTINATION share/qtemu/help/de)
155		155
156	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/de/main.htm DESTINATION help/de)	156	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/de/main.htm DESTINATION share/qtemu/help/de)
157		157
158	INSTALL(TARGETS qtemu DESTINATION bin)	158	INSTALL(TARGETS qtemu DESTINATION bin)