summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2011-02-14 15:20:23 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2011-03-15 14:56:04 (GMT)
commita60bd37c08300201bb2a259f390b92e35808843e (patch)
treec5c5d7f2975049a46b989347cf050da70e30693a /qmake/generators
parentc35f610219b1d09f6d05215a2e2fe4f2f6bd966c (diff)
downloadQt-a60bd37c08300201bb2a259f390b92e35808843e.zip
Qt-a60bd37c08300201bb2a259f390b92e35808843e.tar.gz
Qt-a60bd37c08300201bb2a259f390b92e35808843e.tar.bz2
qmake vc(x)proj generator: fix reading of /YX, /Yc, /Yu compiler flags
Controlling the PCH settings manually via the MSVC compiler flags was broken. Task-number: QTBUG-15594 Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/win32/msvc_objectmodel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 3253c3b..020c3d8 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -857,11 +857,11 @@ bool VCCLCompilerTool::parseOption(const char* option)
break;
case 'X':
UsePrecompiledHeader = pchGenerateAuto;
- PrecompiledHeaderFile = option+3;
+ PrecompiledHeaderThrough = option+3;
break;
case 'c':
UsePrecompiledHeader = pchCreateUsingSpecific;
- PrecompiledHeaderFile = option+3;
+ PrecompiledHeaderThrough = option+3;
break;
case 'd':
case 'l':
@@ -869,7 +869,7 @@ bool VCCLCompilerTool::parseOption(const char* option)
break;
case 'u':
UsePrecompiledHeader = pchUseUsingSpecific;
- PrecompiledHeaderFile = option+3;
+ PrecompiledHeaderThrough = option+3;
break;
default:
found = false; break;