diff options
| author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2022-03-23 08:51:42 +0000 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-04-07 10:00:17 +0000 |
| commit | 288f60442fefa717dfc3c7587f1d480910b50874 (patch) | |
| tree | 2cfafa2d66bdfcbbe35dccd1db8679de7ad7e18e /tests | |
| parent | 8018a4cbce8f01add2aa011b3448516cb6ea92ef (diff) | |
Fix build with libc++
Fix build with libc++ on linux by adding missing use_libcxx
parameter.
Check if re2 and poppler can be used as they use std::string in
their api. Add compiler test to check that.
Pick-to: 6.3 6.2
Change-Id: I74bf79b8443ad470621c1a2e0c9dc768d4cca1f1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/printing/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/widgets/printing/tst_printing.cpp | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/widgets/printing/CMakeLists.txt b/tests/auto/widgets/printing/CMakeLists.txt index e61b8cc89..9e14fd752 100644 --- a/tests/auto/widgets/printing/CMakeLists.txt +++ b/tests/auto/widgets/printing/CMakeLists.txt @@ -17,9 +17,7 @@ qt_internal_add_test(tst_printing ) qt_internal_extend_target(tst_printing - CONDITION POPPLER_CPP_FOUND - DEFINES - POPPLER_CPP + CONDITION POPPLER_CPP_FOUND AND QT_FEATURE_webengine_system_poppler LIBRARIES PkgConfig::POPPLER_CPP ) diff --git a/tests/auto/widgets/printing/tst_printing.cpp b/tests/auto/widgets/printing/tst_printing.cpp index 0559fb787..81d5d9442 100644 --- a/tests/auto/widgets/printing/tst_printing.cpp +++ b/tests/auto/widgets/printing/tst_printing.cpp @@ -27,13 +27,14 @@ ****************************************************************************/ #include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h> +#include <QtWebEngineCore/qtwebenginecore-config.h> #include <QWebEngineView> #include <QTemporaryDir> #include <QTest> #include <QSignalSpy> #include <util.h> -#if defined(POPPLER_CPP) +#if QT_CONFIG(webengine_system_poppler) #include <poppler-document.h> #include <poppler-page.h> #endif @@ -44,7 +45,7 @@ class tst_Printing : public QObject private slots: void printToPdfBasic(); void printRequest(); -#if defined(POPPLER_CPP) && defined(Q_OS_LINUX) && defined(__GLIBCXX__) +#if QT_CONFIG(webengine_system_poppler) void printToPdfPoppler(); #endif }; @@ -110,7 +111,7 @@ void tst_Printing::printRequest() QVERIFY(data.length() > 0); } -#if defined(POPPLER_CPP) && defined(Q_OS_LINUX) && defined(__GLIBCXX__) +#if QT_CONFIG(webengine_system_poppler) void tst_Printing::printToPdfPoppler() { // check if generated pdf is correct by searching for a know string on the page |