diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-07 15:33:15 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-07 22:45:29 +0000 |
| commit | bdb8a5f6640b81a2461b34c1d6bd4b7b9281544f (patch) | |
| tree | 0a883a09bdac0ea087f084350c38021022b0f4c4 /src/gui | |
| parent | 2c4a4ca5d1237983a1e8cc2d289116ebe389ee22 (diff) | |
Regenerate gui and network to handle source subtractions using script
Change-Id: Ifd7014b90e3eb054079de8904d9812cfd28b664d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/.prev_CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 12 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index da149917cb..7789302ae9 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 fb436e8673..b8b24083c7 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 |