Remove implementation details from the public header. Use lambdas
to replace the one-liner private slots.
Change-Id: I1a55af6bf9e67025e656ff90545887998395d9f9
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
Make sure it gets emitted in case of syntax errors. Details are engine
specific anyway, but from testing we get errorCode 0 with both JS and
VB script engines.
Change-Id: I820aa14ed454fb641b3c4ca03b8a08874b0ca769
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
The conan experiment has ended, and the file is only bitrotting
nowadays.
Pick-to: 6.5 6.6
Change-Id: Iaa6a64f95e174048e74a13d09cbea8cc99b398e4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
We now add NOMINMAX to PlatformCommonInternal target which will be
linked to everything else, so min/max will not be defined upon the
inclusion of `windows.h`, or other headers.
Pick-to: 6.5 6.6
Change-Id: I2d8618f1f73e7edde941b21fad1a8528c998106b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The function sets the required CMake variables and policies.
Pick-to: 6.5
Task-number: QTBUG-112685
Change-Id: Ib2398f46802f34631c129aa2c5c66338f7f02291
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Q_ENUMS() and Q_FLAGS() are deprecated in favor of Q_ENUM() and
Q_FLAG().
Pick-to: 6.5
Task-number: QTBUG-113229
Change-Id: I715f0eded2fbd62611b381e560f7f6548f797d45
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
We should not have examples that are specific to opengl on Windows.
In order to keep the use case's code in source, the example was moved to
tests/manual.
Pick-to: 6.5
Change-Id: Ie55aea777c449913e66279728c53f08c4105b66c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
The functionality of providing multiple ActiveX controls in a single
process server should be covered in a documentation snippet.
In order to keep the use case's code in source, the example was moved to
tests/manual.
Pick-to: 6.5
Change-Id: I2633637e8202aadc7798ba5816a61ec1743f0b03
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Showing the usage of QMenuBar and QStatusBar in a QMainWindow can be
merged into another if needed.
In order to keep the use case's code in source, the example was moved to
tests/manual.
Pick-to: 6.5
Change-Id: I76ec12e9c83a42028f2de95ab17ca07544b53425
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Embedding the media player looks really outdated so it shouldn't be
promoted inside an example.
In order to keep the use case's code in source, the example was moved to
tests/manual.
Pick-to: 6.5
Change-Id: I54b23e1a5e4d7b0910ce238ff2fefb14da540739
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Functionality is also covered in other examples so that hierarchy is no
longer needed.
In order to keep the use case's code in source, the example was moved to
tests/manual.
Pick-to: 6.5
Change-Id: I6b3e46d402877b93cfa4dc555328e1e115ec4fc6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
After b83de5f9a43b094bbb77b3aeea77983ea508a2b0 in qtbase, moc
generates complete type information for enum types. ActiveQt declares
enums from type libraries (i.e. on namespace level) also in the
metaobject of each generated class (as we can't inherit the namespace
meta object from each QAxObject class). But those enum types don't
really exist on C++ level. So moc generates incorrectly qualified
enum types.
Augment the post-processing code to detect whether a type that is
actually in the namespace is used as if it was in the class, and
replace the qualifier.
Bump the metaobject revision.
Change-Id: I4d28abaa47a5fa3db70737d006b8e1becf8a51e3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
It takes the name of the function, not of the script name so use the
scriptForFunction helper to find the QAxScript object that provides
access to the function.
The previous code implies that this should work for both function names
and for full function prototypes, so implement that correctly and
without allocating too many unnecessary temporary objects.
Update the test that is now passing to cover all scenarios.
Pick-to: 6.5
Change-Id: I939942cc805a56212d70b1a12b95aaa4b2f64d59
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
That framework has not aged well, add more tests to avoid regressions,
and to document the complete failure of QAxScriptManager::call to say
what it is expected to do.
Pick-to: 6.5
Change-Id: I20acb3eba3f439d2608ec930d9e90b44a83ef980
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Qt knows about QVariant as a built-in meta type, QMetaType::QVariant. It
is no longer mapped to user type. COM objects expect that untyped out-
parameters, which are mapped to QVariant& by ActiveQt, are passed in as
VT_VARIANT|VT_BYREF.
Update our variant-conversion logic accordingly. If the typeName, which
comes from the generated function signature, is "QVariant", then
QMetaType::fromName(typeName) will always be QMetaType::QVariant, and
had to be passed as VT_VARIANT.
Fix the logic for deciding whether we have to write back the out-
parameters so that it works when QAxScript::call is used. We need to
write back no matter whether it's a property or a getter, so check
whether any bit is set, not if both are set.
Add some test for this. Not cherry-picking this further back, the
auto-test coverage of ActiveQt is not good enough to make sure that we
don't break any subtle usecases in e.g. QAxServer, and the usage of
QAxScript does not seem to be very wide.
Fixes: QTBUG-111718
Pick-to: 6.5
Change-Id: I239f71c3637ea9f32dff5123a8ada96e0a894371
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Qt Submodule Update Bot
Volker Hilsheimer
Jani Heikkinen
Tor Arne Vestbø
Amir Masoud Abdol
Alexey Edelev
Topi Reinio
Safiyyah Moosa
Oliver Wolff