diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-13 10:05:49 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-13 10:05:49 +0200 |
commit | 9b102e953f3fd63f9f1d6a4ac2626354972c76d6 (patch) | |
tree | 96813aeb37532532d7a6c841562f2f33a6f745f3 /qmake/Makefile.unix | |
parent | 23d8a7fb237c433a74499dcd65aa60144aafbc46 (diff) | |
parent | e2776b44a0e0e34e5a1d851916a94f7db5e7bb7b (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'qmake/Makefile.unix')
-rw-r--r-- | qmake/Makefile.unix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index c5bce375ae..f55dfe45e2 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -85,8 +85,8 @@ DEPEND_SRC = \ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 \ -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \ - -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ - -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION) -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION)/QtCore \ + -I$(INC_PATH) -I$(INC_PATH)/QtCore \ + -I$(INC_PATH)/QtCore/$(QT_VERSION) -I$(INC_PATH)/QtCore/$(QT_VERSION)/QtCore \ -I$(BUILD_PATH)/src/corelib/global -DHAVE_QCONFIG_CPP \ -I$(QMAKESPEC) \ -I$(SOURCE_PATH)/tools/shared \ |