aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Added examples on how to use FBOs with scene graph.Gunnar Sletta2013-03-035-17/+17
| | | | | | | | | | I also cleaned up the naming of the other scene graph examples a bit, so that they sort together in the samples list and have a more obvious naming scheme. Task-number: QTBUG-29548 Change-Id: I455eacb02c06058a6d49e12e4f1813ec80b655f6 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix docs for Canvas.renderStrategy, the default is CooperativeGunnar Sletta2013-03-031-1/+1
| | | | | | Task-number: QTBUG-29833 Change-Id: I3ee680d2decb01ff514852b2445617e6ab1b1480 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix the QtQml's use of plugins for value type providersThiago Macieira2013-03-012-2/+32
| | | | | | | | | | | | | | | | | | | | When the QtQuick library is loaded, it runs a global constructor that installs the QtQuick value providers. But those providers are never uninstalled when the library is unloaded, resulting in a dangling pointer stored in QtQml's singly-linked list of value providers. Since cafb02911a29b98ac2652fde64e95870e70fd547, QLibrary will unload plugins after inspecting their plugin metadata on Mac and Windows. If QtQml is trying to load a plugin that links to QtQuick (in particular, *the* qtquick2plugin plugin), it would cause the value provider to go stale. To make matters worse, it's quite likely that the plugin would get loaded soon after, at the same address in memory, which causes the valueTypeProvider list to become cyclic. Change-Id: I6f4db5475ceeaba766d9e9c78f86266c9a65806a Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Allow shortcut overrides.Frederik Gladhorn2013-02-261-1/+1
| | | | | | | | | | | | When delivering shortcut events, make it possible for the current active focus item to override the focus. The use case is having an edit/copy menu (ctrl+c) and a text edit. When the text edit is focused, it should override the global shortcut. Change-Id: Ide5b94832289c32762ef7304cdc94c107301d579 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Avoid ambiguous include guards in SG classesGunnar Sletta2013-02-2617-42/+42
| | | | | | | | | These include guards stem from the olden days before the QSG prefix and many of them are conflict prone, which can lead to pretty bisarrer errors for the user. Change-Id: I0e76c68a588404b6e82be9ecc2e7afa3b9a48e78 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Change Canvas to use Image and antialiasing by default.Gunnar Sletta2013-02-261-1/+2
| | | | | Change-Id: I3033cba7c2f9e1dd9886e8f92ece1a2f43f60c01 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Improved documentation in the Screen attached propertyShawn Rutledge2013-02-251-9/+37
| | | | | | | | | It can attach to the Window now too, so needs some clarification about when to use it that way. The orientation properties also need more description to avoid confusion. Change-Id: Ib537422f6001d8b64de176e60a6433b2e25551b9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Make sure exposeEvents trigger a render passGunnar Sletta2013-02-212-1/+5
| | | | | | | | We needs this on non-compositing window managers to trigger repaints on partial updates. Change-Id: Ied5f3e854173c5e00ad7e1222aeb66eb9c96158c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Don't print leak warnings on exit by defaultGunnar Sletta2013-02-204-27/+54
| | | | | | Task-number: QTBUG-29780 Change-Id: I6f35253dbec6346af239c0ab341caad9f4f9b862 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* QQuickScreen is exposed as an attached property on Window tooShawn Rutledge2013-02-201-0/+4
| | | | | Change-Id: I13ee75247cbe6238de1b58cf0005c39fc4314e96 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Add QQuickTextDocumentFrederik Gladhorn2013-02-197-0/+190
| | | | | | | | | | | | | Adding QQuickTextDocument as a way to access the QTextDocument of QQuickTextEdit from C++. This makes it possible to use a QSyntaxHighlighter from C++ without exposing more than one single qml property in the TextEdit. Change-Id: If1790b591493adcb0b68aef0c8ca706e00450657 Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-1910-31/+43
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1810-31/+43
| |\ | | | | | | | | | Change-Id: I33db683ebf12248b2ed14eeaf65c4bcade14bfbf
| | * Doc: Correcting typo "without with"Marcel Krems2013-02-181-1/+1
| | | | | | | | | | | | | | | Change-Id: Ibacbb9aefe9a333994014aec17a0079477a4618f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Fix missing TextInput::remove(int start, int end) docsJ-P Nurmi2013-02-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I0c98e713d53391a191435e5c17b58becddf6d451 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-153-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: Ia0580f7d664ad5e33b48d6511dac7c61349cacce Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * A MouseArea should not receive move or release events if the press was not ↵Michael Brasser2013-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | accepted. Change-Id: If70650d7150b224f4460697a953611dd37d57af1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * DesignerSupport: Fix rendering in designer for if new items are addedMarco Bubke2013-02-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The SG nodes are exchanged if the hierarchy the Qml hierarchy is changed. So the SG root node should be always updated for every rendering. Task-number: QTCREATORBUG-8699 Change-Id: I069142e4c5fc65efc3485017fa000ed7e8f2b350 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| | * Remove use of QPainter::HighQualityAntialiasing. It has no effect.Gunnar Sletta2013-02-122-4/+3
| | | | | | | | | | | | | | | Change-Id: I7e1d07a9f34d6edf9dbe3449d34636f700218532 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * Doc: Removed reference to QAbstractItemModel::setRoleNames()Venugopal Shivashankar2013-02-081-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | This function is deprecated and it is recommended to reimplement QAbstractItemModel::roleNames() instead. Task-number: QTBUG-29456 Change-Id: Ib28759fe2349edd32a1b87bac04eb44d625d3e60 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Let rounded rectangles be antialiased by defaultGunnar Sletta2013-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | This was the behavior in Qt Quick 1.1, so we should keep it Change-Id: I5c6968225e20b06f550c52741fff571088b0100b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Improved animations in the new render loopGunnar Sletta2013-02-192-98/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To advance animations in line with vsync, we used a dedicated event from the rendering thread which we fired immediately after sync. This is a bit elaborate as we know in Gui when sync is complete and we can just animate there and then. This means we can remove all animation logic from the rendering thread, making it simpler. I also updated the syncAndRender pass so that it does not render anything if the scene graph reported no changes during the sync pass. This will prevent non-visual animations and property updates from triggering render passes which will save quite a few cycles. Change-Id: I62bb5484f0673f99abe726fca5a9b424f6b0a317 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Make the base URL available to QQmlExtensionPluginShawn Rutledge2013-02-195-7/+98
| | | | | | | | | | | | | | | | | | | | | | | | This is for the benefit of any plugin which needs to interact with the QML files or related assets which are also located in its import directory. Change-Id: Id23ec279b4d017bd3f620c3a7916dac9f9ac29bc Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | Add qmlRegisterType for Composite TypesAlan Alpert2013-02-182-0/+38
|/ / | | | | | | | | | | | | | | | | This is equivalent functionality to registering a composite type in a qmldir file, a type name in a versioned module is associated with a given file. This function now allows that to be done easily from C++. Change-Id: I1cf44b92c3ad7fee593f4f84773c35b56253e628 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Add Composite Types to QQmlTypeAlan Alpert2013-02-1811-139/+265
| | | | | | | | | | | | | | | | | | When a composite type is loaded from a QML file, it now generates a QQmlType entry in QQmlMetaTypeData. Change-Id: I9b127dff7955456aacb25138fa6ea8efb7bb9221 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | GUI render loop did not render on expose, nor clean up properly.Gunnar Sletta2013-02-181-4/+13
| | | | | | | | | | Change-Id: I6f9ab43ad6d149295487d9f69ceb0131cd142776 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | QQuickPlatform: remove QT_{BEGIN,END}_HEADER macro usageJ-P Nurmi2013-02-151-4/+0
| | | | | | | | | | Change-Id: I219517d740fa7385e923a9e09cb7e241378f8576 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | FolderListModel: prevent assertion failure when filter selects 0 filesShawn Rutledge2013-02-151-2/+4
| | | | | | | | | | | | | | | | | | If you do nameFilters = "*.foo" and there are no matching files, there was an assertion failure due to inserting rows from 0 to -1: ASSERT: "last >= first" in file itemmodels/qabstractitemmodel.cpp Change-Id: I4a3642906a4588bebc699b8d99438726676fb4ca Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Add QQmlPlatform (exposed as Qt.platform)J-P Nurmi2013-02-146-2/+207
| | | | | | | | | | | | Change-Id: If34603fd8fbd907bc063b52ea31848eabdb49f61 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | only instantiate variable when requiredMaurice Kalinowski2013-02-131-1/+1
| | | | | | | | | | | | | | | | | | variable is only used for debugging purposes, where debugging part is inside preprocessor check. Creation of the object should be there as well. Change-Id: I6c9e842ad05d8e45f6d67f5e5dedebc896cda157 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | QQuickItem::childAt(x, y) takes child transformations into accountShawn Rutledge2013-02-121-5/+6
| | | | | | | | | | | | Task-number: QTBUG-28706 Change-Id: Ib1738eac1319361398b1898db341d6e4be0fe5fd Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Do pixel conversion on the pixmap decoder thread when possibleGunnar Sletta2013-02-122-5/+12
| | | | | | | | | | Change-Id: Id991bee5c0a8b260fc1ca4395402970c6a722b5d Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-0724-52/+158
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quick/textureprovider/etcprovider.h src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf tests/auto/quick/qquickflickable/tst_qquickflickable.cpp Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
| * Fixed Canvas ImageData pixel values not being settable to 0.Samuel Rødal2013-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Someone probably figured "since the data is all initialized to 0 to begin with, we can skip 0 values". However, it's possible to temporarily set a value to other than 0 and then back to 0, a fully valid use case that we need to support. Task-number: QTBUG-29065 Change-Id: Ia9f0803743d696ca8b9cca89c666ccba80a3abd0 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-062-12/+12
| | | | | | | | | | Change-Id: If28446d2d14dde62ff662ffdd366dc6384c95326 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix lupdate-warning in qqmlrewrite.cpp.Friedemann Kleint2013-02-061-4/+12
| | | | | | | | | | | | | | | | | | Class 'QQmlRewrite' lacks Q_OBJECT macro. Replace global-static strings by message functions. Change-Id: I67a6fbe67575533d3ce5750d72c9d7eff06e7efa Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Fix lupdate-warnings in qqmlimport.cpp.Friedemann Kleint2013-02-061-13/+9
| | | | | | | | | | | | | | | | | | | | qqmlimport.cpp:738: Class 'QQmlImportsPrivate' lacks Q_OBJECT Remove tr()-function and use QQmlImportDatabase::tr() directly. Change-Id: I3a1561c57a6ee90d271a6043b0175e17a7828666 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Fix lupdate-warnings.Friedemann Kleint2013-02-063-3/+3
| | | | | | | | | | | | | | | | | | qqmlcomponent.cpp:667: Cannot invoke tr() like this qqmltypeloader.cpp:2292: Cannot invoke tr() like this qquickloader.cpp:944: Cannot invoke tr() like this Change-Id: Ifdd1a7b958b6af88f251e7df27eb4d4018301914 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Ensure the cursorRectangle is updated as the width of the text changes.Andrew den Exter2013-02-011-1/+3
| | | | | | | | | | | | | | | | | | | | Outside of when of a monospace font is used, if the text changes the visual position of the cursor will have most likely changed as well even when the cursor index hasn't. Task-number: QTBUG-28677 Change-Id: If8077772d8541a677d5875976e6cd9fc453731df Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Merge branch 'release' into stableSergio Ahumada2013-01-316-8/+7
| |\ | | | | | | | | | Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
| | * Doc: declarative-colors.png not visible in qmltypereference.qdocv5.0.1Nico Vertriest2013-01-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Copied the file from qml image dir to quick image dir Task-number: QTBUG-29101 Change-Id: Iae64763bc38e135a0dbff8566cf540a309e4c42f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Add QML Types to table of contents in AssistantTopi Reinio2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'headerfile' with 'qmlclass' in qdocconf file. As a positive side-effect, QDoc will also add files for 'All members' for QML Types into .qhp as well. Task-number: QTBUG-29226 Change-Id: I282ef42283ec147ea0f2b466b15e7f104c8a012a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| | * Remove outdated macro usageChristian Stenger2013-01-244-7/+6
| | | | | | | | | | | | | | | | | | Change-Id: I4b58f3d74d7dec9a95a07b907c500990630e7762 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | * Doc: Fixed "QML Types" node in AssistantJerome Pasion2013-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed "class" from the "selectors" variable in qdocconf file. Task-number: QTBUG-29242 Change-Id: I960dcbdb22358e033177b0ccb9c211136c0e4dcb Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * | Document QQuickItem::itemChange and QQuickItem::window() properlyGunnar Sletta2013-01-311-3/+87
| | | | | | | | | | | | | | | Change-Id: Ic0e50ae8760c0c3050db3a095b0fa86679a0c010 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Strengthen reference to var properties during constructionAlan Alpert2013-01-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally var properties are kept alive by a reference to the object they are declared on, but during the construction of that object the GC may not be aware of said object. This change uses a strong reference during GC passes which take place while the object is being constructed. Task-number: QTBUG-29138 Change-Id: Ieecfcc7567aefac0d67cb933728daf16ed3eed0a Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * | docfix: Emitter.enabled was documented as Emitter.emitting.Gunnar Sletta2013-01-291-1/+1
| | | | | | | | | | | | | | | Change-Id: I9500c336b9e11f858da95ff4ed783b70876f3fd6 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Fix memory leakAlan Alpert2013-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The cache is filled with dynamically created entries, so clear is not quite enough. Change-Id: I40a49ce5d1a3d6da1b419e85cae95f2f95011a19 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * | Fix unterminated commentSze Howe Koh2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ic5bcbac339588fdded265a00515f768058d73870 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Doc: Fix "Command '\li' outside of '\list' and '\table'"Sze Howe Koh2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It doesn't look like any list is meant to be here. All other instances of "down" are italicized in this document, so we follow suit. Change-Id: I2f0c55dba2025b4eef81248a5f650ebaaaa5bb3a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>