summaryrefslogtreecommitdiffstats
path: root/tools
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-127-136/+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>
* dumpcpp: Acknowledge metaobject revision changeFabian Kosmale2021-04-011-1/+1
| | | | | | Fixes: QTBUG-92351 Change-Id: Icc647f57840f7c2d86403bc0a5029f3b9fe4ef5a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix crash in dumpcpp-generated codeFriedemann Kleint2021-03-153-24/+15
| | | | | | | | | | | QWidget/QObject were generated as base classes for the generated class, which is no longer correct after the introduction of the QAxBaseWidget/Object classes. Pass the correct base QMetaObject and simplify the code since there is always a base class now. Pick-to: 6.1 Change-Id: I822f2de4ce65785cd45dc3b4adf1923efae556be Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Re-generate the CMake project filesAlexey Edelev2021-03-126-5/+105
| | | | | 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>
* dumpcpp: Check 64 bit registry keys for 64bit buildsFriedemann Kleint2020-09-151-3/+14
| | | | | | | | | Add a check depending on pointer size. Pick-to: 5.15 Fixes: QTBUG-86666 Change-Id: I6bb39e94e677e9f9c72b15949e7b463e1f4776d2 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>
* dumpcpp: Adapt to QMetaType changesFriedemann Kleint2020-09-071-38/+5
| | | | | | | | | - Fix qRegisterMetaType() signature - Remove the generation of the QMetaTypeFunctionHelper specialization Change-Id: I844b495557e4935ca4ab54f9ac47e24adb158f72 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Bump dependency version and fix compile errorsFriedemann Kleint2020-08-191-1/+1
| | | | | | | | - Adapt to QMetaType/QVariant changes - Adapt to QIODeviceBase Change-Id: I7cb6b9b0bbc68954c839c2026e3984fd7f913ef9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* 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-233-5/+5
| | | | | | Task-number: QTBUG-84469 Change-Id: I822b48d0f5568ad271b148a3e2058d59097f0154 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Some minor fixes to build against latest Qt dev branchKarsten Heimrich2020-06-101-1/+1
| | | | | Change-Id: Ice7a1064c95fcb6a73904fdc188c9b0363f17150 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove hard-coded QMetaObject dataFriedemann Kleint2020-05-283-11/+9
| | | | | | | | | | | | | 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-124-0/+104
| | | | | | | | 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>
* dumpcpp: Use moc to generate metaobject codeFriedemann Kleint2020-04-084-486/+386
| | | | | | | | | | | | | | | | dumpcpp contained an old version of moc code, which is now out of date. Write out the interface as C++ code and run the real moc on it to generate this. Some modifications are required. Remove some asserts that checked on an empty meta object created in the fallback path of QAxBasePrivate::metaObject() which was removed by 0bcdc74f55574e1a45bef8728bd5093cf1acfc33. Task-number: QTBUG-82945 Change-Id: Ide58bae1440331ea4d5da0fcc74b41f49f09599a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> 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>
* Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-03-302-3/+3
|\ | | | | | | Change-Id: If239a0087c615b25a088eb60561ff7e019ea316c
| * 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>
| * Fix Qt6 buildAlexandru Croitor2019-12-191-218/+218
| | | | | | | | | | | | | | Change-Id: Iaaa644cfe6777b0ffbe3fb5850fb58b323715fd2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 62ed66bce6e6602d82f9474a8589a7dabd7bc9ca) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix build of QtActiveQt after moc string data changesSimon Hausmann2020-01-131-12/+4
| | | | | | | | | | | | | | | | | | | | Commit e58b44d557b859b7b55869f1e137aa1bc8968307 in qtbase changes the meta-object to store string data as an array of offsets and length into the char array instead of a synthetic QByteArrayData (in the old format). This is a port to the new data structure. Change-Id: Ieacfdab69d799f954d9351f8424284b1e6633698 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-196-26/+27
|\| | | | | | | Change-Id: I1e014608bc0a7b07a37a18d43dc3ecc7eb281321
| * Reduce QList usageFriedemann Kleint2019-11-146-26/+27
| | | | | | | | | | | | | | | | 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>
* | Fix Qt6 buildAlexandru Croitor2019-08-011-218/+218
|/ | | | | Change-Id: Iaaa644cfe6777b0ffbe3fb5850fb58b323715fd2 Reviewed-by: Simon Hausmann <simon.hausmann@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>
* dump: Generate C++ 11Friedemann Kleint2019-06-071-42/+73
| | | | | | | | | | | | | | | - Use nullptr, override - Move the constructor body to the implementation on grounds of * Avoid code bloat by inlined constructors * Avoid the ugly C-style cast from IDispatch to IUnknown since both are just forward-declared in the header [ChangeLog][ActiveQt] dumpcpp now generates the constructor code into the .cpp file. Change-Id: I180f64c2b32793d64080ecb8c4246b44b6c0b615 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* dumpcpp: Fix Clang warningsFriedemann Kleint2019-06-071-34/+31
| | | | | | | | | | | | - Use const ref to avoid copies of variables - Use range-based - Streamline code a bit; loop over maps directly instead of key lists - Avoid repetitive calls to toLatin1() - Signedness issue converting QVariant::Type Change-Id: I04ec73548f0a56edea8e3c0e8ee76c23a65aa07b Reviewed-by: Oliver Wolff <oliver.wolff@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>
* Fix class structure and definitionsFriedemann Kleint2019-06-041-1/+1
| | | | | | | | | | - Add override - Use "= default" for trivial constructors/destructors - Q_DISABLE_COPY_MOVE to delete move constructors and assignment Change-Id: If773ad8c092ab8000b268c4231f7f27e5f484e56 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Introduce nullptrFriedemann Kleint2019-06-049-30/+30
| | | | | | | Apply Fixits by Qt Creator with some amendments. Change-Id: Ia47cee2d55432ddc14635aa593c52d80ab39cc82 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Introduce member initializationFriedemann Kleint2019-06-043-15/+9
| | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-041-1/+14
|\ | | | | | | Change-Id: Ibfc5e4ce50bd3392567b6d3f3d00c1062a2d9149
| * dumpcpp: Fix MinGW compile error when declaring enumsFriedemann Kleint2019-04-301-1/+14
| | | | | | | | | | | | | | | | For MinGW, add {} to make it syntactically valid C++. Task-number: QTCREATORBUG-22320 Change-Id: I6113fbe91e531ac2b6c087f6813b0608b56bc73b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@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>
* Remove compatibility with older qtbaseKai Koehne2018-08-251-1/+1
| | | | | | | | | Amends 4bbc782fc70f30e8b15. Task-number: QTBUG-69911 Change-Id: I821739583e347f95a0aa114008e01db1e42eef92 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adapt to QMetaObjectPrivate changes in qtbaseKai Koehne2018-08-141-1/+1
| | | | | | | | | | Commit 1c623bc6d1c0a7c in qtbase bumped QMetaObjectPrivate::OutputRevision, which caused qtactiveqt builds to fail. Task-number: QTBUG-69911 Change-Id: I40be892d8c80fdc4706ae176bbafb302fdd00921 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-142-4/+4
|\ | | | | | | Change-Id: I59bbda884eb38d563b29a50f9a205922ce80066c
| * Replace CoInitialize calls with CoInitializeExFredrik Orderud2018-08-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Done to make single-threaded apartment (STA) usage more explicit. CoInitializeEx(0, COINIT_APARTMENTTHREADED) does exactly the same as CoInitialize(0), so there is no change in behavior. REF: https://docs.microsoft.com/nb-no/windows/desktop/api/combaseapi/nf-combaseapi-coinitializeex Change-Id: I2e2f77745b4360b1da1e6c284551d0f709aba546 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> 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>
* dumpcpp: fix generated string literalOswald Buddenhagen2018-04-201-1/+1
| | | | | | | reported by 'olehs' on github. Change-Id: If07cf9b9b753d46513a80aa2d854d0b55b27dcff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-203-0/+3
|\ | | | | | | | | | | | | | | Conflicts: examples/activeqt/webbrowser/main.cpp examples/activeqt/webbrowser/webaxwidget.h Change-Id: I80775f6d355a278880d7e6044390b67a6f6a893e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 02:41:59 +0000