summaryrefslogtreecommitdiffstats
path: root/examples/activeqt
Commit message (Collapse)AuthorAgeFilesLines
* Use SPDX license identifiersLucie Gérard2022-06-1042-1828/+84
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: Ibdefc58cad3b83d0d117fc333de76ccb5177a621 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2e7234cc40b853c3e796556617b6bd05049fa192) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-221-17/+0
| | | | | | | | Amends 4d528a06c21811b Pick-to: 6.3 Change-Id: I938f857fe036fb84544f7ef26284fc714a71a613 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Port from container.count()/int to container.size()/qsizetypeMarc Mutz2022-03-162-2/+2
| | | | | | | | | | This change is driven by the deprecation of (some) container count() in favor of size(), so the int/qsizetype fixes are limited to the vicinity of count()/size() replacements. Pick-to: 6.3 Change-Id: If6606c9d4aec9bd1cf361efe8ffdf349ac031e79 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-02-0811-84/+31
| | | | | | | | | | | | | | | - Remove '# generated from ' comments - Only opt into CMAKE_AUTOUIC if .ui files are involved - Only opt into CMAKE_AUTORCC if .qrc files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - use REQUIRED COMPONENTS in find_package calls; sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: Ie1fec5e5429ef9022b4c892c5950d518cbd1b0b3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-151-9/+9
| | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: I87f7bd37874499bbc6eafeea32e4eef030184e0c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-2210-10/+10
| | | | | | | | | | | | | Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: I5d8b0e42bd149e5f88326baa4b1f28a5f37e4ec2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Disable server examples for MinGWFriedemann Kleint2021-07-301-12/+14
| | | | | | | | | | | It is missing the midl tool. The .pro file was incorrectly ported; its last line clear the variable. Pick-to: 6.2 Fixes: QTBUG-95406 Change-Id: I157b5c032e506b9481f1af1ed8153506b40cd79d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix type library UUID regexAlexey Edelev2021-07-281-1/+1
| | | | | | | | | | | | 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>
* CMake: Rename example conflicting with the one in qtmultimediaAlexandru Croitor2021-06-041-8/+6
| | | | | | Change-Id: Ie4ea514c351d593ae087081158e5cb328e9e19a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add support of the type library UUIDAlexey Edelev2021-05-101-7/+7
| | | | | | | | | | | | | | | 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>
* Update tests and examples to use the new '_axserver_' functionsAlexey Edelev2021-04-278-89/+32
| | | | | | | | | | 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>
* Re-generate the CMake project filesAlexey Edelev2021-03-1211-9/+66
| | | | | Change-Id: Icdfe81a51b626034bd86bf143eb1fe108603d148 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependenciesFriedemann Kleint2020-10-303-3/+0
| | | | | | | Fix further deprecation warnings about Qt::AA_EnableHighDpiScaling. Change-Id: I145c41b0b009040059de8a39133edb3434059c72 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-231-2/+2
| | | | | | Task-number: QTBUG-84469 Change-Id: I822b48d0f5568ad271b148a3e2058d59097f0154 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix deprecated/removed codeFriedemann Kleint2020-05-202-3/+3
| | | | | | | | | - 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-1211-0/+421
| | | | | | | | Port the 2 main libraries, examples and tests. Task-number: QTBUG-78167 Change-Id: I0d00c9fa352a96dcd0e1f42d52e6f15680abd9ed Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Restructure the librariesFriedemann Kleint2020-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | 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>
* Update dependenciesFriedemann Kleint2020-05-052-2/+2
| | | | | Change-Id: Ia1bf81c340a6168a9f93d5427e0f96a15c60718d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* OpenGL example: Polish a bitv5.15.0-beta3Friedemann Kleint2020-03-301-3/+6
| | | | | | | Remove ugly C-style cast and add Q_UNUSED(). Change-Id: Ia6ec8202ef2a5ad44a05c4f4bb68ed5936381f53 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* OpenGL example: Use double in GL functionsFriedemann Kleint2020-03-302-35/+27
| | | | | | | | This eliminates warnings about float truncation and increases readibility of the code. Change-Id: I9fcae5a556128a31a508613289772128a908a3bb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* OpenGL example: Port to QOpenGLWidgetFriedemann Kleint2020-03-305-14/+17
| | | | | Change-Id: I81b1b2b251a3ffca2f925d5d61f88ac71728ca2b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Reduce QList usageFriedemann Kleint2019-11-141-1/+2
| | | | | | | | 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>
* Remove the usage of deprecated QApplication::setColorSpec()Sona Kurazyan2019-08-221-1/+0
| | | | | | | | 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>
* Fix class structure and definitionsFriedemann Kleint2019-06-047-22/+20
| | | | | | | | | | - 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>
* Introduce nullptrFriedemann Kleint2019-06-042-2/+2
| | | | | | | Apply Fixits by Qt Creator with some amendments. Change-Id: Ia47cee2d55432ddc14635aa593c52d80ab39cc82 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Introduce member initializationFriedemann Kleint2019-06-042-7/+4
| | | | | | | | | | | 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>
* Stop using DISCARDABLE attribute for icon resourcesFredrik Orderud2019-02-267-7/+7
| | | | | | | | | | 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>
* Remove non-informative comment at the top of DEF filesFredrik Orderud2018-11-141-2/+0
| | | | | | | | 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>
* Doc: align the explanation with real codeLiang Qi2018-11-041-1/+1
| | | | | | Fixes: QTBUG-65661 Change-Id: I3f82bd3428c4a19f80864c376bda5d23b92c2896 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Fix outdated BSD license headerLiang Qi2017-11-301-2/+12
| | | | | Change-Id: I1508ff6c68dc9a2f7409fd4728f3493fe1cfb0a4 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Add ActiveQt Media Player exampleAndre de la Rocha2017-11-237-2/+507
| | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2030-443/+732
|\ | | | | | | | | | | | | | | Conflicts: examples/activeqt/webbrowser/main.cpp examples/activeqt/webbrowser/webaxwidget.h Change-Id: I80775f6d355a278880d7e6044390b67a6f6a893e
| * Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3032-495/+802
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie457478a64a28434afb3361dfc6f9478dd9c58bd
| | * Fix outdated BSD license headerKai Koehne2017-09-2932-32/+352
| | | | | | | | | | | | | | | | | | | | | Use new version with commercial exception. Change-Id: I20b377176e99b80db47f41596d20192ae7d5564f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Active Qt Examples: Brush up to C++ 11Andre de la Rocha2017-08-2321-463/+450
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Remove deprecated Web Browser example from ActiveQtAndre de la Rocha2017-11-0315-806/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-1/+1
|/ / | | | | | | | | Change-Id: Iaf72bd006af026255bc5cd1ecf14f187db1bcf52 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* / Port legacy Qt 3 <image> elements in .ui files to resourcesFriedemann Kleint2017-06-1410-31/+19
|/ | | | | Change-Id: I00033e7be4103e22d0b78b079ec4bd313cd813f2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-249-1/+220
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/activeqt/control/qaxserverbase.cpp Change-Id: Ic47ed12f7acf788b923571d1e3515ececd986a19
| * Added simpleqml project demonstrating QML in ActiveQtJørn Bersvendsen2016-09-229-1/+220
| | | | | | | | | | | | | | | | | | | | 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>
* | Remove foreachFriedemann Kleint2017-01-101-3/+3
|/ | | | | | | Use range based for. Change-Id: If91077be5bb13aa1447866c4243511db72d4f46c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-0/+0
|\ | | | | | | | | | | | | Conflicts: src/activeqt/container/qaxwidget.h Change-Id: Ic6e7267fc71e3ace14e75b392ad3f7cac0df41a1
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-221-0/+0
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-151-0/+3
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47
| * Doc: added missing brief statementNico Vertriest2016-01-211-0/+3
| | | | | | | | | | | | Change-Id: Ia23dede42f669034e6601b92d04876a3777bdc6e Task-number: QTBUG-50261 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-01-2710-50/+50
| | | | | | | | | | | | | | Updated FDL license. Change-Id: I033ad6208bb264292af9d2641cfa54c95d81e35b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Convert examples from QAXFACTORY_DEFAULT to Q_CLASSINFO.Fredrik Orderud2015-09-157-26/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix broken openglax by introducing QOpenGLFunctions_1_1.Fredrik Orderud2015-09-114-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add missing DEF files to relevant examples.Fredrik Orderud2015-09-076-0/+21
|/ | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-157-0/+19
|\ | | | | | | | | | | | | Conflicts: qtactiveqt.pro Change-Id: Ie6deaadc8cf69e111a0ae7ebef420b4f47e3b9a3
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 09:40:19 +0000