aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* a nested Window automatically becomes transient for its parentShawn Rutledge2013-04-105-5/+115
| | | | | | | | | | | | | | | | If you declare Window { Window {}} or Window { Item { Window {}}} the inner window will automatically become transient for the outer one. The transient relationship must be set before the inner window becomes visible though, so declaring visible: true doesn't always work, depending on initialization order. It's OK if you assign visible (or call show()) later on when the user needs to see the transient window for the first time. Also added documentation. Change-Id: I888c3b9da6d44d11516227c085bcc12a5ccb5e81 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Fix new warnings in qtdeclarative (found by GCC 4.8)Thiago Macieira2013-04-093-2/+2
| | | | | | | | | qqmlproperty.cpp:1561:35: warning: typedef ‘VMEMO’ locally defined but not used [-Wunused-local-typedefs] qquickglobal.cpp:1017:13: warning: ‘initialized’ defined but not used [-Wunused-variable] qquicktextnode.cpp:245:6: warning: unused parameter ‘position’ [-Wunused-parameter] Change-Id: I48c5486953278dc960249f68e0e122d108f56e07 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Version new property and signalLiang Qi2013-04-082-2/+3
| | | | | | | | activeFocusOnTab and activeFocusOnTabChanged in QQuickItem. Task-number: QTBUG-30446 Change-Id: I973df95d690b8e533b5cc108d8e083a2fed8528a Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fixed distance field text when using non-opaque colors.Yoann Lopes2013-04-062-6/+24
| | | | | | | | The alpha has to be premultiplied before passing the color to the shader. Change-Id: If22f0e0892eb4330d5f7398bea2710fce18c4dcb Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* TestLib: Add more mouseMove in mouseDrag implementationCaroline Chao2013-04-061-0/+14
| | | | | | | | | | | | | So the cursor has intermediate states while dragging instead of jumping to the final position. This is for example useful for testing the behavior of a control during the drag. Add autotest. Change-Id: I061dd18ef7ac389aa4da4a5b60f9e128ee8c08d0 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Use correct alpha range for the distance field outlined text.Yoann Lopes2013-04-061-8/+14
| | | | | | | | | | The alpha treshold values used in the outline shader were hard-coded. It should use the same logic as in the normal text shader, using the ThresholdFunc and the AntialiasingSpreadFunc for calculating these values. Change-Id: I0e6f38644692cc7a8a4cee1e8e60622fe289d615 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-04-055-15/+18
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-035-15/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc examples/quick/accessibility/doc/src/accessibility.qdoc examples/quick/animation/doc/src/animation.qdoc examples/quick/canvas/doc/src/canvas.qdoc examples/quick/draganddrop/doc/src/draganddrop.qdoc examples/quick/imageelements/doc/src/imageelements.qdoc examples/quick/keyinteraction/doc/src/keyinteraction.qdoc examples/quick/localstorage/doc/src/localstorage.qdoc examples/quick/mousearea/doc/src/mousearea.qdoc examples/quick/particles/affectors/doc/src/affectors.qdoc examples/quick/particles/customparticle/doc/src/customparticle.qdoc examples/quick/particles/emitters/doc/src/emitters.qdoc examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc examples/quick/particles/system/doc/src/system.qdoc examples/quick/positioners/doc/src/positioners.qdoc examples/quick/righttoleft/doc/src/righttoleft.qdoc examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc examples/quick/threading/doc/src/threading.qdoc examples/quick/touchinteraction/doc/src/touchinteraction.qdoc examples/quick/views/doc/src/views.qdoc Change-Id: Idf7bb76c82acacf86b19a9f4633c3cbf4ae1a9a0
| | * Fix duplicate examples for qml/quick modulesKai Koehne2013-03-215-16/+19
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-30233 Change-Id: Ic0a6d9112dbf8903d68f571e0ac853d89ff31ebe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Implemented text styles for QSGDefaultGlyphNode.Yoann Lopes2013-04-054-42/+357
| | | | | | | | | | | | | | | | | | | | | | | | Used when Text has renderType: Text.NativeRendering. Task-number: QTBUG-27867 Change-Id: Id1262ef49e26229c86ebd2533b9f6de638bc75cb Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | Make keyClick/Press/Release work with a charAlbert Astals Cid2013-04-054-7/+58
| | | | | | | | | | | | | | | | | | Change-Id: Id821bddd993d4da4458464713a69edfea4aaecaa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Android: Support implicit import paths for assets:/ urlsEskil Abrahamsen Blomfeldt2013-04-052-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assets: scheme is not handled by QNetworkAccessManager, so it needs to be special cased along side the qrc: scheme. We make QML recognize it as a synchronously loaded, local file, and we make the type loader get the correct path and check existence of the directory correctly. This makes it possible to implicitly import the containing directory of QML files that are bundled in the assets directory. Task-number: QTBUG-30510 Change-Id: I048292757e509066a4af342081ec8428e2bd8af3 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | | Remove unused declaration of accessibility text functions.Frederik Gladhorn2013-04-051-8/+0
| | | | | | | | | | | | | | | Change-Id: I5cf9849f5c1ea39954050292d29db9cb1bd78c0c Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | TestLib: add mouse release at the end of a mouseDragCaroline Chao2013-04-051-0/+1
| | | | | | | | | | | | | | | Change-Id: I901f23a2bc7089784ed644a53a3712669b21f417 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Fix autotest-exported class from QtQuick.Thiago Macieira2013-04-042-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Each class with a virtual table should have at least one non-inline member. Especially if it's exported (there's no point in exporting it otherwise). Change-Id: I6b2821faa9662c6e8b65ce9ced53332e1a18e8d9 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Remove the APPLE_texture_format pathGunnar Sletta2013-04-041-2/+0
| | | | | | | | | | | | | | | | | | | | | It is untested and is causing problems elsewhere. Change-Id: I412f820d14c1632e3d1000b627231d8f78e792b5 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Remove resize hook from QSGRenderLoop, exposureChanged is enough.Gunnar Sletta2013-04-045-53/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | After much back and forth, I think we have settled on the right approach in QtGui, which is that resizeEvent is pretty much useless as the action happens on the following exposeEvent(). Change-Id: I5e87bda89853907d041f56acf9a2895e540c41f0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Our debug env vars are a mess. Standardize on QSG_RENDER_TIMINGGunnar Sletta2013-04-046-51/+51
| | | | | | | | | | | | | | | Change-Id: I4e88b479a8a9a5126312a05800e8170511b1f7ac Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | QQuickTextEdit: render inline images after change 48798Pierre Rossi2013-04-041-1/+14
|/ / | | | | | | | | | | | | | | | | | | | | The refactoring in QQuickTextEdit from this change: https://codereview.qt-project.org/#change,48798 accidentally broke rendering of inline images. Revive the ProtectedLayoutAccessor trick to get the proper format and properly extract the image from it. Change-Id: I445914efcea1012daa79d594aa1e828b1039b988 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Fix export macros for the QML parser export.Thiago Macieira2013-04-031-1/+3
| | | | | | | | | | | | | | | | | | These classes are in the QtQml library. They shouldn't be defined to export (even if it's autotest export) when compiling other libraries, notably QtQuick. Change-Id: Id76d2b2f2c60355240edabb7875db3e97fb0da17 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Stabilize CodeAlan Alpert2013-04-023-3/+3
| | | | | | | | | | | | | | | | | | Apparently it is no longer necessary to rely on undefined compiler behavior. Change-Id: I8e93dc0de663713c714d7894f4c66acb0aec30b4 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Version new signalsAlan Alpert2013-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | New signals added as a workaround need to be versioned as new. However, because they're used just to override the property's signals and are forwarded to the old signal you can still use the old signal names from QML. Consequently, this revision shouldn't need to be exposed to QML. Change-Id: I80407852f0a5063866c5f4334cfd0285f00d5578 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Provide workaround to slow glyph cache updates.Michael Brasser2013-04-022-6/+10
| | | | | | | | | | | | | | | | | | | | | | The environmental variable QML_USE_GLYPHCACHE_WORKAROUND can be specified to use the workaround path, which performs better on some hardware. Task-number: QTBUG-29264 Change-Id: I16d35ceabc12c990e4f791693ec4694f4e7f55f7 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Use distance fields for text on retina displaysGunnar Sletta2013-04-023-4/+10
| | | | | | | | | | Change-Id: I6d3f3e7e4813155f2abb3edc51b145fb709c485b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Debugger: Accepts port range as argumentsAurindam Jana2013-04-024-21/+50
| | | | | | | | | | | | | | | | | | | | Allow a port range to pass on command line, and try to listen on any of the ports in the range. (Re)using the ',' separator allows for backwards compatibility, that is, also Qt 4 will accept a -qmljsdebugger=port:1000,1010 argument, but will only try to listen on port 1000. Change-Id: Ic03fe20e4aee9ecdea86651f46f1df5cb19bd75c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix distance field antialiasing for retina displays.Gunnar Sletta2013-04-028-5/+26
| | | | | | | | | | | | Change-Id: I01d7d41a4e70822555bae453978dbe92fbb5c98d Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Doc: Fix some titles and linksSze Howe Koh2013-03-3019-44/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make page titles follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation. Make class/type list titles follow the "<Qt Module> C++ Classes" and "<Qt Module> QML Types" formats. Links are updated accordingly, along with broken links found during this sweep. Some inline links also have their surrounding text modified, to improve flow. Change-Id: I0ed7788caa250085d7ea0080a77d8a2655debf39 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Doc: Update module "Qt Declarative" -> "Qt Quick"Sze Howe Koh2013-03-305-5/+5
| | | | | | | | | | | | | | | | Also update examples/README to show the relationship between Qt Quick and Qt QML. Change-Id: I4e50d9f0ddb1ac25ccdfed09f579f76a375b14fe Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Delay loading implicit importAlan Alpert2013-03-273-20/+55
| | | | | | | | | | | | | | | | As a performance improvement to avoid extra filesystem access, only import "." if it is needed for type resolution. Change-Id: If9be25deb3205f8c81f9f418404d9fb41bebb84f Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | Fix warning QQuickImplicitSizeItem redefines signalsv5.1.0-alpha1Caroline Chao2013-03-272-6/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-30258 Change-Id: I3ab2a3ffbe22f583ac422f876be3037c07e8255d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Doc: Fixed some uses of terminolgies in qdoc files.Jerome Pasion2013-03-2640-251/+236
| | | | | | | | | | | | | | | | | | | | | | -"element" -> "type" or "object" (not in all cases where this change applies) -some instances of QtQuick. It should be "Qt Quick". -only in qdoc files. Examples and source code changes will be done later. Task-number: QTBUG-30180 Change-Id: Ie587461a138e97606f761ad1e90909c91b479303 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Enable accessibility again.Frederik Gladhorn2013-03-223-9/+5
| | | | | | | | | | | | | | | | | | Revert "Disable accessibility temporarily." This reverts commit 361015dc73b887026e1937da09c11df89acf5c85. Change-Id: Ie1d053fe64ee79fbd9e57bf2d0d2764bb638db72 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Merge remote-tracking branch 'origin/dev' into stableFrederik Gladhorn2013-03-2216-1196/+2171
|\ \ | | | | | | | | | | | | | | | | | | These two patches should have targeted 5.1 and went in just at the wrong time. Change-Id: Idd0a7a812fb11e2aea2c187d5e82aa31494c576c
| * | Add Instantiator type to QtQmlAlan Alpert2013-03-205-3/+665
| | | | | | | | | | | | | | | | | | | | | | | | | | | Provides a dynamic instantiation type which is not tied to visual items. Change-Id: I42f7332b29b752dcc94979b6e0ec191fc76b96ef Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Optimize QQuickTextEdit for larger documents.Pierre Rossi2013-03-2011-1193/+1506
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rationale is to not end up re-processing the whole document on each update Since we know where the editing takes place, we can break down the text edit's contents in several text nodes and only re-create the affected text nodes upon editing. This requires ripping out the SelectionEngine helper class from QQuickTextNode so that QQuickTextEdit can tap into its functionality directly. A positive side-effect of this exercise is that it should be much harder to to come across GlyphNodes packing more than 16300 glyphs or so. Task-number: QTBUG-29596 Change-Id: Id29b0709baa43f5b29c44ab02398ba996be3e28a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Merge branch 'dev' into stableSergio Ahumada2013-03-20406-6178/+11838
|\| | | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
| * | Add QQmlApplicationEngineAlan Alpert2013-03-206-2/+469
| | | | | | | | | | | | | | | | | | | | | | | | This helper class exposes QML application functionality that QML-only applications want to have, but QML-using applications may not. Change-Id: If91c3f55ffa2a4aecdd9d6cc62f6ad09fd35b0dd Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * | Fix multi-line string content.Erik Verbruggen2013-03-201-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ECMA5.1, paragraph 7.8.4, item 9 under semantics: The SV of LineContinuation :: \ LineTerminatorSequence is the empty character sequence. So, do not add any line-terminator inside a multi-line string. Escaped characters like \r and \n are added of course. Change-Id: I8c58b7971b1d1bc90adc795ea278541758246e01 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Make sure that TextInteractionFlags get set.Frederik Gladhorn2013-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first time the function is called, it could fail to set the flags. Calling setSelectByKeyboard(true) would not actually set the text interaction flags (was == on). The test didn't detect it because it called setReadOnly before setSelectByKeyboard. Change-Id: Ia54cc782b6ad5a74f1d7029c92fa230116d034b0 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * | Get rid of warning Module 'QtQuick.Dialogs'...cannot be protected...Shawn Rutledge2013-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After I86bc6d975223979c19d94a3fd70e4b5130b73f47 it's possible for qmldir to have the module declaration again. The reason it was absent was that src/imports/dialogs/plugin.cpp was registering new types in initializeEngine. Change-Id: I6b28a3b97df7f7817cfdc1e745c4ce6f048302f1 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | Fix hexadecimal escape sequence validation in strings.Erik Verbruggen2013-03-192-22/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | Give an error message when the sequence does not conform to the grammar. Although the specification does not explicitly state that this is an error, this is the behaviour of both JSC and V8. Change-Id: I34d189f07628bc6cc40b13bfbb8d09bee7810ced Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | QQuickItem: Support FocusReason in focusNextPrevLiang Qi2013-03-181-1/+1
| | | | | | | | | | | | | | | Change-Id: Ib1b69607e1b4b52bad6e382d8102a42553f13432 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Add ColorDialog to QtQuick.DialogsShawn Rutledge2013-03-1822-1/+1528
| | | | | | | | | | | | | | | | | | | | | | | | | | | As with FileDialog, it tries QPA, then QColorDialog, and falls back to a QML implementation (which is also provided here) if neither type of native dialog is available. Change-Id: I384928e1f7322bb6b867d4618d07c88c70e3cbfe Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | Cosmetic changes in DefaultFileDialog and dialog shared controlsShawn Rutledge2013-03-186-61/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of the button for QML-based dialogs matches the one for QML examples. The button and the text field use system palette colors, as does the file dialog. Change-Id: Ibf45d57bdab8799ae6aa69ba543c0e05c55b01d3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | QQuickLoader: fix the recursion guard for size updatesJ-P Nurmi2013-03-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30183 Change-Id: Ic8720e1e35bf2f349d74d2021dd202849da67852 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | optionally bootstrap QmlDevTools and qmlminOswald Buddenhagen2013-03-161-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | QmlDevTools is really meant for host tools (the two only ones using this being qmlmin in this repo and lupdate in qttools). qmake magic will take care of bootstrapping them while x-building. Change-Id: I29d921af483659d5455be0ad080dc1a88540c036 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Create common base class for declarative dialogsShawn Rutledge2013-03-1515-330/+581
| | | | | | | | | | | | | | | | | | | | | | | | QQuickAbstractFileDialog inherits QQuickAbstractDialog, and so can the future platform dialog types. Also some header comment corrections. Change-Id: I86bc6d975223979c19d94a3fd70e4b5130b73f47 Reviewed-by: Liang Qi <liang.qi@digia.com>
| * | Add TextEdit::selectByKeyboardJ-P Nurmi2013-03-154-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | The main use case is for enabling text selection by keyboard for read-only editors. Change-Id: Ieaa9af366fd0eaf863a104a2fdf33c9ddad38b10 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | QQuickWindow: expose activeFocusItem as a propertyJ-P Nurmi2013-03-152-0/+12
| | | | | | | | | | | | | | | Change-Id: Ifd393399f93b04313cd66d7873fb99b505640c8a Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * | QQuickView's equivalent in QtQuick1 is QDeclarativeViewDebao Zhang2013-03-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I12104e8bd58a406a0ff03c110e2df54bbc1c816c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 09:09:04 +0000