summaryrefslogtreecommitdiffstats
path: root/examples/uitools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-308-28/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-106-18/+78
| | | | | | | | | | | | | | Updated BSD license. Change-Id: Ie2521f94a2e8ed423f989e902e5eb88512814f71 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Unify license header usageAntti Kokko2016-06-102-10/+10
| | | | | | | | | | | | | | Updated FDL license. Change-Id: I726ee109b17070d79e19c9edcdba7780aa54b1f1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | 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>
* move ui loader interfaces to own moduleOswald Buddenhagen2015-05-111-1/+1
| | | | | | | | | | | | | | | | | | | 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>
* Update copyright headersAntti Kokko2015-02-148-36/+36
| | | | | | | | | | 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>
* whitespace fixesOswald Buddenhagen2014-01-205-16/+16
| | | | | | | | remove trailing spaces & expand tabs Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-108-8/+8
| | | | | | | Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove QT+=widgets from SUBDIRS projectsOswald Buddenhagen2012-12-161-2/+0
| | | | | | | it makes no sense whatsoever Change-Id: Ida65c7fb02e53bd3d1ccb319bdbcbec4c836b871 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QtTools: Doc: Added missing image to uitools examples.David Schulz2012-12-121-0/+0
| | | | | Change-Id: I6e0144ef2ded5e7dd95b332436a9a7dcbbcfc6fb Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Doc: Fix example pages for Qt ToolsLeena Miettinen2012-12-122-2/+7
| | | | | | | | | | | Use the \group and \ingroup commands to produce Qt 5 style example pages. Unify the file structure for example docs. Add example page for Qt Help and move Context Sensitive Help example to it (from the Qt Assistant Examples page). Change-Id: I687b18a134037588a5a536fe2353c18dfd44b1d7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Doc: add missing files for Qt UI Tools docsLeena Miettinen2012-12-113-0/+253
| | | | | | | | The files were ignored by Git, so they did not get submitted as part of I156dbf0a071137e1e6f3ba99cc390aa88c80b836. Change-Id: Icb3a35d24993ea77077ee3a2e09f347c48c583bd Reviewed-by: David Schulz <david.schulz@digia.com>
* fix installation target paths of examplesJoerg Bornemann2012-12-052-4/+2
| | | | | Change-Id: I11440d60a709cbe4617aa0953c7971a6d731b73b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove obsolete .desktop filesOswald Buddenhagen2012-12-012-22/+0
| | | | | Change-Id: I2a4974229c18b5ad4d18089fc076d86457557cc1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-11-283-12/+2
| | | | | | | follow respective change in qtbase Change-Id: I6e892deb9fa3868579e9c556fbcf00cc7bc6145c Reviewed-by: hjk <qthjk@ovi.com>
* CONFIG+=uitools is deprecated. Use QT+=uitools insteadSergio Ahumada2012-10-311-2/+1
| | | | | Change-Id: I637e32d342c84c5c1e37e582f6e09f1983aaa335 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-256-36/+36
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Restore the forms/ subdir that was lost in the uitools reimportThiago Macieira2012-08-012-0/+98
| | | | | | | | | | | These files are referenced in the .qrc file, so they are necessary during compilation. The files were copied from the commit referenced in the initial import of the qttools.git repository. Change-Id: Id1f182a7a9dd4e08e63fb903b978de192b85cd98 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-306-6/+6
| | | | | | | | | | | 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: Ib4b7580dda53886247ad6eb10d17d8e67c51980d 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-236-6/+6
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692 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-066-6/+6
| | | | | | Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtTools: Remove symbian branches from .pro-files.Friedemann Kleint2011-10-193-14/+1
| | | | | Change-Id: I9b84010a5e0628e348569201503ab6c25a3bbfd5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add QtUiTools and uilibLars Knoll2011-09-1313-0/+848
This code used to live in qtbase. It doesn't belong there however and since there are no dependencies in qtbase left that require it move it here. This significantly simplifies the build system with regards to the code in uilib. Change-Id: I41c8687bd071a1c253eb55594986f3e1424bc6cf Reviewed-on: http://codereview.qt-project.org/4830 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>