aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* QtQuick.Dialogs MessageDialog: use Flow for button layoutShawn Rutledge2013-10-301-7/+18
| | | | | | | | | | | On mobile platforms the dialog can have more buttons than horizontal space to show them, so it's better to let them wrap around to ensure they are all visible. But Flow does not try to maximize its implicitWidth, so we have to calculate it at the right time before showing the dialog. Change-Id: I5667aa90539f291ae040f2e125abc2dea968f9ac Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs: fake window decoration clips, is opaque for touchShawn Rutledge2013-10-301-0/+3
| | | | | | | | | | | This is the wrapper for dialogs on platforms that don't have top-level windows. Mouse events over any unused area in the dialog would fall through to the surrounding mouse area and close the dialog. Now they don't. Clipping is enabled to ensure that dialog contents don't overflow the "window" frame. Change-Id: Ia3c0ae44bb47d46981daac9febd4cc93228dd20f Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs: handle more keyboard shortcutsShawn Rutledge2013-10-305-42/+129
| | | | | | | | | | | The Back button on Android should close the dialog, but there is a bug that Qt only receives the release, not the press. Otherwise Esc should do the same, Enter should accept, it should be possible to copy the text from the MessageDialog, copy colors to and from the ColorDialog, etc. Change-Id: Ib4d4c58cde9f4bb00ce3d46e2f9ea1aad9d52bb0 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add support of hidden files to folder list model.kakadu2013-10-295-3/+48
| | | | | | | | | Property 'ShowHidden' has been added to see hidden files. Task-number: QTBUG-34247. Change-Id: I7016b04b9d29731139c32bc0b30b93762e03e02e Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QQmlSettings: fix loading of initial valuesJ-P Nurmi2013-10-291-3/+2
| | | | | | | | | | When the initial value of a QML Settings var property is invalid ie. it has no initial value set, it must be loaded from QSettings as is without testing QVariant conversion (that would fail when the conversion target type is "invalid"). Change-Id: If002d52251e3f2d6373dcc305b439de61c6b8c79 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QQmlSettings: fix indentationJ-P Nurmi2013-10-291-2/+2
| | | | | Change-Id: I0b8b16176dbc1981f99807f98230294c18255475 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Avoid side effects when en exception has been thrown.Lars Knoll2013-10-291-4/+14
| | | | | | | | | | | | | | We don't want to check for exceptions after every single line on our runtime methods. A better way to handle this is to add the check in all methods that have direct side effects (as e.g. writing to a property of the JS stack). We also need to return whereever we throw an exception. To simplify the code, ExecutionContext::throwXxx methods now return a ReturnedValue (always undefined) for convenience. Change-Id: Ide6c804f819c731a3f14c6c43121d08029c9fb90 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QtQuick.Dialogs: resolution-independent controls use actual resolutionShawn Rutledge2013-10-263-5/+6
| | | | | | | | logicalPixelDensity ended up hard-coded on Android, which made the buttons and the FileDialog too small again. Change-Id: Ic1805246c4466d7167d422ba48ae5ec37978d332 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Added a QML module page for Qt Quick TestVenu2013-10-232-0/+2
| | | | | | | | | | | | This should avoid the TestCase and SignalSpy types being listed in the All Classes page, which is meant for the C++ classes. Task-number: QTBUG-33316 Change-Id: I0f2f9e557df89f46f656a8820602fe5712c64073 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Make LocalStorage more verboseGatis Paeglis2013-10-221-1/+3
| | | | | Change-Id: I4f3dd475156941f1a1d2815a4db57ad9abf8f27d Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* QtQuick.Dialogs: deploy qml files only for debug buildsShawn Rutledge2013-10-171-2/+5
| | | | | | | | | | QML_FILES are installed with the qml plugin they belong to. This is helpful for debugging, but redundant because the same QML is also packaged as resources (after 8780af05b1bc63aa71c3a318972465ffdb830070). Task-number: QTBUG-31565 Change-Id: I0b277b62b48e0a742f3ef2ff6ee2a81cc071295e Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fix crash in FolderListModelFabian Bumberger2013-10-171-3/+5
| | | | | | Change-Id: I8d012e9a356676dd3dad246579c7339eaddc1e91 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Speed up exception propagationSimon Hausmann2013-10-161-19/+36
| | | | | | | | | | Avoid catch (...) with re-throw as it turns that this is very slow because it throws a new exception and the unwinder starts from scratch. Instead use stack allocated objects and cleaning destructors to restore state before continuing with the propagation of exceptions. Change-Id: I6d95026bcd60b58cb6258a9dae28623a46739532 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Dialogs: use resources for QML and imagesShawn Rutledge2013-10-162-15/+64
| | | | | | | | | | | | | | | | All the qml and image files are embedded in the QtQuick.Dialogs plugin. If DefaultFileDialog.qml is missing from the installation directory, loading from resources will be enabled. Otherwise, the files will be loaded from the local path. This is analogous to change b2e5d1acb1aca93157a6d4d0a026153134f9ad01 in Qt Quick Controls: it reduces the number of files that need to be installed, but also preserves ease of debugging whenever the QML files are separately installed. Task-number: QTBUG-31565 Change-Id: Idbe6be5d818eb6a25367f2053ea52bc7ac1485bc Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* QtQuick.Dialogs: on single-window platforms, don't resize the windowShawn Rutledge2013-10-151-1/+4
| | | | | | | | | | | | m_dialogWindow only needs to be set if the dialog has its own window, because otherwise setters such as QQuickAbstractDialog::setHeight (introduced in 37492efee021ccc6e550ecb67a3240b76eb2219e) will result in reshaping the main application window instead of the dialog. Also the window decoration's translucent "veil" should expand to fit the whole application. Change-Id: I16fdb48c54dbc5e758dfec1f18063579ac2bbb05 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add classnames for QML import plugins.Morten Johan Sørvig2013-10-1411-0/+11
| | | | | | | | | Needed for static builds. qmlimportscanner will read the "plugin" and "classname" entries. Change-Id: I31939451366ad3e771d516ac426525c8bcdba57d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>