summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* disable tools that don't make sense on iOS more sensiblyv5.12.0-alpha1Oswald Buddenhagen2018-09-111-4/+5
| | | | | | | | | | | the primary method of doing that is via the -nomake tools machanism, which is the default when cross-building. amends 78df61b51. Fixes: QTBUG-70454 Change-Id: I837d5d130c1295154dab5d0424da46dacbfe2a34 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Disable tools that don't make sense on iOSTor Arne Vestbø2018-08-271-1/+4
| | | | | | | | | Until we can build hosts tools (or tools that only make sense to run on the host/development platform, not the target), that have GUI dependencies, we have to exclude the tools completely. Change-Id: If12c5b4bd47a6456f7ae2779a62cca430cf15c3c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge qcollectiongenerator into qhelpgenerator toolJarek Kobus2018-07-261-2/+2
| | | | | Change-Id: I3c961d7c13ce4f9a3aa36dd0554ec5184fbc5953 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix links in simpletextviewer example .qhp fileKai Koehne2018-03-205-56/+61
| | | | | Change-Id: I9694fd92853c15f2eecb2bdd1b9655b05940f217 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-182-2/+6
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia803aad211281c71a8d13b403d83fb5ec3b2cb2c
| * SimpleTextViewer example: Remove QObject::tr antipatternKai Koehne2018-01-042-2/+6
| | | | | | | | | | Change-Id: I8e7d1dcf9cd2a5a1ccc563032324528fe3262611 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-1513-76/+77
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/examples.pro Change-Id: I1b10716619d6a07466db9d5407a958062e7cd38a
| * RemoteControl example: Remove Q_INIT_RESOURCEKai Koehne2017-10-041-2/+0
| | | | | | | | | | | | | | For exectuables, resources are initialized by default. Change-Id: I3d1aea0afd9cc01996d4b0a496ac9a01787fce4a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * RemoteControl example: Remove superfluous connectKai Koehne2017-10-041-1/+0
| | | | | | | | | | | | | | quitOnLastWindowClosed is the default. Change-Id: Ic2afbef731895f2fce17050655d11facd51736ab Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Assistant Examples: Use nullptrKai Koehne2017-10-044-4/+4
| | | | | | | | | | Change-Id: Icfede0f02c6651aa39e2a0a9d5b586a5bb7037e9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Assistant Examples: Remove stray ;Kai Koehne2017-10-041-1/+1
| | | | | | | | | | Change-Id: I4374610fa78d2c42fc8ca88d80cd1f50a431d046 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Assistant Examples: Unify #include styleKai Koehne2017-10-0412-59/+64
| | | | | | | | | | Change-Id: I72c419123e27e06ae30fa2042fb8bb6ddbab9da4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Improve SimpleTextViewer example documentationKai Koehne2017-09-181-9/+8
| | | | | | | | | | Change-Id: I6da730993b6e9a0fd3b75705547260aef638048d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Fix exclusion condition for assistant examplesJake Petroules2017-09-151-1/+2
| | | | | | | | | | | | | | | | | | | | The actual reason why they were disabled for WinRT is because that platform lacks process support (see 40e060d). Therefore, this fixes the build for VxWorks as well. Change-Id: Id411c467f4c3bbed45f7bd3bd8d4881c72f3b466 Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix problems when building with -no-feature-processUlf Hermann2017-09-121-1/+1
|/ | | | | | | | | | | Guard the QProcess includes, modernize some ifdefs, exclude tests and examples that don't work without processes, and use QT_CONFIG(process) rather than QT_BOOTSTRAPPED as discriminator where we are actually checking for QProcess support. Also, don't try to build linguist and designer without QProcess. Change-Id: I4e1c7485a96ff02f2f6241113add35e44dc54b1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Qt Designer Examples: Brush up to C++ 11Friedemann Kleint2017-06-2623-64/+49
| | | | | | | | Use nullptr, member initialization, QOverload, etc. Task-number: QTBUG-61184 Change-Id: I45061c506dad72d5f495f480b3e61f4d1c0599d4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* MultipleInheritance: Improve code and documentationKai Koehne2017-06-264-7/+8
| | | | | | | Task-number: QTBUG-61419 Change-Id: I858027db3ca83a4fe41a576919acbb408db35cff GPush-Base: 8abb03b0d84a3a94f7db41e010f69955488ea893 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* TextFinder: Remove dubious spacerKai Koehne2017-06-231-36/+42
| | | | | | Task-number: QTBUG-61419 Change-Id: I8704fd5300e165ed6e123f115b797033d39cdbe8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* TextFinder: Improve code and documentationKai Koehne2017-06-227-140/+144
| | | | | | | Task-number: QTBUG-61419 Change-Id: Ib00152f0a04546d275a40a5d57fe046b82ebc421 GPush-Base: 8abb03b0d84a3a94f7db41e010f69955488ea893 Reviewed-by: Martin Smith <martin.smith@qt.io>
* foreach cleanup in the the smaller toolsFriedemann Kleint2016-12-221-2/+2
| | | | | | | | | Replace foreach by C++ 11 range based for in kmap2qmap, makeqpf, pixeltool, qdbus, qtattributionsscanner, qtdiag, qtplugininfo, winrtrunner and the simpletextviewer example. Change-Id: I079da84c47a1584526f4fe188377c0262419a44d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Examples: Add missing overrideAlexander Volkov2016-12-143-3/+3
| | | | | Change-Id: Ie64f892e4259fba5f1e16cf4fa3b62a2779b8bb1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Examples: Replace Q_DECL_OVERRIDE by overrideAlexander Volkov2016-12-1412-63/+63
| | | | | Change-Id: I2bed9c0dc1d72005b40ae7a7b75fa22cc67f88c6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-051-1/+1
|\ | | | | | | Change-Id: I29e1f5d7d146cc77f8cf92bfbe2e41ffad50a041
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-051-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/qdoc/doc/qdoc-manual-markupcmds.qdoc Change-Id: I43e2d334a848397a2e619ad19aab66daff53d9b7
| | * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase), except within \code blocks in QDoc manual, where macros are not expanded. Change-Id: Ic742163948f3970d2acaa179eb02d4e0c1593bf8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-3088-294/+1024
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/qcollectiongenerator/main.cpp src/qtestlib/wince/cetcpsync/main.cpp src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp src/qtestlib/wince/cetcpsync/qtcesterconnection.h src/qtestlib/wince/cetcpsync/remoteconnection.cpp src/qtestlib/wince/cetcpsync/remoteconnection.h src/qtestlib/wince/cetcpsyncserver/commands.cpp src/qtestlib/wince/cetcpsyncserver/commands.h src/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp src/qtestlib/wince/cetcpsyncserver/connectionmanager.h src/qtestlib/wince/cetcpsyncserver/main.cpp src/qtestlib/wince/cetcpsyncserver/transfer_global.h src/qtestlib/wince/cetest/activesyncconnection.cpp src/qtestlib/wince/cetest/activesyncconnection.h src/qtestlib/wince/cetest/cetcpsyncconnection.cpp src/qtestlib/wince/cetest/cetcpsyncconnection.h src/qtestlib/wince/cetest/deployment.cpp src/qtestlib/wince/cetest/deployment.h src/qtestlib/wince/cetest/main.cpp src/qtestlib/wince/cetest/remoteconnection.cpp src/qtestlib/wince/cetest/remoteconnection.h src/qtestlib/wince/remotelib/commands.cpp src/qtestlib/wince/remotelib/commands.h Change-Id: Ia1b311710f7e8009ca1697faae3ae5e37e80ecc3
| * | Unify license header usagev5.7.0Antti Kokko2016-06-1073-219/+949
| | | | | | | | | | | | | | | | | | | | | Updated BSD license. Change-Id: Ie2521f94a2e8ed423f989e902e5eb88512814f71 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Unify license header usageAntti Kokko2016-06-1015-75/+75
| | | | | | | | | | | | | | | | | | | | | Updated FDL license. Change-Id: I726ee109b17070d79e19c9edcdba7780aa54b1f1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-274-0/+4
|\| | | | | | | | | | | Change-Id: I3994e80ec7366f1303d23214315013b79ca2acf3
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-194-0/+4
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5fde87a1ac22e933c926e0d86996791a38d92c4e
| | * declare that the designer example installs are okOswald Buddenhagen2016-04-284-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | installing examples into the proper designer plugin path really is NOT ok, but we have been doing it for so long now ... Change-Id: Id422b1664465bb85665391fe2de3b93f973e579a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-138-8/+4
|\| | | | | | | | | | | Change-Id: Idff3a769724c52de3806697df5b2850cf004d203
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-04-258-8/+4
| |\| | | | | | | | | | Change-Id: I6b72d14a0e6b6523a15e286422bdb15499f7f111
| | * Qt Designer Examples: Remove empty JSON files.Friedemann Kleint2016-04-258-8/+4
| | | | | | | | | | | | | | | | | | | | | Qt Designer plugins do not require any keywords. Change-Id: Ifd38bb8ec9b946731010bb64ee02ada474ed42b3 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devSimon Hausmann2016-04-061-4/+0
|\| | | | | | | | | | | Change-Id: I6cc44e077f16ecfbe7153048539e8a5ce0c17f1e
| * | purge symbian vestigesOswald Buddenhagen2016-04-061-4/+0
| |/ | | | | | | | | Change-Id: I53373e8d6ef2c2f7b46945f6654b019d32d38a2c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* / Remove Windows CE.Friedemann Kleint2016-03-101-1/+1
|/ | | | | | | | | | Remove #ifdef sections for Q_OS_WINCE, wince .pro file clauses and the CE-specific test library. Task-number: QTBUG-51673 Change-Id: I9dbcca9c9b6febe67a7c5b5d2cee0b1ab1f302f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Doc: corrected syntax link object_cast()Nico Vertriest2015-10-293-3/+3
| | | | | | Change-Id: If0be3c8681902c3ecd5945eb9c99b532b369232c Task-number: QTBUG-43810 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-282-43/+1
|\ | | | | | | Change-Id: Ic1c578187b99013c40fe686f98fc85d5917240fe
| * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-191-42/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: examples/designer/doc/src/arthurplugin.qdoc Change-Id: I5c0118a90111b51db04d2ea2eb6b3c47f1fb761f
| | * Doc: Removed the qdoc page for Arthur Plugin example5.4Venugopal Shivashankar2015-05-291-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | The example was removed in 2d750edc Task-number: QTBUG-41996 Change-Id: I778ef5d3af53be73bba37d99498960d2f766a53f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * | Doc: replaced Mac OS X with OS XNico Vertriest2015-08-171-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-40759 Change-Id: I3dd691ec1f17ae3217cb85e6f3e6330114ab7aa3 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Qt Designer: Add customizable property tooltips.Friedemann Kleint2015-07-291-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce tag propertytooltip to property specifications in the ui XML snippet returned by QDesignerCustomWidgetInterface::domXml() - Pass the text to the property editor and set as description tooltip on the property. - As an added benefit, show the type in the normal tooltip. - Demonstrate using TicTacToe example. [ChangeLog][Qt Designer] Added customizable property tooltips. Task-number: QTBUG-45442 Change-Id: I371bbbb3a6f2bc0f433193b5eb45658211ca67de Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Update Qt Designer documentation.Friedemann Kleint2015-05-134-75/+33
| | | | | | | | | | | | | | | | | | | | - Document new QUiPlugin module. - Fix example documentation to reflect the changes in the qmake variables (QT/CONFIG). Task-number: QTBUG-44724 Change-Id: Idd85d601295af25d634c3186e993abc7090fe002 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | move ui loader interfaces to own moduleOswald Buddenhagen2015-05-1110-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's backwards to declare the interface as part of the designer library itself, as that obviously pulls in half of designer itself into custom widget plugins which should be perfectly usable from the stand-alone ui loader in uitools. also, designer isn't built for embedded systems, so the bundling needlessly limited the availability of widget plugins. so move the relevant headers into a separate include-only module. the designer module retains forwarding headers, as the old includes obviously need to continue working. [ChangeLog][UiTools] Custom widget plugins should now use QT+=uiplugin instead of QT+=designer. This makes them usable on embedded systems. Task-number: QTBUG-44724 Change-Id: I5535b10d2f095b257eeda9681f60b2f8c699f7d7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Qt Designer Examples: Fix code around constructors.Friedemann Kleint2015-04-1020-35/+31
| | | | | | | | | | | | | | | | Make constructors explicit, use constructor initialization for member variables, remove unused variables. Change-Id: I84273400d66ef061376bd0ec4948ab1a0fd45f30 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Qt Designer Examples: Fix includes.Friedemann Kleint2015-04-107-19/+25
| | | | | | | | | | | | | | Replace module includes by per-class includes and reorder. Change-Id: Id8273865c0110e6d834d9c40a123e3d72bfc4b87 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Qt Designer Examples: Introduce Qt 5 connect syntax.Friedemann Kleint2015-04-106-13/+19
| | | | | | | | | | Change-Id: I6f0f1fad45412ab3dd7b5ff82f9cab789b805080 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Qt Designer Examples: Introduce Q_DECL_OVERRIDE.Friedemann Kleint2015-04-1012-63/+63
| | | | | | | | | | Change-Id: I08b4227e4609caef74576ea4e05d33c7142f2665 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Update copyright headersAntti Kokko2015-02-1489-388/+388
|/ | | | | | | | | | 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: I7f14f408e04c5c4f73a913fae153adcffbebe38f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 03:12:33 +0000