summaryrefslogtreecommitdiff
path: root/examples/activeqt
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Suppress registration of the server examples in CI builds.Friedemann Kleint2015-03-177-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix some qdoc warnings.Friedemann Kleint2015-03-241-1/+1
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1Frederik Gladhorn2015-03-032-4/+4
|\ \ | |/ | | | | Change-Id: Ifd323d19d2f8d9f58098f904fe44321327fa9bc8
| * Doc: corrections to solve autolink issuesNico Vertriest2015-02-232-4/+4
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: Ide165158a226beb731e9d300df57b142cf456d5d Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Fixed license file headersJani Heikkinen2015-02-1630-90/+90
| | | | | | | | | | Change-Id: Ifb2d18d57602260546cc8a29af221298442575ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1142-214/+214
| | | | | | | | | | | | | | | | | | 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-223-13/+13
| | | | | | | | | | Change-Id: I92c4df2ca8a75d6caafa1900db0730d2e0abaf07 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use Q_DECL_OVERRIDE where applicable.Friedemann Kleint2014-12-081-1/+1
| | | | | | | | | | | | Task-number: QTBUG-41130 Change-Id: I4951e2cc27d5652fd9802216511bbc3a4cdeb186 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.4' into devAlex Blasche2014-10-201-3/+2
|\ \ | |/ | | | | Change-Id: I9c2d50304f8f12e8e609929c90332ae405020b62
| * Do not use QVersionNumber in webbrowser example.Friedemann Kleint2014-10-151-3/+2
| | | | | | | | | | Change-Id: Ib7f269cc9a4841c9477c92e2cb906a052f6c5911 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-091-4/+18
|\ \ | |/ | | | | Change-Id: I1961b2fa015b4fc50b13379d357cb9be4af21631
| * Adapt web browser example to new web site.Friedemann Kleint2014-10-081-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | - Change URL to qt.io. - Save version number to settings and overwrite saved bookmarks unless version exists (enabling further updates depending on version). - Save geometry and make initial geometry large to accommodate qt.io and High DPI screens. Task-number: QTBUG-41798 Task-number: QTBUG-38858 Change-Id: I4da1d6e66135ff2867b6c678f5742767dbcb59fd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Remove remains of Windows CE and MSVC pre 2008.Friedemann Kleint2014-09-234-317/+1
|/ | | | | | | Task-number: QTBUG-41127 Task-number: QTBUG-41130 Change-Id: I0907e92c99ed8861227e90beca579baeb25a06b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Skip OpenGL 1.x example in dynamic GL buildsLaszlo Agocs2014-06-261-1/+1
| | | | | Change-Id: I06b98ef9dbabbcdddcd77d4fd6f4400e54d90b0c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Polish the webbrowser example.v5.3.0-beta1Friedemann Kleint2014-03-044-11/+216
| | | | | | | | | | Update address edit when the browser finishes loading. Add some rudimentary bookmark/history functionality. Add relevant default bookmarks and make qt-project.org the start page. Handle URLs passed on the command line. Change-Id: I21efeb5b4d2a05941407d308a96df7b024100f19 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix some typosSergio Ahumada2014-03-031-1/+1
| | | | | Change-Id: I662e9b8fe644571fc7216a96f1dacfdc274a0e4c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Webbrowser example: Fix crash due to deprecated code.v5.3.0-alpha1Friedemann Kleint2014-02-203-42/+7
| | | | | | | | | | | | | | | | The example uses a Qt Designer form with widgets on a QToolBar imported from Qt 3 which is not supported in Qt 4 and later. In the code generated by uic, a QLabel is constructed passing the toolbar as parent and added to the toolbar using QToolBar::addWidget() which then causes a crash in Qt 4. Move the widgets from the form into the class to avoid this. Task-number: QTBUG-36948 Change-Id: Ia4af871ce99faf555bebc6ebde19bcae0de4d29e Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-121-1/+1
|\ | | | | | | Change-Id: I5eed3f81fe220f82d1eba27d7e7a62803fea5e49
| * Doc: Fix typoRobert Loehning2014-01-231-1/+1
| | | | | | | | | | | | Change-Id: I4975f634da1b02e90e84f704583e5cabdf277e5a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Replace win32-g++ with mingw scopeKai Koehne2014-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: I36449cfa199db8bd25ffb0f7b384346cd74897d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | whitespace fixesOswald Buddenhagen2014-01-2022-202/+202
|/ | | | | | | 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-115-5/+5
| | | | | Change-Id: I427e1b98fd196686f44f3862167f90252e8d665e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Remove instructions for using qtdemo from examples READMETopi Reinio2013-04-161-33/+3
| | | | | | | | | The Qt Examples and Demos Launcher is not maintained anymore. Edit the README to mention Qt Creator as the way to find and launch examples. Task-number: QTBUG-28388 Change-Id: Ic907e2a430571a0f5b3dc1ff8582c3d296ef1682 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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: snippet issues with wrapper-demoNico Vertriest2013-03-051-2/+2
| | | | | | | | Adapted qdocconf + qdoc file to new folder structure Task-number: QTBUG-29101 Change-Id: Ifd8e379915bf0bf612e9211b93cc53636d156f94 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: corrected snippet issuesNico Vertriest2013-02-204-8/+8
| | | | | | | | | | | | | | 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-1042-42/+42
| | | | | | 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-176-6/+6
| | | | | | | qt is already added by spec_pre.prf. Change-Id: Id53efb418c1d545c4c90280f54b3824ae8261e49 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Added documentation for dumpcpp and dumpdoc toolsVenugopal Shivashankar2012-12-122-0/+2
| | | | | | | Moved from the qtdoc repo Change-Id: I05a84e0e3f4d2b08a1712da3cf8d9515e9987b74 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Edited Active Qt documentationJerome Pasion2012-12-1112-0/+1006
| | | | | | | | | | | -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-0310-33/+9
| | | | | | | 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-282-4/+4
| | | | | | | 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-289-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-5/+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>
* Fix building of installed examples.Friedemann Kleint2012-11-221-1/+1
| | | | | | Task-number: QTBUG-27977 Change-Id: I0a8e7698c9d8573a201cbb7394e0c4284983c732 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix build when Qt is configured with Angle supportv5.0.0-beta2Simon Hausmann2012-11-071-1/+1
| | | | | | | | | Don't try to compile the opengl example that relies on Desktop GL. Change-Id: I63e1087fdd0c581389dd848926c663d87e173eff Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2328-168/+168
| | | | | | | | | 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>
View Lorry Controller Status