summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Ensure versionless wrappers do not introduce a new variable scope"Craig Scott2021-09-062-8/+8
| | | | | | | | | | | | | This reverts commit d7cb318f41686f7a43f67d8af0b0539b9dd8f78c. Macros add another level of escaping that functions do not. The conversion of the versionless wrappers to macros may alter the behavior, so revert that change. Task-number: QTBUG-96219 Pick-to: 6.2 Change-Id: Ic0df7dc9f9fd2893ed14037ffa0cc4ab57aee4d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Doc: Remove unsupported customFiltersKai Köhne2021-09-031-4/+0
| | | | | | | | | | customFilters defined in .qdocconf are not supported anymore by Qt Assistant since Qt 5.13. Therefore remove them from all .qdocconf files, also to avoid cargo-culting them to new help modules. Task-number: QTBUG-95987 Change-Id: I811db83a83941cb965cbe26dbac123212cc7eb91 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Ensure versionless wrappers do not introduce a new variable scopeCraig Scott2021-09-012-8/+8
| | | | | | | | | | | | Using function instead of macro prevented the wrappers from being able to pass back any variables set by the wrapped function in the calling scope. Prefer macros to avoid future changes which might do this from silently swallowing such variable setting. Task-number: QTBUG-96121 Pick-to: 6.2 Change-Id: I77f924009b2eae41d89fdc09a2b72eece0937f09 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix type library UUID regexAlexey Edelev2021-07-281-3/+9
| | | | | | | | | | | | CMake doesn't support regex quantifiers, so need to multiply the number of hexadecimal numbers manually in UUID regex. Add missing LIBRARIES argument to qutlook example. Fixes: QTBUG-95407 Pick-to: 6.2 6.1 Change-Id: I3f3da1e29fe524ed7f03b3764de9139c4fc13a5b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Rename SKIP_AX_SERVER_REGISTRATION and QT_SKIP_AX_SERVER_REGISTRATIONAlexey Edelev2021-07-151-14/+14
| | | | | | | | | | | Rename SKIP_AX_SERVER_REGISTRATION argument and QT_SKIP_AX_SERVER_REGISTRATION variable to follow common naming covention. Pick-to: 6.2 Fixes: QTBUG-95184 Change-Id: I43c3c64bfae575903d48643ae7a9b4be99152693 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add missing version less variant of qt6_target_typelibsAlexey Edelev2021-07-021-0/+6
| | | | | | | | Pick-to: 6.1 6.2 Task-number: QTBUG-94581 Task-number: QTBUG-88763 Change-Id: I09d310d619f8e501c7676a1389d33557c3160984 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add the 'Private' suffix to the internal module namesAlexey Edelev2021-05-311-2/+2
| | | | | | | | Rename internal modules to adjust their name to the internal module policy. Change-Id: I4a50a5329462d743a90e7f6e6a0fd707a3497ad4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix compile error due to redefinition of NOMINMAX (MinGW)Friedemann Kleint2021-05-212-2/+6
| | | | | | | | | | | Amends qtactiveqt/81139fb65dd2dd2713029c0fea3b42d0c7bbad79 . Pick-to: 6.1 Fixes: QTBUG-93944 Change-Id: I687d95659fbcbd38df38976fae98c2a9c615c4a6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Use genex to detect .rc filesAlexey Edelev2021-05-171-38/+12
| | | | | | | | This approach makes possible to avoid a DEFER CALL usage to link the generated .tlb file to the ActiveX server. Change-Id: If74c7b96a9902fa68eff83503691faa4bf730b0b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add support of the type library UUIDAlexey Edelev2021-05-101-9/+25
| | | | | | | | | | | | | | | dumpcpp supports generating of the sources using the type library UUID. Add syntax that provides this functionality to the qt6_target_typelibs users. Modify the qutlook library to use the new syntax. Amends da3a24c06541b63011a3af91fbae9f9d2ec28912. Pick-to: 6.1 Fixes: QTBUG-93446 Change-Id: Ic0b657bd39f57d32c3d404bee395f4f375a6d7f8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Use qt_internal_wrap_tool_command to safely pass environment for idcAlexey Edelev2021-05-041-7/+12
| | | | | Change-Id: I3994594b64869d24a1eb24c3c5cbcbe9fba6e5ac Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Implement CMake functions to work with IDCAlexey Edelev2021-04-274-3/+124
| | | | | | | | | | | | | | | | | | | In qmake we have an implicit execution of IDC in case the axserver config is enabled. This quite difficult to implement using CMake. This adds the following CMake functions to work with IDC: - The qt6_add_axserver_executable function adds axserver executable, generates IDL file and link the produced .tbl to the executable. - The qt6_add_axserver_library function adds axserver library, generates IDL file and link the produced .tbl to the dll. - The qt6_target_idl generates IDL file and link the produced .tbl to the executable for the existing target. This also introduces the QT_SKIP_AX_SERVER_REGISTRATION variable, which disables global registration of ActiveX servers. Change-Id: I5695db9d67dac07747894fd4bb37c3e6db408035 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Doc: Fix documentation warningsTopi Reinio2021-04-166-3/+8
| | | | | | | | | | | * Add a dependency to QtCore for the documentation target; required to pull in Qt-specific include paths for QDoc * Fix minor issues, mostly linking to items Pick-to: 6.1 Task-number: QTBUG-91875 Change-Id: Ia99c4e417af15da4e8ac66d14d07f23e83690088 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Remove QMake project filesAlexey Edelev2021-04-129-147/+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>
* Document the qaxserver_no_register configurationFriedemann Kleint2021-04-061-1/+3
| | | | | | | | Pick-to: 6.1 5.15 Fixes: QTBUG-92237 Change-Id: I9b93e557b67f8bd1ac2a5ea34ebb3f4c375b7f9e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Add qt6_target_typelibs functionAlexey Edelev2021-03-231-0/+72
| | | | | | | | | | | | | qt6_target_typelibs should replace the qmake functionality associated with the TYPELIBS variable. This function adds custom call of the dumpcpp program to generate typelib-related sources and adds the sources to the target. Pick-to: 6.1 Task-number: QTBUG-78167 Change-Id: I7b61a2b1804162e723e862945a9650a00776e678 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Enable documentation build on non-Windows platformsTopi Reinio2021-03-151-0/+4
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-91743 Change-Id: I278397bf26b8e11076530cb341420f72bda8a435 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Re-generate the CMake project filesAlexey Edelev2021-03-126-6/+25
| | | | | Change-Id: Icdfe81a51b626034bd86bf143eb1fe108603d148 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix API review findingFriedemann Kleint2021-02-232-1/+3
| | | | | | | | Move QAxObjectInterface::~QAxObjectInterface() to a source file. Pick-to: 6.1 Change-Id: I5b83fad9fe1c7571e1dcea5f0cb01b2fc95c3d31 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix access to Q*ApplicationPrivate APIsOliver Wolff2021-02-191-3/+4
| | | | | | | | | | | A change in qtbase removed the friend declaration of QClassFactory in QCoreApplication. We can avoid the need for this declaration by accessing the functionality differently. Pick-to: 6.1 Change-Id: Ia2bd7d9ee8dc8eff4e3a9afba9cf889dc27ddfb4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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 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-306-120/+143
| | | | | Change-Id: I377e524edaf686d1a77e24f3dcb8f94476004b43 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependenciesFriedemann Kleint2020-10-201-1/+1
| | | | | Change-Id: Ie4bec0ead0f7dc9c5124e560df82f1b95c0dccb9 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-075-74/+74
| | | | | | | | - 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-076-13/+14
| | | | | | | | | | - 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>
* Bump dependency version and fix compile errorsFriedemann Kleint2020-08-194-15/+21
| | | | | | | | - 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-242-5/+5
| | | | | | | | 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-235-15/+15
| | | | | | Task-number: QTBUG-84469 Change-Id: I822b48d0f5568ad271b148a3e2058d59097f0154 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove winrtOliver Wolff2020-06-175-4/+26
| | | | | | | 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-122-10/+2
| | | | | | 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>
* 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-2812-307/+626
| | | | | | | | | | | | | 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-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-127-0/+160
| | | | | | | | Port the 2 main libraries, examples and tests. Task-number: QTBUG-78167 Change-Id: I0d00c9fa352a96dcd0e1f42d52e6f15680abd9ed Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 22:38:06 +0000