| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
It is missing the midl tool. The .pro file was incorrectly ported;
its last line clear the variable.
Fixes: QTBUG-95406
Change-Id: I157b5c032e506b9481f1af1ed8153506b40cd79d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit b7e91572aacfbba55c50a786caedafac1a1f139c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Change-Id: I3f3da1e29fe524ed7f03b3764de9139c4fc13a5b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 934bb86f9bb6c8f36e87097c8d74effc13e08f10)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
| |
Change-Id: Ie4ea514c351d593ae087081158e5cb328e9e19a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_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.
Pick-to: 6.1
Fixes: QTBUG-93446
Change-Id: Ic0b657bd39f57d32c3d404bee395f4f375a6d7f8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Use the new '_axserver_' function in tests and examples associated to
creating of the ActiveX sever.
Squash find_package calls.
Change-Id: Iacdba7b673ae9cfcc7d9e1ff82d0884e330166ab
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
| |
Change-Id: Icdfe81a51b626034bd86bf143eb1fe108603d148
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
| |
Fix further deprecation warnings about Qt::AA_EnableHighDpiScaling.
Change-Id: I145c41b0b009040059de8a39133edb3434059c72
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-84469
Change-Id: I822b48d0f5568ad271b148a3e2058d59097f0154
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>
|
|
|
|
|
| |
Change-Id: Ia1bf81c340a6168a9f93d5427e0f96a15c60718d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
| |
Remove ugly C-style cast and add Q_UNUSED().
Change-Id: Ia6ec8202ef2a5ad44a05c4f4bb68ed5936381f53
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
| |
This eliminates warnings about float truncation and increases
readibility of the code.
Change-Id: I9fcae5a556128a31a508613289772128a908a3bb
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
| |
Change-Id: I81b1b2b251a3ffca2f925d5d61f88ac71728ca2b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
| |
Prepare for migration to Qt 6 by using QVector where possible.
Otherwise, use auto or typedefs like QVariantList.
Change-Id: I6d385efe1a45a0519cf4bb06a1f6d1ea869e890e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
| |
This method has been deprecated and does not have any effect.
Task-number: QTBUG-76491
Change-Id: I001718cc48a2d8ba5caf81a66511814d2ff87ba4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
- Add override
- Use "= default" for trivial constructors/destructors
- Q_DISABLE_COPY_MOVE to delete move constructors and assignment
Change-Id: If773ad8c092ab8000b268c4231f7f27e5f484e56
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
| |
Apply Fixits by Qt Creator with some amendments.
Change-Id: Ia47cee2d55432ddc14635aa593c52d80ab39cc82
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Fix warnings emitted by clang, use default constructors where
applicable.
Remove some unused members.
Change-Id: I287ffa4d884be253ec5272e4266a1645376e7235
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The DISCARDABLE attribute is only supported on 16bit Windows, and is ignored for 32 &
64bit applications. Usage can therefore be removed to simplify the sample code.
Microsoft doc: https://docs.microsoft.com/en-us/windows/desktop/menurc/common-resource-attributes
Change-Id: Ib84217a79cb726b6c1355107e6b254033de515fe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
| |
Also, convert tabs to spaces. Done to simplify and make all DEF files within this repo
identical.
Change-Id: I9c97da9c09686ab6bd761722e08e856dfffe3b1e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
| |
Fixes: QTBUG-65661
Change-Id: I3f82bd3428c4a19f80864c376bda5d23b92c2896
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
|
|
|
|
| |
Change-Id: I1508ff6c68dc9a2f7409fd4728f3493fe1cfb0a4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Media Player example uses the Microsoft Media Player ActiveX
control to implement a functional media player application.
This example demonstrates how a Qt application can communicate with
embedded ActiveX controls using signals, slots and the dynamicCall()
function.
Task-number: QTBUG-60636
Change-Id: Ie2f65d3d8796076b2c18d5fa561b709035a53e79
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/activeqt/webbrowser/main.cpp
examples/activeqt/webbrowser/webaxwidget.h
Change-Id: I80775f6d355a278880d7e6044390b67a6f6a893e
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Ie457478a64a28434afb3361dfc6f9478dd9c58bd
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use new version with commercial exception.
Change-Id: I20b377176e99b80db47f41596d20192ae7d5564f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use nullptr, member initialization, new connect syntax, QStringLiteral, etc.
Change-Id: Ia79473ca302216f91eec6a32f670cf606761ed0d
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Web Browser example is obsolete, since it demonstrates embedding
the long-deprecated Internet Explorer control, which is unable to
display any modern web site, including qt.io.
Task-number: QTBUG-60636
Change-Id: I63f3c25474fb202740a4c067d74f921d2d8dd2cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|/ /
| |
| |
| |
| | |
Change-Id: Iaf72bd006af026255bc5cd1ecf14f187db1bcf52
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|/
|
|
|
| |
Change-Id: I00033e7be4103e22d0b78b079ec4bd313cd813f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/activeqt/control/qaxserverbase.cpp
Change-Id: Ic47ed12f7acf788b923571d1e3515ececd986a19
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added a new ActiveQt example application. The application demonstrates
the use of QML inside an ActiveQt control, running in-process.
Change-Id: I47582cf7eda665ef70f8feccdb6ed1f9e126ab30
Reviewed-by: Fredrik Orderud <forderud@gmail.com>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|/
|
|
|
|
|
| |
Use range based for.
Change-Id: If91077be5bb13aa1447866c4243511db72d4f46c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/activeqt/container/qaxwidget.h
Change-Id: Ic6e7267fc71e3ace14e75b392ad3f7cac0df41a1
|
| |
| |
| |
| |
| |
| |
| |
| | |
Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce -force
Change-Id: I4e19b57a70a1618d1a4d8d3e5cf1bf2394e8eee8
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ia23dede42f669034e6601b92d04876a3777bdc6e
Task-number: QTBUG-50261
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| | |
Updated FDL license.
Change-Id: I033ad6208bb264292af9d2641cfa54c95d81e35b
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Move class ID, interface ID and events ID COM metadata into C++
classes with Q_CLASSINFO for improved readability and
maintainability.
QAXFACTORY_DEFAULT is still documented with an example as part
of the QAxFactory class documentation. Also, it is still used in
the "testcon" ActiveX test container.
Change-Id: I48f5502809081804dc86f1d6b862da281c4cc441
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The openglax example relies on deprecated OpenGL 1.1 functions
that are no longer present in OpenGL ES 2. This leads to a
missing symbols linker error. The problem is fixed by inheriting
from QOpenGLFunctions_1_1 that provides implementations of the
missing OpenGL functions.
The GLBox destructor is also hardened with selective delete to
avoid crashing if initializeGL is not called (occurs when
dumping IDL).
Change-Id: If35539749ab76293f98a5d75944f0f393f4d2a3c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
|
|
| |
DEF files are required to enable symbol export when building
ActiveX controls as in-process DLLs. This makes the menus,
opengl and simple examples compatible with being built as DLLs by
just changing the project template from "app" to "lib".
Change-Id: I6702736505cd143aad9fa939620ce03a52cec6cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
qtactiveqt.pro
Change-Id: Ie6deaadc8cf69e111a0ae7ebef420b4f47e3b9a3
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It does not make sense to register the server examples on the CI
since the registration step is slow and bound to fail if for example
the QPA plugin fails to load in headless environments.
Detect the CI environment by checking on the environment variable
JENKINS_HOME and turn off the axserver post link step accordingly.
Change-Id: I59e8170f071504ee2b141b8a38b594d5bac734c6
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
qtactiveqt/src/activeqt/control/qaxfactory.cpp:540: warning: Can't link to 'QAxFactory::QAXCLASS()'
qtactiveqt/examples/activeqt/comapp/doc/src/comapp.qdoc:28: warning: Can't link to 'QApplication::quit()'
Change-Id: I900d29cfb0d25352357385a77ff6198b31dc7a95
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
|
|\|
| |
| |
| | |
Change-Id: Ifd323d19d2f8d9f58098f904fe44321327fa9bc8
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-43810
Change-Id: Ide165158a226beb731e9d300df57b142cf456d5d
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ifb2d18d57602260546cc8a29af221298442575ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I2febb46d711c51eeb08f13418a4fc15ab0502f1a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|