summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I336a7cd69cebff81a2ee9c6c6c77232fdb11dd20
| * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | + 57f656a964aa9fdeb966d14eddc39f62a989b86b Add changes file for Qt 5.12.5 + ca79ed44d8c5cfa4270d5eca824a76cbcb5887fe Doc: Fix link to Qt for UWP docs Change-Id: I77c350c6657e2b42a587c92f6f91429af81bc31c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | Change-Id: I62c482898edd120b612e1d1fb479455ba6aac7ae
* | Implement QtAndroidWebViewController.getUserAgentPaolo Angelelli2019-10-311-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0a8a69d51042b95649dbdf471acb3c96228f372e introduced the httpUserAgent property, with implementations for apple, winrt, webengine and android. However, the android implementation is missing a piece of implementation. Additionally, use semaphores to make sure that, on return, the setter has completed setting the user agent, and therefore the emitted signal is fired with the correct value. Task-number: QTBUG-68746 Change-Id: Ic8f2a398297c8cd7d87ef4946ef26399167aeba9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Fix library namev5.14.0-beta2v5.14.0-beta1BogDan Vatra2019-10-011-1/+1
| | | | | | | | | | | | Fixes: QTBUG-78616 Change-Id: I68b6f87ca2c962e032abdd9a3338d8b7abfa29b5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Update plugins.qmltypes for 5.14Kai Koehne2019-09-271-4/+9
| | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I77c3c0037818d41f7e9bb47d1beb9ad315c4bdd6 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-241-1/+1
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-241-1/+1
|/| | | |/ | | | | Change-Id: If58d051b036e31d8bdfa56e0b79eca5903a804d5
| * Doc: Fix link to Qt for UWP docsLeena Miettinen2019-09-201-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-61884 Change-Id: I20a381d07198dfe273a27763323fb78228767638 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
|/| | | |/ | | | | Change-Id: If8459aff1b569b5162244db349f3606857aa1f8c
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| |/| | | | | | | | | | Change-Id: I3bfaacb541efbf344c8012cd6d95631307380173
| | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | |/| | | | | | | | | | | | | Change-Id: I28a3875e386cb6a15b6680fab91aabe6efbd84fe
| | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + de7e4c93c0f17e4608abad31bf7cba06b8fc2e19 Bump version Change-Id: I0c3ae6829a9434a15cd79df627115d1d425d8b74 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| |/| | | | | | | | | | | | | | Change-Id: Ibb736534218d1617e56a801d7fb5856353d115e4
| | * | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-08-021-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 460ba5ff499b59904139bd6fd6ecf24d04e403f0 Fix the build with -no-gui + 30b6f89e3694e667aae5700e17926c1761d16d12 Bump version + 9ca4eec0bc5c0fa9d4ab76df5eb06129765bc09a Add changes file for Qt 5.12.4 + b7a622cac9a5de26cd61203ee6dda6105826d293 Bump version + de7e4c93c0f17e4608abad31bf7cba06b8fc2e19 Bump version + cdff99cf40da37c193fa86ca3fd2e744264edee1 Doc: Replace example file lists with links to code.qt.io Change-Id: I1fdc861f41bc26295d945b975e1703566ae469db Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-161-0/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|/| | | | |/ / | | | | | | Change-Id: I4860fe730934bc48250539018f6d00241253f43a
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie4aa60e1b5e9e227263b24734d1536c09409c610
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: Id1276a0c2d6b7a31cfb53195b2bf259699ef5779
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I0d3fa04426e78de5fec50403cddb65b3ad7a9807 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
|/| | | | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icd3e95b0a343464a133ced6e14ac012b19500aa1
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I7d693387e5d6a7621afe34cc38fedb401e578998
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-291-0/+20
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-0/+20
|/| | | | |/ / | | | | | | Change-Id: Iab66f13b00f8fefc5d11e282fb8b2d12bcc1baf9
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| |/| | | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ife9c26139cd23c5cf90b935b367d1ac0ba680246
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | |/| | | | | | | | | | | | | Change-Id: Ia131ddb7c923c18e1053b7c3ad49982a79f55920
| | | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: I600beb027761b40a3d7dd004fd8785e32b9d1f90 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/ | | | | | | | | | Change-Id: Ia196c117826f06734b799cbd5b8a9dd7b444262b
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-221-0/+18
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-221-0/+18
|/| | | | |/ / | | | | | | Change-Id: Ib33e82f3cd55477e335e1c35c2780eea07d3771c
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| |/| | | | | | | | | | | | | | Change-Id: I1845aec29a03f7c1ac44f0a90da06dd255da3020
| | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-131-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I7a02e6306be24eac58de0150c18edd0a3c6c7930 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-05-261-0/+2
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-261-0/+2
|/| | | | | |/ / / | | | | | | | | Change-Id: I31e1cdd01de1b2a7c0b8517313eb2a17c3951321
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-181-0/+2
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I285a2f1a1a830e2c1470f5e4755f7abea5f8b09f
| | * Fix the build with -no-guiLiang Qi2019-05-161-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-75722 Change-Id: I78535572f360ada21d1d1f44e1aeacd32dafb2c0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Add QtWebView::WebView::httpUserAgent propertyArmin Felder2019-05-1519-2/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | The httpUserAgent property allows to get and set the User Agent. Task-number: QTBUG-68746 Change-Id: I12fb5da00b14ecba53e71c532f2c8401f8f2a009 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-271-0/+25
|\| | | | | | | | | | | Change-Id: Ibd4ddb69bc94ca93003e9ee469736ae245374e26
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+25
| |\| | | | | | | | | | Change-Id: I1e645a7cd8e2e1f895803a61d62eb715423e5db1
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I6342e46f209f06f6504113e55ef93c9c8018bfcc
| | | * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-051-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + fc039435b57bb5860ee3c59542d29b106071ffb5 Make sure that we have a valid plugin before using it + 8df88a17a18c34d143f0aefb9e4e0d63e2f8d56e Bump version Change-Id: I5cf7def2400949aebcd0e500b95e399f3b83413f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 16:13:09 +0000