summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1' in qt/qtactiveqtv6.1.0-alpha1Jani Heikkinen2021-02-121-2/+2
| | | | | Change-Id: Idbbfc8082b0ec57cce8088c730f3ff9580a51ebc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump version to 6.1.0Jani Heikkinen2021-02-112-2/+2
| | | | | | Pick-to: dev Change-Id: Ia78bf96cb574ef83ad13332b653715b83402cbb3 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Enable documentation buildJani Heikkinen2021-02-112-0/+6
| | | | | | Task-number: QTBUG-90420 Change-Id: I328c43a6d32287d935bea035bfd4571a64d77581 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update dependencies on '6.1' in qt/qtactiveqtJani Heikkinen2021-02-101-1/+1
| | | | | Change-Id: I7cd53a381b759b28e878bd5603f5ac87e11a9398 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Coin: Build and test module only for Windows targetsOliver Wolff2021-01-251-2/+2
| | | | | | | Task-number: QTBUG-90417 Change-Id: Ieb0f1b64a038283049bd39198261dfb3ea75dd2e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix mingw warningsOliver Wolff2021-01-252-6/+9
| | | | | | | | | | | | | | GetProcAddr returns a FARPROC (function pointer with no arguments) for mingw. In reality GetProcAddr does not result in a FARPROC though so that we have to cast it to void* before casting it to the "real" function pointer to tell mingw that we know what we are doing. Additionally the return value of lastIndexOf was ignored in one place. Just use it instead of relying on the match having been made. Change-Id: I007f4732ff563aa01d2140ed8f92d1fc78f1a71b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix toplevel CMakeLists.txtOliver Wolff2021-01-251-4/+6
| | | | | | | | | Configurations without parts of Qt should not error out, but exit the cmake call gracefully. Change-Id: Iabfa7541681afd5c7354be1c2070e6c24b858eea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies.yamlOliver Wolff2021-01-251-1/+1
| | | | | Change-Id: I97449df2e1b0fc65552669d3214b3de761a79d7b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Skip module build on platform other than WindowsOliver Wolff2021-01-251-0/+5
| | | | | Change-Id: I05d4de0dfa846bb42d7f91b67ca49640aada7b59 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add module_config.yamlOliver Wolff2021-01-251-0/+12
| | | | | | | Task-number: QTBUG-90417 Change-Id: I1c532150a64eb86838acebdc3526f82c081768ef Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix two documentation warningsAndreas Buhr2020-12-042-3/+4
| | | | | | | | | Remove link to Qt Script as it is not maintained any more. Add documentation stub for control() function as others link to it. Task-number: QTBUG-88533 Change-Id: I94d5f2186431eb49fbe5e33e794bb9793be95699 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Remove documentation dependency from activeqt to qtscriptAndreas Buhr2020-12-021-1/+1
| | | | | | | | | QtScript is not maintained any more. This patch removes the dependency of the documentation from activeqt to qtscript. Change-Id: Ie1ec2b8191303fbc6ac44843e636d1c5532d5d28 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Port from devicePixelRatioF() to devicePixelRatio()Morten Johan Sørvig2020-11-091-1/+1
| | | | | Change-Id: Ic0a12db2e62e1e027f352a150ffd276bc0f84b56 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Fix warnings about deprecated QVariant::TypeFriedemann Kleint2020-10-308-129/+152
| | | | | Change-Id: I377e524edaf686d1a77e24f3dcb8f94476004b43 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependenciesFriedemann Kleint2020-10-304-4/+1
| | | | | | | Fix further deprecation warnings about Qt::AA_EnableHighDpiScaling. Change-Id: I145c41b0b009040059de8a39133edb3434059c72 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependenciesFriedemann Kleint2020-10-202-2/+2
| | | | | Change-Id: Ie4bec0ead0f7dc9c5124e560df82f1b95c0dccb9 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>
* Port the asyncExose setting to use the native interface of Qt 6Friedemann Kleint2020-09-081-6/+6
| | | | | | Task-number: QTBUG-83252 Change-Id: I0e30afd79c4d689e975798bbd1baf5e02ccc3dfe Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Remove explicit from parameter-less constructor of AxBaseFriedemann Kleint2020-09-071-1/+1
| | | | | | Task-number: QTBUG-86400 Change-Id: Iaf2c7824b983a98e6b3b2cef21058ac1a2f33b9e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix QMetaType/QVariant-related deprecationsFriedemann Kleint2020-09-076-81/+81
| | | | | | | | - 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>
* Bump dependency version and fix compile errorsFriedemann Kleint2020-09-077-14/+15
| | | | | | | | | | - Adapt to explicit constructor of QUuid - QString changes - Renamed Qt::MidButton to Qt::MiddleButton - QMetaType-related deprecations Change-Id: Icdea2b300c3f33bec3a4ad010ee3150a3b2156de Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* 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>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-261-0/+20
| | | | | | | | | | | | + 72215e4c7c6a42723b138ac97a603af011bd81d2 Compile with QT_NO_CAST_TO_ASCII + cddd08a9ed92aff9f86b0fde86cfac980bec52ea Fix deprecated/removed code + e9ee58208f5eea55e5225513f1403a27dbdd2d60 Print warning message when we can't get type information + 2535f7d0034c03500dd279e735f97941d4d051f4 Bump version Change-Id: I8bfe829629dd5e32b65641d79ff762298b33537a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 560c588e59b7788643307368816fa83b7b2cf3ee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump dependency version and fix compile errorsFriedemann Kleint2020-08-196-17/+23
| | | | | | | | - Adapt to QMetaType/QVariant changes - Adapt to QIODeviceBase Change-Id: I7cb6b9b0bbc68954c839c2026e3984fd7f913ef9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Print warning message when we can't get type informationVolker Hilsheimer2020-07-141-2/+5
| | | | | | | | Task-number: QTBUG-85467 Pick-to: 5.15 Change-Id: I47920180626ea3ecbda3ea8e59600bf2f653f7fe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 19:35:15 +0000