aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix broken linksSze Howe Koh2013-12-301-1/+1
| | | | | Change-Id: I4c4577edde96978a986606bf30fbb925f871bd42 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* systemdialogs example: path to /tmp is different on WindowsShawn Rutledge2013-12-231-1/+1
| | | | | | Task-number: QTBUG-34100 Change-Id: Ic06ed2933b76704b1a298de826cbe6b8587fee76 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Doc: Updated the image URLVenu2013-12-191-2/+2
| | | | | | | | | | | | | The existing HTTP url for logo.png was automatically redirected to an HTTPS url which fails without SSL. So updated the example to use different HTTP url. Also updated another image URL, which is invalid now. Task-number: QTBUG-35557 Change-Id: I793fc5ebda64b21f443da7db9ecda76ae951d5bf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* QtQuick window example improvements: window size and DPI infoShawn Rutledge2013-12-182-3/+4
| | | | | | | | On high-resolution displays it's important to size the window so that the content will fit. Also show the DPI conversion for pixel density. Change-Id: Ie35852ecff0bb0ee5ab9b77c6c18e82cfc300448 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-121-1/+3
|\ | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlcompiler.cpp Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
| * Fix binding loop in Maroon in Trouble QML demoTopi Reinio2013-12-041-1/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-35210 Change-Id: I44bd9f19acba5b59711aa4ca3d2b12c246afcc59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Sebastian Wozny <swozny@blackberry.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-0327-23/+179
|\| | | | | | | Change-Id: I894ad7b4888744833f487b481950c087fa960a5c
| * Doc: Update examples used in Writing QML Extensions tutorialTopi Reinio2013-11-3027-23/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the examples to use Qt's resource file system to store the qml files in, enabling them to run unmodified in any platform/build configuration. Also, - Chapter 6: Move the plugin code to a subproject and create a C++ application to use the plugin - Update documentation related to above chapter - Add thumbnails for the examples so they will appear in Qt Creators example list. Task-number: QTBUG-35001 Change-Id: I29122af11bb11c7e5e17993438e5fc18c7f96f89 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-203-11/+8
|\| | | | | | | Change-Id: Id732233d56e8d1706f62ef7a153d4a471406c551
| * FileDialog example: remove setGeometry buttonShawn Rutledge2013-11-191-10/+0
| | | | | | | | | | | | | | | | | | This was more of a manual test than an example: it should be possible to set the geometry of widget-based and qml-based dialogs. Since it doesn't work for native dialogs let's not invite bug reports about it. Change-Id: I43cb97bff0af932268ae541e3f812fc17a1f76ae Reviewed-by: Liang Qi <liang.qi@digia.com>
| * examples/quick/window example: fullscreen is possible on OSXShawn Rutledge2013-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | It's normally disallowed without the WindowFullscreenButtonHint. But if we're going to declare a value for flags, then we have to put back the Window type which would otherwise be there by default. Task-number: QTBUG-33607 Change-Id: Ibbd593b2648b98d37c7f70a0b9f96787b0a40f22 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Adapt Qt Quick 2 renderer to work with OpenGL Core ProfileSean Harmer2013-11-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic approach is to have the batched renderer create and bind a vertex array object if it detects we are using an OpenGL Core profile context. The VAO is bound for the duration of the QQ2 renderer's work cycle and unbound at the end so as to not interfere with any other VAO's a user may wish to use. All shaders have been copied and ported to be compliant with the GLSL 150 core specification which is the minimum for a Core profile context (OpenGL 3.2 Core). We are not using any newer features as yet so this will work anywhere we can get a Core profile context. The QSGShaderSourceBuilder class has been extended to resolve any requests for shaders to the same basefilename with "_core" appended prior to any file extension. This could be extended in the future to allow version, or GPU or platform specific shaders. The QSGShaderSourceBuilder has also been extended to allow it to insert #define definitions in the prologue of a shader. Any such definition is inserted: * After the last #extension directive (if any are found) * Otherwise after the #version directive (if found) * Otherwise at the start of the shader source This is required by the custom particle shaders which make extensive use of such #defines. In addition the mechanism used by the distance field glyph cache to extend the cache with new glyphs has been modified to work (and work more efficiently) when using a Core profile context. Rather than using a shader program and a buffer filling quad to blit the old texture into the new cache texture, we instead use the technique of framebuffer blitting. The existing fallback implementation using glTexSubImage2D() is still available if needed. The DECLARATIVE_EXAMPLE_MAIN macro has been extended to allow easy testing of any of the QtDeclarative examples with a core profile context. Just run the example with QT_QUICK_CORE_PROFILE=1 ./text for e.g. The only ones that may not work out of the box are those that provide GLSL shader source e.g. the customparticles or shader effect examples. These work fine if the shader source is adapted to GLSL 150 core. In the future it may be a good idea to expose some context property to QML that the user can use to determine what shader source variation to provide to Qt Quick. Along these lines it would also be very nice to allow the provision of shader source to ShaderEffect or CustomParticle from a separate source file just as we now do within Qt Quick. Task-number: QTBUG-32050 Change-Id: Ia6e9f06dbb8508af9ae03c6b60fb418b4cc9e41f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Polish up QQmlFileSelectorAlan Alpert2013-11-131-1/+1
| | | | | | | | | | | | | | | | Incorporate beta feedback, and hide QQmlAbstractUrlInterceptor as the implementation (instead of making that "the API"). Change-Id: Ib7b14afeb9205fb8a87ed16a6d38b1f468b2aaaa Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Respect device pixel ratio in "OpenGL under QML" example.Gunnar Sletta2013-11-141-1/+4
|/ | | | | Change-Id: I1b67acfdcdb1fb47593a6acd62ffd6c3315b5503 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Doc: Fix broken linksSze Howe Koh2013-11-053-3/+3
| | | | | | Change-Id: Ie7408409ddbaa354370267f2dd74326ec56a4186 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Replace Message attached property with gadget typesShawn Rutledge2013-11-051-21/+21
| | | | | | | | | This is a more efficient way to expose the StandardButton and StandardIcon enums. Change-Id: I9d0becf54be2a883d55c9eaeaf10b83b23e59f3c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Fix warnings in StocQt Qt Quick demoTopi Reinio2013-11-044-10/+22
| | | | | | | | | | | | | Fix a number of warnings from QML engine by adding some boundary & sanity checks for properties. Also address UI update issues by having XMLHTTPRequest calls to trigger by a timer, instead of directly binding them to multiple change notifier signals. Task-number: QTBUG-33867 Change-Id: I48f573050b5dc3e3fe6e75bc423fe86ecc4a2469 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* QtQuick examples make use of the new pixelDensity propertyShawn Rutledge2013-10-303-3/+6
| | | | | Change-Id: I273fc08405724158fbf7c7d410bfa38fef4600b1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Modify SameGame to use QML SingletonAntti Piira2013-10-2911-47/+121
| | | | | | | | | | Converts SameGame to use QML Singleton for storing global settings data that was previously stored in javascript files. In addition adds a BlackBerry specific selector to load a different singleton settings instance. Change-Id: If511e5efd0e539c764ab70eca4fb0f2874b6240e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Make example work on WindowsGunnar Sletta2013-10-222-23/+10
| | | | | Change-Id: I75a035939a390de8cdae03c11599efa0b7ed68df Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Increased precision in shader exampleBernd Weimer2013-10-171-2/+2
| | | | | | | | On BB10 the shader effect displayed as a black rectangle. Change-Id: I9cd12e66875c07cc7ecfa2aec6d7e5912926511e Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Animator overview docs and example.Gunnar Sletta2013-10-034-0/+123
| | | | | Change-Id: If0852e48dbbfea4fadca9c897ea0e62393763055 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Convenience class for FBO rendering in Qt QuickGunnar Sletta2013-09-253-77/+19
| | | | | Change-Id: I5712bbfa0cde9f2fe5fddc35c4cc23597717065c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Apply file selectors to QQmlApplicationEngine appsAlan Alpert2013-09-209-7/+66
| | | | | | | | | You can also manually apply them to a QQmlEngine using setUrlInterceptor(new QQmlFileSelector(parent)), or using your own QQmlAbstractUrlInterceptor subclass. Change-Id: I0c0ff8b080c138686b3c03e0bc3b9f25bcd11a85 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-09-196-0/+141
|\
| * Merge branch 'stable' into devSergio Ahumada2013-09-196-0/+141
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/v8/qqmlbuiltinfunctions.cpp tests/auto/qml/qml.pro Change-Id: Ib373aed6a8f8df9521740fb5b080daed38546cd2
| | * Doc: Reintroduce docs for Qt Quick Models and Views examplesTopi Reinio2013-09-186-0/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | The .qdoc files/images for these examples were lost during modularization. This change adds them back and fixes related links. Change-Id: Id5260daad1c38284e3aa8178ae82d24067f4e88c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Adding QtQuick.Dialogs.MessageDialogShawn Rutledge2013-09-199-1/+400
|/ / | | | | | | | | Change-Id: Ifa3de21e6f611c24742118d6d178edbe14f243be Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Add FontDialog to QtQuick.DialogsLiang Qi2013-09-184-2/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | As with FileDialog, it tries QPA, then QFontDialog, and falls back to a QML implementation (which is also provided here) if neither type of native dialog is available. The update of plugins.qmltypes files will be in a separate commit. Task-number: QTBUG-31852 Done-with: Shawn Rutledge <shawn.rutledge@digia.com> Change-Id: I066ebbcf44c413af26020ddf8414252b99f5218b Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Qt Quick Dialogs: can see and control geometry of QML implementationsShawn Rutledge2013-09-171-0/+11
| | | | | | | | | | | | | | | | | | | | | | QQuickAbstractDialog had x/y/width/height properties already but they didn't do anything. It's still not possible with the native dialogs because neither QPlatformDialogHelper nor QFileDialogOptions etc. have any geometric properties; but the application author can now see and control the geometry of any QML dialog implementation. Change-Id: Icdac9592c72e81175436436027f7fe3d75ff7f42 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | systemdialogs example bug fix: don't allow clicking through tabsShawn Rutledge2013-09-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | For example on Font Dialogs tab of examples/quick/dialogs/systemdialogs/systemdialogs.qml it was possible to open the color dialog by clicking slightly below the open button, because the color dialog tab was behind the current one. Change-Id: If9917e2baef7cfd49a0d01acd73ffa69dfcee088 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Add support for external drag and drop in Quick items.Chris Meyer2013-09-099-0/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dragType enums with values of None, Automatic, Internal (default). Setting to Automatic allows startDrag to be called automatically. Setting to Internal (default) retains old behavior. Add mimeData to Drag item to enable external drags. Call startDrag to start drag manually or change from internal drag to external drag. Added events dragStarted and dragFinished that get invoked from startDrag. Mime data must be specified in the mimeData property as mime-type / data pairs. Moved QQuickDrag from qquickmousearea* files to qquickdrag* files to reduce header interdependencies that caused linking errors in other modules and also to improve code organization. Allow DropArea to receive and process external data. Introduced new variable containsDrag to QQuickDropAreaPrivate. This replaces mimeData which was previously being used to determine if a drop operation was currently occurring. The problem was that mimeData was being externally destructed. Also introduced accessor methods for getting color, html, image, text, and urls out of the drop. This facilitates dropping of external data of those types onto a DropArea. Added example quick/externaldraganddrop. Task-number: QTBUG-27498 Change-Id: I1420df7c161ea3399e49a23305273e106baa246f Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-1975-3980/+353
|\| | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquickgridview/qquickgridview.pro tests/auto/quick/qquickitem/qquickitem.pro Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556
| * Doc: Update example used for QML getting started tutorialTopi Reinio2013-08-0916-268/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the example project referred to in Getting Started with Qt Quick tutorial. - Fix coding/comment style issues - Change plugin TARGET name, Use /imports as the destination directory - Fix qmldir with proper module info, delete unused qmldir from /core - Add a .qmlproject file Change-Id: If269e61fb76399faae753469dc251d07cc219139 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Remove unused /parts directory from QML getting started exampleTopi Reinio2013-08-0256-3718/+0
| | | | | | | | | | | | | | | | | | | | | | | | The example code for getting started with QML doc has six smaller projects under /parts - these out of sync with the main example code in its parent directory, they are undocumented and not referred to in any other documentation. The QML getting started guide itself uses \code blocks to present the code snippets. Change-Id: I3b9c83a60fdeb9fa13f364b04c38943222c682cb Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Make buttons and tabs larger in QML examples and dialogsShawn Rutledge2013-07-294-8/+14
| | | | | | | | | | | | Task-number: QTBUG-32578 Change-Id: Ic89058abc55e5e079f44862986b2132114456147 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | FileDialogs example: added option to open the filesShawn Rutledge2013-08-151-1/+10
| | | | | | | | | | | | | | | | Qt.openUrlExternally is a nice feature to remind users about, and gives this file dialog some purpose. Change-Id: I56e436f8b2f4362891450d57b6d9c36e26983513 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | examples: set application name and organization for QSettingsShawn Rutledge2013-08-151-0/+3
| | | | | | | | | | | | | | | | With the Qt.labs.settings module available, it makes sense for each example to have its own settings file. Change-Id: I8257f04ec13c7caf9995e03626e5453c653cfb92 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Doc: Renamed accessibility example to "quick-accessibility".Jerome Pasion2013-08-1310-3/+3
| | | | | | | | | | | | | | | | -Generated HTML file name conflicted with accessibility group. Task-number: QTBUG-32580 Change-Id: I5f5a4bb8134268c58105ea61d5ae3bbdd35c0d50 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Doc: Renamed and moved examples/qml/i18n to examples/qml/qml-i18nJerome Pasion2013-08-138-10/+10
| | | | | | | | | | | | | | | | | | -the generated HTML page conflicts with the i18n.html page from qtdoc. -edited the content. Task-number: QTBUG-32580 Change-Id: I32ded1913d9faecb95e28043983e957ccd0e8749 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Doc: Moved QML "plugins" example to "qmlextensionplugins"Jerome Pasion2013-08-0913-6/+5
| | | | | | | | | | | | | | | | | | | | The example generates a plugins.html which collides with the plugins.html from qtbase repository. Task-number: QTBUG-32580 Change-Id: I47ce9e00378738f7696672e6e47dd3337bb4fafc Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-08-067-54/+181
|\ \
| * | Merge branch 'stable' into devSergio Ahumada2013-08-057-54/+181
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06f79bcbde13c7b12905492a17dbcbb4a594e557
| | * Doc: Update Tweet Search Demo to use Twitter Search API v1.1Topi Reinio2013-07-266-53/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twitter REST API v1 is no longer supported. This change updates the Tweet Search Demo to use the new version (v1.1). Specifically, - Use of OAuth tokens (authentication required in v1.1) - JSON parsing for results instead of XML - Use of url/hashtag/username entities returned in search results Also, update the documentation to discuss authentication and registering the application to dev.twitter.com. Task-number: QTBUG-31745 Change-Id: I00cd7b07f065babb03483daabe8df22f22995c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | * Doc: Modified the term for the Qt global object.Jerome Pasion2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtQml::Qt is a "QML global object" to differentiate it from the Qt namespace. "QML Qt object" "QML Qt global object" "Qt global object" (in the context of QML-only pages) Change-Id: I1d2896ad48e8432c5eb8b18f05af247986bff336 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative ↵Simon Hausmann2013-08-061-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | into dev Change-Id: I278524d0f43d2237201d9cf78c1c36a5ecc83d84
| * | Prospective iOS build fixSimon Hausmann2013-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reason no Makefile is created for this .pro file. TEMPLATE = app should be the default, but OTOH it's missing here. Change-Id: I499d13368944e552ee85a0c6f194c09e4c19bf8e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Fix image URLAlan Alpert2013-07-301-1/+1
|/ / | | | | | | | | Change-Id: I4abac2a842453dbf6838f55703956b2fd53b8f37 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-236-11/+7
|\| | | | | | | Change-Id: I2279f181b1c30e81651f8907447ec5c826e11475
| * Put back OTHER_FILES in systemdialogs exampleShawn Rutledge2013-07-221-0/+5
| | | | | | | | | | | | | | | | | | Partial revert of 1e9589eb0c2bb9404e11c69e1d76ef9efd89af56. Creator currently needs this variable in order to find the QML files. (see https://bugreports.qt-project.org/browse/QTCREATORBUG-9860) Change-Id: Id5882dfe9733a6b401976e4d6e5baf2066d21b1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 09:03:58 +0000