diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:13 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:51 +0200 |
| commit | 4dac45c9ee59ff6586d90d423654da91523ab679 (patch) | |
| tree | cd4a4adf2cbc9e77bf86d2d11e71ec66afdf3be4 /mkspecs/features/qt_module_headers.prf | |
| parent | 078cd61751aeaa310d35a3d596a21a36004a1a0f (diff) | |
| parent | f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277
Diffstat (limited to 'mkspecs/features/qt_module_headers.prf')
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 4 |
1 files changed, 2 insertions, 2 deletions
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 } |