From 6e5e8016dd3f0d2bc31ac692843c653cb1872fc9 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 3 Mar 2021 16:23:53 +0100 Subject: Fix build of Core module without regularexpression feature qregularexpression.h requires FEATURE_regularexpression to be enabled. Add a condition to the 'qt_pch.h' header to fix the build when PCH are enabled and FEATURE_regularexpression is disabled. It seems that the filter implementation of QSortFilterProxyModel has QRegularExpression as its base. It's necessary to make sortfilterproxymodel dependent on the regularexpression feature. Fix the precompiler condition for the extractSections function in the QString implementation. Use the same precompiler condition for the QString::section and extractSections functions, since QString::section depends on extractSections. Change-Id: I5b775e0842a0aa1a8d47f8dded376bdfcf63b5bf Reviewed-by: Joerg Bornemann --- src/corelib/configure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/configure.json') diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 9c8615cf74..b1ba89cd39 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -898,7 +898,7 @@ "label": "QSortFilterProxyModel", "purpose": "Supports sorting and filtering of data passed between another model and a view.", "section": "ItemViews", - "condition": "features.proxymodel", + "condition": "features.proxymodel && features.regularexpression", "output": [ "publicFeature", "feature" ] }, "identityproxymodel": { -- cgit v1.2.3