1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate gui and network to handle source subtractions using script

Browse Source 
Change-Id: Ifd7014b90e3eb054079de8904d9812cfd28b664d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
This commit is contained in:
Alexandru Croitor 2019-10-07 15:33:15 +02:00
parent 2c4a4ca5d1
commit bdb8a5f664
4 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/.prev_CMakeLists.txt
View File

@ -109,7 +109,7 @@ add_qt_module(Gui
painting/qcompositionfunctions.cpp painting/qcompositionfunctions.cpp
painting/qcosmeticstroker.cpp painting/qcosmeticstroker_p.h painting/qcosmeticstroker.cpp painting/qcosmeticstroker_p.h
painting/qdatabuffer_p.h painting/qdatabuffer_p.h
painting/qdrawhelper.cpp painting/qdrawhelper_p.h painting/qdrawhelper_p.h
painting/qdrawhelper_x86_p.h painting/qdrawhelper_x86_p.h
painting/qdrawingprimitive_sse2_p.h painting/qdrawingprimitive_sse2_p.h
painting/qemulationpaintengine.cpp painting/qemulationpaintengine_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 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") extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
DEFINES DEFINES
ENABLE_PIXMAN_DRAWHELPERS ENABLE_PIXMAN_DRAWHELPERS
@ -617,6 +609,13 @@ extend_target(Gui CONDITION WASM
platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h 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) qt_create_tracepoints(Gui qtgui.tracepoints)
add_qt_docs(Gui add_qt_docs(Gui

12
src/gui/CMakeLists.txt
View File

@ -152,7 +152,7 @@ add_qt_module(Gui
painting/qcompositionfunctions.cpp painting/qcompositionfunctions.cpp
painting/qcosmeticstroker.cpp painting/qcosmeticstroker_p.h painting/qcosmeticstroker.cpp painting/qcosmeticstroker_p.h
painting/qdatabuffer_p.h painting/qdatabuffer_p.h
painting/qdrawhelper.cpp painting/qdrawhelper_p.h painting/qdrawhelper_p.h
painting/qdrawhelper_x86_p.h painting/qdrawhelper_x86_p.h
painting/qdrawingprimitive_sse2_p.h painting/qdrawingprimitive_sse2_p.h
painting/qemulationpaintengine.cpp painting/qemulationpaintengine_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 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") extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
DEFINES DEFINES
ENABLE_PIXMAN_DRAWHELPERS ENABLE_PIXMAN_DRAWHELPERS
@ -742,6 +740,14 @@ extend_target(Gui CONDITION WASM
platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h 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) qt_create_tracepoints(Gui qtgui.tracepoints)
add_qt_docs(Gui add_qt_docs(Gui
doc/qtgui.qdocconf doc/qtgui.qdocconf

11
src/network/.prev_CMakeLists.txt
View File

@ -157,11 +157,6 @@ extend_target(Network CONDITION UNIX
socket/qnet_unix_p.h 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 extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
LIBRARIES LIBRARIES
${CMAKE_DL_LIBS} ${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 extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
SOURCES SOURCES
-kernel/qdnslookup_unix.cpp
kernel/qdnslookup_android.cpp kernel/qdnslookup_android.cpp
) )
@ -441,6 +435,11 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
LIBRARIES LIBRARIES
crypt32 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 add_qt_docs(Network
doc/qtnetwork.qdocconf doc/qtnetwork.qdocconf
) )

11
src/network/CMakeLists.txt
View File

@ -157,11 +157,6 @@ extend_target(Network CONDITION UNIX
socket/qnet_unix_p.h 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 extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
LIBRARIES LIBRARIES
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
@ -443,9 +438,13 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
crypt32 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 add_qt_docs(Network
doc/qtnetwork.qdocconf doc/qtnetwork.qdocconf
) )
extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf