summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-221331-1331/+1331
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qsavefile_p.h src/corelib/tools/qregularexpression.cpp src/gui/util/qvalidator.cpp src/gui/util/qvalidator.h Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
| * | Update copyright year in Digia's license headersSergio Ahumada2013-01-181331-1331/+1331
| | | | | | | | | | | | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-163-44/+45
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/styles/qstyleanimation.cpp Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8
| * | Fix crash in hellowindow example when minimizing.Friedemann Kleint2013-01-151-1/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28439 Change-Id: Idcea2712afdbb08b4da2fa230fd8ba6aebd380b7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Doc: corrected typo "the the"Nico Vertriest2013-01-112-43/+43
| |/ | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28756 Spurious repetition of the definite article Trailing space issue corrected. Change-Id: I3a051f5dc291e546d8d67d6775e84b388bdc0363 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Merge branch 'stable' into devFrederik Gladhorn2013-01-071-1/+0
|\| | | | | | | | | | | | | Conflicts: tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47
| * Remove metatype registration of built-in types.Stephen Kelly2013-01-031-1/+0
| | | | | | | | | | | | | | | | As they are built-in, they are effectively registered at compile-time already. Change-Id: I7ae6ba16088eab5d19213fa7b07c2a7760988a86 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge branch 'stable' into devFrederik Gladhorn2013-01-04410-1951/+2069
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/painting/shared/shared.pri src/corelib/tools/qharfbuzz_p.h src/corelib/tools/qunicodetools.cpp src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
| * Polish code of some opengl exampleshjk2012-12-2829-255/+182
| | | | | | | | | | Change-Id: If24ae1845176fc525cf6a239a5079f4802f8df3f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * add and use qtHaveModule() functionOswald Buddenhagen2012-12-2129-36/+36
| | | | | | | | | | | | | | | | | | | | | | this is much more elegant than the so far propagated !isEmpty(QT.foo.name). also replace feature-specific tests (no-gui and no-widgets) and the obsolete contains(QT_CONFIG, foo) syntax. Change-Id: Ia4b3c8febcabf9eeca67b1f9173a523820b1038b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fix typo in docs.Richard Moore2012-12-211-1/+1
| | | | | | | | | | Change-Id: I608fbf5751bf1fa819d9fe10e159fa2a9c5e238d Reviewed-by: hjk <qthjk@ovi.com>
| * Fix compilation of Open GL ES 2 examples when using a Qt-namespace.Friedemann Kleint2012-12-193-5/+2
| | | | | | | | | | Change-Id: I174569a8c989ab53fb6b9bb700c110db2f93c2d5 Reviewed-by: hjk <qthjk@ovi.com>
| * fix examples/gui/analogclock for MSVCJoerg Bornemann2012-12-191-0/+3
| | | | | | | | | | | | | | | | | | | | This example is hit by the infamous QTBUG-13496 issue. Task-number: QTBUG-28665 Change-Id: I9bcffe72d34b1eaa9f5beafc69a16913a597d17f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Qt Gui Examples: Fixed QDoc filesChristiaan Janssen2012-12-183-0/+0
| | | | | | | | | | Change-Id: I160d8d186a1078f20f2b779bfbdae90459c27641 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix building of the painting examples that use shared codehjk2012-12-181-16/+15
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-8437 Change-Id: I66031184a009f3b26ad4af36b1975204e8fa80dc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from commit 2dc6ad8adf7f98d55aca5def8ee3f9c12934fb7b)
| * clean up example project files, mostly wrt QT+=widgetsOswald Buddenhagen2012-12-17168-351/+324
| | | | | | | | | | | | | | | | | | move QT+=widgets (and printsupport) statements before the install statements, and de-duplicate some cases. also move some TARGET assignments to a more conventional place. Change-Id: I6140d8611680f66c24490e5894e4eb90cae95635 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * remove QT+=widgets from SUBDIRS projectsOswald Buddenhagen2012-12-1728-50/+0
| | | | | | | | | | | | | | it makes no sense whatsoever Change-Id: Ica7c764575079a12512ee2eb62a995ebbefa09a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-177-8/+0
| | | | | | | | | | | | | | | | qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: Ic00e0ba496d698ed9659c476f2ca99fc0f86a093 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * OpenGL examples: Add error message about ANGLE on WindowsThomas Hartmann2012-12-177-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These OpenGL examples require a Desktop OpenGL and will not build with OpenGL ES 2.0. This means those examples do not build on Windows with the default configuration using ANGLE. ANGLE is wrapping OpenGL ES 2.0 to DirectX and does not support the full Desktop OpenGL feature set. Since this is confusing for Windows users that do not know about ANGLE this patch adds an explicit error message describing the solution. (configuring Qt with -opengl desktop) Task-number: QTBUG-28590 Change-Id: I782e6830b9e282ddcc8a2ee0a47faf3579d36aab Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fix mandlebrot and imagescaling example qdoc markup.hjk2012-12-172-7/+6
| | | | | | | | | | Change-Id: I5c9802cab917203092d93fca73b166d2dfeb64bc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * D-Bus Examples: added qdoc files and pathChristiaan Janssen2012-12-145-0/+155
| | | | | | | | | | | | Change-Id: I59b3db3f3c5d076b60a2e6f909d7919d5126a1e6 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Entered hardcoded url to XaoS as a workaroundNico Vertriest2012-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | Symbel from external-resource.qdoc not working, so replace it with the url. Corrected in mandelbrot.qdoc Task-number : QTBUG-27512 Change-Id: Ibf54bf707deb73f1cf22d347839dcd347382ecd9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Added documentation for dbus and touch examplesVenugopal Shivashankar2012-12-146-0/+112
| | | | | | | | | | Change-Id: I68b6679e1f3454d93081136a77fc5462e434b61e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Entered hardcoded url workaround QTBUG-28500Nico Vertriest2012-12-141-2/+2
| | | | | | | | | | | | | | | | Url for OpenGL Registry Url for Khronos OpenGL ES API Registry Change-Id: I682ddcedf1e06d589e5c44e364936c78fd9219a5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * QtBase: Removed moved linguist examples.David Schulz2012-12-1420-982/+0
| | | | | | | | | | | | | | Linguist examples are now in qttools. Change-Id: I8abfff50d81cda143a080711bf9583e7be777009 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Doc: remove example docs that were moved to qttoolsLeena Miettinen2012-12-142-159/+0
| | | | | | | | | | | | | | | | | | Remove docs and images for Multiple Inheritance and Text Finder examples that were moved to qttools/uitools. Change-Id: I29e8f76b2512e329c354a6d3676c9b2e09e35726 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
| * Enhance example qtbase/examples/widgets/widgets/mousebuttonsRick Stockton2012-12-143-6/+55
| | | | | | | | | | | | | | | | | | | | | | Add Display and QDebug() of Qt::MouseButtons values. (I.e., Buttons believed to be in 'Pressed' State by Qt.) Assists in platform plugin mouse software debug. Task-number: QTBUG-28603 Change-Id: I4a7a3ac44a8cc7eb1eceb9f348493b58b12dbd69 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 08:09:35 +0000