summaryrefslogtreecommitdiffstats
path: root/tools/testcon
Commit message (Collapse)AuthorAgeFilesLines
* testcon: Use qt_internal_add_app()Li Xinwei2021-07-151-2/+1
| | | | | | | | | | testcon is a user facing app. Task-number: QTBUG-88414 Change-Id: I46d1c94145024972e4bb2946e3b0218be0910c8c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit dfd2e6949b27f374f8bf0efbfd14a08fd3b23eb1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove High DPI scaling attributesFriedemann Kleint2021-07-151-5/+0
| | | | | | | | | | They no longer have any effect and cause warnings and errors. Change-Id: Ibeb25186d92a0755a06193f34892ac0d64314e2e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 7040246efcaddbbda534acc841bcd7ec6b1bdfb4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix UIC warningKai Köhne2021-06-011-1/+0
| | | | | | | | | | qtactiveqt\tools\testcon\mainwindow.ui: Warning: action `actionGroupLogging' not declared Amends 7f6d41e35091 Pick-to: 6.1 Change-Id: I25b96631017f01c48f3d80e9a372bb7bf3e3dffb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove QMake project filesAlexey Edelev2021-04-122-68/+0
| | | | | | | | | | Remove the .pro/.pri project files and the associated .prev_CMakeLists.txt files. Task-number: QTBUG-78167 Pick-to: 6.1 Change-Id: I8dea2d3efccf8bae6a4b41779dccfaf5f9f83222 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Re-generate the CMake project filesAlexey Edelev2021-03-122-3/+56
| | | | | Change-Id: Icdfe81a51b626034bd86bf143eb1fe108603d148 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix warnings about deprecated QVariant::TypeFriedemann Kleint2020-10-301-8/+8
| | | | | Change-Id: I377e524edaf686d1a77e24f3dcb8f94476004b43 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix QMetaType/QVariant-related deprecationsFriedemann Kleint2020-09-071-7/+7
| | | | | | | | - Refactor code to use ints for metatype id Change-Id: I0a88f19ade25b1f8bb5a5138c602a71cf1f7282a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-241-1/+1
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: Ie1081f1a8a35e1ae7f57697dafee066969463967 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-232-4/+4
| | | | | | Task-number: QTBUG-84469 Change-Id: I822b48d0f5568ad271b148a3e2058d59097f0154 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove hard-coded QMetaObject dataFriedemann Kleint2020-05-282-10/+8
| | | | | | | | | | | | | Introduce QAxBaseObject and QAxBaseWidget providing the static properties and signals of QAxObject and QAxWidget. Rename the QAxBase methods to be called from the metacall implementations of QAxObject and QAxWidget. Add "classContext" as a real property on this occasion. Change-Id: Ia4f4e45e091e2d575ed9e6b2dd212139a1146300 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix deprecated/removed codeFriedemann Kleint2020-05-201-2/+2
| | | | | | | | | - Port away from QDesktopWidget - Use QFontMetrics::horizontalAdvance() instead of width() Pick-to: 5.15 Change-Id: I5d721fa574356a27e414545d6b9b2d28d400080b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Initial port to cmakeFriedemann Kleint2020-05-121-0/+53
| | | | | | | | Port the 2 main libraries, examples and tests. Task-number: QTBUG-78167 Change-Id: I0d00c9fa352a96dcd0e1f42d52e6f15680abd9ed Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Restructure the librariesFriedemann Kleint2020-05-065-8/+10
| | | | | | | | | | | | | | | | | | | | | | | Establish QtAxContainer and QtAxServer as proper modules. Add QtAxBase as a static helper lib containing qaxtypefunctions.cpp and qaxutils.cpp from the shared directory. qaxtypes.cpp remains in the shared directory as it is used by both modules with differing defines. The VARIANT <-> QVariant conversion is exposed via QAxBasePrivate for testcon. Add activeqt as a header-only module modeled after platformheaders. This makes it easier for the cmake conversion tools. Task-number: QTBUG-78167 Task-number: QTBUG-27776 Change-Id: I3e7956ea91f2177b8c2596402908351b4d99c510 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* testcon: Fix build after removal of QLayout::setMargin()Friedemann Kleint2020-04-181-1/+1
| | | | | Change-Id: If36f3576952dad987847903b81d0c64da4fdc40e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* testcon: Remove QActionGroup from main formFriedemann Kleint2020-03-301-39/+31
| | | | | | | | QActionGroup support of Qt Designer was dropped in Qt 4. The group in question is also not exclusive, so, it does not make sense. Change-Id: I8927c730bab9071fd05de4207f4727c5d1bf4922 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* testcon: Adapt to renamed signal of QComboBoxFriedemann Kleint2020-03-302-3/+3
| | | | | | Task-number: QTBUG-80906 Change-Id: Id18ae4adea182291ccd8b367e055afb894c97bb5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Reduce QList usageFriedemann Kleint2019-11-145-12/+13
| | | | | | | | Prepare for migration to Qt 6 by using QVector where possible. Otherwise, use auto or typedefs like QVariantList. Change-Id: I6d385efe1a45a0519cf4bb06a1f6d1ea869e890e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Testcon: Fix deprecation warning about QComboBox::autoCompletionFriedemann Kleint2019-07-022-3/+5
| | | | | | | | | Add completer in code, fixing: ui_invokemethod.h: In member function 'void Ui_InvokeMethod::setupUi(QDialog*)': .uic\debug/ui_invokemethod.h:137:45: warning: 'void QComboBox::setAutoCompletion(bool)' is deprecated: Use setCompleter() instead. [-Wdeprecated-declarations] Change-Id: I4df3d05fa3beb3fe6dcd3a75a9d647d080e644b3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup of Clang warnings (with exception of dumpcpp)Friedemann Kleint2019-06-071-1/+1
| | | | | | | | | | | - Fix remaining nullptr - else after return - Use const ref to avoid copies of variables - C-Style casts - Use multi-arg version of QString::arg() Change-Id: I4525f68bd576f9d6d7249d5153198896b8653fa7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix C-style castsFriedemann Kleint2019-06-061-1/+1
| | | | | | | Use C++ casts or remove where not needed. Change-Id: I7eaffcc20bcc925ab7be984cdb7d4b9b17949d40 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Introduce nullptrFriedemann Kleint2019-06-047-17/+17
| | | | | | | Apply Fixits by Qt Creator with some amendments. Change-Id: Ia47cee2d55432ddc14635aa593c52d80ab39cc82 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Introduce member initializationFriedemann Kleint2019-06-042-11/+5
| | | | | | | | | | | Fix warnings emitted by clang, use default constructors where applicable. Remove some unused members. Change-Id: I287ffa4d884be253ec5272e4266a1645376e7235 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix deprecation warningsv5.13.0-beta1v5.13.0-alpha1Friedemann Kleint2019-02-053-6/+6
| | | | | | | | | | mainwindow.cpp:397:51: warning: 'static QPixmap QPixmap::grabWidget(QObject*, int, int, int, int)' is deprecated: Use QWidget::grab() instead [-Wdeprecated-declarations] changeproperties.cpp:206:47: warning: 'void QTreeWidgetItem::setTextColor(int, const QColor&)' is deprecated: Use QTreeWidgetItem::setForeground() instead [-Wdeprecated-declarations] ... qaxserver.cpp:290:101: warning: 'QVariant::QVariant(const char*)' is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations] Change-Id: I500ef8a7b5ecf6d7c189388113f217a8bd5a6e55 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* Convert testcon project to use QAXFACTORY_BEGIN/END for COM registrationFredrik Orderud2019-01-292-6/+10
| | | | | | | | | Done to associate the ClassID, InterfaceID & EventsID values more directly against the MainWindow class. The code also becomes more descriptive. Task-number: QTBUG-73056 Change-Id: Ifd2a75aef23190bb19fe229c4e50329ab0dc9651 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Implement sandboxing support in TestConFredrik Orderud2018-10-193-6/+75
| | | | | | | | | | | | Leverage QAxWidget::setClassContext and integrity level impersonation to require the ActiveX control to either be started in a separate process, or in a separate "low integrity" process. Based on "Designing Applications to Run at a Low Integrity Level" https://msdn.microsoft.com/en-us/library/bb625960.aspx Task-number: QTBUG-70983 Change-Id: Ic71a076c9d54b433e7b0285e958bb86a6ff163bb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix remaining Clang warningsFriedemann Kleint2018-08-273-9/+6
| | | | | | | | | | | - Remove else after return/break - Avoid copies of variables which are used as const-ref - Simplify boolean return values - Remove redundant declarations - Use range-based for where applicable Change-Id: I5a3e4ba86845ac4d1c6f166c3f808eb06469c28f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Migrate tools/testcon's ChangeProperties to QRegularExpressionSamuel Gaist2018-07-061-2/+2
| | | | | | | | | This patch updates the ChangeProperties class of the testcon tool to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: If972c091fa929f77282b94e46f37c2d945df9262 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-0/+1
|\ | | | | | | | | | | | | | | Conflicts: examples/activeqt/webbrowser/main.cpp examples/activeqt/webbrowser/webaxwidget.h Change-Id: I80775f6d355a278880d7e6044390b67a6f6a893e
| * Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-301-0/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie457478a64a28434afb3361dfc6f9478dd9c58bd
| | * QRegExp include cleanupSamuel Gaist2017-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-291-6/+6
| | | | | | | | | | | | | | | Change-Id: I0df68cec43511537b61ddfe74bd677be7a598eae Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-1/+1
|/ / | | | | | | | | Change-Id: Iaf72bd006af026255bc5cd1ecf14f187db1bcf52 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* / Port legacy Qt 3 <image> elements in .ui files to resourcesFriedemann Kleint2017-06-146-15/+11
|/ | | | | Change-Id: I00033e7be4103e22d0b78b079ec4bd313cd813f2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@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>
* 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>
* Remove foreachFriedemann Kleint2017-01-103-9/+19
| | | | | | | Use range based for. Change-Id: If91077be5bb13aa1447866c4243511db72d4f46c Reviewed-by: Joerg Bornemann <joerg.bornemann@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.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-152-1/+21
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47
| * String fixes.Friedemann Kleint2016-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | - 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-2521-357/+252
|/ | | | | | | | | | | 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>
* Fixed license file headersJani Heikkinen2015-02-165-5/+5
| | | | | Change-Id: Ifb2d18d57602260546cc8a29af221298442575ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 17:51:57 +0000