diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/itemmodels/qrangemodel_impl.h | 10 | ||||
| -rw-r--r-- | src/gui/configure.cmake | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/corelib/itemmodels/qrangemodel_impl.h b/src/corelib/itemmodels/qrangemodel_impl.h index 5ad7dd08059..96dacda0260 100644 --- a/src/corelib/itemmodels/qrangemodel_impl.h +++ b/src/corelib/itemmodels/qrangemodel_impl.h @@ -514,8 +514,12 @@ namespace QRangeModelDetails using row_type = typename range_traits<QRangeModelDetails::wrapped_t<Range>>::value_type; template <typename R = row_type, - std::enable_if_t<std::conjunction_v<std::is_destructible<wrapped_t<R>>, - is_owning_or_raw_pointer<R>>, bool> = true> + std::enable_if_t< + std::conjunction_v< + std::is_destructible<QRangeModelDetails::wrapped_t<R>>, + is_owning_or_raw_pointer<R> + >, + bool> = true> auto newRow() -> decltype(R(new QRangeModelDetails::wrapped_t<R>)) { if constexpr (is_any_of<R, std::shared_ptr>()) return std::make_shared<QRangeModelDetails::wrapped_t<R>>(); @@ -589,7 +593,7 @@ namespace QRangeModelDetails template <typename P, typename R> using protocol_mutable_childRows_test = decltype(refTo(std::declval<P&>() - .childRows(std::declval<wrapped_t<R>&>())) = {}); + .childRows(std::declval<QRangeModelDetails::wrapped_t<R>&>())) = {}); template <typename P, typename R> using protocol_mutable_childRows = qxp::is_detected<protocol_mutable_childRows_test, P, R>; diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index b14f7e74ad2..e34f4d8b30a 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -28,8 +28,11 @@ set_property(CACHE INPUT_libpng PROPERTY STRINGS undefined no qt system) #### Libraries -qt_set01(X11_SUPPORTED LINUX OR HPUX OR FREEBSD OR NETBSD OR OPENBSD OR SOLARIS OR - HURD) +if(LINUX OR HPUX OR FREEBSD OR NETBSD OR OPENBSD OR SOLARIS OR HURD) + set(X11_SUPPORTED 1) +else() + set(X11_SUPPORTED 0) +endif() qt_feature_vcpkg_scope(gui) qt_find_package(ATSPI2 MODULE PROVIDED_TARGETS PkgConfig::ATSPI2 MODULE_NAME gui QMAKE_LIB atspi) qt_find_package(DirectFB PROVIDED_TARGETS PkgConfig::DirectFB MODULE_NAME gui QMAKE_LIB directfb) |