summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* dbus-chat => chatOswald Buddenhagen2012-11-287-1/+1
| | | | | | | to make the source and install locations consistent Change-Id: Ifde8748eeab843b06bf79f941fa4789b5b68cca9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove rather useless text fileOswald Buddenhagen2012-11-281-4/+0
| | | | | | | somebody who cares can find the information in the git log Change-Id: I97dff4ab33a773247e1320ba6491e6377a2b94e7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove apparently unused fileOswald Buddenhagen2012-11-281-8/+0
| | | | | Change-Id: Ie8b60b9e63c5783674cbac3bbe277f58d3059ea3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove meaningless OTHER_FILES assignmentsOswald Buddenhagen2012-11-282-6/+0
| | | | | | Change-Id: Id3d5690d5b174e5374332158709365ab431f660b Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* README.txt => READMEOswald Buddenhagen2012-11-281-0/+0
| | | | | | | use the same naming everywhere Change-Id: Ic9106a17eb0979278f12f2ea2b7c1a04bc448745 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* delete .desktop files of examplesOswald Buddenhagen2012-11-28219-2409/+0
| | | | | | | | | they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I27e2c35375e28645b0c03449ddc7ac7017da5943 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Always use QAIM to get the default flags.Stephen Kelly2012-11-286-7/+7
| | | | | Change-Id: I801f5c8023e3e3672fde28139a7f34f640e650f5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Examples: move widgets specific "tools" examples to the correct placeJ-P Nurmi2012-11-28204-157/+168
| | | | | | | examples/tools -> examples/widgets/tools Change-Id: I8b9e23c45e07ce5cd9da8f24a9a9f7ae10b2b107 Reviewed-by: hjk <qthjk@ovi.com>
* Change copyright information from Nokia to DigiaSergio Ahumada2012-11-271-3/+3
| | | | | | | Task-number: QTBUG-28156 Change-Id: Id6b1cd83155c61b0d3ead2d185b8968511d4a23f Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update the StylePlugin exampleJ-P Nurmi2012-11-272-14/+18
| | | | | | | | | QWindowsStyle will soon become an internal class, inherit SimpleStyle from QProxyStyle. The documentation has been updated accordingly. Change-Id: Ib55f59729e980b93276e9c2903f13b5e46612ac8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove remaning TARGET.EPOCHEAPSIZE settings from examples.hjk2012-11-272-4/+0
| | | | | | | Not needed anymore. Change-Id: I28b6566e1498afb68295c16e8786fe8bc0256361 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Fixed abbreviations in QWindow::framePos() and QWindow::setFramePos().Samuel Rødal2012-11-271-2/+2
| | | | | | | | | | | | As 672e7c875e8680818e23d0aef98129d95eb7e91c did changing pos() to position() and setPos() to setPosition(). Luckily there's not much code that uses these. Change-Id: I1e1982f00412a22bd376e667a5e8c30b6149f9b5 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Examples: inherit NorwegianWoodStyle from QProxyStyleJ-P Nurmi2012-11-263-18/+26
| | | | | | | | | | | | | | The QStyle specializations are being made internal. The recommended way to customize styles is now to use QProxyStyle (& QStyleFactory), or to implement a full custom style one can alternatively subclass QCommonStyle. The proxy style approach was chosen for this case, since the example assumes some drawing functionality provided by the windows style and it is not a "complete" custom style implementation but more like a customization anyway. Change-Id: Ib2477339cfef258cfc944a76a2eea728066e1f45 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Widgets/Painting examples: inherit ArthurStyle from QCommonStyleJ-P Nurmi2012-11-262-12/+12
| | | | | | | | | The QStyle specializations are being made internal. The ArthurStyle does not seem to require anything from QWindowsStyle, but QCommonStyle as a base class gives just as nice looks. Change-Id: I5ad8dd881e03f166ae5d3aedccb2688952dc0a28 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Examples: Install to $$[QT_INSTALL_EXAMPLES]/$submodule/$examplehjk2012-11-26300-584/+584
| | | | | | | | This makes the structure of the examples after an 'make install' similar to the one in a 'developer build'. Change-Id: I9120bd741fab332e64e30adc01cefe87e5633454 Reviewed-by: Martin Smith <martin.smith@digia.com>
* LocaleSelector: Replace hard-coded impl with an algorithmic oneKonstantin Ritt2012-11-251-253/+23
| | | | | | | | The old implementation is just not acceptable! The new one is able to distinguigh locales by script. Change-Id: Ic772f6da8744825080f739e64af00267e5f82434 Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* QtBase: example code styleDavid Schulz2012-11-2532-93/+83
| | | | | Change-Id: I0685f7e2c7c698a4bf288b8b1ae909167932a3fb Reviewed-by: hjk <qthjk@ovi.com>
* QtBase: examples/widgets/richtext code styleDavid Schulz2012-11-2415-87/+90
| | | | | Change-Id: Ie0c27464e0fdb8f26caf0d8f27043da4ec45f41f Reviewed-by: hjk <qthjk@ovi.com>
* Prevent easing example warnings.Thomas Hartmann2012-11-231-2/+19
| | | | | | | | | | | | | | examples/widgets/animation/easing was spitting out a lot of "QEasingCurve: Invalid tcb curve" warnings. The reason was that in case of the TCP curve we do not provide defaults. The function createEasingCurve() now provides reasonable values for the custom curves to show what is possible and how to use them. Change-Id: I880d8d0f0ce2872ce2019f7d2e000f4c4ce136e2 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QtBase: examples/widgets/graphicsview/ codestyleDavid Schulz2012-11-2349-302/+296
| | | | | Change-Id: I501066b5eb5a1557d510e0ec20b5270e8c12704a Reviewed-by: hjk <qthjk@ovi.com>
* QtBase: examples/widgets/painting code styleDavid Schulz2012-11-2337-264/+218
| | | | | Change-Id: I3d3c6f3bae20ac8383279437f8f89c92195a704f Reviewed-by: hjk <qthjk@ovi.com>
* QtBase: examples/widgets/itemviews code styleDavid Schulz2012-11-2266-385/+355
| | | | | Change-Id: I78a7745f7dc3add3fd7780220118d1b35b50a941 Reviewed-by: hjk <qthjk@ovi.com>
* QtBase: examples/widgets/itemviews/addressbook codestyleDavid Schulz2012-11-2211-73/+69
| | | | | Change-Id: I710d67018351c34ef14ac30edcca81aba7ff5ad3 Reviewed-by: hjk <qthjk@ovi.com>
* Remove warnings from qtbase.Mitch Curtis2012-11-212-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | geometryengine.cpp: In member function 'void GeometryEngine::drawCubeGeometry(QGLShaderProgram*)': geometryengine.cpp:159:93: warning: cast to pointer from integer of different sie [-Wint-to-pointer-cast] geometryengine.cpp:167:95: warning: cast to pointer f rom integer ofdifferent size [-Wint-to-pointer-cast] benchmarking.cpp: In member function 'void TestBenchmark::multiple()': benchmarking.cpp:85:9: warning: variable 'result' set but not used [-Wunused-but-set-variable] benchmarking.cpp: In member function 'void TestBenchmark::series()': benchmarking.cpp:120:9: warning: variable 'result' set but not used [-Wunused-but-set-variable] qstandarditemmodel.cpp:2717:45: warning: unused variable 'd' [-Wunused-variable] qxcbconnection.cpp: In member function 'xcb_timestamp_t QXcbConnection::getTimestamp()': qxcbconnection.cpp:930:40: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qguiapplication.cpp: In constructor 'BlockableWindow::BlockableWindow()': tst_qguiapplication.cpp:340:9: warning:'BlockableWindow::enters' will be initialized after [-Wreorder] tst_qguia pplication.cpp:339:9: warning 'int BlockableWindow::leaves' [-Wreorder] tst_qguiapplication.cpp:342:12: waring: when initialized here [-Wreorder] tst_qsqltablemodel.cpp:570:10: warning: unused parameter 'value' [-Wunused-parameter] tst_qabstractitemview.cpp:1546:8: warning: unused parameter 'index' [-Wunused-parameter] Change-Id: I49c88547182e4669cfde2c2536403fc5573ca2da Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Clean up diagramscene example's toolbutton icons.Mitch Curtis2012-11-216-4/+4
| | | | | | | | | | | | Remove artefacts from pointer.png. Replace several PNGs with images without artefacts (used FreeSerif as the font). Stopped scaling images up in MainWindow::createColorToolButtonIcon. Change-Id: I7adf2deea73b89c631d39d575804e8d3f58c9fe1 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Fix building of examples.Friedemann Kleint2012-11-21182-355/+385
| | | | | | | | | | | - Correct install path of widget examples to contain widgets directory in target tree. - Add missing resources. Task-number: QTBUG-27977 Change-Id: If4cb117998892b0b165d7678367553d3a7553b91 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* QtBase: examples/widgets/layouts coding styleDavid Schulz2012-11-2110-18/+14
| | | | | Change-Id: I4340c1fcbb467bf3c2ace3b4bd4b042fe9521c35 Reviewed-by: hjk <qthjk@ovi.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-2023-48/+92
|\ | | | | | | | | | | | | | | | | | | | | Added prepare_docs to qt_build_config.prf (it was added directly in configure in the source branch) Conflicts: configure tools/configure/configureapp.cpp Change-Id: I1337c69fc62b1c934e3e39b4409e4857440c9db8
| * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocsJerome Pasion2012-11-026-361/+0
| |\ | | | | | | | | | Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
| * \ Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-261-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
| * | | Move validators example from qtdoc repo to qtbase repoJan Arve Saether2012-10-241-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old path in qtdoc repo: doc/src/examples/widgets-validators.qdoc Change-Id: Ibf6cad9e7525fff3360cd0b99ce0911b864dea1d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | | Use \annotatedlist for list of examples instead of "manual links"Jan Arve Saether2012-10-2421-45/+55
| | | | | | | | | | | | | | | | | | | | Change-Id: Id945fd35f5eb6a6d11156d4a1356f99cc49405e2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | | Doc: Added landing-, examples- and C++ class list-page to qtwidgetsJan Arve Saether2012-10-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems this is the pattern to follow: landing page: qtwidgets-index.html examples page: qtwidgets-examples.html class list page: qtwidgets-module.html Change-Id: I3e5459fe650178e0398cb43181b594c0f12a170e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | Rename all QWindow properties that have "window" in themShawn Rutledge2012-11-076-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | windowTitle, windowModality, windowIcon and so on are named that way to be similar to the ones in QWidget. However QQuickWindow inherits all of the declared properties, and we would like to have shorter property names in QML. If you are working with a Window then it's obvious the title property is the window title. Unfortunately, there must be patches in many other modules which depend on this one. In order to avoid the need to merge them all at the same time, there is also patch https://codereview.qt-project.org/#change,39001 which temporarily adds backwards-compatible accessors, which can be removed after the other modules are able to build without them. We should not rename windowState to state, because in QML, state usually drives the state machine for animation transitions etc. (although QWindow is not an Item, a user might get confused about it). Related patches are https://codereview.qt-project.org/#change,39001 https://codereview.qt-project.org/#change,37764 https://codereview.qt-project.org/#change,37765 https://codereview.qt-project.org/#change,37766 https://codereview.qt-project.org/#change,37762 Change-Id: Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | Fix hellowindow example generating excess timersMiikka Heikkinen2012-11-052-5/+8
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was creating a new timer on every expose event, which quickly leads into massive excess of timeout signals. Fixed by only creating one timer. Task-number: QTBUG-27836 Change-Id: Ia6ed1bd9575e296f4c6c5b12509095e4d5c016dd Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Do the actual removal of the Soft Keys API and related codeJan Arve Saether2012-10-296-361/+0
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to the actual removal of the softkeys API in QAction, this commit removes some enums related to the softkeys feature: Qt::WA_MergeSoftkeys Qt::WA_MergeSoftkeysRecursively It also removes some "zombie" enums: Qt::WindowSoftkeysVisibleHint = 0x40000000, Qt::WindowSoftkeysRespondHint = 0x80000000, (The only implementation that used these were removed when qapplication_s60.cpp and qwidget_s60.cpp were removed.) Change-Id: Ib6fc6d543def4757383d5f19256199d9d190c614 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Modularize drag and drop documentationGatis Paeglis2012-10-191-1/+1
|/ | | | | | | | - Move dnd docs and examples out of QtDoc module to gui library in QtBase - Remove info related to Motif dnd since Qt5 doesn't implement it Change-Id: Id7eb4eb422f4294a36dd92709ce3007903371f03 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixed cube opengl exampleOliver Wolff2012-10-171-1/+2
| | | | | | | | | | | Proper variable initialization should fix crashs and black screens for that example. Task-number: QTBUG-27281 Task-number: QTBUG-27021 Change-Id: I538f233ea3c2faf6c1864c46be0d03828e92a110 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Use organization name "QtProject" in examples.Friedemann Kleint2012-10-1610-17/+17
| | | | | Change-Id: Ibbe9517ccf81d25eccbdff98f7cfe8ff6ec485d2 Reviewed-by: hjk <qthjk@ovi.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-10-152-4/+4
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I66d941a5fa7ed8046a3498686432450018a8dfaa Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-10-1538-77/+116
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ia683171b30b5bf7cedb56cc3087b4b68644a3da1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Removed references to stale links.Jerome Pasion2012-10-131-5/+1
| | | | | | | The links are from the qt-webpages.qdoc and no longer exist. Change-Id: I8329032215fa77811117e2767bae745795b209cb Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix missing return in QtOpenGl/paintedwindow example.Friedemann Kleint2012-10-131-1/+1
| | | | | | Change-Id: I17da0e93bb7c1b0cdbb5b76035ec913cbc616608 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Delete the QVariant ctors taking global Qt enum values.Stephen Kelly2012-10-102-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They have unexpected results in Qt 5 (the Qt::GlobalColor one works as expected in Qt 4, but was removed in Qt 5): QVariant v = QVariant(Qt::red); qDebug() << v; // QVariant(int, 7) v = Qt::red; qDebug() << v; // QVariant(int, 7) The correct way is to use: QVariant v = QVariant::fromValue(QColor(Qt::red)); The deleted constructors are the ones for which there is a class with an implicit constructor taking the enum, and that class is a built-in metatype. QLocale::Language and QKeySequence::StandardKey would also fit the description, but I can't include the header for QKeySequence as it is in QtGui, and I don't want to include the qlocale header in qvariant.h. Putting a QLocale::Language is probably very uncommon anyway. The QTextFormat test is doing the wrong thing, but the result isn't being tested. Added new tests which fail before the patch. Change-Id: Ia38a0784990f4d40ff7457a86daf58aabd4964eb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* remove superfluous include from echoplugin exampleJoerg Bornemann2012-10-081-1/+0
| | | | | Change-Id: I8a53c5e628e43796d7f4b53c311dd4d200527262 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Made cube example not use glActiveTexture.Samuel Rødal2012-10-021-2/+1
| | | | | | | | | We're setting the default texture unit anyway, and glActiveTexture would require resolving through QOpenGLFunctions. Task-number: QTBUG-24555 Change-Id: Id8d660baaa1532e7b8e623673f501703c76fac65 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QPA/Windows example: Set proper window flags, titles, names.Friedemann Kleint2012-10-012-4/+19
| | | | | | | | Do not leak windows. Change-Id: I3af29ce597742cbe6444208aa72443c0507819db Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added QGLPixelBuffer implementation using framebuffer objects.Samuel Rødal2012-09-273-7/+7
| | | | | | | | | | | Instead of having QGLPixelBuffer be a unusable stub implementation we deprecate it and implement it in terms of QOpenGLFramebufferObject. Framebuffer objects are anyway the recommended replacement for pixelbuffers in modern OpenGL, as the context switching overhead is avoided. Change-Id: Ia220c358ee92813e87981d297c51d84525010322 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* fix conflicting Visual Studio project names for Qt examplesJoerg Bornemann2012-09-2715-0/+30
| | | | | | | | | Loading examples.sln resulted in a cascade of error messages because Visual Studio doesn't allow projects of the same name in a solution. Now using QMAKE_PROJECT_NAME to give the projects distinct names. Change-Id: Ifd3a00311253e4b234ece936092649ce0f0869d8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Remove CDE and Motif styles from qtbaseJens Bache-Wiig2012-09-277-31/+24
| | | | | | | | | | | | | | | | | It is time to clean up some of our legacy code. These styles have not been actively maintained for a long time and I think it is safe to say that they should no longer belong as part of the default distribution of Qt. We dont support any platforms based on CDE with our source packages. Note that even if we are removing these styles from the default distribution of Qt, applications that depend on them will still be able to bundle the existing (and unmodified) styles along with their own source code as we are not breaking compatibility. Change-Id: I1709630c20ba8e8088cd01628628d86856db57a4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>