Uppercase the CONFIG for verbatim mode.
Change-Id: Iec883e0218af80fc329d866affb2b95db72c54d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
parent
648d5964ee
commit
6bd4be9436
@ -167,7 +167,7 @@ exists($$cmake_macros_file.input) {
|
||||
CMAKE_MODULE_MACROS = "true"
|
||||
|
||||
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
|
||||
|
||||
|
@ -508,7 +508,7 @@ MakefileGenerator::init()
|
||||
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;
|
||||
if (v.contains(confign))
|
||||
verbatim = v[confign].contains(QLatin1String("verbatim"));
|
||||
|
@ -74,7 +74,7 @@ QMAKE_PKGCONFIG_VARIABLES += lupdate_dir lrelease_dir
|
||||
|
||||
ctest_macros_file.input = $$PWD/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
|
||||
|
||||
|
@ -5,4 +5,4 @@ indirect.output = $$OUT_PWD/sub/indirect_test.txt
|
||||
|
||||
copy.input = $$PWD/copy.txt
|
||||
copy.output = $$OUT_PWD/copy_test.txt
|
||||
copy.config = verbatim
|
||||
copy.CONFIG = verbatim
|
||||
|
Loading…
x
Reference in New Issue
Block a user