summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-201-0/+22
| | | | | Change-Id: I53a7795c6132b603d5727cf60e2ccf349a72828a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update the doc about the license to reflect that it is dual licensedv5.11.0-beta4Andy Shaw2018-04-093-80/+37
| | | | | Change-Id: I8728e32726fb45f04acfe878aca54a67f62961a9 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Doc: Resolve documentation warningsTopi Reinio2018-04-056-24/+88
| | | | | | | | | | Provide a custom module headers and additional include paths to make Clang parse the C++ documentation correctly. This is needed as e.g. on Linux, the build system doesn't provide these because the module is not going to be built on that platform. Change-Id: Id81c4dbdd546b2dea08d30ebea2717157b6df81c Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6c842982b27f137e28f5207cbaf054a9d9f1d83a
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: Iefeacca7186f6df2b1ce6ec273a8d66831627d09
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
|\ \ | | | | | | | | | Change-Id: Ib1b90b8fdfc291fd10e9ed0244d7b113c2a2954b
| * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | Change-Id: I1fb01910908a0b3392397a41bce65aea60e27316 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Fix typosJarek Kobus2018-02-131-1/+1
| | | | | | | | | | | | | | | Change-Id: Ide9a069a37a6d289a3f0223f17563a440d67c461 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-203-3/+54
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8f6b5ce962177001d064be5b7b0c4740607e999b
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-182-3/+30
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibeb74b560f39f3b6b48344873c87aba3a4af8a2c
| | * Fix compilation with newer gccKai Koehne2018-01-111-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move disabling of overloaded-virtual warning before the includes, and the Q_OBJECT definition, to make it effective. Task-number: QTBUG-65676 Change-Id: Ic34e5ade0b21b53540db9b2f429f1b441463632c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-051-0/+24
| | | | | | | | | | | | | | | Change-Id: Iead5f79b489e14cf654fcafbcc171557c9f6e8e5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I258176199edd6a6cd413830bfeb0eac070bd5a89
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I276cd0a8a52f95750208caca0fcd18f5b1489f5b
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I511c823669dfb97447a05e50defc6b37a22a651d
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I6c5fa57cf0b912a2528bd9113ff4dc01d9e0bfba
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
| |/| | | | | | |/ | | |/| | | | | Change-Id: I44ea5a0da9fb1b2d02c53cde2c8fad4362d18c02
| | * | Add changes file for Qt 5.9.3v5.9.3Jani Heikkinen2017-11-081-0/+24
| | |/ | | | | | | | | | | | | | | | Task-number: QTBUG-64180 Change-Id: I9a29333e82c77ea05fbacabbd0ddd8c59b217d38 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Port away from QRegion::rects()Marc Mutz2017-12-041-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use begin()/end() instead. Drop the special handling of rectCount() == 1, since with begin()/end(), we no longer take the hit of creating a QVector just to be able to return it from rects(). Change-Id: I4c03e10f7a8bfea87cb04aed7b87410991020a89 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Fix outdated BSD license headerLiang Qi2017-11-301-2/+12
| | | | | | | | | | | | | | | Change-Id: I1508ff6c68dc9a2f7409fd4728f3493fe1cfb0a4 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Add ActiveQt Media Player exampleAndre de la Rocha2017-11-239-2/+510
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Media Player example uses the Microsoft Media Player ActiveX control to implement a functional media player application. This example demonstrates how a Qt application can communicate with embedded ActiveX controls using signals, slots and the dynamicCall() function. Task-number: QTBUG-60636 Change-Id: Ie2f65d3d8796076b2c18d5fa561b709035a53e79 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2079-493/+1308
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/activeqt/webbrowser/main.cpp examples/activeqt/webbrowser/webaxwidget.h Change-Id: I80775f6d355a278880d7e6044390b67a6f6a893e
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-101-0/+22
| | | | | | | | | | | | | | | Change-Id: Ifb2918559ea22cf3cc38303e71a2ab4121b02dd8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3077-545/+1353
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie457478a64a28434afb3361dfc6f9478dd9c58bd
| | * Get the right interface type for m_spInPlaceSiteAndy Shaw2017-10-271-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We depend on m_spInPlaceSite being an IOleInPlaceSiteWindowless type as we call a function only available for that type and not the base one. Therefore, we need to have a pointer to both interfaces, so we can use the right one when needing IOleInPlaceSiteWindowless. Since not all controls provide IOleInPlaceSiteWindowless we need to have both in case IOleInPlaceSite is available. Task-number: QTBUG-63903 Change-Id: Ieaf039c169347606aec43f53c8cb29e1317db3b9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * AxServerBase::create(): Improve handling of window creation failuresFriedemann Kleint2017-10-191-3/+16
| | | | | | | | | | | | | | | | | | | | | Output error messages and return nullptr accordingly. Change-Id: I228a625d2f5b716c4068c7117987571a96990dc4 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+24
| | |\ | | | | | | | | | | | | Change-Id: Iaf159b2a8043e089d1c5528432ff0398c6be8c21
| | | * Add changes file for Qt 5.9.2v5.9.2Jani Heikkinen2017-09-251-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-62737 Change-Id: Id4e54ad2591777f344b66c1e4a83c3ac4ed5d6a7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | | | | | Change-Id: I54537b6aec34cd625bbae8af1e0d46d772c1af66
| | * | Fix outdated BSD license headerKai Koehne2017-09-2974-74/+814
| | |/ | | | | | | | | | | | | | | | | | | Use new version with commercial exception. Change-Id: I20b377176e99b80db47f41596d20192ae7d5564f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Set embedded native parent handle on an already created widget windowAndy Shaw2017-09-011-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the parent already has a window for it (such as if QOpenGLWidget is used) then the _q_embedded_native_parent_handle property needs to be set on the window as this will not happen automatically in the platform plugin. Change-Id: I7e5816da1c22bf53bb039a19713ae1a3e5970b3c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Add changelog for Qt 5.6.3 releaseFriedemann Kleint2017-08-241-0/+24
| | | | | | | | | | | | | | | Change-Id: I0ea648bfca49b5a1c07927ddd843212315d17982 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * Active Qt Examples: Brush up to C++ 11Andre de la Rocha2017-08-2321-463/+450
| | | | | | | | | | | | | | | | | | | | | | | | Use nullptr, member initialization, new connect syntax, QStringLiteral, etc. Change-Id: Ia79473ca302216f91eec6a32f670cf606761ed0d Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * QRegExp include cleanupSamuel Gaist2017-08-193-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing include statement where the QRegExp class is used and remove them where not. Change-Id: I857dbc18af9f4ef5a3d9552b61c814e9fd85a438 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | Set proper descriptions for toolsv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1Kai Koehne2017-09-213-0/+3
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-61970 Change-Id: I188638ac433f3f313a1e93b5f26f73f8fc680ed6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Remove deprecated Web Browser example from ActiveQtAndre de la Rocha2017-11-0317-809/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Web Browser example is obsolete, since it demonstrates embedding the long-deprecated Internet Explorer control, which is unable to display any modern web site, including qt.io. Task-number: QTBUG-60636 Change-Id: I63f3c25474fb202740a4c067d74f921d2d8dd2cd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-2913-45/+45
| | | | | | | | | | | | | | | Change-Id: I0df68cec43511537b61ddfe74bd677be7a598eae Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-229-41/+41
| | | | | | | | | | | | | | | Change-Id: Iaf72bd006af026255bc5cd1ecf14f187db1bcf52 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ / | | | | | | Change-Id: I1acd00bc172de8afe6d0dfc53ca2a8486db84418
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1Liang Qi2017-08-155-13/+53
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4d94e662fb8608a90cb548b5c79f82482d5d819b
| * Fallback to [Un]RegisterTypeLibForUser if the admin access failsAndy Shaw2017-07-141-7/+23
| | | | | | | | | | | | | | | | | | If the user cannot register the control due to lacking admin rights then it should fall back to the user registration so that it can still successfully be registered. Change-Id: Idb514c2e02d8e7fb084a23182dcc2a793eb12d08 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+24
| |\ | | | | | | | | | Change-Id: Ie2df48a13a428f5f63f5159dce6c444505b156f9
| | * Merge 5.9 into 5.9.1v5.9.1Oswald Buddenhagen2017-06-191-3/+3
| | |\ | | | | | | | | | | | | Change-Id: I3bc9b43c4952599c074eccf53b8310a8eaae6e6e
| | * | Add changes file for 5.9.1Friedemann Kleint2017-06-161-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: Iab35093e202068ada0778f6a095e2e056caccdb6 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ifbf451c9ed9c330edd55a8147b0c2cd40c024254
| * | | Add Q_FALLTHROUGH to unmarked fallthroughs seen by GCC 7Friedemann Kleint2017-06-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qaxbase.cpp:2557:13: warning: this statement may fall through [-Wimplicit-fallthrough=] qaxserverbase.cpp:2343:13: warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: I1aad3955f2901493ac9a6fb50b7bc32b0e98f509 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | | Fix infinite loop in MIME classinfo parser in ActiveQtAndy Shaw2017-06-201-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This is the same change as dd0feaa95a4c3e186c18bab16db5552bb8efc2db but done in the other location where the same loop is handled in the same manner. Change-Id: I86773b1ed5c9ac7bd23974e9eefcb89f7b515014 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | dumpcpp: make dump QT_NO_CAST_FROM_ASCII proofEric Lemanissier2017-06-161-3/+3
| |/ | | | | | | | | Change-Id: I4873179ec8ff42173009973ac96dea3a2bbdb014 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Port legacy Qt 3 <image> elements in .ui files to resourcesFriedemann Kleint2017-06-1416-46/+30
| | | | | | | | | | Change-Id: I00033e7be4103e22d0b78b079ec4bd313cd813f2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0711-1435/+82
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4ab46a953b46b63c6819995ab3c369599e5d3551
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 12:50:29 +0000