aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Add findChild to TestCase.Mitch Curtis2014-07-041-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | This is useful for auto tests where it's necessary to have access to dynamically created child items. For example: property Component threeItemDelegate: Text { objectName: "delegate" + styleData.index text: styleData.value } ... function test_stuff() { ... var delegate0 = findChild(item, "delegate0"); // check delegate0 for some condition... } [ChangeLog][QtTest][TestCase] Added findChild function to TestCase. Change-Id: I04a8b07c9904768c07ec12f4b03f1afb1989e054 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-06-041-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | The merge conflict is about the removal of "d1" from the register set on ARM, but that was already done in dev in commit ddb33ee9ba9e1344caa9be5dbf4b534c3ede692e The change in src/quick/scenegraph/coreapi/qsgrenderer.cpp with commit 2414f1675eab163b22dcc4e8ded80ed04d06369b was reverted to what it was before, per Laszlo's advice. Conflicts: src/qml/jit/qv4isel_masm.cpp Change-Id: I7bce546c5cdee01e37853a476d82279d4e72948b
| * Don't add the database before verificationRob Hoelz2014-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local storage facility exposed to QML has a bug; if you attempt to open a versioned connection, the version is wrong, and you try to handle that error, the connection is still stored in a connection pool, but in an unopened state. The next time you attempt to connect, no matter if you have the version right or not, the database handle will complain about being unopened. See also http://qt-project.org/forums/viewthread/38458/ Task-number: QTBUG-38543 Change-Id: I921b94621009f4968144e1cc513c17b4924a792a Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-222-21/+292
|\| | | | | | | Change-Id: I0dd91626837276f5811e4830f4a4e9f89bf1e1bd
| * Update qmltypes filesAlan Alpert2014-05-062-21/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, fixes some revisioning errors which a manual inspection of the qmltypes files diffs revealed. -mipmapChanged signal is new -windowTitleChanged signal is new -Matrix4x4 made 5.3, but was revisioned for 5.4 Task-number: QTBUG-29806 Change-Id: I4cb8bca6ac6fe8040871734c88aabcd392c1d696 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-103-27/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/accessible/quick/quick.pro src/quick/items/qquickpincharea.cpp src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp src/quick/scenegraph/qsgthreadedrenderloop.cpp Manually adjusted for TestHTTPServer constructor change: tests/auto/quick/qquickimage/tst_qquickimage.cpp Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f
| * Fix the initial value of XmlListModel::countJ-P Nurmi2014-04-101-1/+1
| | | | | | | | | | | | | | | | | | QAbstractItemModel::rowCount() should under no circumstances return -1 or it will crash QSortFilterProxyModel. Change-Id: Ib3d4a57d5fc3761a7fc6f6925c3d25bdea20ce78 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Finish QML test cases after waiting for deletionUlf Hermann2014-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | Otherwise messages triggered by the waiting (and the event loop that's run in QTest::qWait()) won't be correctly attributed to the test function being run. Task-number: QTBUG-37609 Change-Id: Iccc13d8caa021fc26fbf76da0056cb0dd870ec0e Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * Doc: Reintroduce missing sample XML file for XMLRole documentationTopi Reinio2014-03-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | XMLRole documentation talks about sample XML content, but erraenously quoted a QML file instead. This change brings back the sample file from Qt 4.8, and updates it to cover the use of boolean role. Change-Id: Id71550fab15c761320551f6583a138cd7cc88376 Reviewed-by: Bea Lam <bea.lam@jollamobile.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * FolderListModel: pessimize change signals when the filter changesShawn Rutledge2014-03-181-24/+17
| | | | | | | | | | | | | | | | | | | | | | FileInfoThread doesn't have separate signals for insertions, deletions and updates, so QQuickFolderListModel shouldn't make an assumption that if the list got bigger, an insertion was the only thing that happened. Task-number: QTBUG-36576 Change-Id: Ibb02d64e1645dd6df231d28a93e424aaad0effff Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | doc: Minor group/module page changes.Martin Smith2014-03-261-1/+1
|/ | | | | | | | | | These changes were made in conjunction with the large update to qdoc to teach it to use multiple trees. Task-number: QTBUG-35377 Change-Id: If16bfdf9186483c0b313c999c61fa4dc5cf49048 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Make the Ref classes not template basedLars Knoll2014-02-071-1/+2
| | | | | | | | | | Move to a class hierarchy that mirrors the main classes. This will allow moving functionality over into the Ref classes, as the current Managed classes become mainly something that holds the data. This is required to make objects movable by the GC. Change-Id: I4ca88ab0e5d8c88c8dc56d51937990500a33e0d9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Rename Referenced to ManagedRefLars Knoll2014-02-071-1/+1
| | | | | | | | | | First step of removing the templates here and turning this into a class hierarchy. This is required, so we can move all member methods into the Ref classes and make objects movable during GC. Change-Id: Ie14af07fd3e72a7d84a528d0042189ff12ba21bb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-031-4/+4
| | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I58132e11ab5fc942b04925c3bcc919165784a5d1 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Rename some filesLars Knoll2014-01-311-1/+1
| | | | | | | | | | | | Rename qv4value_def_p.h -> qv4value_p.h and qv4value_p.h to qv4value_inl_p.h. It makes more sense to have the class definition in the file that is named after the class and move the inline methods into a _inl file. Doing this now, as I expect we'll be needing a few more _inl files soon. Change-Id: Ib59e9380e9e976254c6b4369574157f39b1b5f51 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Split ManagedVTable into two classesLars Knoll2014-01-211-3/+3
| | | | | | | | Keep the basic methods in ManagedVTable, but have the Object related stuff in an ObjectVTable class. Change-Id: I9b068acf3caef813686227b8d935e7df1a7d1a6e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-107-1036/+767
|\ | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4managed_p.h Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
| * not build QQmlSettings when QT_NO_SETTINGS is definedTasuku Suzuki2014-01-101-0/+3
| | | | | | | | | | | | | | | | The current implementation is based on QSettings. Change-Id: I2e45070dabaf915b1c1b9f4e7c63b6c3e36e48a0 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Doc: QtTest - Fix documentation for TestCase and SignalSpyCaroline Chao2014-01-096-1036/+764
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The property/methods documentation needs to be available in the components qml file. Thus we now import those components from the qml files directly instead of using fake header files. Rename the Qt Quick Test page to Qt Quick Test Qml Types to be consistent with the other submodules. Task-number: QTBUG-33587 Change-Id: Ifb1df8e7d15f2e23b4b4268e5df138934e62fc42 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | QQmlSettings: if debugging is turned on, show the path where storedShawn Rutledge2014-01-091-0/+3
| | | | | | | | | | | | | | Being able to read the file as stored is useful for debugging. Change-Id: Ifae8d2e1acc654d24efdbff2d2cb433f0e7d3f13 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Cleanup: change signature of Object::insertMember()Lars Knoll2014-01-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Methods returning a Property pointer have to be removed, so that we can move over to store member data requiring only one value for the common case of data properties. This will in the long term reduce memory consumption on 64 bit systems quite a bit. Change-Id: I78de3794ec7b3bc5db13aa57275d3f08fa9d470a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Rework array handling for JS objectsLars Knoll2014-01-091-1/+1
| | | | | | | | | | | | | | | | | | Split up ArrayData into two classes, one for regular arrays, one for sparse arrays and cleanly separate the two cases. Only create array data on demand. Change-Id: I9ca8d0b53592174f213ba0f20caf93e77dba690a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-01-082-2/+2
|\| | | | | | | Change-Id: Ied8d65aaf57e897a3dbc4df100744a594e8ee2cf
| * Doc: Add links to Qt Quick Test Reference DocumentationCaroline Chao2014-01-072-2/+2
| | | | | | | | | | | | | | | | To TestCase and SignalSpy documentation. Change-Id: I83f18ab107e8d047756568ab2cdddd1eaf5574ec Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | remove QtQuick.Dialogs and related modulesShawn Rutledge2014-01-0788-9930/+0
| | | | | | | | | | | | | | | | | | | | | | | | They are being moved to the QtQuick Controls repository (see change ba9ba084124403bd8930e29d8afcea9d64b6c0b6 in qtquickcontrols). This makes it possible to use QtQuick Controls in the implementation. [ChangeLog][QtQuick][Dialogs]Moved dialog implementations from qtdeclarative module to qtquickcontrols module due to dependencies Change-Id: I76d5b71b185dd14a188ea68f18bfec61b4bf2f41 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-063-1/+7
|\| | | | | | | Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
| * QtQuick.Dialogs FileDialog: default mode is ExistingFileShawn Rutledge2014-01-031-0/+1
| | | | | | | | | | | | | | | | | | Previously did not sync the mode with the state of the selectExisting property on construction. Task-number: QTBUG-35877 Change-Id: Ifb630fb51c463025ec2f6a1932714f354552c234 Reviewed-by: Liang Qi <liang.qi@digia.com>
| * QtQuick ColorDialog: ensure slider rotation takes effectShawn Rutledge2013-12-301-0/+5
| | | | | | | | | | | | Task-number: QTBUG-35206 Change-Id: Ia6b4f743cd9bea937eb891ddd16776f975d42bcd Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * QtQuick.Dialogs: check for inheriting from QApplicationShawn Rutledge2013-12-291-1/+1
| | | | | | | | | | | | | | | | | | Widget-based dialogs are allowed if the application is a QApplication, but subclassing is OK too. Task-number: QTBUG-35769 Change-Id: Iec329792d7c1d85adcb1c3542444f0e92792b20b Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Move array data into it's own structLars Knoll2014-01-031-2/+2
|/ | | | | | | First step of separating the array data from Object. Change-Id: I5c857397f0ef53cff0807debdb1e405424e1046a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QtQuick Dialogs: don't use native windows on iOSShawn Rutledge2013-12-161-1/+3
| | | | | | | | | It makes more sense to show the dialogs as items in the scene rather than as undecorated windows. Task-number: QTBUG-35561 Change-Id: I2fb29ed8eeb999b99829a9d5ffc088f401d5d602 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-121-0/+1
|\ | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlcompiler.cpp Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
| * static builds: add classname entry to qmldir for QtQuick.Dialogs.PrivateRichard Moe Gustavsen2013-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | Add classname entry to qmldir, otherwise qmlimportscanner cannot utilize it when doing static builds (on iOS). Task-number: QTBUG-35369 Change-Id: If5440ffcdd805a832d4ff1d129e9f24d222b45d5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Encapsulate the current context and fix it's usageLars Knoll2013-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | Encapsulate accesses to the current context, and rework the way we push and pop this context from the context stack. Largely a cleanup, but simplifies the code in the long term Change-Id: I409e378490d0ab027be6a4c01a4031b2ea35c51d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Move the vtable pointer from the object to the internal classLars Knoll2013-12-041-1/+1
|/ | | | | | | | This saves one pointer per object, and willmake other optimizations easier in the future. Change-Id: I1324cad31998896b5dc76af3c8a7ee9d86283bfe Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QtQuick.Dialogs MessageDialog docsShawn Rutledge2013-11-226-15/+203
| | | | | Change-Id: Ic229a26c395be0542409ba3e13739e55b6ffb521 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Fixed QtQuick.Window documentationJerome Pasion2013-11-151-1/+1
| | | | | | | | | | | -fixed import statement in \qmlmodule and \inqmlmodule command. -Removed extra identifier in property documentation. Task-number: QTBUG-33360 Change-Id: I1e7ca5f418c327d42247ab4f4a11733c63d8c273 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Adding FontDialog type to group "dialogs".Jerome Pasion2013-11-131-0/+1
| | | | | | | | | -needed for FontDialog to show up in the landing page. Task-number: QTBUG-33360 Change-Id: Ic3ea5722e963045704e81a673ebd85770c0253a3 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update .qmltypes files for 5.2Alan Alpert2013-11-129-64/+1028
| | | | | | | | Task-number: QTBUG-34601 Change-Id: Icf5bdc2ea66b9a13186de957d5ae9c8701b481c7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QtQuick.Dialogs: hide internal functions and propertiesShawn Rutledge2013-11-122-75/+74
| | | | | | | | with double-underscores Change-Id: If397bfaf50e0878516296eb4237bcf012eb8dae4 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Simplify & speed up function callingLars Knoll2013-11-091-10/+10
| | | | | | | | | Get rid of the SimpleCallContext, instead simply use the CallContext data structure, but don't initialize the unused variables. Change-Id: I11b311986da180c62c815b516a2c55844156d0ab Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* MessageDialog: handle clicked(button, role) signal properlyShawn Rutledge2013-11-087-88/+158
| | | | | | | | | | Depends on I7be753080794adabb784df9b95ac04aa1c29151c in qtbase. Now the Android native dialog can provide the same functionality as the QML and QMessageBox implementations. Change-Id: Icc9c610669742199d48497096524f6cf8ed4d835 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* DefaultMessageDialog: use gadget StandardButton typeShawn Rutledge2013-11-081-36/+36
| | | | | | | | Followup to e17ae3b8b716b00c7cb6156347101f2e789dbd58 : Message.Ok etc. are no longer available. Change-Id: I30fc054fc6ace7dc48951739c88f49db2291a7a9 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Fix FolderListModel versioningJ-P Nurmi2013-11-075-15/+23
| | | | | | | Task-number: QTBUG-34448 Change-Id: Idebfdc123a7b908988c9ae86d7db4831ad0e4433 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: Ie23c3748fbe780fa00f98404238099809df5ef06 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Add missing Q_INIT_RESOURCETor Arne Vestbø2013-11-051-0/+7
| | | | | | | | | | The library needs to do Q_INIT_RESOURCE for all resources it uses internally, otherwise static linking will fail, and the user has no idea how to rectify it as the name of the missing resource is not known. Change-Id: I8ea766e63cff22bbb0c45e6125c3a07948de2274 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Fix broken linksSze Howe Koh2013-11-051-1/+1
| | | | | | 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-053-17/+16
| | | | | | | | | 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>
* QtQuick.Dialogs DefaultFontDialog: visual improvementsShawn Rutledge2013-10-311-329/+334
| | | | | | | | | | | | | Layout is taller and less wide, by putting weight, style and sample below the other list views. It's more resolution-independent and looks reasonable by default on Android. Renamed Others to Style. Made column headings bold. Text in selected ListItem delegates are in a contrasting color. Delegates are taller so they are easier to select by touch. Task-number: QTBUG-34157 Change-Id: Ia0c96c8556835d689d3c2fd5e2c0d34e421aff76 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs DefaultFileDialog: visual improvementsShawn Rutledge2013-10-301-4/+5
| | | | | | | | Make spacing of controls consistent with the other dialogs. It was too conservative for high-resolution displays anyway. Change-Id: I095d0c8f136b6692cc9c4ac01db748dbef205867 Reviewed-by: Liang Qi <liang.qi@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 14:54:42 +0000