summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.9.3v5.9.35.9.3Jani Heikkinen2017-11-081-0/+24
| | | | | | Task-number: QTBUG-64180 Change-Id: I9a29333e82c77ea05fbacabbd0ddd8c59b217d38 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* 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.25.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>
* 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.15.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>
* Unset widget window's parent when WM_DESTROY is sent to prevent a crashAndy Shaw2017-05-151-1/+6
| | | | | | | | | | | | | When a control is activated and deactivated in Powerpoint then it will cause the ActiveX window hosting the QWidget to be destroyed. In this case we need to set the parent of this widget's own QWindow's HWND to be 0 so it does not reference the deleted window. This reflects the handling in WM_SHOWWINDOW where the parent is set for the widget's own QWindow's HWND. Change-Id: Ie32d408782cdf94a98cb13eda49f6ccf73cccd51 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | Change-Id: Ieb901b1c92f63c4b52776e2db0868e1aef0e37c9
* Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0-beta4v5.9.05.9.0Friedemann Kleint2017-05-051-0/+25
| | | | | Change-Id: I9a009107dac3f723562a325ebb7f90e7ffe95595 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix previous optimization to prevent a crashAndy Shaw2017-04-271-2/+2
| | | | | | | | | | | In 2faaec4e061c7f531624cad3cba5921ed3a51b20, optimizations were done to fix warnings as indicated by the Clang model. However the combining of the two ifs caused a problem as riid might still be equal to IID_IPropertyNotifySink and be the same as ciid. Therefore the check has to be the last one done to account for other possibilities first. Change-Id: I6a5f38beb723407b4bea8ab58c04ebbd1b900140 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix licensingJani Heikkinen2017-04-276-1431/+24
| | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with GPL-EXCEPT one Task-number: QTBUG-57147 Change-Id: I4c97cdcff6dfe3ed17d85d391bc700daa4f267a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* idc: Suppress error dialogs should LoadLibrary[Ex]() failv5.9.0-beta3v5.9.0-beta2Friedemann Kleint2017-04-041-0/+2
| | | | | | Task-number: QTBUG-59791 Change-Id: I1b7f6f9ca12f8e42166104512a85ddb55d0b8e28 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta1Liang Qi2017-03-101-0/+22
|\ | | | | | | Change-Id: Ia62c820c6b312288f2ec49a0e105c0bc6edad259
| * Merge remote-tracking branch 'origin/5.8.0' into 5.85.8Liang Qi2017-01-261-0/+22
| |\ | | | | | | | | | Change-Id: I830b041ce2cc548459284a17fb382bcefd994fa1
| | * Add changes file for 5.8.0v5.8.0-rc1v5.8.05.8.0Friedemann Kleint2016-12-011-0/+22
| | | | | | | | | | | | | | | Change-Id: I7ad475c2bd07ec113c7dfdba034d483294b31bd2 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | QClassFactory::CreateInstanceHelper(): make variable argc staticFriedemann Kleint2017-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, crashes occur when accessing the arguments of QCoreApplication since the variable is passed by reference. Task-number: QTBUG-59047 Change-Id: I5cbeb86814ab048e6d815498484108e9dc828d0a Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-2421-206/+580
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/activeqt/control/qaxserverbase.cpp Change-Id: Ic47ed12f7acf788b923571d1e3515ececd986a19
| * | Update .gitignoreFriedemann Kleint2017-01-241-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add wrapper.bat files and remove some suffixes and directories that are not relevant on Windows. Change-Id: I55fb523b968a57593117105625f52c66858e9a8a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Enable failure recovery from crashing out-of-process controlFredrik Orderud2017-01-091-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of today, crashing out-of-process controls are not cleaned up properly in the container. Also, an assertion failure is triggered when running in debug. ActiveQt should be hardened to more gracefully deal with out-of-process controls that crash without leaving the container in an inconsistent state. Change-Id: Ifa4d4375e7c811a72413abffe19731aad6be9ae9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | Change-Id: Ib0338b9ec9ae62a615d191002ecef59da14151c3
| * | Rewrite qaxserver_main.cpp to use CommandLineToArgvW()Friedemann Kleint2016-12-192-27/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the command line processing to use QStrings constructed from the return value of CommandLineToArgvW(). This ensures that arguments with blanks are processed correctly and fixes the invocation of .exe targets with spaces via idc using the -dumpidl option and removes the dependency on the qWinMain() function exported from QtCore. Task-number: QTBUG-55332 Change-Id: I2d6cc11f2bff30027664707d03a75650d724a4f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Use an uint for scode as opposed to unsigned short to avoid truncationAndy Shaw2016-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since scode is effectively an uint and not an unsigned short like wcode is then we should go with the bigger type to ensure it is not truncated. Change-Id: I6f1affea5a06371eb3c3a632c3ecb9578f6254e4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | fix (skip) build with -no-widgetsOswald Buddenhagen2016-12-061-0/+2
| |/ | | | | | | | | Change-Id: If4643fd8442ccbc678ef6310d3718fd9acdef83d Reviewed-by: Jake Petroules <jake.petroules@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.15.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>
* | | | testcon: Show debug log when loading failsFriedemann Kleint2017-01-192-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to debug log and point it out in message. Change-Id: I0809a1da0c6d5dab148705fae32004af0dc8e371 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | | Disable SEH & C++ exception handling by COM for out-of-process controlsFredrik Orderud2017-01-131-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][ActiveQt] Out-of-process ActiveQt controls no longer silently discards unhandled SEH or C++ exceptions that would otherwise crash the application. Done to make crashes visible, simplify debugging and enable automatic crash dump generation through Windows error reporting. Recommended by Microsoft in https://msdn.microsoft.com/en-us/library/aa344211.aspx Change-Id: I76d8872a215551893e2423f412001cb8c404e370 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | Testcon: Add Help menu with "About..." entriesFriedemann Kleint2017-01-113-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "About Qt" and "About Testcon" which displays Qt version and build. Change-Id: Iddedf0ccf4d1e753a9deb5812c3df482e5a2e480 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | QAxSelect dialog (64bit): Display complete list of 32 bit controlsFriedemann Kleint2017-01-111-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer filter out duplicate CLSIDs and enable loading of 32 bit out-of-process controls. Change-Id: I1bddc717e81e6d16ee698e5b9c4ebcb10a8c048b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Improve tooltip of the QAxSelect dialogFriedemann Kleint2017-01-111-9/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add the root key. - Expand all environment variables. - Add a type enumeration for in/out of process controls. - Mark non-existent binaries red. Change-Id: I5671ea0d6f8e2fee1ca8da586e393e04efff5860 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Remove foreachFriedemann Kleint2017-01-1013-53/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use range based for. Change-Id: If91077be5bb13aa1447866c4243511db72d4f46c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
View Lorry Controller Status