diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-14 17:56:32 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-15 15:55:47 +0200 |
| commit | 75c4fd52d126fcdd7dcc211096e90633594f872d (patch) | |
| tree | 77daf7263b5afeb0e8e4c227b0d886e1e7ed359b /src | |
| parent | 61a9038877adee1ecd835312fc528c7eb409c5b3 (diff) | |
CMake: Regenerate configure.cmake files
Change-Id: I844e82b4655cf1967b16a7785b4e1ef777e61c22
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/.prev_configure.cmake | 6 | ||||
| -rw-r--r-- | src/network/configure.cmake | 2 | ||||
| -rw-r--r-- | src/widgets/configure.cmake | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake index e48fc36514..cd962e8667 100644 --- a/src/gui/.prev_configure.cmake +++ b/src/gui/.prev_configure.cmake @@ -99,10 +99,6 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) endif() qt_add_qmake_lib_dependency(xcb_xfixes xcb) if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) - qt_find_package(XCB COMPONENTS XINERAMA PROVIDED_TARGETS XCB::XINERAMA MODULE_NAME gui QMAKE_LIB xcb_xinerama) -endif() -qt_add_qmake_lib_dependency(xcb_xinerama xcb) -if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(X11_XCB PROVIDED_TARGETS X11::XCB MODULE_NAME gui QMAKE_LIB xcb_xlib) endif() qt_add_qmake_lib_dependency(xcb_xlib xcb xlib) @@ -491,7 +487,6 @@ qt_config_compile_test(xcb_syslibs XCB::SHM XCB::SYNC XCB::XFIXES - XCB::XINERAMA XCB::XKB XCB::XCB CODE @@ -506,7 +501,6 @@ qt_config_compile_test(xcb_syslibs #include <xcb/shm.h> #include <xcb/sync.h> #include <xcb/xfixes.h> -#include <xcb/xinerama.h> #include <xcb/xcb_icccm.h> #include <xcb/xcb_renderutil.h> #include <xcb/xkb.h> diff --git a/src/network/configure.cmake b/src/network/configure.cmake index a6b98b6fad..6f3dac9faa 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -255,7 +255,7 @@ qt_feature("libproxy" PRIVATE ) qt_feature("linux-netlink" PRIVATE LABEL "Linux AF_NETLINK" - CONDITION LINUX AND TEST_linux_netlink + CONDITION LINUX AND NOT ANDROID AND TEST_linux_netlink ) qt_feature("openssl" PRIVATE LABEL "OpenSSL" diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake index fa55073f62..650c35876d 100644 --- a/src/widgets/configure.cmake +++ b/src/widgets/configure.cmake @@ -433,7 +433,7 @@ qt_feature("filedialog" PUBLIC SECTION "Dialogs" LABEL "QFileDialog" PURPOSE "Provides a dialog widget for selecting files or directories." - CONDITION ( QT_FEATURE_buttongroup ) AND ( QT_FEATURE_combobox ) AND ( QT_FEATURE_dialog ) AND ( QT_FEATURE_dialogbuttonbox ) AND ( QT_FEATURE_label ) AND ( QT_FEATURE_proxymodel ) AND ( QT_FEATURE_splitter ) AND ( QT_FEATURE_stackedwidget ) AND ( QT_FEATURE_treeview ) AND ( QT_FEATURE_toolbutton ) + CONDITION ( QT_FEATURE_buttongroup ) AND ( QT_FEATURE_combobox ) AND ( QT_FEATURE_dialog ) AND ( QT_FEATURE_dialogbuttonbox ) AND ( QT_FEATURE_filesystemmodel ) AND ( QT_FEATURE_label ) AND ( QT_FEATURE_proxymodel ) AND ( QT_FEATURE_splitter ) AND ( QT_FEATURE_stackedwidget ) AND ( QT_FEATURE_treeview ) AND ( QT_FEATURE_toolbutton ) ) qt_feature_definition("filedialog" "QT_NO_FILEDIALOG" NEGATE VALUE "1") qt_feature("fontdialog" PUBLIC |