From 0e14bd586a6e04da3f7c16f98b2392d56a5539d8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 30 Sep 2019 17:58:17 +0200 Subject: Regenerate qtbase/src projects To get less diffs for next merges and pro2cmake changes. Change-Id: I7fb5ff34bb884072a9964e8e3488c69f4290fca2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/corelib/.prev_CMakeLists.txt | 10 +++++----- src/corelib/CMakeLists.txt | 8 ++++---- src/dbus/.prev_CMakeLists.txt | 2 +- src/gui/.prev_CMakeLists.txt | 30 +++++++++++++++--------------- src/gui/CMakeLists.txt | 28 ++++++++++++++-------------- src/network/.prev_CMakeLists.txt | 6 +----- src/network/CMakeLists.txt | 4 ---- src/printsupport/CMakeLists.txt | 1 - src/sql/CMakeLists.txt | 1 - src/testlib/.prev_CMakeLists.txt | 2 +- src/widgets/.prev_CMakeLists.txt | 3 +-- src/widgets/CMakeLists.txt | 1 - 12 files changed, 42 insertions(+), 54 deletions(-) (limited to 'src') diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index ebaed361a0..56a0ecaa46 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -258,9 +258,9 @@ if(ANDROID) endif() #### Keys ignored in scope 1:.:.:corelib.pro:: -# CMAKE_DISABLED_FEATURES = "join(QT_DISABLED_FEATURES,"$$escape_expand(\\n) ")" -# CMAKE_HOST_DATA_DIR = "join($$[QT_HOST_DATA/src],$$[QT_INSTALL_PREFIX])" -# CMAKE_INSTALL_DATA_DIR = "join($$[QT_HOST_DATA],$$[QT_INSTALL_PREFIX])" +# CMAKE_DISABLED_FEATURES = "$$join(QT_DISABLED_FEATURES, "$$escape_expand(\\n) ")" +# CMAKE_HOST_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA/src], $$[QT_INSTALL_PREFIX])" +# CMAKE_INSTALL_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA], $$[QT_INSTALL_PREFIX])" # HOST_BINS = "$$[QT_HOST_BINS]" # INSTALLS = "ctest_qt5_module_files" "cmake_qt5_umbrella_module_files" # MODULE = "core" @@ -433,7 +433,7 @@ extend_target(Core CONDITION _ss_f16c_cxx #### Keys ignored in scope 27:.:global:global/global.pri:else: # F16C_SOURCES = "global/qfloat16_f16c.c" -extend_target(Core CONDITION linux_x_ OR (hurd_x_ AND NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static) +extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_) DEFINES ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\" LINK_OPTIONS @@ -999,7 +999,7 @@ extend_target(Core CONDITION WASM qt_create_tracepoints(Core qtcore.tracepoints) -add_qt_docs(Core, +add_qt_docs(Core doc/qtcore.qdocconf ) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index f4678562c6..7e5a3eb083 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -344,9 +344,9 @@ if(ANDROID) endif() #### Keys ignored in scope 1:.:.:corelib.pro:: -# CMAKE_DISABLED_FEATURES = "join(QT_DISABLED_FEATURES,"$$escape_expand(\\n) ")" -# CMAKE_HOST_DATA_DIR = "join($$[QT_HOST_DATA/src],$$[QT_INSTALL_PREFIX])" -# CMAKE_INSTALL_DATA_DIR = "join($$[QT_HOST_DATA],$$[QT_INSTALL_PREFIX])" +# CMAKE_DISABLED_FEATURES = "$$join(QT_DISABLED_FEATURES, "$$escape_expand(\\n) ")" +# CMAKE_HOST_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA/src], $$[QT_INSTALL_PREFIX])" +# CMAKE_INSTALL_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA], $$[QT_INSTALL_PREFIX])" # HOST_BINS = "$$[QT_HOST_BINS]" # INSTALLS = "ctest_qt5_module_files" "cmake_qt5_umbrella_module_files" # MODULE = "core" @@ -517,7 +517,7 @@ extend_target(Core CONDITION INTEGRITY # special case begin # Remove this because it's handled manually -#extend_target(Core CONDITION linux_x_ OR hurd_x_ AND NOT cross_compile AND NOT static AND NOT _x_-armcc_x_ +#extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_) # DEFINES # ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\" # LINK_OPTIONS diff --git a/src/dbus/.prev_CMakeLists.txt b/src/dbus/.prev_CMakeLists.txt index 851058b297..bbb0a61abd 100644 --- a/src/dbus/.prev_CMakeLists.txt +++ b/src/dbus/.prev_CMakeLists.txt @@ -69,7 +69,7 @@ extend_target(DBus CONDITION WIN32 user32 ws2_32 ) -add_qt_docs(DBus, +add_qt_docs(DBus doc/qtdbus.qdocconf ) diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 2c96447e58..da149917cb 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -397,42 +397,42 @@ extend_target(Gui CONDITION WIN32 # CMAKE_WINDOWS_BUILD = "True" #### Keys ignored in scope 11:.:.:gui.pro:QT_FEATURE_egl: -# CMAKE_EGL_LIBS = "join($$QMAKE_LIBS_EGL)" +# CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)" #### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY: -# CMAKE_EGL_LIBDIR = "join($$QMAKE_LIBDIR_EGL)" +# CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)" #### Keys ignored in scope 13:.:.:gui.pro:QT_FEATURE_opengles2: # CMAKE_GL_HEADER_NAME = "GLES2/gl2.h" -# CMAKE_OPENGL_INCDIRS = "join($$QMAKE_INCDIR_OPENGL_ES2)" -# CMAKE_OPENGL_LIBS = "join($$QMAKE_LIBS_OPENGL_ES2)" +# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)" +# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)" # CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2" #### Keys ignored in scope 14:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY: -# CMAKE_GL_INCDIRS = "join($$QMAKE_INCDIR_OPENGL_ES2)" +# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)" #### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY: -# CMAKE_OPENGL_LIBDIR = "join($$QMAKE_LIBDIR_OPENGL_ES2)" +# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)" #### Keys ignored in scope 17:.:.:gui.pro:QT_FEATURE_opengl: # CMAKE_GL_HEADER_NAME = "GL/gl.h" -# CMAKE_OPENGL_INCDIRS = "join($$QMAKE_INCDIR_OPENGL)" +# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)" # CMAKE_QT_OPENGL_IMPLEMENTATION = "GL" #### Keys ignored in scope 18:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY: -# CMAKE_GL_INCDIRS = "join($$QMAKE_INCDIR_OPENGL)" +# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)" #### Keys ignored in scope 19:.:.:gui.pro:NOT QT_FEATURE_dynamicgl: -# CMAKE_OPENGL_LIBS = "join($$QMAKE_LIBS_OPENGL)" +# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)" #### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY: -# CMAKE_OPENGL_LIBDIR = "join($$QMAKE_LIBDIR_OPENGL)" +# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)" #### Keys ignored in scope 21:.:.:gui.pro:APPLE: # CMAKE_GL_HEADER_NAME = "gl.h" #### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl: -# CMAKE_EGL_INCDIRS = "join($$QMAKE_INCDIR_EGL)" +# CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)" extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES @@ -520,7 +520,7 @@ 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) +extend_target(Gui CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5 SOURCES -painting/qdrawhelper.cpp painting/qdrawhelper.cpp @@ -594,14 +594,14 @@ extend_target(Gui CONDITION QT_FEATURE_vulkan # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl" # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml" # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL" -# qvkgen_h.commands = "$$QMAKE_QVKGEN" "${QMAKE_FILE_IN}" "join($$QMAKE_QVKGEN_LICENSE_HEADER)" "${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE}" +# qvkgen_h.commands = "$$QMAKE_QVKGEN" "${QMAKE_FILE_IN}" "$$shell_quote($$QMAKE_QVKGEN_LICENSE_HEADER)" "${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE}" # qvkgen_h.input = "QMAKE_QVKGEN_INPUT" # qvkgen_h.output = "$$OUT_PWD/vulkan/qvulkanfunctions.h" -# qvkgen_ph.commands = "join(\\n)" +# qvkgen_ph.commands = "$$escape_expand(\\n)" # qvkgen_ph.depends = "$$OUT_PWD/vulkan/qvulkanfunctions.h" # qvkgen_ph.input = "QMAKE_QVKGEN_INPUT" # qvkgen_ph.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.h" -# qvkgen_pimpl.commands = "join(\\n)" +# qvkgen_pimpl.commands = "$$escape_expand(\\n)" # qvkgen_pimpl.depends = "$$OUT_PWD/vulkan/qvulkanfunctions_p.h" # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 26261eb71d..fb436e8673 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -471,42 +471,42 @@ extend_target(Gui CONDITION WIN32 # CMAKE_WINDOWS_BUILD = "True" #### Keys ignored in scope 11:.:.:gui.pro:QT_FEATURE_egl: -# CMAKE_EGL_LIBS = "join($$QMAKE_LIBS_EGL)" +# CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)" #### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY: -# CMAKE_EGL_LIBDIR = "join($$QMAKE_LIBDIR_EGL)" +# CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)" #### Keys ignored in scope 13:.:.:gui.pro:QT_FEATURE_opengles2: # CMAKE_GL_HEADER_NAME = "GLES2/gl2.h" -# CMAKE_OPENGL_INCDIRS = "join($$QMAKE_INCDIR_OPENGL_ES2)" -# CMAKE_OPENGL_LIBS = "join($$QMAKE_LIBS_OPENGL_ES2)" +# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)" +# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)" # CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2" #### Keys ignored in scope 14:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY: -# CMAKE_GL_INCDIRS = "join($$QMAKE_INCDIR_OPENGL_ES2)" +# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)" #### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY: -# CMAKE_OPENGL_LIBDIR = "join($$QMAKE_LIBDIR_OPENGL_ES2)" +# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)" #### Keys ignored in scope 17:.:.:gui.pro:QT_FEATURE_opengl: # CMAKE_GL_HEADER_NAME = "GL/gl.h" -# CMAKE_OPENGL_INCDIRS = "join($$QMAKE_INCDIR_OPENGL)" +# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)" # CMAKE_QT_OPENGL_IMPLEMENTATION = "GL" #### Keys ignored in scope 18:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY: -# CMAKE_GL_INCDIRS = "join($$QMAKE_INCDIR_OPENGL)" +# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)" #### Keys ignored in scope 19:.:.:gui.pro:NOT QT_FEATURE_dynamicgl: -# CMAKE_OPENGL_LIBS = "join($$QMAKE_LIBS_OPENGL)" +# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)" #### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY: -# CMAKE_OPENGL_LIBDIR = "join($$QMAKE_LIBDIR_OPENGL)" +# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)" #### Keys ignored in scope 21:.:.:gui.pro:APPLE: # CMAKE_GL_HEADER_NAME = "gl.h" #### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl: -# CMAKE_EGL_INCDIRS = "join($$QMAKE_INCDIR_EGL)" +# CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)" extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES @@ -719,14 +719,14 @@ endif() # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl" # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml" # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL" -# qvkgen_h.commands = "$$QMAKE_QVKGEN" "${QMAKE_FILE_IN}" "join($$QMAKE_QVKGEN_LICENSE_HEADER)" "${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE}" +# qvkgen_h.commands = "$$QMAKE_QVKGEN" "${QMAKE_FILE_IN}" "$$shell_quote($$QMAKE_QVKGEN_LICENSE_HEADER)" "${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE}" # qvkgen_h.input = "QMAKE_QVKGEN_INPUT" # qvkgen_h.output = "$$OUT_PWD/vulkan/qvulkanfunctions.h" -# qvkgen_ph.commands = "join(\\n)" +# qvkgen_ph.commands = "$$escape_expand(\\n)" # qvkgen_ph.depends = "$$OUT_PWD/vulkan/qvulkanfunctions.h" # qvkgen_ph.input = "QMAKE_QVKGEN_INPUT" # qvkgen_ph.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.h" -# qvkgen_pimpl.commands = "join(\\n)" +# qvkgen_pimpl.commands = "$$escape_expand(\\n)" # qvkgen_pimpl.depends = "$$OUT_PWD/vulkan/qvulkanfunctions_p.h" # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index 0815b68d56..9beb702c10 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -65,7 +65,6 @@ add_qt_module(Network ) #### Keys ignored in scope 1:.:.:network.pro:: -# MODULE_PLUGIN_TYPES = "bearer" # MODULE_WINRT_CAPABILITIES = "internetClient" "internetClientServer" "privateNetworkClientServer" # QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK" # _LOADED = "qt_module" @@ -90,9 +89,6 @@ if(ANDROID AND (QT_FEATURE_bearermanagement)) ) endif() -#### Keys ignored in scope 3:.:.:network.pro:QT_FEATURE_bearermanagement: -# MODULE_PLUGIN_TYPES = "bearer" - extend_target(Network CONDITION QT_FEATURE_ftp SOURCES access/qftp.cpp access/qftp_p.h @@ -445,7 +441,7 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 LIBRARIES crypt32 ) -add_qt_docs(Network, +add_qt_docs(Network doc/qtnetwork.qdocconf ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index e1e4a151c3..427e7d877b 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -65,7 +65,6 @@ add_qt_module(Network ) #### Keys ignored in scope 1:.:.:network.pro:: -# MODULE_PLUGIN_TYPES = "bearer" # MODULE_WINRT_CAPABILITIES = "internetClient" "internetClientServer" "privateNetworkClientServer" # QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK" # _LOADED = "qt_module" @@ -90,9 +89,6 @@ if(ANDROID AND (QT_FEATURE_bearermanagement)) ) endif() -#### Keys ignored in scope 3:.:.:network.pro:QT_FEATURE_bearermanagement: -# MODULE_PLUGIN_TYPES = "bearer" - extend_target(Network CONDITION QT_FEATURE_ftp SOURCES access/qftp.cpp access/qftp_p.h diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index 861f36adba..def4d69c91 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -35,7 +35,6 @@ add_qt_module(PrintSupport ) #### Keys ignored in scope 1:.:.:printsupport.pro:: -# MODULE_PLUGIN_TYPES = "printsupport" # QMAKE_LIBS = "$$QMAKE_LIBS_PRINTSUPPORT" # _LOADED = "qt_module" diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index 966862eb39..2e9083b52d 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -32,7 +32,6 @@ add_qt_module(Sql ) #### Keys ignored in scope 1:.:.:sql.pro:: -# MODULE_PLUGIN_TYPES = "sqldrivers" # SQL_P = "sql" # _LOADED = "qt_module" diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt index 60fb8bb1e0..88377a2ae2 100644 --- a/src/testlib/.prev_CMakeLists.txt +++ b/src/testlib/.prev_CMakeLists.txt @@ -141,7 +141,7 @@ extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERS #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -add_qt_docs(Test, +add_qt_docs(Test doc/qttestlib.qdocconf ) diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 5f53e85739..a190060648 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -282,7 +282,6 @@ add_qt_resource(Widgets "qstyle1" #### Keys ignored in scope 1:.:.:widgets.pro:: # MODULE_CONFIG = "uic" -# MODULE_PLUGIN_TYPES = "styles" # QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtWidgets.dynlist" # QMAKE_LIBS = "$$QMAKE_LIBS_GUI" # _LOADED = "qt_module" @@ -835,7 +834,7 @@ extend_target(Widgets CONDITION QT_FEATURE_qeventtransition qt_create_tracepoints(Widgets qtwidgets.tracepoints) -add_qt_docs(Widgets, +add_qt_docs(Widgets doc/qtwidgets.qdocconf ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index e4d8e84423..1359f637fd 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -284,7 +284,6 @@ add_qt_resource(Widgets "qstyle1" #### Keys ignored in scope 1:.:.:widgets.pro:: # MODULE_CONFIG = "uic" -# MODULE_PLUGIN_TYPES = "styles" # QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtWidgets.dynlist" # QMAKE_LIBS = "$$QMAKE_LIBS_GUI" # _LOADED = "qt_module" -- cgit v1.2.3