From f0f46ade9e9cee586ed6b3965e87e7e2f428e03b Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Fri, 19 Jul 2019 09:23:14 +0900 Subject: [PATCH] Fix SOURCES duplication in tools/bootstrap on macOS Three *_unix.cpp are added twice for unix and for mac Makefile:14766: warning: overriding commands for target `.obj/ qfilesystemengine_unix.o' Makefile:14037: warning: ignoring old commands for target `.obj/ qfilesystemengine_unix.o' Makefile:14913: warning: overriding commands for target `.obj/ qfilesystemiterator_unix.o' Makefile:14184: warning: ignoring old commands for target `.obj/ qfilesystemiterator_unix.o' Makefile:15071: warning: overriding commands for target `.obj/ qfsfileengine_unix.o' Makefile:14342: warning: ignoring old commands for target `.obj/ qfsfileengine_unix.o' Change-Id: Ia5f9d2873f738081c2d1e763efbdfc64209aaf7d Reviewed-by: BogDan Vatra --- src/tools/bootstrap/bootstrap.pro | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index f4d930babb..32e36cefa0 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -126,10 +126,7 @@ win32:SOURCES += ../../corelib/global/qoperatingsystemversion_win.cpp \ mac { SOURCES += \ ../../corelib/kernel/qcoreapplication_mac.cpp \ - ../../corelib/kernel/qcore_mac.cpp \ - ../../corelib/io/qfilesystemengine_unix.cpp \ - ../../corelib/io/qfilesystemiterator_unix.cpp \ - ../../corelib/io/qfsfileengine_unix.cpp + ../../corelib/kernel/qcore_mac.cpp OBJECTIVE_SOURCES += \ ../../corelib/global/qoperatingsystemversion_darwin.mm \