1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uppercase the CONFIG for verbatim mode.

Browse Source 
Change-Id: Iec883e0218af80fc329d866affb2b95db72c54d3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Stephen Kelly 2012-07-03 22:29:45 +02:00 committed by Qt by Nokia
parent 648d5964ee
commit 6bd4be9436
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/create_cmake.prf
View File

@ -167,7 +167,7 @@ exists($$cmake_macros_file.input) {
CMAKE_MODULE_MACROS = "true" CMAKE_MODULE_MACROS = "true"
cmake_macros_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake cmake_macros_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
cmake_macros_file.config = verbatim cmake_macros_file.CONFIG = verbatim
QMAKE_SUBSTITUTES += cmake_macros_file QMAKE_SUBSTITUTES += cmake_macros_file

2
qmake/generators/makefile.cpp
View File

@ -508,7 +508,7 @@ MakefileGenerator::init()
outn = fileFixify(inn.left(inn.length()-3), qmake_getpwd(), Option::output_dir); outn = fileFixify(inn.left(inn.length()-3), qmake_getpwd(), Option::output_dir);
} }
QString confign = subs.at(i) + ".config"; QString confign = subs.at(i) + ".CONFIG";
bool verbatim = false; bool verbatim = false;
if (v.contains(confign)) if (v.contains(confign))
verbatim = v[confign].contains(QLatin1String("verbatim")); verbatim = v[confign].contains(QLatin1String("verbatim"));

2
src/corelib/corelib.pro
View File

@ -74,7 +74,7 @@ QMAKE_PKGCONFIG_VARIABLES += lupdate_dir lrelease_dir
ctest_macros_file.input = $$PWD/Qt5CTestMacros.cmake ctest_macros_file.input = $$PWD/Qt5CTestMacros.cmake
ctest_macros_file.output = $$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake ctest_macros_file.output = $$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake
ctest_macros_file.config = verbatim ctest_macros_file.CONFIG = verbatim
QMAKE_SUBSTITUTES += ctest_macros_file QMAKE_SUBSTITUTES += ctest_macros_file

2
tests/auto/tools/qmake/testdata/substitutes/test.pro vendored
View File

@ -5,4 +5,4 @@ indirect.output = $$OUT_PWD/sub/indirect_test.txt
copy.input = $$PWD/copy.txt copy.input = $$PWD/copy.txt
copy.output = $$OUT_PWD/copy_test.txt copy.output = $$OUT_PWD/copy_test.txt
copy.config = verbatim copy.CONFIG = verbatim