summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Fix custom dialog exampleMichal Klocek2021-08-105-11/+25
| | | | | | | | | | | | | | | | Fix issue where ERR_UNEXPECTED_PROXY_AUTH error page is shown on proxy dialog request. * use qt.io url as dummy, otherwise CONNECT and GET requests to localhost end in proxy unexpected error. * in case of invalid authentication reload url instead of showing error page. * adjust app default width and height so dialog box is visible. Change-Id: I16a1dade73f7cb0f4f6da48b7d6902a2e7a57b5b Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit b18e707c4824004487e968fc95e8943dc3527506) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix widget dependency in customdialogsMichal Klocek2021-08-101-2/+1
| | | | | | | | Fixes: QTBUG-95367 Change-Id: I40851a8e6e6484bd7f7bba0f0e60a72b6331bcec Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 4ff41d948059ebd014c4bb3a094cf0e21dd74ada) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Reintroduce File Picker controlBalazs Egedi2021-08-102-3/+3
| | | | | | | | | | | - Using FileDialog from QuickDialogs2 - Enabled the UIDelegates test Task-number: QTBUG-93666 Change-Id: I8438a2498e864bc93abf26f2527d7883ac26ca9b Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 47d57eaa2756a108ae28d9e6226577fe66868cee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Implement QML Color DialogBalazs Egedi2021-08-052-3/+3
| | | | | | | | | | | Quick Controls 2 does not contain Color Dialog, the Labs version does not run on every OS. Task-number: QTBUG-93666 Change-Id: Idfb1fd017a7f7b74c4ad135575a9727607dacac4 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 27bd65913943f589b6c94d85f9d96a73de94a24c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update customdialogs example to work with Quick Controls 2Balazs Egedi2021-07-2724-83/+70
| | | | | | | | Task-number: QTBUG-93666 Change-Id: I3716454d7a0560f58a0e2da363b1d053babe824b Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 37cb5c751e85cb39c9098008ea21d5977c6364bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove duplicated 'downloadProgress' in favor of separate signalsKirill Burtsev2021-07-212-3/+3
| | | | | | | Change-Id: Ib825d63c89e591e740b206f43c3eadbf32319daa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit abd050e9806123cbc6288e7d33ed01ceb2921766) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove qqc2 build time requirementMichal Klocek2021-07-162-2/+0
| | | | | | | | | | | After 3668c27dee6 we do not longer check for qqc2 target in lifecycle example, however build time references where not removed. Fix it. Change-Id: I54c21ed675030b1a2993fb882278c31315f5301a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 699755b760f77c6b00f2660876f22252e070a650) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adaptations for 90-basedAllan Sandfeld Jensen2021-07-131-1/+5
| | | | | | Change-Id: I8402b044d8e12d75e144a00984b856f3de10bffd Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 1d988d971bc4270ba3d148e8e2c143bf8f625b6e)
* QuickNanoBrowser: Port to Qt6Balazs Egedi2021-07-098-273/+323
| | | | | | | | | | | | - QuickNanoBrowser now uses only Quick Controls 2. - FilePicker and ColorPicker are not supported yet. - Dialog icon support is incomplete. Task-number: QTBUG-93666 Change-Id: I7da101a312ec4fe6e140b309213d4297f7e96371 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 83abbe3fdfd2cf3d0334d5f7388ae30962147f3c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix project files in Quick examplesBalazs Egedi2021-07-093-7/+7
| | | | | | | | | | - Fix typos - Fix Quick Controls 2 dependencies Change-Id: I3f8d2314a78f9193ce20b69cf2b1ed87311d4870 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3668c27dee6afe1ef0e05df4fc6c5a3450e84901) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix documentation issues for Qt WebEngineTopi Reinio2021-07-074-20/+24
| | | | | | | | | | | API and documentation changes since 5.15 caused multiple warnings from QDoc; this change addresses most of them. Some warnings indicate missing documentation, those issues still remain. Change-Id: I96be38b7daac37a7e35c149b4b3ec3f18c4415c9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit c248844b3b8ee004800606d1a6c6e6d6bee31738) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove deprecated useforglobalcertificateverificationPeter Varga2021-07-062-2/+0
| | | | | | | | | | | | | It enabled an unrecommended OCSP path on Linux [ChangeLog] (Q)WebEngineSettings::useForGlobalCertificateVerification has been removed. Task-number: QTBUG-91467 Change-Id: I9f5d1ad5e4fcb59abd31e6a133ded7bf8319c811 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 8f7a386a5228428122813ebea1d7489783b00633) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove import versions from Quick examplesBalazs Egedi2021-07-0610-45/+45
| | | | | | | | Task-number: QTBUG-93666 Change-Id: I035ceab5bf3f0194ef9f98ccb3f79317f15c968a Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 6b9b4b6ec334e47c9bed4fc74a8568481bcd5b7c) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Make default profile off the recordMichal Klocek2021-06-252-7/+7
| | | | | | | | | | | | | | | | Make default profile otr, this prevents accessing data cache which could be created by older other version of Chromium. Allow to register a protocol handler on ort profile. [ChangeLog][QtWebEngineCore] Default profile is off-the-record Off-the-record profile can have registered protocol handlers. Task-number: QTBUG-66068 Change-Id: Ief202de5c6734d293cb64d83ad447b1eba19e9a4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit d0ff107c0096fa0e0347ddadda9a98438d27631e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QWebEngineQuick namespace for webenginequick moduleMichal Klocek2021-06-158-15/+15
| | | | | | | | | | | | This is followup change for QtWebEngineQuick rename. [ChangeLog][QtWebEngineQuick] Use namespace QtWebEngineQuick QtWebEngine::initialize() is now QtWebEnigneQuick::initialize() Change-Id: I90acab04ff0240b399a863c88eff915efa360f6f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 5f723fe7469ac9ce3373dbcd3eb0978595271514) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add spellchecker support and qwebengine_covert_dict to cmakeMichal Klocek2021-06-151-0/+34
| | | | | | | | | | Add spellchecker dictionary conversion tool. Change scope of gn object imported variables to function scope. Change-Id: Ice579a89e20b80034b675e7f767a774100478472 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 9451ceee24e832d32a86ae6a2f37eea781acaa2f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move printing finished callback to signalAllan Sandfeld Jensen2021-06-111-2/+2
| | | | | | | | | | | | We can only have one printer active at a time anyway. At the same time restore some lost documentation. Task-number: QTBUG-63235 Change-Id: I454ef3fb038712c832e73c661120fbbe77b3a90c Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 4338bcbacf467c0d0d7aec36fbd186ca6b9e02f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix some compiler warningsPeter Varga2021-06-1023-30/+1
| | | | | | | | | | | | | | - Remove deprecated Qt::AA_EnableHighDpiScaling and Qt::AA_UseHighDpiPixmaps from examples. High-DPI scaling is always enabled. - Reorder initialization of members of QWebEngineDownloadRequestPrivate. Also remove m_ prefix from public members' name. - Remove unused parameters from methods of DummyDelegate. - Add missing overrides in auto tests. Change-Id: I18d6973b8bee574b37b73fbaaa8d57002ac8ba2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 740b8c94f27930a33298c81c2284d1f0a9e2f11b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* WebEngineView: rename navigationHistory to historyKirill Burtsev2021-06-041-1/+1
| | | | | | | | | | Match widgets API name for the same QWebEngineHistory class [ChangeLog][QWebEngineQuick][WebEngineView] 'navigationHistory' property is now just 'history' Change-Id: I78507929baa84c8be08f79050568d04868171b3f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Drop printsupport dependency from coreSzabolcs David2021-06-032-9/+9
| | | | | | | | | Prevent linkage of core to widgets by moving printing API from QWebEnginePage to View and using QPagedPaintDevice (the QtGui ancestor of QPrinter) where it's needed. Change-Id: I6ea96edb495b0dcaaa584bbe72632fda025c18d3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move createWindow to a signalAllan Sandfeld Jensen2021-06-031-7/+7
| | | | | | | | | | | | | | Ports QQuickWebEngineNewViewRequest to QtWebEngineCore. [ChangeLog][QtWebEngineQuick][WebEngineView] WebEngineView::NewViewRequested is now handled with WebEngineView::acceptAsNewView() instead of with WebEngineNewViewRequest::openIn(). Task-number: QTBUG-74587 Change-Id: I9b27128948076e13f2c228458e1e7491df12153d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Use fixed qt_add_resource BASE argumentPeter Varga2021-05-2810-74/+51
| | | | | | Task-number: QTBUG-86726 Change-Id: I33ec2a73254d9b44de83f4f5491f372b4bb9959b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make handling of certificate errors possible from a signalAllan Sandfeld Jensen2021-05-253-5/+4
| | | | | | Task-number: QTBUG-74587 Change-Id: I9955a4c70b339523b5e9e9d6dffe928e61fbab90 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Bump the minimum required cmake version to 3.19Michal Klocek2021-05-2220-20/+20
| | | | | | | | | | | QtWebEngine requires support of TARGET_PROPERTY for genex in gn template generation to dump all compilation flags. This is supported since version 3.19, set examples to 3.16 as rest of the qt. Task-number: QTBUG-91760 Change-Id: Ifa5903c8c6efcb160db05baf1e18c865b48bcf39 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add examples to the cmake buildMichal Klocek2021-05-2224-27/+1249
| | | | | | | | | | | | | Add only quick and widget examples to the build for now. Update examples qmake files so the ci can also build qmake examples after the cmake bulid. Note this patch breakes qmake builds. Task-number: QTBUG-91760 Change-Id: Ia867a49bc3deab1967bdedcf525ad4afe3967c2a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-05-122-0/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webenginewidgets/printme/printhandler.cpp src/3rdparty src/core/api/qwebenginepage_p.h src/core/content_browser_client_qt.h src/core/web_contents_adapter_client.h src/core/web_contents_delegate_qt.cpp src/core/web_contents_delegate_qt.h src/webenginequick/api/qquickwebengineview_p_p.h tests/auto/quick/qmltests/data/tst_download.qml tests/auto/quick/qmltests/data/tst_viewSoure.qml tests/auto/widgets/loadsignals/tst_loadsignals.cpp tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp Change-Id: I9c1819ec15e13d4f8e244defe860e26274b5d4be
| * Docs: Suggest to use higher DPI for printingSzabolcs David2021-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | When printing with the default resolution of QPrinter, rasterized images of pages are just too small to produce sharp result. Documentation of QPrinter also mentions that the default ScreenResolution should only be used for drafts. Change-Id: I5fe93f7985d16b1126cf2bbcb9b4a4ddbdfd21f2 Task-number: QTBUG-92185 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Support devtools close button in QuickNanoBrowserBalazs Egedi2021-04-151-0/+12
| | | | | | | | | | | | Fixes: QTBUG-92376 Change-Id: I8b9e35a75a4edb7f3a0dd858987b0f14993df65d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix 'WebEngine' ambiguity for Qt6Michal Klocek2021-04-138-10/+10
| | | | | | | | | | | | | | | | | | 'WebEngine' is a qml module, however name itself is ambiguous. Thefore now with Qt6 and with cmake port name the module as WebEngineQuick. Change-Id: I948672dd5d389a01c6a31ec871459164fd989c0f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-03-161-1/+0
|\| | | | | | | Change-Id: I0dd7c64669f4b130047a4a3836f62f7ee5b5f8d9
| * Fix crash on exit in quicknanobrowser when popupMichal Klocek2021-02-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Quicknanobrowser uses "onClosing: destory()" on main window. This however will end up badly when there is open popup, since calling destroy on exit immediately deletes WebContents, while popup is still not closed. Let the application first close/destroy popup and then main qquickwindow. Change-Id: I9c3974cd0f6126558b876cb0199928797e3f7a47 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-02-021-1/+3
|\| | | | | | | | | | | | | Conflicts: tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp Change-Id: Ibf03467e398f8dcdb5f950e1a70f3e4e591003db
| * Support devtools close buttonAllan Sandfeld Jensen2021-01-221-1/+3
| | | | | | | | | | Change-Id: Icad495c3bf144a4da53b2a60585dabb3fc36d3d6 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* | Remove qwebengineview setter from qwebenginepageMichal Klocek2020-11-207-130/+181
| | | | | | | | | | Change-Id: Ifaac7287d24e38e04e217cae65f6e5294e8bdd9e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update dependencies on 'dev' in qt/qtwebengineAllan Sandfeld Jensen2020-11-021-0/+1
| | | | | | | | | | Change-Id: I74c7293ebf5ace5bd07e3bf5455dd90bf4ed6380 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-11-026-8/+8
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/quick/dialogs/tst_dialogs.cpp Change-Id: I6840495a40e4e1e4512573c980816112ae5786d7
| * Compile pdf examplesMichal Klocek2020-10-066-8/+8
| | | | | | | | | | | | | | | | Fix typo in examples.pro and update related pro files. Drop dependency on widgets in qml examples. Change-Id: I571069e5b42cc0d0d94d54ce157a6e8636275cae Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Cleanup qwebenginescript and qwebenginescriptcollection apiMichal Klocek2020-09-281-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch cleans up script and collection apis: * do not allocate user_script on heap, there is no need for that. * remove isNull(), which was used by collection.findScript(name) * remove collection.size(), there is already collection.count() * remove collection.findScript(name), user can use findScripts(name) which returns list of scripts or empty list if not found * collection.findScripts(name) is simply collection.find(name) [ChangeLog] Removed QWebEngineScriptCollection::findScript(name), use QWebEngineScriptCollection::find(name) instead. Change-Id: Iecf8f1d7c26275b9ce3a1ea97cf4bd74b17f681e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix compilation after 757a9c21c1 in basePeter Varga2020-09-233-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Adaptations for the following qtbase changes: - acbf9a858b Cleanup QTypeInfo - 652bd1efca Make QStringList an alias to QList<QString> - 25351dcc54 Long live QKeyCombination! - ed8acbeb7c Automatically register data/debug stream operations in QMetaType - a735038376 Move QStateMachine from QtCore to QtScxml Change-Id: Ieb2677cd0572cc6dfe7be4b8f8dd4189a39bd3fe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove default qwebenginesettings getterMichal Klocek2020-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | Remove defaultSettings() from qwebenginesettings and drop dependency on qwebenigineprofile in qwebenginesettings, let's see if we can also get rid of default profile later. Remove deprecated method globalSettings(). Change-Id: Ibccca50af237ed6a3dd32137d34f8e7e0e7357f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Improve QWebEngineCertificateError apiMichal Klocek2020-08-282-26/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove const ref from QWebEngineCertificateError Q_GADGET is a value type, QWebEngineCertificateError is pass as const reference from api. This is not so useful since, in qml this will be anyway copied and for c++ this is not useful since reject, ignore, defer methods are all const. Therefore simply pass it by value. * make consistent naming defer(), acceptCertificate(), rejectCertificate() * remove properties 'differed', 'answered' which are use internally, user knows if he calls functions. * error.errorDescription -> error.description() * error.error() -> error.type() [ChangeLog] In QWebEngineCertificateError use acceptCertificate() instead of ignoreCertificiateError() Change-Id: I9ffa500a0a455d98445b066252dd283872740731 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Rename QWebEngineDownloadItem -> QWebEngineDownloadRequestMichal Klocek2020-08-185-26/+26
| | | | | | | | | | | | | | | | | | | | This fits better with other QWebEngine*Requests. [ChangeLog] QWebEngineDownloadItem is now QWebEngineDownloadRequest, also in qml. Change-Id: I506e9fac746b4f23ac0936c2fbe1c7472f4fda36 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Unify certificate error handlingMichal Klocek2020-08-142-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Before we move the certificate error to core, unify error handling between qml and widgets. [ChangeLog] WebPage::certificateError does not return bool it is enough to call defer, ignoreCertificateError() or rejectCertificate(). Change-Id: I14be40f1ab6b4cbded550260d66152f51cf47de2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove QT_VERSION from simplebrowserMichal Klocek2020-08-149-51/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 468c2d9a6 it is possible to compile simplebrowser with older versions of webengine. Unfortunately it makes example code harder to read and follow. It affects user experience and does not provide any benefits for the user. Moreover, with Qt6 changes to api this would even look more ugly and complexity will grow over time. Keep example code simple and clean, remove all the QT_VERSION checks. Change-Id: I2b2ea1d11c1e59bdcbbc7351daae5308f23890d3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge all webenginecontextmenudata wrappers into one classMichal Klocek2020-08-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new class qwebenginecontextmenurequest in core which merges: * qquickwebenginecontextmenurequest * qwebenginecontextmenudata * implictly shared webenginecontextdata Unfortunately new class has to be QObject, since we want to reuse it qml. Q_GADGET can be used only as a value type, however we need to know if request is accepted or not in qml, therefore it must be passed as pointer. Since we use QObject now, class is no longer implicitly shared, however we only allocate request once and reuse the object for every new request (it is still copied in qml just to keep it aligned with other request handlers) [ChangleLog] QWebEngineContextMenuRequest is replacement for QWebEngineContextMenuData Change-Id: Ib387ec2065361a4bacc20675ca7352ab75a0e436 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Move QMenu handling from page to viewMichal Klocek2020-08-122-3/+3
| | | | | | | | | | | | | | | | [ChangeLog] createStandardContextMenu is moved from QWebEnginePage to QWebEngineView Change-Id: I08a7a1f7e55ca7396547006523cdec250a3ad117 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Use QList instead of QVectorJarek Kobus2020-07-153-6/+6
| | | | | | | | | | | | Task-number: QTBUG-84469 Change-Id: I666a060351f73783e15e3f96884c9393a5cd7e46 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adapt to newer dependenciesAllan Sandfeld Jensen2020-07-061-1/+0
| | | | | | | | | | | | Change-Id: I495880f56fbc10d8f332f26101f8a25c2a1c5631 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-06-291-5/+21
|\| | | | | | | | | | | | | Conflicts: src/src.pro Change-Id: I03c260ba676296f93d8137e79b46f3978f5f41ef
| * Fix 'qmake -r' runMichal Klocek2020-05-291-5/+21
| | | | | | | | | | | | | | Use current configure instead of qtHaveModule(). Change-Id: Ifc4500ff5eee4b997a0c02fb387d8918f88d06d1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 18:29:21 +0000