From 8012f38379fa4ecaf018b8e3e1a36e743a6e388a Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 13 Feb 2017 15:24:36 +0100 Subject: Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen --- qmake/qmake.pri | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qmake/qmake.pri') diff --git a/qmake/qmake.pri b/qmake/qmake.pri index c0f7250bcf..b9ed9ce96a 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -132,8 +132,7 @@ bootstrap { #Qt code unix { SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp mac { - SOURCES += qcore_mac.cpp qsettings_mac.cpp - OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm + SOURCES += qcore_mac.cpp qsettings_mac.cpp qcore_mac_objc.mm qlocale_mac.mm LIBS += -framework ApplicationServices -framework CoreServices -framework Foundation } else { SOURCES += qlocale_unix.cpp -- cgit v1.2.3