diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-05-01 07:38:12 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-06-12 08:39:19 +0000 |
| commit | 2715088397641a85c1fb61d64bdb4c677713337f (patch) | |
| tree | 030309fb1dbf51553273f0b1948087088e6d4935 /tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | |
| parent | b7f36051fb0bd16fa61e08ecd77978a45a125dea (diff) | |
Fine tune configure and clean up header includes
Previously configure was generating two config headers
qtwebengine-config.h and qtwebengine-config_p.h, however
those headers were never installed or included as dependency
in Makefiles. Moreover, due to the name clash all features
were included into qt_lib_webengine_*.pri which is
QtWebEngine QML module.
Move configure to core so all features belong now to
qt_lib_webenginecore*.pri. Fix global includes to include
qtwebenginecore-config*.h.
Drop all DEFINES and use QT_CONFIG instead.
Cleanup all evil looking includes in headers for webengine and
webenginewidgets.
Change-Id: Iddbc8bf4487d9a5f0c19a71a9569535083507756
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp')
| -rw-r--r-- | tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index b252fa763..42e96c0f5 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -37,9 +37,9 @@ #include <QtQml/QQmlEngine> #include <QtTest/QtTest> #include <QtWebEngine/QQuickWebEngineProfile> -#include <private/qinputmethod_p.h> -#include <private/qquickwebengineview_p.h> -#include <private/qquickwebenginesettings_p.h> +#include <QtGui/private/qinputmethod_p.h> +#include <QtWebEngine/private/qquickwebengineview_p.h> +#include <QtWebEngine/private/qquickwebenginesettings_p.h> #include <qpa/qplatforminputcontext.h> #include <functional> @@ -623,8 +623,8 @@ void tst_QQuickWebEngineView::setZoomFactor() void tst_QQuickWebEngineView::printToPdf() { -#if !defined(ENABLE_PDF) - QSKIP("ENABLE_PDF"); +#if !QT_CONFIG(webengine_printing_and_pdf) + QSKIP("no webengine-printing-and-pdf"); #else QTemporaryDir tempDir(QDir::tempPath() + "/tst_qwebengineview-XXXXXX"); QVERIFY(tempDir.isValid()); @@ -650,7 +650,7 @@ void tst_QQuickWebEngineView::printToPdf() QList<QVariant> failedArguments = savePdfSpy.takeFirst(); QVERIFY2(failedArguments.at(0).toString() == path, "File path for second saved PDF does not match arguments"); QVERIFY2(failedArguments.at(1).toBool() == false, "Printing to PDF file succeeded though it should fail"); -#endif // !defined(ENABLE_PDF) +#endif // !QT_CONFIG(webengine_printing_and_pdf) } void tst_QQuickWebEngineView::stopSettingFocusWhenDisabled() |