aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | skip failing constantUpdatesOnWindow test for nowShawn Rutledge2013-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test tries to render some frames and count them; but even 10 frames in one second seems to be too many to expect on the CI Macs. Change-Id: Id9cd700499101ca10afeddee89bc183fef7d30d3 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-262-2/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I3033cba7c2f9e1dd9886e8f92ece1a2f43f60c01 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | | Various improvements to Canvas examplesJens Bache-Wiig2013-02-2628-1020/+623
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed these examples were rather "aestetically challenged" and decided to make it a test case for our WIP style guidelines. - Use consistent margins (12 px) - Use proposed color palettes - Use proposed fonts and header styles I created a new Slider graphic and moved this into the shared folder as I think it is useful for other examples. I removed a lot of unused files which seem to have been added but never actually used. I also found several bugs in our implementation, including not scaling or rotation around the correct origin. In many cases I simplified the examples, removing variables/sliders where they did not add significantly to the example itself. Change-Id: Ie09da33deaf56a3ec45a2031b87a24a8602e994a Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> 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-213-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | 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-1911-0/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1925-51/+1755
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1825-51/+1755
| |\| | | | | | | | | | | | | | 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>
| | * | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-154-0/+1660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: I35cb3523061cfb041084fe9a7e60928c44e224b2 Reviewed-by: Jason McDonald <macadder1@gmail.com>
| | * | A MouseArea should not receive move or release events if the press was not ↵Michael Brasser2013-02-143-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | accepted. Change-Id: If70650d7150b224f4460697a953611dd37d57af1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | Remove QPointerBase bic check.Stephen Kelly2013-02-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: Ieb7360a1a01125d4bff20140b02ec71a076440cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.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>
| | * | Fix extending example.Gunnar Sletta2013-02-128-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The antialiasing was broken due to wrong flag being used and that the bounds were outside the texture and chapter 5 and 6 did not compile. Change-Id: Ib7c4d8c276a3cc5583ff794e10ff539720857e0c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * | Doc: corrected reference to snippet in imageparticle.qdocNico Vertriest2013-02-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29101 Change-Id: If731480343fd4d65aa5fca5c184b03c14f2f340e Reviewed-by: Jerome Pasion <jerome.pasion@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-195-99/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-189-5/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | qmlplugindump: don't crash if a composite type was a registeredShawn Rutledge2013-02-181-4/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | This doesn't actually result in putting any information about the composite type into the output, though. Change-Id: I160702578f0acd22eff98e8afa288b3c9fb20076 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | Add Composite Types to QQmlTypeAlan Alpert2013-02-1819-140/+354
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Ensure EtcTexture always provides a valid textureId.Michael Brasser2013-02-152-4/+14
| | | | | | | | | | | | | | | Change-Id: I1e7e8095593838f0fc1d78d1cb5a146787f748a7 Reviewed-by: Gunnar Sletta <gunnar.sletta@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-0743-78/+337
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Stabilize resizemodeitem test.Frederik Gladhorn2013-02-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resizing can take time. Instead of qWait(50) use QTRY_COMPARE to make sure we give enough time. Change-Id: I484eca1f4d49381913dc82f405c73de653608493 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * | Fixed Canvas ImageData pixel values not being settable to 0.Samuel Rødal2013-02-072-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add next.png to shared qrc filesAlan Alpert2013-02-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the executable versions of the examples print errors instead of loading it. Change-Id: I7d370ce3ee172491c004668847cdb6d5967f2b24 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * | Ensure the cursorRectangle is updated as the width of the text changes.Andrew den Exter2013-02-012-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3113-18/+36
| |\| | | | | | | | | | 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: corrected path to snippetNico Vertriest2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added "quick" to path in imageparticle.qdoc Task-number: QTBUG-29101 Change-Id: If328cde08f46b720defa1953916753ba9d9836a8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * fix qmltest example install pathOswald Buddenhagen2013-01-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I267155bb34b8226331fc2951521dc7b8643a014c Reviewed-by: Alan Alpert <aalpert@rim.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 04:21:16 +0000