diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-09-02 08:01:36 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2021-10-14 00:05:53 +0200 |
commit | d155f3da5d6e8ad08fab040d8f748d3bbdb69039 (patch) | |
tree | 0ab3a68b51a7a03550f67ab6ed6db4cfa7f93954 /src/webenginequick | |
parent | acb3a3fc82fd4c4b619095ab7b9fcfc02f89113d (diff) |
Remove the rest of qmake based configuration
The only not cover part in cmake port are:
* ios builds for qtpdf
* qt static dependecies for qpdf
Pick-to: 6.2
Change-Id: Iefe624c35d847b4a9c3cd970192487340b1657f9
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/webenginequick')
-rw-r--r-- | src/webenginequick/configure.json | 34 | ||||
-rw-r--r-- | src/webenginequick/module.pro | 78 | ||||
-rw-r--r-- | src/webenginequick/ui/ui.pro | 20 | ||||
-rw-r--r-- | src/webenginequick/webenginequick.pro | 12 |
4 files changed, 0 insertions, 144 deletions
diff --git a/src/webenginequick/configure.json b/src/webenginequick/configure.json deleted file mode 100644 index ce9421575..000000000 --- a/src/webenginequick/configure.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "module": "webenginequick", - "condition": "module.webenginecore && features.webengine-quick", - "depends": [ - "webenginecore-private" - ], - "commandline": { - "options": { - "webengine-quick": "boolean" - } - }, - "features": { - "webengine-quick": { - "label": "Support Qt WebEngineQuick", - "purpose": "Provides WebEngineQuick support.", - "output": [ "privateFeature" ] - }, - "webenginequick-ui-delegates": { - "label": "UI Delegates", - "section": "WebEngine", - "output": [ "privateFeature" ] - } - }, - "summary": [ - { - "section": "Qt WebEngineQuick", - "entries": [ - "webengine-quick", - "webenginequick-ui-delegates" - ] - } - ] -} - diff --git a/src/webenginequick/module.pro b/src/webenginequick/module.pro deleted file mode 100644 index 2c10aaa73..000000000 --- a/src/webenginequick/module.pro +++ /dev/null @@ -1,78 +0,0 @@ -include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) -QT_FOR_CONFIG += webenginequick-private webenginecore-private - -TARGET = QtWebEngineQuick -MODULE = webenginequick - -# For our export macros -DEFINES += QT_BUILD_WEBENGINE_LIB - -QT += qml quick webenginecore -QT_PRIVATE += quick-private gui-private core-private webenginecore-private - -QMAKE_DOCS = $$PWD/doc/qtwebengine.qdocconf - -INCLUDEPATH += $$PWD api ../core ../core/api - -SOURCES = \ - api/qquickwebengineaction.cpp \ - api/qquickwebengineclientcertificateselection.cpp \ - api/qquickwebenginedialogrequests.cpp \ - api/qquickwebenginehistory.cpp \ - api/qquickwebenginefaviconprovider.cpp \ - api/qquickwebenginenavigationrequest.cpp \ - api/qquickwebenginenewviewrequest.cpp \ - api/qquickwebengineprofile.cpp \ - api/qquickwebenginesettings.cpp \ - api/qquickwebenginesingleton.cpp \ - api/qquickwebenginetouchhandleprovider.cpp \ - api/qquickwebengineview.cpp \ - api/qtwebengineglobal.cpp \ - api/qquickwebenginescriptcollection.cpp \ - render_widget_host_view_qt_delegate_quick.cpp \ - render_widget_host_view_qt_delegate_quickwindow.cpp \ - ui_delegates_manager.cpp - -HEADERS = \ - api/qtwebengineglobal.h \ - api/qtwebengineglobal_p.h \ - api/qquickwebengineaction_p.h \ - api/qquickwebengineaction_p_p.h \ - api/qquickwebengineclientcertificateselection_p.h \ - api/qquickwebenginedialogrequests_p.h \ - api/qquickwebenginehistory_p.h \ - api/qquickwebenginefaviconprovider_p_p.h \ - api/qquickwebenginenavigationrequest_p.h \ - api/qquickwebenginenewviewrequest_p.h \ - api/qquickwebengineprofile.h \ - api/qquickwebengineprofile_p.h \ - api/qquickwebenginesettings_p.h \ - api/qquickwebenginesingleton_p.h \ - api/qquickwebenginetouchhandleprovider_p_p.h \ - api/qquickwebengineview_p.h \ - api/qquickwebengineview_p_p.h \ - api/qquickwebenginescriptcollection.h \ - render_widget_host_view_qt_delegate_quick.h \ - render_widget_host_view_qt_delegate_quickwindow.h \ - ui_delegates_manager.h - -!build_pass { - python = $$pythonPathForShell() - chromium_attributions.commands = \ - cd $$shell_quote($$shell_path($$PWD/../3rdparty)) && \ - $$python chromium/tools/licenses.py \ - --file-template ../../tools/about_credits.tmpl \ - --entry-template ../../tools/about_credits_entry.tmpl credits \ - $$shell_quote($$shell_path($$OUT_PWD/chromium_attributions.qdoc)) - chromium_attributions.CONFIG += phony - - QMAKE_EXTRA_TARGETS += chromium_attributions - - prepare_docs { - prepare_docs.depends += chromium_attributions - } else { - html_docs.depends += chromium_attributions - } -} - -load(qt_module) diff --git a/src/webenginequick/ui/ui.pro b/src/webenginequick/ui/ui.pro deleted file mode 100644 index 01754666a..000000000 --- a/src/webenginequick/ui/ui.pro +++ /dev/null @@ -1,20 +0,0 @@ -TARGETPATH = QtWebEngine/ControlsDelegates - -QML_FILES += \ - # Authentication Dialog - AuthenticationDialog.qml \ - # JS Dialogs - AlertDialog.qml \ - ColorDialog.qml \ - ConfirmDialog.qml \ - FilePicker.qml \ - PromptDialog.qml \ - # Menus. Based on Qt Quick Controls - Menu.qml \ - MenuItem.qml \ - MenuSeparator.qml \ - ToolTip.qml \ - information.png \ - question.png - -load(qml_module) diff --git a/src/webenginequick/webenginequick.pro b/src/webenginequick/webenginequick.pro deleted file mode 100644 index d7271a220..000000000 --- a/src/webenginequick/webenginequick.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = subdirs - -qml_module.file = module.pro -qml_plugin.file = plugin/plugin.pro - -qml_plugin.depends = qml_module - -SUBDIRS += qml_module qml_plugin - -qtConfig(webenginequick-ui-delegates) { - SUBDIRS += ui -} |