summaryrefslogtreecommitdiff
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-153-13/+43
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47
| * dumpcpp: Introduce flags type ObjectCategories for enum ObjectCategory.Friedemann Kleint2016-02-121-10/+20
| | | | | | | | | | | | | | | | The enumeration values are mostly used as flags with some unnecessary casts. Clean this up by introducing flags. Change-Id: Iab03acb9ab83624bd0e3a6812255d7215d502003 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * String fixes.Friedemann Kleint2016-02-112-3/+3
| | | | | | | | | | | | | | | | | | | | - Avoid conversion from QString to QByteArray. - Replace a = a.mid() by a.remove(). - Replace a = a.left() by a.truncate(). - Streamline code extracting an error code. Change-Id: I43c1f04e947632f725bbb86af5abf108b2b02261 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| * testcon: Add options for application attributes.Friedemann Kleint2016-01-291-0/+20
| | | | | | | | | | | | | | | | | | Make it possible to set Qt::AA_DisableHighDpiScaling and Qt::AA_DontCreateNativeWidgetSiblings. Task-number: QTBUG-50206 Change-Id: Ib5f0e9f29a78b22c99edfef3b6687482150d9896 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-2523-391/+276
|/ | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I28b956229a96fd982b22640226a716c1a4f3aa0d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* testcon: Better adapt to High DPI screens.Friedemann Kleint2016-01-052-8/+4
| | | | | | | | | Resize main window and select dialog according to available screen size. Task-number: QTBUG-50206 Change-Id: I66fa527dceb19fab87ac84ee3063f5b84e487fb4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* 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>
* 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>
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-32/+55
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0308544188e73d94b836685f07e44337ca57a723
| * 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-031-0/+7
|\ \ | |/ | | | | Change-Id: I37609a137247e3203d09942e187ec880c6eba884
| * 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>
* | remove dumpcpp's -donothing optionJoerg Bornemann2015-04-131-10/+1
|/ | | | | | | | This option was used as a hack for qmake. We know better hacks these days. Change-Id: I9fb6b40f7d2ddd40cd51ae758c86fd6d3b060035 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fixed license file headersJani Heikkinen2015-02-165-5/+5
| | | | | Change-Id: Ifb2d18d57602260546cc8a29af221298442575ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-1123-231/+191
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I2febb46d711c51eeb08f13418a4fc15ab0502f1a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* dumpcpp: Add Q_DECLARE_OPAQUE_POINTER() for referenced types.Friedemann Kleint2015-02-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors occurring for forward-declared types in the generated header like: qmetatype.h(1354) : error C2027: use of undefined type 'stdole::Font' vcgantt.h(26) : see declaration of 'stdole::Font' qmetatype.h(1539) : see reference to class template instantiation 'QtPrivate::IsPointerToTypeDerivedFromQObject<T>' being compiled with [ T=stdole::Font * ] qmetatype.h(1546) : see reference to class template instantiation 'QMetaTypeId<T>' being compiled with [ T=stdole::Font * ] \vcgantt.h(33401) : see reference to class template instantiation 'QMetaTypeId2<T>' being compiled with [ T=stdole::Font * ] qmetatype.h(1354) : error C2338: Type argument of Q_DECLARE_METATYPE(T*) must be fully defined Task-number: QTBUG-26587 Change-Id: I9e6c87551b462bc27f94d8e8bd36497075dac8d3 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* dumpcpp: Introduce QCommandLineParser.Friedemann Kleint2015-02-021-93/+117
| | | | | | Task-number: QTBUG-41130 Change-Id: I0ee3668e302e89cb538fafc6eb4bda9d9e05f4ac Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* dumpcpp: Remove unused code.Friedemann Kleint2015-02-021-100/+0
| | | | | | | | Remove function generateClass() and unused variable castType. Change-Id: Iefbb5405e64491b9a9580128c2fa46161c074188 Task-number: QTBUG-41130 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* dumpcpp: Refactor code handling options strings.Friedemann Kleint2015-02-021-49/+47
| | | | | | | | | | Change the type from QByteArray to QString, removing some conversion code. Move nameSpace option parameter into main and turn into a QString as well. Task-number: QTBUG-41130 Change-Id: Ife42f099f725a83e91cc2b73b49cee3fa8c3898b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix single character string constants in dumpcpp.Friedemann Kleint2015-01-121-54/+54
| | | | | Change-Id: I4a92d228b16fd1cd7008b36fa9fe39838a90ef9f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use Qt 5 signals & slots syntax.Friedemann Kleint2014-12-222-5/+4
| | | | | Change-Id: I92c4df2ca8a75d6caafa1900db0730d2e0abaf07 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update activeqt to use new QMetaType::registerNormalizedType signatureJędrzej Nowacki2014-11-171-9/+0
| | | | | Change-Id: I492841b4c34396da250254822509e71193645ed7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Use QString/QByteArray::prepend() where appropriate.Friedemann Kleint2014-10-091-5/+5
| | | | | Change-Id: Ifbdc828a646cab18548683829c2f45c84da0076b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix usage of QString::left()/QString::right().Friedemann Kleint2014-10-092-3/+3
| | | | | | | | QString::truncate(), QString::remove() or QString::chop() should be used when assigning to self. Change-Id: Ic0582ad3bc9389cbd315dee885921628197747f2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Refactor string handling in testcon.Friedemann Kleint2014-10-062-16/+12
| | | | | | | Remove some single character string constants. Change-Id: I73cba7645d9ae4dc752538a9f7cab6d280aefecb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Use case insensitive comparison instead of toLower().Friedemann Kleint2014-09-261-2/+2
| | | | | Change-Id: I73907afab82cdef8e717def6095cd7d03236fadf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Tools: fix arg.toLower()Maks Naumov2014-09-092-4/+2
| | | | | | Change-Id: I4321103f75a13688de3400a1a238ac5414a0efd8 QByteArray::toLower() returns a lowercase copy of the byte array. Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Update license headers and add new license filesv5.4.0-alpha1Jani Heikkinen2014-08-2617-323/+187
| | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Ib9c4cfb6651a523e2da710f0a71586ec84538007 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Replace win32-g++ with mingw scopeKai Koehne2014-01-211-1/+1
| | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: I36449cfa199db8bd25ffb0f7b384346cd74897d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* whitespace fixesOswald Buddenhagen2014-01-2014-289/+289
| | | | | | | expand tabs, fix indentation, remove trailing whitespace. Change-Id: Ibec1bbad9e8faff81671ce9d1c7bb4fb9b340bb9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to new "configure -nomake tools" semanticsv5.1.0-beta1Oswald Buddenhagen2013-05-061-0/+4
| | | | | Change-Id: Ie5fdbf5b01dc1d522dd6bbed6d73efb95da4ae85 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-2524-29/+24
|\ | | | | | | Change-Id: I68995b86daa2caaa1806107631edaeb2d8dc66c3
| * use qt_tool.prf for dumpdocOswald Buddenhagen2013-02-061-6/+1
| | | | | | | | | | | | | | | | it was previously skipped - probably because it contains QT+=widgets. it's still a command line tool, though. Change-Id: I1c641d80d1d2ccdf25ffa4613ad5030c9695a8a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1023-23/+23
| | | | | | | | | | | | Change-Id: Ia19cb01ac9f0c5e3863e684d2f701ac424ba64f4 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Check return values of CoInitialize().Friedemann Kleint2013-01-182-2/+8
| | | | | | | | | | Change-Id: I97e94517e1fb1af89d992db9c1a8c15aba5f8425 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-071-9/+43
|\ \ | |/ | | | | | | | | | | Conflicts: sync.profile Change-Id: I1bca8b78106fba1846ad8513f02f650d418b773e
| * Fix namespace generation for ** parameters in dumpcppMiikka Heikkinen2012-12-141-0/+2
| | | | | | | | | | | | | | | | | | Pointer to a pointer (**) type parameters didn't get namespace prepended to them. Task-number: QTBUG-28383 Change-Id: I9379fecfad5814b897af7757d0b7b650b31d01e1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * dumpcpp: compile with QT_NO_CAST_TO_ASCIIJoerg Bornemann2012-12-062-4/+5
| | | | | | | | | | | | | | Change-Id: I96750ea25c6b4499dccf55509510c076bc4ad371 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> (cherry picked from commit 59a003faafe53a155e4a46725ef41b1b7dca4b75)
| * dumpcpp: use temporary file as class implementation bufferJoerg Bornemann2012-12-041-3/+28
| | | | | | | | | | | | | | | | | | | | | | Instead of writing vast amounts of data into a QByteArray, we're using a temporary file as clipboard. This enables us to handle much larger import tables without worrying about running out of RAM. Task-number: QTBUG-28325 Change-Id: Ied9567651cd859400ba3ed9a45cbbaac603300b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * dumpcpp: properly clean up temporary metaobjectsJoerg Bornemann2012-12-041-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All qax_* functions that return QMetaObject instances actually return instances of QAxMetaObject. To make sure that ~QAxMetaObject is called, we introduce the qax_deleteMetaObject function and call it in the appropriate places. The explicit call to QByteArray::detach is needed because the affected QMetaObject/Method calls return a QByteArray that directly holds a pointer to the QByteArrayData contained in QAxMetaObject. Once the QAxMetaObject is destroyed, the QByteArray objects will hold pointers to freed memory. Therefore we make a deep copy of the QByteArray by detaching it. Task-number: QTBUG-28325 Change-Id: I97613f12f1a30608dd5acd67d0faebb3f39cdf70 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* | Testcon: Fix includes.Friedemann Kleint2012-12-174-8/+21
| | | | | | | | | | | | | | | | Replace module includes by per-class includes. Change-Id: I5c70aa194b4066ef14082af79f396a635bf8475f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* | dumpcpp: compile with QT_NO_CAST_TO_ASCIIJoerg Bornemann2012-12-042-4/+5
|/ | | | | | Change-Id: I96750ea25c6b4499dccf55509510c076bc4ad371 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Change copyright information from Nokia to DigiaSergio Ahumada2012-11-281-2/+2
| | | | | | | Task-number: QTBUG-28156 Change-Id: I3b33ee0a574b7ec5c4f192a40877bf0141ff2df1 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix activeqt module structureJoerg Bornemann2012-11-283-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The formerly monolithic ActiveQt module has been split into three modules: axserver A static library for creating a server project. axcontainer A static libary for creating a container project. axbase A static library with shared code for the latter two libraries. This module also is responsible for the installation of header files in the include/ActiveQt directory. "CONFIG += qaxserver" has been deprecated. Use "QT += axserver" instead. "CONFIG += qaxcontainer" has been deprecated. Use "QT += axcontainer" instead. Code from qaxtypes.cpp that does not depend on the QAX_SERVER define has been moved to qaxtypefunctions.cpp and resides in the axbase module. Task-number: QTBUG-27776 Change-Id: Ib39fc897ccfce16849be0e3c084817d2cd0fc926 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
View Lorry Controller Status