diff --git a/src/app/app.pro b/src/app/app.pro index cc56a5642..125b41fb4 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -113,12 +113,12 @@ CONFIG(debug, debug|release){ unix { *-g++{ QMAKE_CXXFLAGS += \ - -isystem "/usr/include/qt5" \ - -isystem "/usr/include/qt5/QtWidgets" \ - -isystem "/usr/include/qt5/QtXml" \ - -isystem "/usr/include/qt5/QtGui" \ - -isystem "/usr/include/qt5/QtXmlPatterns" \ - -isystem "/usr/include/qt5/QtCore" \ + -isystem "$$[QT_INSTALL_HEADERS]" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \ -isystem "$${OUT_PWD}/$${UI_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${RCC_DIR}" \ @@ -127,12 +127,12 @@ CONFIG(debug, debug|release){ #Turn on Clang warnings clang*{ QMAKE_CXXFLAGS += \ - -isystem "/usr/include/qt5" \ - -isystem "/usr/include/qt5/QtWidgets" \ - -isystem "/usr/include/qt5/QtXml" \ - -isystem "/usr/include/qt5/QtGui" \ - -isystem "/usr/include/qt5/QtCore" \ - -isystem "/usr/include/qt5/QtXmlPatterns" \ + -isystem "$$[QT_INSTALL_HEADERS]" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \ -isystem "$${OUT_PWD}/$${UI_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${RCC_DIR}" \ diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index cc0badb6c..52ff3c209 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -82,12 +82,12 @@ CONFIG(debug, debug|release){ unix { *-g++{ QMAKE_CXXFLAGS += \ - -isystem "/usr/include/qt5" \ - -isystem "/usr/include/qt5/QtWidgets" \ - -isystem "/usr/include/qt5/QtXml" \ - -isystem "/usr/include/qt5/QtGui" \ - -isystem "/usr/include/qt5/QtXmlPatterns" \ - -isystem "/usr/include/qt5/QtCore" \ + -isystem "$$[QT_INSTALL_HEADERS]" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ $$GCC_CXXFLAGS } diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index c7bea4756..0d3ea0b66 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -125,24 +125,24 @@ CONFIG(debug, debug|release){ unix { *-g++{ QMAKE_CXXFLAGS += \ - -isystem "/usr/include/qt5" \ - -isystem "/usr/include/qt5/QtWidgets" \ - -isystem "/usr/include/qt5/QtXml" \ - -isystem "/usr/include/qt5/QtGui" \ - -isystem "/usr/include/qt5/QtXmlPatterns" \ - -isystem "/usr/include/qt5/QtCore" \ + -isystem "$$[QT_INSTALL_HEADERS]" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ $$GCC_CXXFLAGS } #Turn on Clang warnings clang*{ QMAKE_CXXFLAGS += \ - -isystem "/usr/include/qt5" \ - -isystem "/usr/include/qt5/QtWidgets" \ - -isystem "/usr/include/qt5/QtXml" \ - -isystem "/usr/include/qt5/QtGui" \ - -isystem "/usr/include/qt5/QtCore" \ - -isystem "/usr/include/qt5/QtXmlPatterns" \ + -isystem "$$[QT_INSTALL_HEADERS]" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \ + -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ $$CLANG_CXXFLAGS }