summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2017-02-13 16:02:26 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2017-02-17 12:08:56 +0000
commitd36e472aea952db6e685c0358d584d655f2fbbd5 (patch)
treebb4bbc6bcaf7f661fb5e18857bc18deeb1105626 /qmake
parent27d5cc2ceb7d9970b371d2ad2dda058da84315b0 (diff)
Use QMKGENSRC a bit more to save some repetition
Also split a long list of -I flags so that "for each platform" dirs all land on the same line, rather than breaking part way through the platform list. Change-Id: I855f6b152567bc2031e08361d2b02a788df8287e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.unix4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index a7aad3b422..4908ec2846 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -94,8 +94,8 @@ DEPEND_SRC = \
$(QTSRCS) $(QTSRCS2)
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) -I$(QMKLIBSRC) -I$(QMKGENSRC) \
+ -I$(QMKGENSRC)/unix -I$(QMKGENSRC)/win32 -I$(QMKGENSRC)/mac \
-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 \