summaryrefslogtreecommitdiffstats
path: root/examples/widgets
Commit message (Collapse)AuthorAgeFilesLines
* docs: DirView example uses QFileSystemModel not QDirModelShawn Rutledge2013-05-311-1/+1
| | | | | Change-Id: Ie172b1458401c4627314ff0db6992647388bf382 Reviewed-by: Jerome Pasion <jerome.pasion@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>
* 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>
* 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>
* | Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-16114-573/+573
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+189
|\ \ | | | | | | | | | | | | | | | | | | | | | 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-0/+189
| |/ | | | | | | | | | | | | | | | | | | | | | | 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-052-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | 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-202-0/+4
| | | | | | | | | | | | 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-2610-12/+12
| | | | | | | | | | | | | | ...but QT_NO_PRINTER isn't. Change-Id: I888c177cfdd2245eb55de766dfd93f6acd4293e9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@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-1426-69/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'release' into stableSergio Ahumada2013-01-3126-69/+32
| |\ | | | | | | | | | 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-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 some more old references and links to NokiaSergio Ahumada2013-01-285-5/+5
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28156 Change-Id: I9ba0d6f1e92103219bec1e61e716b6b2f269a8ad Reviewed-by: Laszlo Papp <lpapp@kde.org> 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-297-7/+7
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-287-7/+7
| |\| | | | | | | | | | | | | | 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-253-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-22837-837/+837
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-18837-837/+837
| | | | | | | | | | | | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-161-42/+42
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/styles/qstyleanimation.cpp Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8
| * | Doc: corrected typo "the the"Nico Vertriest2013-01-111-42/+42
| |/ | | | | | | | | | | | | | | | | | | | | 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-04256-404/+935
|\| | | | | | | | | | | | | | | | | | | | | 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
| * add and use qtHaveModule() functionOswald Buddenhagen2012-12-2121-23/+23
| | | | | | | | | | | | | | | | | | | | | | 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 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-17141-293/+283
| | | | | | | | | | | | | | | | | | 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-1720-36/+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>
| * Doc: remove example docs that were moved to qttoolsLeena Miettinen2012-12-141-0/+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>
| * Fix empty window title regression, add application display name to window titleDavid Faure2012-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This increases consistency a lot: all windows and dialogs from a Qt application will show the app display name in the caption, on Windows and X11. This helps identifying which app a dialog belongs to, which is especially useful when the dialog is very generic and shows up unexpectedly. For compatibility reasons, the app name is added to the caption only if setApplicationDisplayName() was called -- or if the caption would be completely empty. The standard Qt4 case (setWindowTitle + no display name) is unchanged. Change-Id: Ib284c62c1f4c0bc923e5bc2d10247d95e9aa76c1 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Docs: Fix referencesChristian Stenger2012-12-131-1/+1
| | | | | | | | | | Change-Id: I48173186afb874d307010f4f303d0e4f97ec0287 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Added documentation for the examplesVenugopal Shivashankar2012-12-1120-24/+36
| | | | | | | | | | | | | | | | | | | | | | - Moved documentation for the Qt XML, Qt Widgets, Qt Concurrent, and Qt Network examples from qtdoc. - Grouped the documentation pages under relevant groups - Fixed \snippet paths Task-number: QTBUG-27515 Change-Id: I43c22a679e2eefbb48e3cd5893aa2afd3d905863 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * QtBase: Doc: Fix Links to designer manual.David Schulz2012-12-101-3/+2
| | | | | | | | | | Change-Id: I87f68fb70aa773c44b90b58bd56fc5585a7e4107 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Doc: Updated outdated docs to use new macroChristian Stenger2012-12-102-9/+18
| | | | | | | | | | Change-Id: I9a3528112fba1db988592d9f4f470ec678e81e1a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix compile with -DQT_NO_SYSTEMTRAYICONMontel Laurent2012-12-063-1/+34
| | | | | | | | | | Change-Id: Icca0bef7efca77a841b30f40692144663e7ae913 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * doc: Add missing images in richtext example docsEskil Abrahamsen Blomfeldt2012-12-063-0/+0
| | | | | | | | | | | | | | Copied from Qt 4.8 Change-Id: Ic98a5e87305dbf9bb0df7ae071c42bb42a803b10 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * doc: Fix Graphics View example docsEskil Abrahamsen Blomfeldt2012-12-069-2/+154
| | | | | | | | | | | | | | | | | | | | | | Make the same layout of the new graphics view example documentation as we had before (except by using annotatedlist instead of hardcoding the links). I've also moved four examples from qtdoc to qtbase so that they can be included in this documentation. Change-Id: Ic2202ade119cadd98d036f1bd77e91dae49b5677 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Fix compile with -DQT_NO_TRANSLATIONMontel Laurent2012-12-055-2/+11
| | | | | | | | | | Change-Id: Ia6929f871485476e8b5bb14e7bf8117d0c562841 Reviewed-by: David Faure <david.faure@kdab.com>