summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1453-128/+105
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
| * Fix module name format in displayed codeSze Howe Koh2013-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtDBus -> Qt D-Bus QtMultimedia -> Qt Multimedia QtWidgets -> Qt Widgets Change-Id: I96a1523b37e294b10b203782074943c6ec55e34a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Merge branch 'release' into stableSergio Ahumada2013-01-3150-124/+101
| |\ | | | | | | | | | Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
| | * fix install locations of examples/widgets/toolsOswald Buddenhagen2013-01-3118-18/+18
| | | | | | | | | | | | | | | | | | | | | amends cb961007c5 Change-Id: I725042c55816832eeb5b0d8a3522911877279aae Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * push feature conditionals down to subdirectoriesOswald Buddenhagen2013-01-3112-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | the top-level project is not installed, and the meta-project which is used instead does not know anything about conditionals. Task-number: QTBUG-28414 Change-Id: Id5785ab5f92373ece74699e3c28220fc7f9689ac Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * don't build shared demo library which is not used anywayOswald Buddenhagen2013-01-312-46/+7
| | | | | | | | | | | | | | | | | | | | | | | | this amends 5a2fc03ef4 Change-Id: I42b2141ad33b75041ee2bb58af642fc3d07f290e Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Fix warnings about files that can't be found in QtConcurrentSergio Ahumada2013-01-285-5/+5
| | | | | | | | | | | | | | | | | | | | | Change-Id: I712e3de68bd329fc5e615b08278e719619f856b2 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Fix some more old references and links to NokiaSergio Ahumada2013-01-2813-32/+32
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28156 Change-Id: I9ba0d6f1e92103219bec1e61e716b6b2f269a8ad Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Doc: Fix references to Qt TestSze Howe Koh2013-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtTestLib and QTestLib don't exist. The proper name is "QtTest" (code) or "Qt Test" (English) http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation http://lists.qt-project.org/pipermail/interest/2012-December/005221.html Files paths in qttestlib.qdocconf can't be changed easily however, as it breaks things. So, they're left as they are. Change-Id: Ifbc44ea858c453bedad8cd7723f847e67fc7a85a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Fix unopened commentSze Howe Koh2013-01-281-1/+1
| | | | | | | | | | | | | | | Change-Id: I68d131bb29ed4c150ef2630654d2b8ff59ea47cf Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Keep QLineEdit placeholder text visible when focusedAurélien Gâteau2013-02-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful when the widget is focused by default, and also gives another opportunity to the user to read the message before typing, removing the need for workarounds like clicking in another text entry to bring back the placeholder message. Change-Id: I4a2981a6656a87934b5c8ed4a8a2dc13b748c94d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-01-2911-12/+12
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-2811-12/+12
| |\| | | | | | | | | | | | | | Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
| | * | Doc: Widgets/Tools examples: fix group and missing imagesTopi Reinio2013-01-274-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds two images missing from Completer example documentation and fixes typos in \ingroup parameter. Change-Id: I2a9c1a22c65145dba37b182a82c19f4f0e424ca7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | Doc: Fix module name formatSze Howe Koh2013-01-257-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtCore -> Qt Core QtDBus -> Qt D-Bus QtDesigner -> Qt Designer QtGui -> Qt GUI QtImageFormats -> Qt Image Formats QtNetwork -> Qt Network QtPrintSupport -> Qt Print Support QtScript -> Qt Script QtSql -> Qt SQL QtSvg -> Qt SVG QtTest -> Qt Test QtWebKit -> Qt WebKit QtWidgets -> Qt Widgets QtXml -> Qt XML QtConcurrent -> Qt Concurrent (partial) QtQuick -> Qt Quick (partial) Also, distinguish between "module" and "library" Change-Id: Icb8aa695ae60b0e45920b0c8fce4dc763a12b0cd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-291-4/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id2bb2e2cabde059305d4af5f12593344ba30f001 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | | Introducing QWidget::createWindowContainer()Gunnar Sletta2013-01-253-1/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A QWidget that can embed a QWindow. This can be used to embed a QWindow/QOpenGLContext based window or a full QQuickView. Change-Id: I8415b5ae38562fc00b46150fa70b56fd9b19a80c Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: I4ca87d44129fa5c1d8541cd58b8d62bc69080688
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-01-221-1/+1
| |\| | | | | | | | | | Change-Id: Iaa321deb9e536ce89b87a337b57634f00c770a32
| | * fix a typo in cube exampleJing Bai2013-01-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I1ad01aa519007d203669ccc63ef7d769b7e740b5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 03:26:54 +0000