summaryrefslogtreecommitdiffstats
path: root/examples/activeqt/multiple
Commit message (Collapse)AuthorAgeFilesLines
* examples: Remove multiple examplesOliver Wolff2023-04-0610-263/+0
| | | | | | | | | | | | | 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. Change-Id: I2633637e8202aadc7798ba5816a61ec1743f0b03 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1bad3a86dcdc6c168090f17e93c86490d601d4f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-231-1/+1
| | | | | | | Task-number: QTBUG-105718 Change-Id: I7cf0f0a98984e5ec6c1edb30f6ba979305c344f4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-071-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I07739807abcf7d8f305bb17cfdc6edefba49a2b1 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-104-173/+8
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: Ibdefc58cad3b83d0d117fc333de76ccb5177a621 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-02-081-8/+3
| | | | | | | | | | | | | | | - 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>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-221-1/+1
| | | | | | | | | | | | | 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>
* Update tests and examples to use the new '_axserver_' functionsAlexey Edelev2021-04-271-10/+4
| | | | | | | | | | 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-121-1/+5
| | | | | Change-Id: Icdfe81a51b626034bd86bf143eb1fe108603d148 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Initial port to cmakeFriedemann Kleint2020-05-121-0/+39
| | | | | | | | Port the 2 main libraries, examples and tests. Task-number: QTBUG-78167 Change-Id: I0d00c9fa352a96dcd0e1f42d52e6f15680abd9ed Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix class structure and definitionsFriedemann Kleint2019-06-042-2/+2
| | | | | | | | | | - 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 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-261-1/+1
| | | | | | | | | | 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>
* Fix outdated BSD license headerKai Koehne2017-09-293-3/+33
| | | | | | | 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-232-19/+21
| | | | | | | | 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>
* Unify license header usageAntti Kokko2016-01-271-5/+5
| | | | | | | Updated FDL license. Change-Id: I033ad6208bb264292af9d2641cfa54c95d81e35b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-151-0/+2
|\ | | | | | | | | | | | | Conflicts: qtactiveqt.pro Change-Id: Ie6deaadc8cf69e111a0ae7ebef420b4f47e3b9a3
| * Suppress registration of the server examples in CI builds.Friedemann Kleint2015-03-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fixed license file headersJani Heikkinen2015-02-163-9/+9
| | | | | | | | | | Change-Id: Ifb2d18d57602260546cc8a29af221298442575ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-115-23/+23
|/ | | | | | | | | 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>
* whitespace fixesOswald Buddenhagen2014-01-203-21/+21
| | | | | | | expand tabs, fix indentation, remove trailing whitespace. Change-Id: Ibec1bbad9e8faff81671ce9d1c7bb4fb9b340bb9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: several snippet issues in multiple.qdocNico Vertriest2013-03-151-2/+2
| | | | | | | | | | | | | - added path to qdocinc file in qtactiveqt.qdocconf - removed unnecessary snippet label from multiple-demo.qdocinc - modified path to qdocinc file - removed reference to directory name, input statement now only specifying file name multiple-demo.qdocinc Task-number: QTBUG-29101 Change-Id: Icc957907cfcbab97a01ffec07819f667961644b8 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: corrected snippet issuesNico Vertriest2013-02-201-1/+1
| | | | | | | | | | | | | | In multiple.qdoc: replace \snippet with \input Replaced statement "snippet" with "input" Replaced "*;" with "*\" Replaced raw-endraw with code-endcode Replaced "raw" with "code" Put code-endcode around numbered paragraphs Resolved conflict in simple-demo.qdocinc Task-number: QTBUG-29101 Change-Id: Idceb971d56551bf9e8bdce410360d418747731fe Reviewed-by: Martin Smith <martin.smith@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-105-5/+5
| | | | | | Change-Id: Ia19cb01ac9f0c5e3863e684d2f701ac424ba64f4 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove some unnecessary CONFIG additionsv5.0.0Oswald Buddenhagen2012-12-171-1/+1
| | | | | | | qt is already added by spec_pre.prf. Change-Id: Id53efb418c1d545c4c90280f54b3824ae8261e49 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Edited Active Qt documentationJerome Pasion2012-12-111-0/+70
| | | | | | | | | | | -fixed snippets, examples -left demos alone. Don't know if they were working. -updated landing page -added QAxContainer and QAxServer module pages Task-number: QTBUG-28042 Change-Id: Ic446680319fa9cc0e917cebdb30d6a246026ac20 Reviewed-by: hjk <qthjk@ovi.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-031-3/+1
| | | | | | | follow respective change in qtbase Change-Id: I6bbcefcad264191dac51d52cd335de776ae3bfe5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Change copyright information from Nokia to DigiaSergio Ahumada2012-11-281-2/+2
| | | | | | | Task-number: QTBUG-28156 Change-Id: I3b33ee0a574b7ec5c4f192a40877bf0141ff2df1 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix activeqt module structureJoerg Bornemann2012-11-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The formerly monolithic ActiveQt module has been split into three modules: axserver A static library for creating a server project. axcontainer A static libary for creating a container project. axbase A static library with shared code for the latter two libraries. This module also is responsible for the installation of header files in the include/ActiveQt directory. "CONFIG += qaxserver" has been deprecated. Use "QT += axserver" instead. "CONFIG += qaxcontainer" has been deprecated. Use "QT += axcontainer" instead. Code from qaxtypes.cpp that does not depend on the QAX_SERVER define has been moved to qaxtypefunctions.cpp and resides in the axbase module. Task-number: QTBUG-27776 Change-Id: Ib39fc897ccfce16849be0e3c084817d2cd0fc926 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Remove obsolete QT_DLL and QT_NODLL usageMiikka Heikkinen2012-11-261-2/+0
| | | | | | | | | | | | These defines are old compatiblity defines and are no longer supposed to be used. Usage in examples doesn't do anything currently, so removed it entirely. Task-number: QTBUG-28181 Change-Id: I98db88e3ef9f98c70132cea986127ed883dd8503 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-233-18/+18
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I4060147644d7ca34ccff71b3deb30e242b611dab Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix installation of ActiveQt examplesv5.0.0-beta1Miikka Heikkinen2012-08-224-3/+9
| | | | | | | | | | | Active Qt examples cannot have dependencies to sources because not all installations have sources available. Each example that needs them now has its own copy of .rc, .def, and .ico files to make them self-contained. Task-number: QTBUG-26848 Change-Id: I1ce919dd393ff372ef12c5db268f9f08022fa3f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* ActiveQt: Fix example installs.Friedemann Kleint2012-07-111-1/+1
| | | | | Change-Id: I735f35a0a41f8a8e034acc7b45840cea38b92b7b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-303-3/+3
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I82638e41d9adc9180fef26a5548f775399afafb2 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-203-3/+3
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I63ca8dd2d86ed3428448556a02a19004f662402a Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-064-4/+4
| | | | | | Change-Id: I2bab6c14208911188d66eeab71ee6b2707355483 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix compilation after refactor merge.Friedemann Kleint2011-10-041-0/+2
| | | | | | | | | Comment out Some functionality for the moment. Change-Id: Ia7d1d3ba982e97776ae7259be06689b5477450a1 Reviewed-on: http://codereview.qt-project.org/5972 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Changed references to ActiveQt resources.axis2011-04-271-1/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-276-0/+288
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 23:54:02 +0000