| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
Amends qtactiveqt/81139fb65dd2dd2713029c0fea3b42d0c7bbad79 .
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>
(cherry picked from commit bd8ea10cf6bb4532931fd733cbf35a5c33fb6189)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Fixes: QTBUG-93446
Change-Id: Ic0b657bd39f57d32c3d404bee395f4f375a6d7f8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 1acbc29ef950369a67256221d10867a32282412c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
Task-number: QTBUG-91875
Change-Id: Ia99c4e417af15da4e8ac66d14d07f23e83690088
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit ff72ae1903e9b303e7fdc9572ae829be9f3af9e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Remove the .pro/.pri project files and the associated
.prev_CMakeLists.txt files.
Task-number: QTBUG-78167
Change-Id: I8dea2d3efccf8bae6a4b41779dccfaf5f9f83222
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4d528a06c21811b9ac6dbb8ecde23c2537c4c567)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-92237
Change-Id: I9b93e557b67f8bd1ac2a5ea34ebb3f4c375b7f9e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 363068f57525e808aa20cb8dbcffdc13f6712df1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Task-number: QTBUG-78167
Change-Id: I7b61a2b1804162e723e862945a9650a00776e678
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit b8935eca5625be034632200adcccf18a398f67a2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-91743
Change-Id: I278397bf26b8e11076530cb341420f72bda8a435
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 03de877ae8e9da3b2d7b06268a5a2c1156ee50ee)
|
|
|
|
|
|
|
| |
Change-Id: Icdfe81a51b626034bd86bf143eb1fe108603d148
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit da3a24c06541b63011a3af91fbae9f9d2ec28912)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
Move QAxObjectInterface::~QAxObjectInterface() to a source file.
Change-Id: I5b83fad9fe1c7571e1dcea5f0cb01b2fc95c3d31
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 741dfc6966c3d08a9c8bca4c7d38c723e07f4999)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Change-Id: Ia2bd7d9ee8dc8eff4e3a9afba9cf889dc27ddfb4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 5fdef054da6ca3cf99b9c455dcf7fc870e3b242c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ic0a12db2e62e1e027f352a150ffd276bc0f84b56
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|
|
|
|
| |
Change-Id: I377e524edaf686d1a77e24f3dcb8f94476004b43
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
| |
Change-Id: Ie4bec0ead0f7dc9c5124e560df82f1b95c0dccb9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-83252
Change-Id: I0e30afd79c4d689e975798bbd1baf5e02ccc3dfe
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-86400
Change-Id: Iaf2c7824b983a98e6b3b2cef21058ac1a2f33b9e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
| |
- Adapt to QMetaType/QVariant changes
- Adapt to QIODeviceBase
Change-Id: I7cb6b9b0bbc68954c839c2026e3984fd7f913ef9
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I3c8395c9bc171af69513a8ca471709d44be051ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QTBUG-85179
Change-Id: Icd4843315da79643921479a68c7bd83acd57cc3f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QTBUG-84469
Change-Id: I822b48d0f5568ad271b148a3e2058d59097f0154
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-84434
Change-Id: I0a7628ac33971154244d3ddfe824889795aea06c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
| |
Change-Id: I8ebce5c3f49dd07e6de2aa847625a3c5f677c756
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-84319
Change-Id: I450272cf93e9b886c27176622c305af41ca7a035
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Streamline code, fix indentation errors.
Change-Id: I7f16ac912bb5ec7d6f25f11cd2e1ae81a0db2196
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ic594816a6b8943130e53ebbe9969e187df7bf924
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
| |
Port the 2 main libraries, examples and tests.
Task-number: QTBUG-78167
Change-Id: I0d00c9fa352a96dcd0e1f42d52e6f15680abd9ed
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Pick-to: 5.15
Task-number: QTBUG-78167
Change-Id: I628df5c4db8b072fa34a14890b031429b550b51a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-78167
Change-Id: I23270018ce8c6c66eeb8aa631147ae7b468088fe
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: I2910828c915f0a48069f161c1e7feeeac0f1faff
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: I6a3266cb21f30206ecb991fb1dc99e25f9a91259
|