diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-13 16:16:35 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-14 19:46:01 +0200 |
| commit | a6a97f23bcebfc7c3319607b612be3b0d59ea46f (patch) | |
| tree | 8b7a99042ee932f45234440f17053e3f15ed3d5d /src | |
| parent | bf42f6707dc5d6a61b4838d0d692f782fb62568f (diff) | |
| download | qtwebengine-a6a97f23bcebfc7c3319607b612be3b0d59ea46f.tar.gz | |
Resolve duplicate symbol error
When doing unity build, `CharacterHitTolerance` collides with similarly
named variable in `qpdfdocument.cpp`.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: If7ac4ec095c88bff38f3b62b4caac82f0bfd8368
Reviewed-by: Orkun Tokdemir <orkun.tokdemir@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pdf/qpdfsearchmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pdf/qpdfsearchmodel.cpp b/src/pdf/qpdfsearchmodel.cpp index a8946ccfe..7fe11c2fe 100644 --- a/src/pdf/qpdfsearchmodel.cpp +++ b/src/pdf/qpdfsearchmodel.cpp @@ -20,7 +20,6 @@ Q_LOGGING_CATEGORY(qLcS, "qt.pdf.search") static const int UpdateTimerInterval = 100; static const int ContextChars = 64; -static const double CharacterHitTolerance = 6.0; /*! \class QPdfSearchModel @@ -257,6 +256,7 @@ bool QPdfSearchModelPrivate::doSearch(int page) } FPDF_SCHHANDLE sh = FPDFText_FindStart(textPage, searchString.utf16(), 0, 0); QList<QPdfLink> newSearchResults; + constexpr double CharacterHitTolerance = 6.0; while (FPDFText_FindNext(sh)) { int idx = FPDFText_GetSchResultIndex(sh); int count = FPDFText_GetSchCount(sh); |