aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QtQuick.Dialogs.ColorDialog: set current color in the QColorDialogShawn Rutledge2013-07-311-0/+5
| | | | | | | | | It was a missing feature to set the current color programmatically, either before or after showing the dialog. Task-number: QTBUG-32621 Change-Id: I62a811f7c36eaab5356c5924bf3447deca55ada3 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Make buttons and tabs larger in QML examples and dialogsShawn Rutledge2013-07-291-3/+3
| | | | | | Task-number: QTBUG-32578 Change-Id: Ic89058abc55e5e079f44862986b2132114456147 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Workaround for distance field glyph upload problem.Yoann Lopes2013-07-261-2/+4
| | | | | | | | | | | It seems uploading an image (into a texture) which has padding at the end of each scanLine and alpha-only pixel format is broken with some OpenGL ES drivers. The workaround is to upload one line at a time. Task-number: QTBUG-30908 Change-Id: Ic680654951b6aec294c1a173708c1fb75e57ff8f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Keep the QML ColorDialog's controls in sync with the color propertyShawn Rutledge2013-07-252-7/+26
| | | | | | | | | | Until now, the user could change the color by dragging the crosshairs or the sliders, but if the application set the color property, it did not programmatically move the crosshairs and sliders. Task-number: QTBUG-32545 Change-Id: Idd54e711400dfd78d570161297559f9521c1d67f Reviewed-by: Liang Qi <liang.qi@digia.com>
* Correct initial/minimum size of default QML ColorDialogShawn Rutledge2013-07-251-1/+1
| | | | | | Change-Id: Idd53d9c7246b17a9159faec06a7ce6c6355cd09f Task-number: QTBUG-32572 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Doc: Link to QML Qt object in relevant locationsTopi Reinio2013-07-252-1/+6
| | | | | | | | | | There is no obvious path to find the reference for QML Qt object. This change adds links to it in Qt QML module index page and QML Basic Types documentation. Task-number: QTBUG-31921 Change-Id: I8a4ef1b3e696a0a7dec416d759ae64110e59c6c0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Modified the term for the Qt global object.Jerome Pasion2013-07-251-4/+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>
* Link between "QML Basic Type: date" and QML Date object documentation.Mitch Curtis2013-07-233-8/+9
| | | | | | | | | | The basic date type seems useless if you don't know it can be used as as JavaScript date (with QML extensions). Task-number: QTBUG-32492 Change-Id: I14962f4e57522f5515f0e78d484aa59fcd9dff3c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Use GET method for redirect in QDeclarativeXMLHttpRequest.Friedemann Kleint2013-07-221-0/+5
| | | | | | | | Initial-patch-by: Marek Więckowski <wiecko@fuw.edu.pl> Task-number: QTBUG-32332 Change-Id: I5514d97ef8574f8e7eef8fcca39bed4cd7e917ad Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Fix CLANG-warning '&&' within '||' [-Wlogical-op-parentheses].Friedemann Kleint2013-07-121-1/+1
| | | | | Change-Id: Id724c86f87a78048df9b93f2d190593d36261943 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix CLANG-warning about unused member variable m_defaultAntialiasingMode.Friedemann Kleint2013-07-121-1/+0
| | | | | Change-Id: I68a04532bacd326b4bb3eb8f9a7ee04c67fcd68e Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Docs: restore missing ListModel methodsJ-P Nurmi2013-07-081-9/+9
| | | | | Change-Id: Icb491d14d42af769928b1663be0877e23ff43850 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixed typo 'backens'Thorbjørn Lindeijer2013-07-081-1/+1
| | | | | Change-Id: I65e4492d1bc70e5344c0edc37a7c2f87fe355e62 Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
* Update snap when snapMode changesAlbert Astals Cid2013-07-081-0/+1
| | | | | | | Task-number: QTBUG-32258 Change-Id: Id2120acad06d7cfce988400df0067e2c0f16eb24 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix typo in Graphical Effects documentation.Mitch Curtis2013-07-081-1/+1
| | | | | Change-Id: Iad5ee6a965a6373941468bf98ac328e51c5c4066 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Item views: do not track the geometry of items being removedJ-P Nurmi2013-07-044-41/+45
| | | | | | Task-number: QTBUG-31873 Change-Id: I4230893ccb2925ed9c2429d26b411264bf7c1c65 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* QQuickTextEdit: move QSG* members from dptr to root node.Pierre Rossi2013-07-032-19/+39
| | | | | | | | | Subclass QSGTransform node for our use case and add the frame decorations and cursor nodes in there. Task-number: QTBUG-31580 Change-Id: Id2b468b53092f21134ae45e5694bc54c43660f8b Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Doc: Fix documentation of ownership of in QmlComponent::createKai Koehne2013-07-031-4/+2
| | | | | | | | | Fixes documentation introduced in b1ee75d377fc9517d6 : Actually the ownership is _always_ transferred to the caller. Change-Id: I3b50588b69fa45730ac09c46912f8319e7581a5f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix access to invalid memory in ~QQmlEnginePrivateKai Koehne2013-07-031-3/+0
| | | | | | | | | | | | | | ~QQmlEnginePrivate tries to set incubationController->d to 0. However, we're already setting the backpointer (q) of incubationController to 0 in ~QQmlEngine, so that the IncubationController destructor might run in between without being able to reset incubationController. To fix this, just handle the unsetting of incubationController once, in ~QQmlEnginePrivate. Task-number: QTBUG-32161 Change-Id: I43a72dcfc0f95938ebfa67d3998adff1fb2d05a1 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Initialize m_dirty_texture memberGunnar Sletta2013-07-031-0/+1
| | | | | Change-Id: I4fa2774aef9bc3258572d28425d1427151297358 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Fix warning about change of sign: glyph_t is unsignedThiago Macieira2013-07-031-3/+3
| | | | | | | | | qsgdistancefieldglyphnode_p.cpp(222): warning #68: integer conversion resulted in a change of sign Use the value 0, which is reserved to mean "no texture" Change-Id: I0bb135639c432ab08f6561c1d45f64e2d8f96dd7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix missing QQuickTextDocument docsJ-P Nurmi2013-07-022-18/+18
| | | | | | | | | It didn't appear in the docs at all. Moving the documentation to .cpp fixes the problem. Change-Id: Id9741bc6dab20ba976952143160d3551787fae40 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Debugger: Remove handling of QT_DECLARATIVE_DEBUG macroKai Koehne2013-07-021-1/+1
| | | | | | | | | | This was added originally to keep older Qt Creator versions working. However, any newer versions automatically set QT_QML_DEBUG too, and checking for both actively prevented selectively enabling QtQuick1 or QtQuick2 debuggers only. Change-Id: I4d4a984958ef3430ebe05b267bd87185005bbe51 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Disambiguate name of static helper from QtQuick1Kai Koehne2013-07-021-2/+2
| | | | | | | | | | Change name of static 'qmlEnableDebuggingHelper' variable to disambiguate it from QtQuick1 variable with the same name. Task-number: QTBUG-31064 Change-Id: Ia4b0f18a33a383dd4ade1bdb45506304f9066502 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Document public members of QSGSimpleMaterialShaderGunnar Sletta2013-07-021-3/+15
| | | | | Change-Id: I2e46989d4076ff639d7264985e030df0f1cb2a88 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Relayout the text after the vertical alignment is changedMarco Bubke2013-07-011-0/+4
| | | | | | | | | | In the designer it is no working without a layout update. Task-number: QTBUG-32041 Change-Id: I2276914c81b38ad8931109b3d800b65a0d11bca7 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Only emit moving change signals when moving actually changesAaron Kennedy2013-07-011-2/+2
| | | | | Change-Id: Ib775ce8439183388634c6b08785cd8aff4e8e174 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Document QWindow::alert() in Qt Quick.Friedemann Kleint2013-06-281-0/+12
| | | | | | | | Task-number: QTBUG-32069 Task-number: QTBUG-30416 Change-Id: If7e9fd63d858416a23ff768272d94219595be1c5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2826-114/+265
|\ | | | | | | Change-Id: I140852ef7fbbfe303dac620af5e6eba5ee3a4b02
| * FileDialog.folder property should also be a QUrl, for consistencyv5.1.0-rc2v5.1.0Shawn Rutledge2013-06-2811-42/+45
| | | | | | | | | | | | | | | | | | | | In QtQuick we never use plain file paths, because URL is more general. Also use const references for string and URL setters, and fixed the dependency between the FolderListModel's folder, the field for editing it, and the folder property of the AbstractFileDialog. Change-Id: I6e965b80b73d4eb2473712a4f4d4f816b768d802 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * QtQml: document QQmlExtensionPlugin::baseUrlShawn Rutledge2013-06-282-1/+10
| | | | | | | | | | | | | | | | | | | | | | It was added here https://codereview.qt-project.org/#change,47532 without documentation. Also updated \since because for now qdoc seems to interpret \since 5.0 as QtQml 5.0. Task-number: QTBUG-31928 Change-Id: I652e9471f1ad8e83b355bffc8498a6565dc9aa2b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| * QtQuick.Dialogs: sync the docs with the implementationShawn Rutledge2013-06-275-28/+22
| | | | | | | | | | | | | | | | | | | | We've been using URLs instead of strings for some time now, just forgot to change the docs until now. Task-number: QTBUG-31847 Change-Id: I49a42282aeefb95e4d367397e2f290f4af65687e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Switch to non-streaming version of qWarning()Alan Alpert2013-06-271-2/+1
| | | | | | | | | | | | | | | | | | Allows us to drop the qdebug.h include in a public and frequently used header. Change-Id: I2cb05fbec6298ba600020db684e9eea4093ce663 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * Undo presumably accidental line deletionAlan Alpert2013-06-271-0/+1
| | | | | | | | | | Change-Id: I7ddb3ef9b45cfb95c48c2060dc62acd4ed9d64f9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Declarative dialog improvements for the non-Window use caseShawn Rutledge2013-06-2610-41/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | Platforms like Android and EGL don't support multiple top-level windows, so we have to avoid trying to use widget-based dialogs (because a widget dialog on top of a scene graph will result in a second window), allow the QML dialog to be an Item, and decorate it to look like a window. Task-number: QTBUG-31898 Change-Id: I9af049f3265188e8be677a05a8bc6d1699b4cd00 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Request paint if scene changes for the canvas itemMarco Bubke2013-06-261-1/+4
| | | | | | | | | | | | | | | | | | Otherwise for every scene the canvas is simply not painted anymore in the designer. For example if you change the parent. Change-Id: I4883eab44d73a59381230755f7caa596f2b6569f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-265-5/+11
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-255-5/+11
| |\| | | | | | | | | | Change-Id: I6e060496b8c252fb4e2d5d2d40ae16bf950e2ec4
| | * Update 5.1.0 changelog and what's newAlan Alpert2013-06-252-1/+7
| | | | | | | | | | | | | | | | | | | | | All the new features should now be listed in those two documents Change-Id: Ifa17581bf589f3a18b602f8a1d10683a5e48c70d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * QQmlPlatform: rename "mac" to "osx"J-P Nurmi2013-06-242-3/+3
| | | | | | | | | | | | | | | | | | Change-Id: Ie458690b8008b211785cf9dcc0312a7e25c84f6b Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Add missing Q_REVISIONAlan Alpert2013-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | This invokable method is new in Qt 5.1/QtQuick 2.1 Change-Id: I7d0e332b52a815ac0722e39db68ef1f190534a57 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | | QQmlTrace: getpid() requires unistd.hShawn Rutledge2013-06-251-0/+1
|/ / | | | | | | | | | | | | | | Doesn't build on MacOS if you omit this include and uncomment define QML_ENABLE_TRACE in qqmltrace_p.h Change-Id: I78ed43b16a006699449202dd234e43be2f7b84fd Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Improve QtQuick Item Anchors documentation.Mitch Curtis2013-06-251-5/+5
| | | | | | | | | | Change-Id: Ib47051be82df16e5d08df50b5327aba8c004f4d3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Tidy up Context2D transform-related documentation.Mitch Curtis2013-06-257-20/+31
| | | | | | | | | | | | | | | | | | | | Also adds back some images that 61d35829eed6661c1371d397bbb316ea2f636c50 removed (4a5d31a56dfd871f3f7c5ce162885ebc870b8803 specified the wrong paths to all but one file, which is probably why they were cleaned up). Change-Id: Idd42bb831c97935e53ce05c69ea2691a2769f453 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-242-4/+10
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-202-4/+10
| |\| | | | | | | | | | Change-Id: I6bd61ebda17c34f51a4c4ece4852ab144bf542a6
| | * QColorDialogHelper: Force QWindow before setting flagsShawn Rutledge2013-06-192-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs the same fix as the one in the QFileDialogHelper (change I7a3b2321f4a1bf179dced8e98598559f396386db). However to be even safer, we can check for a null pointer before calling any methods on the QWindow. Task-number: QTBUG-31834 Change-Id: I319326f06fb2c92dc898fd12be86b6c7b7f87e5a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * QFileDialogHelper: Force QWindow before setting flags.Friedemann Kleint2013-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes a crash when clicking the dialog icon in the QtQuickControls gallery example. Change-Id: I7a3b2321f4a1bf179dced8e98598559f396386db Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | emit runningChanged when AnimatedSprite stops by loops settingsTasuku Suzuki2013-06-221-3/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31522 Change-Id: I20718cda5f77f3a53176c8b1a4baacedd77375af Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Fix some Canvas/Context2D documentation issues.Mitch Curtis2013-06-212-32/+53
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-23597 Change-Id: I7b3c343a822c136cecec5ce9ce705f2d99466e77 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 20:51:31 +0000