From 917e78fb8848b9e31c81d6d4b0286ee23c0a84f1 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Fri, 9 Jan 2015 13:07:22 +0100
Subject: Revert "Mac: INCLUDEPATH fix"

This reverts commit a7da7f8ab00e6fe246ff8a02082305ea7f833fd3.

Adding the install prefix to the inlude search paths causes us to pick up
header files from there if there are any, which causes all sorts of issues.

Conflicts:
	lib/lib.pro
	shared/shared.pro

Change-Id: I070ff6443bb5612b3b7e3878d22dc9dd69d62e70
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
---
 src/core/core_gyp_generator.pro | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/core')

diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 38aba3a76..3817c334b 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -29,8 +29,7 @@ else: DEFINES += QT_NO_EGL
 
 RESOURCES += devtools.qrc
 
-# something fishy with qmake in 5.2 ?
-INCLUDEPATH += $$[QT_INSTALL_HEADERS] $$PWD
+INCLUDEPATH += $$PWD
 
 SOURCES = \
         access_token_store_qt.cpp \
-- 
cgit v1.2.3