From 12e2c8aabab70fa8db0295c5c959fcadc6400f27 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 26 Dec 2020 18:29:19 +0200 Subject: [PATCH] Use QMAKE_DEFAULT_INCDIRS to extend list of system directories. --- common.pri | 9 +++++++-- src/app/valentina/valentina.pro | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common.pri b/common.pri index 6da9e1601..8f2ea2464 100644 --- a/common.pri +++ b/common.pri @@ -359,8 +359,13 @@ LIBS_USED_FOR_QT = \ QtConcurrent for(somelib, $$list($$LIBS_USED_FOR_QT)) { - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers + contains( QMAKE_DEFAULT_INCDIRS, "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" ) { + QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" + } + + contains( QMAKE_DEFAULT_INCDIRS, "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" ) { + QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" + } } } diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 7cf5839ee..8f8c6db24 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -127,6 +127,7 @@ message(Data files: $$[QT_INSTALL_DATA]) message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) message(Settings: $$[QT_INSTALL_SETTINGS]) message(Examples: $$[QT_INSTALL_EXAMPLES]) +message(Default include dirs: $${QMAKE_DEFAULT_INCDIRS}) # Path to recource file. win32:RC_FILE = share/resources/valentina.rc