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/inspectorserver | |
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/inspectorserver')
-rw-r--r-- | tests/auto/quick/inspectorserver/inspectorserver.pro | 2 | ||||
-rw-r--r-- | tests/auto/quick/inspectorserver/tst_inspectorserver.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/inspectorserver/inspectorserver.pro b/tests/auto/quick/inspectorserver/inspectorserver.pro index 1a2c2f053..fdc213f38 100644 --- a/tests/auto/quick/inspectorserver/inspectorserver.pro +++ b/tests/auto/quick/inspectorserver/inspectorserver.pro @@ -1,4 +1,4 @@ include(../tests.pri) QT += webengine -QT_PRIVATE += webengine-private +QT_PRIVATE += core-private webengine-private webenginecore-private DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\" diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp index e45b4466c..5f47ee797 100644 --- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp +++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp @@ -33,7 +33,7 @@ #include <QtQml/QQmlEngine> #include <QtTest/QtTest> #include <QQuickWebEngineProfile> -#include <private/qquickwebengineview_p.h> +#include <QtWebEngine/private/qquickwebengineview_p.h> #define INSPECTOR_SERVER_PORT "23654" static const QUrl s_inspectorServerHttpBaseUrl("http://localhost:" INSPECTOR_SERVER_PORT); |