summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2017-02-13 15:19:59 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2017-02-17 12:08:47 +0000
commit27d5cc2ceb7d9970b371d2ad2dda058da84315b0 (patch)
tree251c0f8c9f356b6b4e0f548a989f67fd1f1f317f /qmake
parentcc7d17ffb3003564295d6a07bc6dbca6c73dbbb8 (diff)
Be consistent about indentation
Most continuation lines in long variable values indented with a tab and some space; three used spaces only; make them match the rest. A foolish consistency is the hobgoblin of my little mind. Change-Id: I7e51ea830040efe62801e80a49486d26dd2a3978 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.unix6
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 17282bd20b..a7aad3b422 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -75,7 +75,7 @@ DEPEND_SRC = \
$(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \
$(SOURCE_PATH)/src/corelib/tools/qhash.cpp $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \
$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm \
- $(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm \
+ $(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm \
$(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
$(SOURCE_PATH)/src/corelib/io/qsettings.cpp $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
$(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \
@@ -101,8 +101,8 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
-I$(BUILD_PATH)/src/corelib/global \
-I$(QMAKESPEC) \
-DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \
- -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \
- -DQT_NO_FOREACH
+ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \
+ -DQT_NO_FOREACH
CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)