diff options
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/ltcg.prf | 9 | ||||
-rw-r--r-- | mkspecs/features/qt_module_headers.prf | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf index d113caf35c..43ba482954 100644 --- a/mkspecs/features/ltcg.prf +++ b/mkspecs/features/ltcg.prf @@ -28,7 +28,10 @@ CONFIG(release, debug|release) { } load(link_ltcg) - QMAKE_CFLAGS *= $$QMAKE_CFLAGS_LTCG - QMAKE_CXXFLAGS *= $$QMAKE_CXXFLAGS_LTCG - QMAKE_LFLAGS *= $$QMAKE_LFLAGS_LTCG + QMAKE_CFLAGS -= $$QMAKE_CFLAGS_LTCG + QMAKE_CFLAGS += $$QMAKE_CFLAGS_LTCG + QMAKE_CXXFLAGS -= $$QMAKE_CXXFLAGS_LTCG + QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_LTCG + QMAKE_LFLAGS -= $$QMAKE_LFLAGS_LTCG + QMAKE_LFLAGS += $$QMAKE_LFLAGS_LTCG } diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 37b69e31c8..899a40103a 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -272,7 +272,7 @@ headersclean:!internal_module { hcleanFLAGS += -std=c++98 } - hcleanCOMMAND = $$QMAKE_CXX -c $(CXXFLAGS) $$hcleanFLAGS $(INCPATH) $$hcleanDEFS -xc++ ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + hcleanCOMMAND = $(CXX) -c $(CXXFLAGS) $$hcleanFLAGS $(INCPATH) $$hcleanDEFS -xc++ ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} } else: msvc:!intel_icl { # 4180: qualifier applied to function type has no meaning; ignored # 4458: declaration of 'identifier' hides class member @@ -284,7 +284,7 @@ headersclean:!internal_module { # 4577: 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed. Specify /EHsc greaterThan(QMAKE_MSC_VER, 18): hcleanFLAGS += -wd4577 - hcleanCOMMAND = $$QMAKE_CXX -c $(CXXFLAGS) $$hcleanFLAGS $(INCPATH) $$hcleanDEFS -FI${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT} \ + hcleanCOMMAND = $(CXX) -c $(CXXFLAGS) $$hcleanFLAGS $(INCPATH) $$hcleanDEFS -FI${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT} \ $$[QT_INSTALL_DATA/src]/mkspecs/features/data/dummy.cpp } |