Uppercase the CONFIG for verbatim mode.

Change-Id: Iec883e0218af80fc329d866affb2b95db72c54d3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index ef83f56..d373157 100644 (file)
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -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
 

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index abd6d32..3a29c55 100644 (file)
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -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"));

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 101cc4d..5f322af 100644 (file)
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -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
 

diff --git a/tests/auto/tools/qmake/testdata/substitutes/test.pro b/tests/auto/tools/qmake/testdata/substitutes/test.pro
index 65bb2d8..8c00327 100644 (file)
--- a/tests/auto/tools/qmake/testdata/substitutes/test.pro
+++ b/tests/auto/tools/qmake/testdata/substitutes/test.pro
@@ -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