summaryrefslogtreecommitdiff
path: root/examples/activeqt/simple
Commit message (Collapse)AuthorAgeFilesLines
* Added simpleqml project demonstrating QML in ActiveQtJørn Bersvendsen2016-09-221-1/+1
| | | | | | | | | | 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>
* 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-271-5/+5
| | | | | | | | | | | | | | 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-152-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add missing DEF files to relevant examples.Fredrik Orderud2015-09-072-0/+7
|/ | | | | | | | | | | 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-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-161-3/+3
| | | | | | | | | | Change-Id: Ifb2d18d57602260546cc8a29af221298442575ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-112-11/+11
| | | | | | | | | | | | | | | | | | 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>
* | Use Qt 5 signals & slots syntax.Friedemann Kleint2014-12-221-2/+2
|/ | | | | Change-Id: I92c4df2ca8a75d6caafa1900db0730d2e0abaf07 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* whitespace fixesOswald Buddenhagen2014-01-202-37/+37
| | | | | | | expand tabs, fix indentation, remove trailing whitespace. Change-Id: Ibec1bbad9e8faff81671ce9d1c7bb4fb9b340bb9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Documentation: Remove references to Nokia and obsolete QSA-product.Friedemann Kleint2013-07-111-1/+1
| | | | | Change-Id: I427e1b98fd196686f44f3862167f90252e8d665e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: corrected snippet issuesNico Vertriest2013-02-201-4/+4
| | | | | | | | | | | | | | 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-102-2/+2
| | | | | | 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/+116
| | | | | | | | | | | -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>
* 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>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-6/+6
| | | | | | | | | 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-223-2/+5
| | | | | | | | | | | 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>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | | 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-201-1/+1
| | | | | | | | 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-061-1/+1
| | | | | | 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/+1
| | | | | | | | | 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-273-0/+160
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
View Lorry Controller Status