From bdb8a5f6640b81a2461b34c1d6bd4b7b9281544f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 7 Oct 2019 15:33:15 +0200 Subject: [PATCH] Regenerate gui and network to handle source subtractions using script Change-Id: Ifd7014b90e3eb054079de8904d9812cfd28b664d Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- src/gui/.prev_CMakeLists.txt | 17 ++++++++--------- src/gui/CMakeLists.txt | 12 +++++++++--- src/network/.prev_CMakeLists.txt | 11 +++++------ src/network/CMakeLists.txt | 11 +++++------ 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index da149917cb9..7789302ae99 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -109,7 +109,7 @@ add_qt_module(Gui painting/qcompositionfunctions.cpp painting/qcosmeticstroker.cpp painting/qcosmeticstroker_p.h painting/qdatabuffer_p.h - painting/qdrawhelper.cpp painting/qdrawhelper_p.h + painting/qdrawhelper_p.h painting/qdrawhelper_x86_p.h painting/qdrawingprimitive_sse2_p.h painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h @@ -520,14 +520,6 @@ extend_target(Gui CONDITION QT_FEATURE_cssparser text/qcssparser.cpp text/qcssparser_p.h ) -extend_target(Gui CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 - SOURCES - -painting/qdrawhelper.cpp - painting/qdrawhelper.cpp - NO_PCH_SOURCES - "painting/qdrawhelper.cpp" -) - extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") DEFINES ENABLE_PIXMAN_DRAWHELPERS @@ -617,6 +609,13 @@ extend_target(Gui CONDITION WASM platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) +extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 + SOURCES + painting/qdrawhelper.cpp + NO_PCH_SOURCES + "painting/qdrawhelper.cpp" +) + qt_create_tracepoints(Gui qtgui.tracepoints) add_qt_docs(Gui diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index fb436e86736..b8b24083c74 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -152,7 +152,7 @@ add_qt_module(Gui painting/qcompositionfunctions.cpp painting/qcosmeticstroker.cpp painting/qcosmeticstroker_p.h painting/qdatabuffer_p.h - painting/qdrawhelper.cpp painting/qdrawhelper_p.h + painting/qdrawhelper_p.h painting/qdrawhelper_x86_p.h painting/qdrawingprimitive_sse2_p.h painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h @@ -603,8 +603,6 @@ extend_target(Gui CONDITION QT_FEATURE_cssparser text/qcssparser.cpp text/qcssparser_p.h ) -# extend_target(Gui CONDITION GCC AND (QT_COMPILER_VERSION_MAJOR STREQUAL 5) ... # special case: remove - extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") DEFINES ENABLE_PIXMAN_DRAWHELPERS @@ -742,6 +740,14 @@ extend_target(Gui CONDITION WASM platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) +extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 + SOURCES + painting/qdrawhelper.cpp + NO_PCH_SOURCES + "painting/qdrawhelper.cpp" +) + + qt_create_tracepoints(Gui qtgui.tracepoints) add_qt_docs(Gui doc/qtgui.qdocconf diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index 9beb702c109..6f7a081bd8b 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -157,11 +157,6 @@ extend_target(Network CONDITION UNIX socket/qnet_unix_p.h ) -extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT INTEGRITY - SOURCES - kernel/qdnslookup_unix.cpp -) - extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX LIBRARIES ${CMAKE_DL_LIBS} @@ -179,7 +174,6 @@ extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup SOURCES - -kernel/qdnslookup_unix.cpp kernel/qdnslookup_android.cpp ) @@ -441,6 +435,11 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 LIBRARIES crypt32 ) + +extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY + SOURCES + kernel/qdnslookup_unix.cpp +) add_qt_docs(Network doc/qtnetwork.qdocconf ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 427e7d877b5..f2be442df2b 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -157,11 +157,6 @@ extend_target(Network CONDITION UNIX socket/qnet_unix_p.h ) -extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT INTEGRITY AND NOT ANDROID - SOURCES - kernel/qdnslookup_unix.cpp -) - extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX LIBRARIES ${CMAKE_DL_LIBS} @@ -443,9 +438,13 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 crypt32 ) -extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf +extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY + SOURCES + kernel/qdnslookup_unix.cpp +) add_qt_docs(Network doc/qtnetwork.qdocconf ) +extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf