To build the documentation the module build needs to be skipped
because the noop build would result in premature agent exit.
Pick-to: 6.1
Change-Id: Ib990c696b6ac0616d9008bbb1219ca05ddbdd92f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Documentation is build on Ubuntu in Coin so we cannot completely
skip the module on other platforms.
This reverts commit 1099b093dc.
Pick-to: 6.1
Change-Id: Ibe34ac8592c3b5f8eb275386221310eee7a9fcd5
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
And at same time update dependencies as well
Task-number: QTBUG-90420
Change-Id: I328c43a6d32287d935bea035bfd4571a64d77581
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Support building with Conan against Qt6 base binary package.
The build recipe expects to locate QT_PATH from env.
The 'qt-cmake(.bat)' is used for the build.
'CMAKE_TOOLCHAIN_FILE' is used to pick the toolchain
file for cross compilations.
Fixes: QTBUG-90421
Change-Id: I82522898332ac1f71d297a28e6a99644b219489c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
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>
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>
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>
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>
- 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>
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>
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>
Toni Saario
Oliver Wolff
Jani Heikkinen
Friedemann Kleint
Qt Submodule Update Bot
Andreas Buhr
Morten Johan Sørvig
Antti Kokko
Volker Hilsheimer
Lars Schmertmann
Nico Vertriest
Jarek Kobus
Karsten Heimrich