summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for 5.8.0v5.8.0-rc1v5.8.0Friedemann Kleint2016-12-011-0/+22
| | | | | Change-Id: I7ad475c2bd07ec113c7dfdba034d483294b31bd2 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-2612-15/+248
|\ | | | | | | Change-Id: I80198f4338b8930811f65b56626ad3a0dda84b5b
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-10/+0
| |\ | | | | | | | | | Change-Id: I620c37cedab1d18fb6f78ee626f0bf96b0c5abea
| | * remove dependencies from sync.profileOswald Buddenhagen2016-11-051-10/+0
| | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Ibc463d79ac92b0fc5ab6cbf5f291eaf077b58a29 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | Add changes file for 5.7.1v5.7.1Jani Heikkinen2016-10-241-0/+24
| | | | | | | | | | | | | | | Change-Id: I78ad0038581fea638e47387957169ba7dcf6b636 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-011-4/+4
| |\| | | | | | | | | | Change-Id: I41fbcae8340f30007455b596869be668b65ef0a7
| | * Fix dumping of IDL for 64bit integer typesFriedemann Kleint2016-09-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace no longer applicable CY by modern hyper type. Task-number: QTBUG-55900 Change-Id: I00c50aa2b630f8f47acf9b1d2241b950a4ae1722 Reviewed-by: Fredrik Orderud <forderud@gmail.com> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | Added simpleqml project demonstrating QML in ActiveQtJørn Bersvendsen2016-09-229-1/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new ActiveQt example application. The application demonstrates the use of QML inside an ActiveQt control, running in-process. Change-Id: I47582cf7eda665ef70f8feccdb6ed1f9e126ab30 Reviewed-by: Fredrik Orderud <forderud@gmail.com> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Fixed cleanup of QApplication when unloading ActiveQt DLLv5.8.0-beta1Jørn Bersvendsen2016-10-194-146/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an ActiveQt server starts, it creates a QApplication and tries to mimic the behavior of QCoreApplication::exec(). However, when destroying the QApplication in qaxserverdll.cpp DllCanUnloadNow(), it now performs the same cleanup as QCoreApplication::exec(). This is a partial fix for QTBUG-56172. Task-number: QTBUG-56172 Change-Id: Ibf8c411f8a1534beee61a738be3fd414de73f0ad Reviewed-by: Fredrik Orderud <forderud@gmail.com> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | QAxBase: use QSignalBlockerMarc Mutz2016-09-211-2/+1
| | | | | | | | | | | | | | | Change-Id: I87e40e12957d3b50c690bd23d08524023079337c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-185-5/+56
|\| | | | | | | | | | | Change-Id: Iac8c9e49fd96c80fff85277e02b7deb6a8a1b28e
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-162-5/+38
| |\| | | | | | | | | | Change-Id: I06f6228762422bbd0096ee9e3b8b31c4ff240330
| | * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-161-0/+26
| | |\ | | | | | | | | | | | | Change-Id: I779f9f6815a7be132576a0fcfe48ead422a01513
| | | * Add changelog for Qt 5.6.2 releasev5.6.2Friedemann Kleint2016-09-011-0/+26
| | |/ | | | | | | | | | | | | Change-Id: Iad025f4e6273c3f1602e32059ad0fea708e56433 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| | * idc: Fix quoting of .idl fileFriedemann Kleint2016-08-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call quotePath() on the idlfile inside dumpIdl() when building the command to run for .exe files instead of quoting it before passing it to dumpIdl(). Task-number: QTBUG-55332 Change-Id: Iae934e960d94fe1f9b469ca57f9fba2c74ee108c Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| | * idc: Search %PATH% when loading librariesFriedemann Kleint2016-08-161-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call LoadLibraryEx() with flags=0 in addition to get the LoadLibrary() behavior (search %PATH%). Amends change 824df695ad99d6096c2744bd476f75822cee1323. Task-number: QTBUG-55283 Change-Id: Ib10eea9f71677c877f5316b45562ed48d1cc31cb Reviewed-by: Fredrik Orderud <forderud@gmail.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Add menu entry for freeing unused DLLsFredrik Orderud2016-09-153-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Windows COM runtime uses delay-unloading of unused COM DLLs, with a default delay of 10min. The new menu entry enables immediate unload of unused COM DLLs, thus avoiding the need to wait for 10min. This makes it easier to investigate DLL lifetime issues in ActiveX controls that would otherwise require a 10min wait after the control have been closed. Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/ms678413.aspx Change-Id: I48ea7748cc3d976a912f050ccb54c2be4a86486e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devv5.8.0-alpha1Liang Qi2016-08-027-11/+27
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icba6315772d2c31eb30f02460b2b282d12b33d37
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-015-5/+4
| |\| | | | | | | | | | Change-Id: I3439e998c2a86d7bf28becca3b5db174839fb825
| | * dumpcpp: Fix regression when creating function signatures.Friedemann Kleint2016-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Revert a part of change 1a7b140eb8f3f03354452c4669aabae2f141b9c8, which removed the assignment to a different variable. Task-number: QTBUG-54000 Change-Id: Ic15411259445afa50770487a37f8762fe57975e9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-173-3/+3
| | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I58ee25346d333ff16833c491ba2227227e9b748b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I360eed5bad86c8f7e61885c521b43407b2fe58b6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I7ce7a2a01814f70586d32ea10423bd52c4237c29
| * | Fix build with QT_NO_CAST_FROM_ASCII.Friedemann Kleint2016-06-272-4/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-54352 Change-Id: I608a253819241d23241f9f8d37782726a1f93a03 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-2/+18
| |\ \ | | | | | | | | | | | | Change-Id: I3f17ed2cb0b2fe604df64168fd4257fef623d42a
| | * | Mention license change in 5.7.0 changelog.v5.7.0Friedemann Kleint2016-06-081-2/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53913 Change-Id: I573f5efb7864ecb23e3c727c6c795c9651b71b83 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | QAxHostWidget: Remove dependency on qt_win_display_dc()Friedemann Kleint2016-07-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | qt_win_display_dc() is a simple wrapper around GetDC(0) which is only used here for redirected painting (grabbing) of a QAxHostWidget. As the export might be changed/removed, expand the code. Change-Id: Id00546282d37ae00baa36fdd22164e412d7e57f9 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-243-2/+46
|\| | | | | | | | | | | Change-Id: Icae44481aae4bec9d70267f0006117652e7923a0
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-192-2/+24
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7c9a4153a0d93e531e5a881761fada2457cc3632
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: If2a5e089f9a524a60c3793387d5e0fcee76084d7
| | * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.1Topi Reinio2016-05-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I0f307b1eec9aaa1d4464d3eddcb2229d56c7eaf8 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| | * Add changelog for Qt 5.6.1 releaseFriedemann Kleint2016-05-121-0/+24
| | | | | | | | | | | | | | | Change-Id: If40289edda921734b84a1bba3cf26417ce08df8d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Add changelog for Qt 5.7.0 releaseFriedemann Kleint2016-04-261-0/+22
| | | | | | | | | | | | | | | Change-Id: I7c0d44f64a99717e01cc8b6e7ed978c920d79539 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-0828-526/+552
|\| | | | | | | | | | | Change-Id: I391dd7da33fb998f2033d73a72faf26ac1a077b9
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0820-390/+399
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/activeqt/container/qaxwidget.h Change-Id: Ic6e7267fc71e3ace14e75b392ad3f7cac0df41a1
| | * Fix old-style cast compile error in qaxobject.h.David Schulz2016-03-231-2/+2
| | | | | | | | | | | | | | | Change-Id: Ie313a60c7d1c55f4c281544d7fbeb3f176e2c8e5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * Fix warnings as shown by Qt Creator's Clang based code model.Friedemann Kleint2016-03-2215-361/+370
| | | | | | | | | | | | | | | | | | | | | | | | Remove C-style casts and fix integer conversion issues. Task-number: QTBUG-50804 Change-Id: Ib5913bc5262a2c141f34d9f70fe6ec4139a63e4f Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
| | * Fix C-style cast in QAxWidget::qObject()Marc Mutz2016-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It actually is a const_cast followed by an implicit conversion to the base class, so use a const_cast. Public Qt header are supposed to compile with -Wold-style-cast or similar. Change-Id: Ifa311824aabc2978004c1ff3029073c2bf230157 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| | * Make more ctors explicitMarc Mutz2016-03-225-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: Idbe6108bfc1f66e3e1a6fefbb77be7c13c9b2a18 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-226-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: Iae48c528666459ebb368cd57615f4ead4147f872 Task-number: QTBUG-45291 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I4e19b57a70a1618d1a4d8d3e5cf1bf2394e8eee8 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-0710-136/+153
| |\| | | | | | | | | | Change-Id: I51bb4162845894f4757a0d0dc40e2c04af546f06
| | * Remove duplicated image conversion functions.Friedemann Kleint2016-02-225-136/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace qaxPixmapToWinHBITMAP(), qaxPixmapFromWinHBITMAP() by qt_pixmapToWinHBITMAP(), qt_pixmapFromWinHBITMAP() from QtGui. The code was duplicated in ActiveQt in the early days of Qt 5 when the image conversion functions were in the QPA plugin. They were later moved back to QtGui. Change-Id: I911ba543b27b9392d143e5dfab260def4241f477 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
| | * Add a control for manual testing.Friedemann Kleint2016-02-185-0/+141
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-41186 Task-number: QTBUG-50206 Change-Id: I5de37c187e40ddbe3eccb07b01f895897196ece1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I1e86fd46ee325c74e5fdfc343230f70c3d463eea
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-1517-152/+174
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47
| * Further string fixes: Replace ugly STRIPCB macro by static function.Friedemann Kleint2016-02-151-22/+22
| | | | | | | | | | | | | | Introduce function stripCurlyBraces() to consistently format UUIDs. Change-Id: I9091102d8d5c54efec04d5b4e5d2f84e52276122 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-151-0/+22
| |\ | | | | | | | | | Change-Id: Ic751e6837cadc2b9b4a02e15017cfee5e222c7b3
| | * Merge 5.6 into 5.6.0v5.6.0-rc1v5.6.0Oswald Buddenhagen2016-02-022-2/+22
| | |\ | | | | | | | | | | | | Change-Id: I820ea5ce096f79e3a6f57b6cd8d519b705475ba3
| | * | Add changelog for Qt 5.6.0 releaseFriedemann Kleint2016-01-281-0/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: Id1872b3f611c34850f5eb77bb9b18be312541ff7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 21:16:50 +0000