summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
* Fix qutlook compilation.Miikka Heikkinen2012-09-121-2/+2
| | | | | | | QAbstractItemModel::reset() has been deprecated and causes build error. Change-Id: I4b08c8e5e6a9210832314b8917ce1c9625d727a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix installation of ActiveQt examplesv5.0.0-beta1Miikka Heikkinen2012-08-2221-15/+43
| | | | | | | | | | | 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-113-3/+3
| | | | | Change-Id: I735f35a0a41f8a8e034acc7b45840cea38b92b7b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* ActiveQt: Bring back the webbrowser example.Friedemann Kleint2012-06-282-3/+1
| | | | | | | Build the example in shared configurations. Change-Id: Iec7df96084ca9a1db0b3e86d1e03177869e12735 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3028-28/+28
| | | | | | | | | | | 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-2028-28/+28
| | | | | | | | 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-0630-30/+30
| | | | | | 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-0411-3/+14
| | | | | | | | | 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-276-7/+7
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2765-0/+5007
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-21 15:06:04 +0000