summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Fix MSVC-warnings about double to float truncation.Friedemann Kleint2014-01-241-24/+24
| | | | | Change-Id: I4aef12bd8fe37dffb06fc7d0b6a330bfc42fa270 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix MSVC-warnings about stray */* in sources.Friedemann Kleint2014-01-242-2/+2
| | | | | Change-Id: Ifa8de548dc8df79fa2b5d884383dc120661cb45a Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-201-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5
| * Doc: Fix typo in Fade Message Effect Example documentationJonathan Liu2014-01-161-1/+1
| | | | | | | | | | Change-Id: I3a64f296d01f2b0147f87b406163ff25c4d12ada Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | expand tabs and related whitespace fixes in *.{cpp,h,qdoc}Oswald Buddenhagen2014-01-1332-178/+178
| | | | | | | | | | | | | | | | the diff -w for this commit is empty. Started-by: Thiago Macieira <thiago.macieira@intel.com> Change-Id: I77bb84e71c63ce75e0709e5b94bee18e3ce6ab9e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-01-031-2/+2
|\| | | | | | | Change-Id: Id13badc270db98806048753fd7fb658aa17f1ede
| * Fix some typos in documentation.Jeff Tranter2014-01-021-2/+2
| | | | | | | | | | | | | | | | Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code. Change-Id: I2e946fda0bd9a2117f8e9b2fb300df9bf0a98a6c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-245-4/+118
|\| | | | | | | Change-Id: I2defae1904154283446b069d151c3ef57302ec7b
| * Doc: corrected broken linksNico Vertriest2013-12-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-34749 Corrected link to drag and drop example. Corrected link to {mandatory fields} Created target referring to macros for defining plugins Change-Id: I387a2d9bab428b2eacd8d371f08c72f42f7e2be2 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: Move XML example documentation to correct locationNico Vertriest2013-12-203-0/+74
| | | | | | | | | | | | | | | | | | Moving the examples documentation to resolve doc linking issues. Task-number: QTBUG-34749 Change-Id: I2adb1b5d37911c7df6a78a03741d3d43ab24eafb Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: solved link problem for dombookmarks.qdocNico Vertriest2013-12-162-0/+40
| | | | | | | | | | | | | | Task-number: QTBUG-34749 Change-Id: I2f2fbf16314e069ab04e5c5ab4bcef9780c008a2 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2013-12-092-0/+48
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-052-0/+48
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/sqlite/qsql_sqlite.cpp Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
| | * Doc: Moved Books SQL Example documentationNico Vertriest2013-12-052-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved qdoc and image file to correct qdoc folder. Added brief and ingroup statements to books.qdoc. Task-number: QTBUG-34749 Change-Id: I5806ffd6f116cccf10238e3e1a9fc627ad0e93a9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | WinRT: Fixed compilation of bearermonitor exampleOliver Wolff2013-12-062-6/+6
|/ / | | | | | | | | Change-Id: I761ad1d85d97d7746d826225f03f95c2f04f8b88 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-294-5/+5
|\| | | | | | | Change-Id: Ibb342cc5fc55ff9a3f4b3ecbd53936b57bc13e63
| * Make OpenGL examples work on retina displays.Morten Johan Sørvig2013-11-294-5/+5
| | | | | | | | | | | | | | | | | | glViewport expects device pixels, but the various geometry accessors returns values in device-independent pixels. Change-Id: I8004692de82251e4f1f25bf8f2698895f222ede3 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-2632-1059/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the conflicts in msvc_nmake.cpp the ifdefs are extended since we need to support windows phone in the target branch while it is not there in the current stable branch (as of Qt 5.2). Conflicts: configure qmake/generators/win32/msvc_nmake.cpp src/3rdparty/angle/src/libEGL/Surface.cpp src/angle/src/common/common.pri src/corelib/global/qglobal.h src/corelib/io/qstandardpaths.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxscreeneventhandler.h src/plugins/platforms/xcb/qglxintegration.h src/widgets/kernel/win.pri tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp tools/configure/configureapp.cpp Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
| * Doc: Fix broken linksSze Howe Koh2013-11-056-11/+12
| | | | | | | | | | | | | | | | Task-number: QTBUG-33360 Change-Id: Ic944cb2f575c35ebad64852ef5fc44a50ac03571 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: Clean up threading examplesSze Howe Koh2013-11-0520-943/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Example 3 (Clock) is a collection of anti-patterns. - It implements a slot in a QThread subclass and then forces the new thread to use Qt::DirectConnection to invoke the slot in the "wrong" thread. - It talks about getting away with non-thread-safe usage - It uses a thread as a timer and then admits that it's an over- complicated approach. - Example 4 (Permanent Thread) is over-complicated yet incomplete. A better one exists in the QThread class ref. - Example 1 (Thread Pool) is covered by the QThreadPool class ref. - Example 2 (QtConcurrent::run()) is covered in the "Threading and Concurrent Programming Examples" page and the "QtConcurrentRun" page. - The undocumented "Hello Thread" example is covered in the QThread class ref. - These examples cannot be accessed from Qt Creator's Examples tool. - These examples are neither widget-related nor tutorials, contrary to their source paths. Task-number: QTBUG-33360 Change-Id: Ic79cb764ee925ddbcbeafee8e1d01db7fe0f6cfe Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * remove remaining non-concurrent branches from concurrent samplesOswald Buddenhagen2013-10-296-105/+0
| | | | | | | | | | | | | | amends 677825f0bad9. Change-Id: I8bc3ade3a1602b9a2c0bdc837f4b19c67b2e0dba Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Examples: Add support for custom nameserver to dnslookupMandeep Sandhu2013-11-071-1/+12
| | | | | | | | | | | | | | | | | | Updated dnslookup example to take an optional nameserver argument for doing DNS lookup against a specific nameserver. Task-number: QTBUG-30166 Change-Id: I9f46f9f766b56f770d2c8372e3bfad5c71023c73 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | added QAbstractSpinBox::setGroupSeparatorShown function.Oto Magaldadze2013-10-292-0/+28
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtWidgets][QAbstractSpinBox] QTBUG-5142 - This will allow a group (thousand) separator to be shown in QSpinBox and QDoubleSpinBox widgets. Task-number: QTBUG-5142 Change-Id: I2e23f5f83c93bb092a2dbd784e06d17d40d42909 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-248-26/+13
|\| | | | | | | Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
| * don't erroneously claim that gui support is neededOswald Buddenhagen2013-10-164-4/+4
| | | | | | | | | | Change-Id: Ia7b1f02cab9fa0fc9e487ca49d75e85ed0cfee9d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * remove non-concurrent branch from concurrent exampleOswald Buddenhagen2013-10-161-22/+0
| | | | | | | | | | | | | | kinda stupid to have it ... Change-Id: Icb31c524e04f43b0fb966c5500e22dfd574f969f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * skip gui-needing examples with -no-guiOswald Buddenhagen2013-10-113-0/+9
| | | | | | | | | | Change-Id: I2413f14f0c2d9179868877615d6131bf4ca7ea16 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-11106-226/+0
|\| | | | | | | Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
| * Remove warnings about examples not running in the Qt SimulatorTor Arne Vestbø2013-10-09106-226/+0
| | | | | | | | | | | | | | The Qt Simulator is no longer supported with Qt 5. Change-Id: I0f98351d482dd0554ea0754746d56f94ee6bf22f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-09-271-8/+17
|\| | | | | | | Change-Id: I06694436322a7810a163b27b8a059cee2b046f06
| * QMacNativeWidget: Have example use a delegateGabriel de Dietrich2013-09-261-8/+17
| | | | | | | | | | | | | | This would be the case in most if not all the real life use cases. Change-Id: Ib7ebc6dbe471ce50f4bd1df9becba8e9806008e7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | WinRT: Don't build the network-chat exampleAndrew Knight2013-09-261-1/+1
|/ | | | | | | | | WinRT doesn't support QProcess, so the network-chat example shouldn't be built there. Change-Id: I7885a992d3b8baffd5530c694063140535240f07 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Port QMacCocoaViewContainer to Qt 5.Morten Johan Sørvig2013-09-233-2/+78
| | | | | | | Includes example. Change-Id: Ifdda5c535d0ec41694712405d921b2c32cb8dfc8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Port QMacNativeWidget to Qt 5Morten Johan Sørvig2013-09-234-0/+155
| | | | | | | | Also adds examples/widgets/mac subdir for Mac specific examples, starting with one for this feature. Change-Id: I4cc7d84ce3d7562259d6206faa5d6996c2392a3e Reviewed-by: Liang Qi <liang.qi@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-09-211-1/+1
|\ | | | | | | Change-Id: I37d85631ab1165ab91457d8880c4da907a9df73b
| * stickman example: fix header include guardMarc Mutz2013-09-161-1/+1
| | | | | | | | | | Change-Id: I65f2187b309f075035ad6c8beab40bf2a177140c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-09-168-16/+3
|\| | | | | | | | | | | | | Conflicts: src/corelib/tools/qstring.cpp Change-Id: Ifc6cd3a0f1cf14cc0fe6cf30afb0c7f40cfdbc3e
| * examples: fix if (!foo == 0)Marc Mutz2013-09-141-1/+1
| | | | | | | | | | | | | | Clang issues a warning for this. Change-Id: I1b9741d0260d43f864e404c693b5a459c5038b67 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * examples: remove unused static const variablesMarc Mutz2013-09-144-7/+0
| | | | | | | | | | | | | | They cause warnings on Clang. Change-Id: If599303f4a00c2a24f0a7c369299f3ea6fe7fc91 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Doc: Remove section about how to start threadsSze Howe Koh2013-09-143-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Incomplete: It doesn't talk about how to use a raw QThread, or QRunnable, or Qt Concurrent. - Redundant: Its contents are already presented in QThread's class ref, and the line before this section links to the "Multithreading Technologies in Qt" overview page which provides a more complete intro Also remove snippet markers that are no longer used. Change-Id: I89b7bd72f10c8ffdfd9b7772e2493050aafc9c88 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Remove qSort usages from qtbase examplesGiuseppe D'Angelo2013-09-143-4/+10
| | | | | | | | | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I68dec0cb6efa1f164ba9f1671b55332ee4ad2e23 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge branch 'stable' into devSergio Ahumada2013-09-132-1/+5
|\| | | | | | | | | | | | | | | Conflicts: src/concurrent/qtconcurrentmedian.h src/corelib/itemmodels/qabstractitemmodel.cpp Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
| * standarddialogs example: add detailed textShawn Rutledge2013-09-121-0/+4
| | | | | | | | | | | | | | | | | | Demonstrates that you can have mnemonic buttons which don't conflict with the Ctrl-A and Ctrl-C shortcuts. Task-number: QTBUG-6731 Change-Id: I41ce64e6f3bd0cf387af13c5c37894b721b5a3bb Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * Fix echoplugin docs: Q_INTERFACES expects a space-separated list.Mitch Curtis2013-09-111-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-25580 Change-Id: I736d5743b7901bf207c31795c96acc02fd149277 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Add clear button and side action to customsortfiltermodel example.Friedemann Kleint2013-09-127-33/+223
| | | | | | | | | | | | | | | | Demonstrate the new side widgets feature of QLineEdit. Change-Id: I1c4289c652abf2209e50601871249008fdec4f6b Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-09-101-2/+3
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-071-2/+3
| |\| | | | | | | | | | Change-Id: I9ee4176f0a0078908d49896508826154c9f71530
| | * Do not attempt to save a file in the resourcesGiuseppe D'Angelo2013-08-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A wrong code path caused the textedit example to attempting to try to save the file it was currently editing even if it was loaded from the resource system. Task-number: QTBUG-33105 Change-Id: I9e03168968a98a421e8ab93a8d06f808b72ac3b0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | hellowindow: Request multisampling only when told soLaszlo Agocs2013-09-101-1/+2
|/ / | | | | | | | | | | | | | | | | | | Similarly to qmlscene, multisampling will only be requested when passing --multisample on the command line. This is useful because (1) multisampling is not really needed by this app and (2) it helps with broken drivers that advertise MSAA configs but break when using them. Change-Id: I50ff0db80843f488899901ab796eee588b62078b Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-09-0244-4217/+555
|\ \ | | | | | | | | | refs/staging/dev