Attachment #340468 for bug #459690

View | Details | Raw Unified | Return to bug 459690
Collapse All | Expand All




# NOTE: We need to put the linguist tools cmake files in the lib directory. The lib directory
# as set by the uitools module is used for that, as linguist doesn't set such a variable.
CMAKE_PACKAGE_VERSION = $$eval(QT.uitools.VERSION)
cmake_linguist_config_file.output = $$OUT_PWD/../../lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake
cmake_linguist_config_version_file.output = $$OUT_PWD/../../lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
cmake_linguist_macros_file.output = $$OUT_PWD/../../lib/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
cmake_linguist_macros_file.CONFIG = verbatim
QMAKE_SUBSTITUTES += cmake_linguist_config_file cmake_linguist_config_version_file cmake_linguist_macros_file

cmake_linguist_tools_files.files += $$cmake_linguist_config_file.output $$cmake_linguist_macros_file.output
cmake_linguist_tools_files.path = $$OUT_PWD/../../lib/cmake/Qt5LinguistTools
cmake_linguist_tools_files.CONFIG = no_check_exists
INSTALLS += cmake_linguist_tools_files

Lines 1-6 Link Here

(-)qttools-opensource-src-5.0.1/src/linguist/linguist/linguist.pro.orig (-1 / +1 lines)
1	TEMPLATE = app	1	TEMPLATE = app
2	LANGUAGE = C++	2	LANGUAGE = C++
3	DESTDIR = $$QT.designer.bins	3	DESTDIR = ../../../bin
4		4
5	QT += core-private widgets xml uitools-private	5	QT += core-private widgets xml uitools-private
6	qtHaveModule(printsupport): QT += printsupport	6	qtHaveModule(printsupport): QT += printsupport

Return to bug 459690

Lines 32-44 Link Here

(-)qttools-opensource-src-5.0.1/src/linguist/linguist.pro.orig (-4 / +4 lines)
32	# NOTE: We need to put the linguist tools cmake files in the lib directory. The lib directory	32	# NOTE: We need to put the linguist tools cmake files in the lib directory. The lib directory
33	# as set by the uitools module is used for that, as linguist doesn't set such a variable.	33	# as set by the uitools module is used for that, as linguist doesn't set such a variable.
34	CMAKE_PACKAGE_VERSION = $$eval(QT.uitools.VERSION)	34	CMAKE_PACKAGE_VERSION = $$eval(QT.uitools.VERSION)
35	cmake_linguist_config_file.output = $$eval(QT.uitools.libs)/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake	35	cmake_linguist_config_file.output = $$OUT_PWD/../../lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake
36	cmake_linguist_config_version_file.output = $$eval(QT.uitools.libs)/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake	36	cmake_linguist_config_version_file.output = $$OUT_PWD/../../lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
37	cmake_linguist_macros_file.output = $$eval(QT.uitools.libs)/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake	37	cmake_linguist_macros_file.output = $$OUT_PWD/../../lib/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
38	cmake_linguist_macros_file.CONFIG = verbatim	38	cmake_linguist_macros_file.CONFIG = verbatim
39	QMAKE_SUBSTITUTES += cmake_linguist_config_file cmake_linguist_config_version_file cmake_linguist_macros_file	39	QMAKE_SUBSTITUTES += cmake_linguist_config_file cmake_linguist_config_version_file cmake_linguist_macros_file
40		40
41	cmake_linguist_tools_files.files += $$cmake_linguist_config_file.output $$cmake_linguist_macros_file.output	41	cmake_linguist_tools_files.files += $$cmake_linguist_config_file.output $$cmake_linguist_macros_file.output
42	cmake_linguist_tools_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5LinguistTools	42	cmake_linguist_tools_files.path = $$OUT_PWD/../../lib/cmake/Qt5LinguistTools
43	cmake_linguist_tools_files.CONFIG = no_check_exists	43	cmake_linguist_tools_files.CONFIG = no_check_exists
44	INSTALLS += cmake_linguist_tools_files	44	INSTALLS += cmake_linguist_tools_files