summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove deprecated empty macroLars Schmertmann2020-07-021-1/+0
| | | | | Change-Id: I3c8395c9bc171af69513a8ca471709d44be051ab Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix deprecation warnings about mouse event positionsFriedemann Kleint2020-07-021-6/+9
| | | | | | | | | | | | | | Fix: qaxserverbase.cpp:4360:27: warning: 'int QMouseEvent::x() const' is deprecated: Use position() [-Wdeprecated-declarations] qaxserverbase.cpp:4361:27: warning: 'int QMouseEvent::y() const' is deprecated: Use position() [-Wdeprecated-declarations] ^ qaxserverbase.cpp:4377:27: warning: 'int QMouseEvent::x() const' is deprecated: Use position() [-Wdeprecated-declarations] qaxserverbase.cpp:4378:27: warning: 'int QMouseEvent::y() const' is deprecated: Use position() [-Wdeprecated-declarations] ^ qaxserverbase.cpp:4403:27: warning: 'int QMouseEvent::x() const' is deprecated: Use position() [-Wdeprecated-declarations] qaxserverbase.cpp:4404:27: warning: 'int QMouseEvent::y() const' is deprecated: Use position() [-Wdeprecated-declarations] Change-Id: I8a0c4f6d83c33bd02bc8b4909332a31c281af695 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Doc: Update docs with cmake package informationNico Vertriest2020-06-262-0/+2
| | | | | | Task-number: QTBUG-85179 Change-Id: Icd4843315da79643921479a68c7bd83acd57cc3f Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-243-6/+6
| | | | | | | | 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-2310-23/+23
| | | | | | Task-number: QTBUG-84469 Change-Id: I822b48d0f5568ad271b148a3e2058d59097f0154 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove winrtOliver Wolff2020-06-179-8/+120
| | | | | | | Task-number: QTBUG-84434 Change-Id: I0a7628ac33971154244d3ddfe824889795aea06c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Bump dependency version and fix compile errorsKarsten Heimrich2020-06-123-11/+3
| | | | | | Change-Id: I8ebce5c3f49dd07e6de2aa847625a3c5f677c756 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Qt6: Port QtActiveQt from QStringRef to QStringViewKarsten Heimrich2020-06-102-2/+2
| | | | | | Task-number: QTBUG-84319 Change-Id: I450272cf93e9b886c27176622c305af41ca7a035 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Some minor fixes to build against latest Qt dev branchKarsten Heimrich2020-06-102-2/+2
| | | | | Change-Id: Ice7a1064c95fcb6a73904fdc188c9b0363f17150 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QAxObject/Widget: Enable overwriting clear() by dumpcppFriedemann Kleint2020-05-296-7/+23
| | | | | | | | | | | | | | | | | Rename virtual QAxObjectInterface::clear() to resetControl() and change QAxObject/Widget::clear() to a non-virtual function calling it. resetControl() is more inline with Qt naming conventions and making clear() non-virtual prevents clashes when a control generated by dumpcpp has a clear() method. It is not a general solution for the issue; but helps this case. Fixes: QTBUG-83735 Change-Id: I6aa01db6e95477e0407ba40fbc14f4991edf5f3e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Move some of the internal functions from QAxBase to QAxBasePrivateFriedemann Kleint2020-05-299-165/+154
| | | | | | | | | By making the QAxWidget/ObjectPrivate inherit QAxBasePrivate, some virtual internal functions can be moved there and QAxSignalBridge can also be removed. Change-Id: Ic53cb61afe3fb2a431c149b1b73697bbf287b6b0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Introduce private classes for QAxWidget, QAxObjectFriedemann Kleint2020-05-288-47/+244
| | | | | | | | It solves the problem of calling virtual clear() from the destructor and prepares for further changes. Change-Id: Icb8530c70e451ab5f27443fbd54fb3b3cf5e8c03 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove hard-coded QMetaObject dataFriedemann Kleint2020-05-2815-318/+635
| | | | | | | | | | | | | 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>
* Brush up the QAxFactory macrosFriedemann Kleint2020-05-261-19/+20
| | | | | | | Streamline code, fix indentation errors. Change-Id: I7f16ac912bb5ec7d6f25f11cd2e1ae81a0db2196 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QAXCLASS: Fix warning about unused variable itFriedemann Kleint2020-05-261-1/+0
| | | | | | | | | Remove left-over iterator from porting to range based for in 5a1ce04cb71263ab078921f5efc8cf30f95a2eb5. Pick-to: 5.15 Change-Id: I0d16055ab383d536d8e1cc24b5777426fbd5c504 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* CMake: Add the ActiveQt header moduleJoerg Bornemann2020-05-251-0/+5
| | | | | Change-Id: Ic594816a6b8943130e53ebbe9969e187df7bf924 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Adapt to QString::utf16() now returning char16_t *Edward Welbourne2020-05-204-18/+29
| | | | | | | | | | | | | | Make the code agnostic of the exact return type. In one case, were filling a C# IntPtr, drop the cast and use .data(), as IntPtr has a ctor from void* and the code stores an explicit string length, so we don't need the NUL-termination that utf16() guarantees. There are a handful of casts remaining, so write a small helper that allows to comment on certain aspects of the conversion. Done-with: Marc Mutz <marc.mutz@kdab.com> Change-Id: I16227077b31f02fbbefe1a83e4dfbd2d5333a0f7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix deprecated/removed codeFriedemann Kleint2020-05-204-7/+7
| | | | | | | | | - 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>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: Ic56cad0a3cb86c6be1564a576cba7aff73606185
| * Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
| |\ | | | | | | | | | Change-Id: I870be7e9ad3a4b053f1d345ab8e1f36619bb68ea
| | * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| | |\ | | |/ | |/| | | | Change-Id: I1465a6baa057a736af4176170de890af0c7a5082
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 855c01603e19a78cb73421d4a5c2410c4ad31c3e Bump version + 4606e00679ba2c11661ce099fa6bcb489b239bae Reduce QList usage + 1fca42ec752d9ff594f90a319456379196150b19 Fix clang warnings left over from last purge + 13363248cfb0bab60e4d25f4bc2da692a9b51a50 Avoid initializing QFlags with 0 or nullptr + e3c06beffd3ccf59c5266dd2c9620c499561e26f Fix Qt6 build + 927a76c9246109f14b51bd9a3cf224d6f987e10d Fix broken IDL version handling in DumpIDL + f29b73d0026db64d7b2d1ca049461b784c98cecc axviewer test: Add a metaobject dump + 52c02908abecbb9fd4afcb0de6a0b50b3ae85827 testcon: Adapt to renamed signal of QComboBox + 1fb1936afb00a408799c3f8a4755da21450289b8 OpenGL example: Port to QOpenGLWidget + a9ba05936f9f78bd2e6294f356fe1ae37042ef33 OpenGL example: Use double in GL functions + 8ca337213f1e79abca96a70a17f771f322c58319 OpenGL example: Polish a bit + cdd58e2c155063f9b52b69a47f45c2430214e3a4 Add a manual test for dumpcpp Change-Id: I13ca04fb103a9ee92b82757b38439b317abb94b1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Initial port to cmakeFriedemann Kleint2020-05-1235-0/+907
| | | | | | | | | | | | | | | | | | | | | | | | 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-0635-77/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Compile with QT_NO_CAST_TO_ASCIIFriedemann Kleint2020-05-056-24/+31
| | | | | | | | | | | | | | | | | | | | | Pick-to: 5.15 Task-number: QTBUG-78167 Change-Id: I628df5c4db8b072fa34a14890b031429b550b51a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Update dependenciesFriedemann Kleint2020-05-053-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia1bf81c340a6168a9f93d5427e0f96a15c60718d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Remove wince from .pro filesFriedemann Kleint2020-04-282-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-78167 Change-Id: I23270018ce8c6c66eeb8aa631147ae7b468088fe Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\| | | | | | | | | | | Change-Id: I0210db12d18aa468e8c445b812cdda7ded881851
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | |/ | |/| | | | Change-Id: Ib0a488304d6cf03e89153f4fd42051b7bd5ad3fb
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I6b3ef1c4834a9e962baa0906ea8334965bb1df4c
| | | * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 2bb2080ddc9c45b425f1e38f21c737932a3768ce Add per-user registration support to IDC tool + 974bead30f32a832180126944973c82f5bc6f6e2 Workaround for Application.WordBasic.DisableAutoMacros not working + 6ae4d9b39285d84dad731893444f7027945900fb Bump version Change-Id: Ibc9a55d5dd50e464da533e6fb9faa88e5bef3d2b Reviewed-by: Andy Shaw <andy.shaw@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>
* | | QAxBase: Streamline codeFriedemann Kleint2020-04-153-129/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove duplicated assignment of variable index - Extract QAxBasePrivate to a private header - Make checkHRESULT a member of QAxBasePrivate, removing the "that" parameter. - Streamline the code for handling exceptions; the signal will always be present in QAxObject, QAxWidget. Change-Id: I16b278ff87fb09e18f4fc809e564b609f1081624 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Move static methods/properties of QAxWidget/Object to the frontFriedemann Kleint2020-04-151-30/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The static methods and properties (control, exception()), are currently at the back behind the COM properties and functions starting with captical letters due to the usage of a QMap to sort them alphabetically. Extract helpers to add them to the QMetaObjectBuilder directly without storing them in the maps and add them first. Change-Id: I774dc44a2c1579e839c26433d37d78eac1e0beb6 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-1110-193/+468
|\| | | | | | | | | | | Change-Id: I4e9dbc17f87a6b604b77ca9e0f9ac1810df870a1
| * | Add a manual test for dumpcppv5.15.0-beta4Friedemann Kleint2020-04-0810-193/+468
| | | | | | | | | | | | | | | | | | | | | | | | Let it generate code for the WebBrowser and display the meta object. Factor out useful code from axviewer. Change-Id: Ib250c749459836e2145f83f4f68fa0caee2a2ad9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | dumpcpp: Use moc to generate metaobject codeFriedemann Kleint2020-04-086-490/+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>
* | | Update include for QAction after move from widgets to gui in qtbaseVolker Hilsheimer2020-04-014-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix include for QAction after move from widgets to gui in qtbase - Adapt to OpenGL split - Skip dumpcpp test for the moment Change-Id: I8fcec00c56158ee427a9f374b07bb814a99d3bce 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-307-54/+52
|\| | | | | | | | | | | Change-Id: If239a0087c615b25a088eb60561ff7e019ea316c
| * | OpenGL example: Polish a bitv5.15.0-beta3Friedemann Kleint2020-03-301-3/+6
| | | | | | | | | | | | | | | | | | | | | Remove ugly C-style cast and add Q_UNUSED(). Change-Id: Ia6ec8202ef2a5ad44a05c4f4bb68ed5936381f53 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | OpenGL example: Use double in GL functionsFriedemann Kleint2020-03-302-35/+27
| | | | | | | | | | | | | | | | | | | | | | | | This eliminates warnings about float truncation and increases readibility of the code. Change-Id: I9fcae5a556128a31a508613289772128a908a3bb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | OpenGL example: Port to QOpenGLWidgetFriedemann Kleint2020-03-305-14/+17
| | | | | | | | | | | | | | | Change-Id: I81b1b2b251a3ffca2f925d5d61f88ac71728ca2b 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>
* | | Port to QMetaObjectBuilderFriedemann Kleint2020-03-302-195/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveQt needs to be ported to use QMetaObjectBuilder to assemble the metaobjects to remove the dependency on the internal representation. This requires removing the QAxMetaObject inheriting QMetaObject since the builder produces plain QMetaObjects. Cache the extra information in a struct by meta object instance. Rewrite the generator code to use QMetaObjectBuilder. Simplify the code around Method::flags; story only real attributes; access and meta method type are redundant. Task-number: QTBUG-82945 Change-Id: I911959390976ee9f8c77bfc49bd5d4c4ae7d4bcb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-281-1/+220
|\| | | | | | | | | | | Change-Id: I0d744d349dbeb682413058db58ed8a3a347e0a38
| * | axviewer test: Add a metaobject dumpFriedemann Kleint2020-03-271-1/+220
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-82945 Change-Id: If9c84743779acdd199fd67ec2c2f4fc72f58129a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-181-1/+2
|\| | | | | | | | | | | Change-Id: I2910828c915f0a48069f161c1e7feeeac0f1faff
| * | Fix broken IDL version handling in DumpIDLFredrik Orderud2020-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IDL versions are limited to "major.minor" format, where each number can range from 0 to 65k. Patch and build numbers are not supported. The current implementation just removes extra dots, converting a "10.20.30.40" version string into "10.203040", which seem odd to me. It also causes the following failure when the concatenated "<minor><patch><build>" string exceed 65k: MIDL2152: [version] format is incorrect Change-Id: I915e70a5480f69caa3822ec9b41fc6edc7fe4cfa Fixes: QTBUG-82883 Reference: https://docs.microsoft.com/en-us/windows/win32/midl/compiler-errors Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-081-0/+6
|\| | | | | | | | | | | Change-Id: I6a3266cb21f30206ecb991fb1dc99e25f9a91259
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 12:45:05 +0000