summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-09-0244-4217/+555
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-2744-4217/+555
| |\ | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
| | * Fix compilation of windowcontainer exampleRafael Roquetto2013-08-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Compilation was failing when compiling with -no-opengl Task-number: QTBUG-32712 Change-Id: I7c3f7c6be542aa79afa20d8563565fd477cc053c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Doc: Remove addressbook-frhjk2013-08-2338-4523/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation is generally not translated, this one sticks out. Task-number: QTBUG-28535 Change-Id: Ib2cdbc8c94a6354af3369ff2dcf4df69cde4c381 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | * Add json/savegame example.Mitch Curtis2013-08-2211-0/+843
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There wasn't any example documentation besides json.html, which doesn't actually describe usage of the various QJson* classes. This also makes each QJson* class page link back to json.html. Change-Id: If5ad6493d2728df0cec7bdbbc5790f0b755f816c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Fix possible build failure in windowcontainer exampleAndrew Knight2013-09-021-0/+1
|/ / | | | | | | | | | | | | | | The windowcontainer example utilzes the openglwindow example, so it must also check that OpenGL is available. Change-Id: I7ecb372cfd533bb56effe7c61ebee9bd53de4c54 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-211-28/+26
|\| | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
| * Tidy up collidingmice example documentation.Mitch Curtis2013-08-131-28/+26
| | | | | | | | | | Change-Id: I22dc325319389d146a99a5beb1e0c1c78283af63 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-07-2437-1340/+1369
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-2337-1340/+1369
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
| | * Changed digia contact details to */legal, updated licensesTeemu Kaukoranta2013-07-2037-1340/+1369
| | | | | | | | | | | | | | | | | | | | | | | | Scripts are available in internal mkdist repo. Added license tags, updated licenses and copyrights/contacts Change-Id: Ibc734275f3000987eaa4f5c57f19d4e1fda2c479 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | qdoc: Eliminate cases of multiple topic commandsMartin Smith2013-07-232-28/+0
|/ / | | | | | | | | | | | | | | | | | | Several instances where \page and \example are corrected by removing the \page and leaving the \example. Task-number: QTBUG-331578 Change-Id: I95373c2d209698b68197bb9c95ef0c41e64c55d3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-153-4/+4
|\| | | | | | | Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f
| * Remove references to Nokia in qtbase examples.Friedemann Kleint2013-07-113-4/+4
| | | | | | | | | | Change-Id: I0d4a309bc7f92e1ad2c7465bfb2d677c91e6d818 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-282-2/+0
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-272-2/+0
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| | * Dialogs examples: remove QLayout::SetNoConstraintJ-P Nurmi2013-06-212-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These constraints were adjusted in qt4 commit 3abaecc in order to make the dialogs fit Symbian/Maemo screens. These are not mobile oriented examples and it breaks resizing behavior on desktop so badly, that we will simply revert the constraint changes to make the dialogs respect their minimum sizes. Task-number: QTBUG-31351 Change-Id: Ibf358ddedadf05614ef7a66b6a98fe5d7073996f Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | Add getMultiLineText static method to QInputDialogDavid Gil2013-06-272-1/+21
|/ / | | | | | | | | | | Change-Id: I6d43772f6ee66c6c43d64fb3d18f2a5f0c894a00 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-121-1/+1
|\| | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb
| * docs: DirView example uses QFileSystemModel not QDirModelShawn Rutledge2013-05-311-1/+1
| | | | | | | | | | Change-Id: Ie172b1458401c4627314ff0db6992647388bf382 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-2351-922/+150
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
| * QGLWidget: Support retina framebuffer grabbingGabriel de Dietrich2013-05-231-1/+1
| | | | | | | | | | | | | | | | | | And update the opengl/grabber example. Task-number: QTBUG-31173 Change-Id: If09f1f3634b353d034f51240fc68be6ee7aabb48 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Update opengl/overpainting example for high-dpiGabriel de Dietrich2013-05-231-2/+4
| | | | | | | | | | | | | | | | Depends on I8e81a0c6af61df1c4497a5934e2b89bad6f616f0 to properly render the overlay. Change-Id: I7ef6b726cc06eb750e7c00beb4ec6e80e85866a1 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Doc: Updated content for Drill Down exampleTopi Reinio2013-05-2221-171/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWidgets/Drill Down example uses images and information about Nokia's old office locations as content. This change updates the example to use concepts related to Qt instead. In addition, - Documentation, screenshot updated accordingly - Corrected aspect ratio when scaling image items in the scene - Added a gray background with a slight gradient - Removed Symbian-specific code remnant Task-number: QTBUG-31075 Change-Id: Id8abfbf7f4033f74172477570f8f28390854101c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Avoid harmless warning in paintedwindow exampleGunnar Sletta2013-05-142-7/+2
| | | | | | | | | | | | Task-number: QTBUG-31078 Change-Id: Id7221db752c06fc94e55ae859615abb2642a139b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Doc: Remove applicationicon and orientation examples from QtWidgetsTopi Reinio2013-05-0821-736/+0
| | | | | | | | | | | | | | | | | | These two widget-based, mobile-targeted examples are obsolete, defunct, and/or serve no purpose in Qt 5. Task-number: QTBUG-31023 Change-Id: Ie5732734bb2547b1ea701d7b3c8dcd806362de09 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Fix paths for a number of examplesv5.1.0-beta1Topi Reinio2013-05-085-5/+5
| | | | | | | | | | | | | | | | | | | | Modularized example paths are defined in module-specific .qdocconf files. This change fixes \example command for a number of examples to be relative to those paths. This way, the manifest files will have a correct project path for each example. Change-Id: I6d3dba34a1eb04a2bc294520102e232ccd0f0ba2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Set the base used to display the spin box valueKevin Ottens2013-05-071-0/+10
| | | | | | | | | | | | | | | | | | | | Provide a new displayIntegerBase property which control the base used by the spin box to display the value in its internal line edit. Change-Id: Ibadc37107db8770d757b64350946bf19142e8f6c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-292-26/+55
|\| | | | | | | Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c
| * Improved robustness of threaded rendering in hellowindow example.Samuel Rødal2013-04-252-26/+55
| | | | | | | | | | | | | | | | | | | | | | | | Previously resizes along with the animation was implemented using queued signals and slots, potentially causing a huge lag between the size of the window and the rendered contents. Now the animation is always driven by the rendering thread and is triggered based on the window's isExposed() status. Change-Id: Ifd89a63c2a436671a7b15326ff56be9ec2a5362d Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-04-266-11/+3
|\| | | | | | | refs/staging/dev
| * fix processing order for qmake -rOswald Buddenhagen2013-04-191-1/+1
| | | | | | | | | | | | | | | | the plugandpaint example statically links to one of the plugins, so there is a build-time dependency. Change-Id: I9c77b5641028e6b958ceeea56c606bda59f396b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * don't install the project file twiceOswald Buddenhagen2013-04-191-5/+0
| | | | | | | | | | | | | | somehow this was missed when the source installs were automated. Change-Id: Ic842fd9ac221cb3748b5a6369eacf8a55f8d8d4d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Doc: Fix \group and \ingroup usage for a number of examplesTopi Reinio2013-04-195-5/+2
| | | | | | | | | | | | | | | | | | A number for groups, including 'all-examples' was defined multiple times by some examples. This change fixes the incorrect definitions. Change-Id: I2fb5da11e8762698942a076e0f0576033ce3cabc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | QAbstractScrollArea - add SizeAdjustPolicy and viewportSizeHintChristoph Schleifenbaum2013-04-222-1/+3
|/ | | | | | | | | | This patch adds SizeAdjustPolicy to QAbstractScrollArea. If it is set to AdjustToContents it will make use of the new protected viewportSizeHint() (BC since it was reserved in Qt5). This function returns a suggested size based on contents. Change-Id: I5d8aa517e88b8b21c5712e62b4d574c3aad99d3b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Doc: Fix network/torrent example to work on Qt 5Topi Reinio2013-04-044-36/+31
| | | | | | | | | | | | | | | | | | This change fixes two issues in the torrent example: - Correctly use a query constructed from the announce url to fetch the list of peers (using QUrlQuery). - Reimplement QAbstractSocket's connectToHost() and disconnectFromHost() which are virtual in Qt 5, instead of of using the protected connectToHostImplementation() / disconnectFromHostImplementation() slots. Also removes a warning about deprecation of QHttp class as it's no longer used in this example. Task-number: QTBUG-30329 Change-Id: I9230cd2204bfc1a66f2ea3e98940b09681df250e Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+6
|\ | | | | | | Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
| * Boxes: Check for opengl version in .pro fileKai Koehne2013-04-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | Make sure that people get an understandable error message when trying to compile the boxes demo with e.g. ANGLE. Task-number: QTBUG-30406 Change-Id: I0ba0e26e424d768f95d7977862d9f2c4e85b41fb Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | improve openglwindow example a bitGunnar Sletta2013-03-213-13/+4
| | | | | | | | | | Change-Id: I50e00c33c100beab975d0fcbfc4ccdd496cccbaf Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | PaintedWindow example: Use standard window flags.Friedemann Kleint2013-03-181-1/+1
| | | | | | | | | | Change-Id: Ie7202efc88c176e2c39574677227c9f177c8e6d1 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-16152-735/+734
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix warnings about unused variables in sub-attaq-example (CLANG).Friedemann Kleint2013-03-063-10/+4
| | | | | | | | | | Change-Id: Icad46a03a8d5875c128bd1f1bc97127e0ee05622 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix warning about float truncation in scroller example (CLANG).Friedemann Kleint2013-03-061-1/+1
| | | | | | | | | | Change-Id: I66913c43fb668da128b994f44d3f180e1ce3abbe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-061-19/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/qnx/qqnxscreen.cpp src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a
| * | Doc: fixed snippet issues with customcompleter.qdocNico Vertriest2013-03-051-19/+21
| |/ | | | | | | | | | | | | | | | | | | | | | | Edited customcompleter.qdoc (paths snippets + ingroup statement) Moved customcompleter.qdoc to widgets/tools/customcompleter/doc/src Moved png files to doc/qtwidgets/images Task-number: QTBUG-29101 Change-Id: Iab66f178b92321257c4eb0e4e9704bb1e3043ef6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-053-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac
| * Fixed qtbase examples build when configured with -no-openglSamuel Rødal2013-02-203-1/+7
| | | | | | | | | | | | Change-Id: Idafdc3264f760d6400ce04bb9da36289b1f96438 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Compile fix when QT_NO_PRINTDIALOG is definedPaul Olav Tvete2013-02-2611-13/+13
| | | | | | | | | | | | | | ...but QT_NO_PRINTER isn't. Change-Id: I888c177cfdd2245eb55de766dfd93f6acd4293e9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Check for network module when building according examplesOliver Wolff2013-02-213-2/+6
| | | | | | | | | | | | Change-Id: Id17ba13988e37fa583948f4861b44bb1f05bf375 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Check for printsupport module when building according exampleOliver Wolff2013-02-201-0/+1
| | | | | | | | | | | | Change-Id: Ie98418c0640e2fe7cb829988f9194cb620b71629 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 23:25:44 +0000