summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | testcon: Set MainWindow instance pointer after setupUi().Friedemann Kleint2016-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | Otherwise, the application crashes when debug messages are emitted while creating window. Amends fc55372413a064baa049f28a13cba1406b132cfb. Task-number: QTBUG-49712 Change-Id: I393d46431fbafb6aab95866848466dc72820fa89 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | testcon: Add option to suppress installation of the message handler.Friedemann Kleint2016-01-043-15/+30
| | | | | | | | | | | | | | | | | | | | When debugging controls potentially crashing testcon, it makes sense to use the standard tools to capture debug output. Add an option and move the handler code to main.cpp. Task-number: QTBUG-49712 Change-Id: I9fd60513e7b3e6fc8a20019778a5844ad99d554e Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | testcon: Fix hangs when closing the window.Friedemann Kleint2015-12-222-0/+12
| | | | | | | | | | | | | | | | | | | | When loading controls using the same version of Qt, QGuiApplication::quitOnLastWindowClosed is set to false. Overwrite MainWindow::closeEvent() to fix this. Task-number: QTBUG-49712 Change-Id: I7425cf2a4a70353e017ed5cad463e1b66b819247 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | testcon: Refactor registering script languages.Friedemann Kleint2015-12-221-3/+21
| | | | | | | | | | | | | | | | Use a struct and log a warning when registration fails. Task-number: QTBUG-49712 Change-Id: I138ec010cde6c97867994c1a4f4f75a460a4061d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | testcon: Use m_ convention and constructor initialization for member variables.Friedemann Kleint2015-12-222-49/+49
| | | | | | | | | | | | Task-number: QTBUG-49712 Change-Id: I0460264dede9109f9627d8557d0264ffb0a9acaa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix infinite loop in MIME classinfo parser in ActiveQtv5.6.0-beta1Kati Kankaanpaa2015-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | MIME extensions are parsed starting from the end by finding the last extension separator ':' and chopping off the end of the string. Now only 'extension - 1' chars are chopped which leaves the last extension separator in place causing an infinite loop where the same separator is found round after round. Fixed by chopping the extension separator also. Change-Id: I3df6008ad53dbecc17ac98647aedab63bf848963 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Avoid foreach in public headers for QT_NO_KEYWORDS compatibilityThomas Sondergaard2015-12-011-2/+2
| | | | | | | | | | | | | | | | Fix QT_NO_KEYWORDS regression introduced in commit 575ee40621f7 (2015-10-06). Change-Id: I24ad330074fbcd521fae7efceac50a87bc8d4e40 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Testcon: Add command line options for loading CLSIDs, files and scripts.Friedemann Kleint2015-11-243-17/+82
| | | | | | | | | | | | | | | | | | Factor out load methods and add command line parser. Task-number: QTBUG-49355 Change-Id: Ic7c15c19e0b51e666fc13d74751713ccdc97dd9d Reviewed-by: Fredrik Orderud <forderud@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add VBScript example for the "hierarchyax" project.Fredrik Orderud2015-11-191-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The script demonstrates how to navigate between custom Qt objects from a scripting language. None of the existing scripts demonstrate this capability, so the script should therefore be useful. The background for sending this patch is that scripting ActiveQt can be a bit tricky. Adding more sample scripts will hopefully make it easier for newcomers to get started. Change-Id: I06820339bc92b556229af101ca2cc177da96ccc2 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Correct WinMain usage in AxServer under MinGWEric Lemanissier2015-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | The macro QT_NEEDS_QMAIN must be defined under MinGW, so that the entry point is WinMain in qaxservermain.cpp. Otherwise the entrypoint is main in qaxmain.cpp Task-number: QTBUG-41227 Change-Id: Iad6818e9a7b2a45afad47b44e0551be0eaae7858 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | RAII wrapper for command-line arguments in WinMain.Fredrik Orderud2015-11-021-9/+17
| | | | | | | | | | | | | | | | | | | | Fixes a memory leak. Introduce scoping to ensure that CoUninitialize is performed after argument cleanup. Task-number: QTBUG-49148 Change-Id: Icc53f87361c492ab9c53290626bab6758b337098 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-281-0/+24
|\| | | | | | | Change-Id: Iad9116db8ac8943fcd3ea9ed28b9ffc396ba0ae0
| * Add changelog for Qt 5.5.1 releasev5.5.1Friedemann Kleint2015-09-091-0/+24
| | | | | | | | | | Change-Id: I9802b8215ae1f149f5e76896de9b0eec71fa09a5 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I69a30edbc2b35654da8ed61ef01d8a732a2e4060 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Improve documentation on servers.Friedemann Kleint2015-10-131-4/+8
| | | | | | | | | | | | | | | | Mention windeployqt and give hint about registering as administrator. Task-number: QTBUG-48586 Change-Id: I48158cfa4c7b04f28f04468c41abf3d1f0f42e2d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | idc: Improve command line handling.Friedemann Kleint2015-10-121-14/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add usage information and help option. - Introduce Mode enumeration to be able to do the register/unregister operations after parsing the options. This makes it possible to put the option in first: idc /regserver foo.dll which did not work before (cryptic error due to 'input' being empty). Task-number: QTBUG-48586 Change-Id: I05552293ec604bbe4ae61e130519b5b228d9f9d4 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | idc: Streamline string conversion code.Friedemann Kleint2015-10-121-34/+26
| | | | | | | | | | | | | | | | Use qPrintable()/QFile::decodeName() where appropriate. Task-number: QTBUG-48586 Change-Id: Ib84b62b2b41e62f9922ef0949040a02f2a901b3b Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | IDC: Add folder containing DLL to search path for dependencies.Fredrik Orderud2015-10-091-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IDC crashes when attempting to register a ActiveQt COM DLL as post-build event, if the DLL depends on other DLL(s) in the same folder. The reason for this is because IDC loads the DLL using LoadLibrary, which does NOT add the folder containing the DLL to the search path when loading dependencies. This patch fixes this problem by introducing the LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR flag to LoadLibraryEx and expanding the input path to become fully qualified. Change-Id: If41609d48842567984013b1f3f2b00b0a93d5960 Task-number: QTBUG-48586 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Fix crash in QAxServerBase::ActiveXProc().Friedemann Kleint2015-10-081-68/+87
| | | | | | | | | | | | | | | | | | | | | | Rewrite QAxServerBase::ActiveXProc() to retrieve the pointer to the QAxServerBase instance from GWLP_USERDATA only in the messages it handles itself. Otherwise, crashes occur when this interferes with QAxServerBase::TranslateAcceleratorW() temporarily setting other values. Task-number: QTBUG-48600 Change-Id: I3ab22d208666b072e1164942cce89fe0dedc7ccf Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: replaced \target with \keyword at top of pageNico Vertriest2015-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | A \target whose purpose is to link to the top of a page (and not to a section within a page) works better as a \keyword, because \target generates a new html anchor which, in this case, is not tied to any title element on the page. A \keyword links to the page itself, as expected. Change-Id: I7ce0283f7371de191d3e1b35874b3824bf6d2566 Task-number: QTBUG-48482 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Clean .gitignore file.Friedemann Kleint2015-09-081-160/+0
| | | | | | | | | | | | | | | | Remove obsolete directories dating back to Qt 4, Symbian leftovers and obsolete Creator debugging helpers. Change-Id: I1a1e6781e695c9dcbc3988fc0496c890ce3a2195 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-213-0/+698
|\| | | | | | | Change-Id: I1a46a940d3e2ba5f71fc69d25c3637e7a1cc65eb
| * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-191-0/+10
| |\ | | | | | | | | | Change-Id: I0bb8aed8125f001a25cfb6485760f480f5324b7e
| | * Doc: Added generic thumbnail images to few examples5.4Venugopal Shivashankar2015-05-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Except one, all the example documentation are missing an image. Task-number: QTBUG-41996 Change-Id: Ib72dbf239810e66a60841a1ba1395e6fbcb3e8fe Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-091-1/+1
|\| | | | | | | | | | | Change-Id: Ie63185f66c060582a11ee75eca215d6536283e86
| * | fix build with MinGW header version >= 4.0Eric Lemanissier2015-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 66e1ecc2 broke the compilation with MinGW64 4.0 and above. The work-around for mingw-w64 bug #464 must be applied to all MinGW versions that are affected. Change-Id: Ie6665d076dc1e38e459ae3c9cc51202b4a12e736 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-293-34/+57
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0308544188e73d94b836685f07e44337ca57a723
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | | | | | Change-Id: I025b5c65994b999b35b04fb51c2bd9587f74012b
| * | Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-262-2/+2
| |\ \ | | | | | | | | | | | | Change-Id: I9c088036dd897e8457ba9e5ab266ad7c5b084bea
| | * | fix build with MinGW header version > 3.0v5.5.0Joerg Bornemann2015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 7dffc4f4 broke the compilation with MinGW64 3.1 and above. The work-around for mingw-w64 bug #464 must only applied to MinGW versions that are affected. Task-number: QTBUG-46712 Change-Id: I62bda4db361d15849fa071d0acaee72254d34bd6 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| | * | Fixed win32 build of toolsFriedemann Kleint2015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | load(qt_parts) causes the inclusion of src, tools etc but on non-win32 platforms (and wince and winrt) we have to add the src subdirectory anyways in order to create the doc target. Task-number: QTBUG-46712 Change-Id: I51cf4050fed744c844acc8ff4fe5f5f1d8c32d1a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | dumpcpp: Do not generate qRegisterMetaType<> for vtable-stubs.Friedemann Kleint2015-06-161-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vtable-stubs inherit QAxObject and can thus not be copied. When using qRegisterMetaType<> on them, cryptic error messages are generated: src/activeqt/container/qaxobject.h(58) : error C2248: 'QObject::QObject' : cannot access private member declared in class 'QObject' src/corelib/kernel/qobject.h(275) : see declaration of 'QObject::QObject' include\qtcore\../../src/corelib/kernel/qobject.h(96) : see declaration of 'QObject' To fix this, extract a list of the stubs at the beginning and suppress the generation of qRegisterMetaType<> for them. When writing out the class declaration, explicitly disable copy for them to make error messages clearer. Task-number: QTBUG-27792 Change-Id: Ia538a68864f3621234c1aab366b097ded881e859 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | dumpcpp: Add Qt version and command line to header comment block.Friedemann Kleint2015-06-091-14/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | produces: /**************************************************************************** ** ** Namespace TestLib generated by dumpcpp v5.5.0 using ** dumpcpp -o test Test.tlb ** from the type library Test.tlb ** ****************************************************************************/ Task-number: QTBUG-27792 Change-Id: I22ef45c424f07ae89e2cbae1d8c05686b0646c5c Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-038-11/+69
|\| | | | | | | | | | | Change-Id: I37609a137247e3203d09942e187ec880c6eba884
| * | Add changelog for Qt 5.5.0 releasev5.5.0-rc1Friedemann Kleint2015-06-021-0/+22
| | | | | | | | | | | | | | | Change-Id: I4f9beb32feff7e177b69fe2c2f058992ce095f86 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-05-251-0/+24
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iaf1281a9b6fc851362c42621fc4109536da88058
| | * Merge remote-tracking branch 'origin/5.4.2' into 5.4Liang Qi2015-05-181-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I1e9993873a52dfe59adcb5479e131495854b17be
| | | * Add changelog for Qt 5.4.2 releasev5.4.2Friedemann Kleint2015-04-221-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic05f2312e3dbbc011a5a5a5b34403cd0c452eef3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Bump versionOswald Buddenhagen2015-04-201-1/+1
| | |/ | | | | | | | | | Change-Id: I5d966e253003bd32caaf61ea7f22d36acf57f6f2
| * | dumpcpp: Speculative fix for methods taking array type parameters.Friedemann Kleint2015-05-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMetaMethod::methodSignature() produces for an invokable slot with array type parameters (void foo(const char p1[10],int p2)): foo(const char[10],int) Split off the array specification and append it to the parameter name. Task-number: QTBUG-46177 Change-Id: I58670570357472f6f5b7fcf0e841d3b7cb4189c8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | QAxWidget: Reverse order of releasing the interfaces.Friedemann Kleint2015-05-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Release IOleControl before IOleObject from which it was obtained. Task-number: QTBUG-45937 Change-Id: I3add7dc6e6c62172b71d36126e2a0ce86b28da5e Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
| * | Disable gcc warnings by adding pragmas and re-enable headersclean.v5.5.0-beta1Friedemann Kleint2015-04-233-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - IAxServerBase inherits IUnknown which does not have a virtual destructor. - QAxFactory::metaObject(const QString &) hides QObject::metaObject() (false positive). Task-number: QTBUG-45666 Change-Id: I8d1e69903ba6edde84ae9d4b64ee2e6088efad8b Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * | Add virtual destructor to QAxScriptSite.Friedemann Kleint2015-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Silence warning by MinGW: qtactiveqt\src\activeqt\container\qaxscript.cpp:143: warning: deleting object of polymorphic class type 'QAxScriptSite' which has non-virtual destructor might cause undefined behavior [-Wdelete-non-virtual-dtor] Task-number: QTBUG-45022 Change-Id: I5f221a953e44c3977ba633b999223fd4aa014666 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | enable QAxScript on MinGWJoerg Bornemann2015-04-221-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][ActiveQt] Enabled QAxScript on MinGW. Change-Id: I90b56b02d1c90fada512e725aa6f498861a118f2 Task-number: QTBUG-45022 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-2122-124/+327
|\| | | | | | | | | | | Change-Id: I24d14e84caa2e47ea39d477b07f711f6ac3ba2de
| * | Add virtual destructors to some classes.Friedemann Kleint2015-04-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silence warnings by MinGW for QAxServerAggregate, QAxSignalVec, QAxConnection, QClassFactory: warning: deleting object of polymorphic class type '...' which has non-virtual destructor might cause undefined behavior [-Wdelete-non-virtual-dtor] Task-number: QTBUG-45666 Change-Id: Id610094014699b95cba46119658da1b5005ff554 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * | MinGW: Fix build with headerclean checkKai Koehne2015-04-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qaxtypefunctions.h uses IUnknown as base class, which causes warnings on MinGW due to not having a virtual destructor: qaxtypefunctions.h:57:8: error: base class 'struct IUnknown' has accessible non-virtual destructor [-Werror=non-virtual-dtor] struct IAxServerBase : public IUnknown QAxFactory hides the declaration of metaObject() in QObject: qobjectdefs.h:158:32: error: 'virtual const QMetaObject* QObject::metaObject() const' was hidden [-Werror=overloaded-virtual] virtual const QMetaObject *metaObject() const; \ ^ qaxfactory.h:68:32: error: by 'virtual const QMetaObject* QAxFactory::metaObject(const QString&) const' [-Werror=overloaded-virtual] virtual const QMetaObject *metaObject(const QString &key) const = 0; ^ Task-number: QTBUG-45666 Change-Id: I9cdf275a1c74950d66c19e025918b8416f94d9ca Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | qaxtypefunctions.h: Fix build with headersclean check.Friedemann Kleint2015-04-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing include qt_windows.h, required for qtbase/ 6668f5becfb8fcb6d10e42495c6ea5cdba2d15c5. Change-Id: I8e9ea48e950b210579cfc523fafea84300aaca22 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-159-1/+23
| |\| | | | | | | | | | | | | | | | | | | Conflicts: qtactiveqt.pro Change-Id: Ie6deaadc8cf69e111a0ae7ebef420b4f47e3b9a3
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 14:37:50 +0000