aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-1311-11/+11
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsapi/qjsengine.cpp src/qml/qml/qqmlengine_p.h src/quick/items/qquickanchors.cpp src/quick/items/qquickanimatedimage_p_p.h src/quick/items/qquickitem_p.h tests/auto/qml/qqmlecmascript/testtypes.h tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp tests/benchmarks/qml/creation/tst_creation.cpp Change-Id: I65861e32f16e8a04c7090a90231627e1ebf6ba6f
| * | | | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-2711-11/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickimagebase.cpp src/imports/layouts/plugin.cpp Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21
| | * | | | | Instantiate static Qml plugins declaring QQmlExtensionInterface onlySebastian Lösch2016-04-1110-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When instantiating static plugins no check is done whether the QQmlExtensionInterface is declared. Therefore all user plugins are instantiated in the Qml thread, which may cause problems. Task-number: QTBUG-52012 Change-Id: Ia91ec5ec7b2a9721bd11e3648cdc161855b4454e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | | | | Remove empty methodFrank Meerkoetter2016-04-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The base type already provides an empty implementation of that method. Change-Id: I942db101343b1d4bb6de16ada189d969834a6cae Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | | | | Mark overrides of QQmlExtensionPluginFrank Meerkoetter2016-04-1911-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clearly state that we want to override registerTypes of QQmlExtensionPlugin. Change-Id: I0acf76115d47d7166ccb813a811dd757d514e6e2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | | | | Cleanup dead fwd declarationFrank Meerkoetter2016-04-181-2/+0
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I339b2234e64eaab2d2e73c1d3cb37e2d0b60fe3b Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | | | | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-083-1/+25
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48c493b537e65276107ed7ee029312e294947e8b
| * | | | | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-04-083-1/+25
| |\ \ \ \ \
| | * | | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-083-1/+25
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also fixes the build of two benchmarks, tst_affectors and tst_emission. Conflicts: src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro src/qml/qml/ftw/qhashfield_p.h tests/benchmarks/particles/affectors/tst_affectors.cpp tests/benchmarks/particles/emission/tst_emission.cpp tests/benchmarks/qml/pointers/pointers.pro tests/benchmarks/qml/pointers/tst_pointers.cpp tests/benchmarks/qml/qmltime/qmltime.pro tests/benchmarks/qml/qquickwindow/qquickwindow.pro Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
| | | * | | | Give a nicer error if the passed item doesn't existAlbert Astals Cid2016-04-011-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of Cannot read property 'width' of null and a line pointing to TestCase.qml, you get No item given to mouseWheel and a line pointing to the offending code Change-Id: I8e035878035cb836a4c0c33a772ad4353d8dd000 Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | | * | | | Prevent worker thread of FolderListModel from starting immediatelyJoni Poikelin2016-03-112-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Worker thead may have started iterating through filesystem before component was completely initialized, resulting in unnecessary and unexpected results. Task-number: QTBUG-49898 Change-Id: Ibaa2572139b0aed2fdc9bd3bbcdffa58791e38d7 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | | | | | | Merge remote-tracking branch 'origin/5.7' into devSimon Hausmann2016-04-083-11/+22
|\| | | | | | | |_|_|_|_|/ |/| | | | | | | | | | | Change-Id: I60b8a701b6d90f8572143cf760873f6b8b453c14
| * | | | | Ensure the resources are initialized when used staticallyAndy Shaw2016-04-071-0/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbcd16402189c4621596fc38c3bd8931b3b6a66e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * | | | Replace qQNaN() and friends with qt_qnan().Erik Verbruggen2016-04-052-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These constexpr functions can be inlined, and the compiler can be a bit smarter with code generation. Change-Id: I4ea87c794dd8e375749e18d273d01bb848231113 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | | | Merge remote-tracking branch 'origin/5.7' into devAndy Nichols2016-04-051-2/+11
|\| | | | | |_|_|/ |/| | | | | | | Change-Id: I57b06e2e98beb010a56dd0593d93e078ecf76eea
| * | | SignalSpy: fix qtest_signalHandlerName()J-P Nurmi2016-03-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't add second 'on' prefix if the user passed a signal handler name. Change-Id: I9ba3e61503ca3f9f0ac880dbbb83ca790b98eb47 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * | | SignalSpy: Support "pressed" signal use-caseGabriel de Dietrich2016-03-181-2/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some types, e.g. MouseArea, the "pressed" symbol refers both to a signal and to a property. When trying to connect to the signal, we get an error since the engine will resolve to the property instead. We circumvent that by connecting to the signal handler instead, i.e. "onPressed" for the "pressed" signal. Change-Id: I4212b752be4da4ec2209a3447ac41326f1e0bb5d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* / | Add property for setting hinting preference on fontsEskil Abrahamsen Blomfeldt2016-03-151-0/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As screen density is rapidly increasing and user interfaces are moving more and more towards using unhinted text as default, we have to make it possible to select the hint level from Qt Quick as well. While this is already partially covered by the unhinted QtRendering render type, it is still interesting to be able to tweak the native rendering accordingly, since this is a more precise rasterization. QtRendering also doesn't support medium hinting. [ChangeLog][Text] Added "hintingPreference" property to Text, TextEdit and TextInput. Change-Id: Ib99dbea24aba082481629deddde88c04cdeb8cdb Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Move QtQuick.Layouts to qtdeclarative from qtquickcontrolsJan Arve Saether2016-02-2615-0/+3580
| | | | | | | | | | | | | | | | This is in order for it to be available without having to install Qt Quick Controls Change-Id: I3f0d0dc108829947cd189b7861944e556e00cef3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-223-5/+92
|\| | | | | | | Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
| * Provide access to signal parameters in SignalTransition::onTriggered.Michael Brasser2016-01-193-5/+92
| | | | | | | | | | | | | | Change-Id: Ib74d3f5e9a357a86b818e27dd7249e2ecdf1e513 Task-number: QTBUG-46897 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-01-1933-462/+660
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ic36f1a0a1436fe6ac6eeca8c2375a79857e9cb12 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-185-0/+1876
|\| | | | | | | | | | | | | Conflicts: tests/auto/quick/qquicklistview/tst_qquicklistview.cpp Change-Id: I9588a3e2c7d590e031dd4c66905a79f0d74d3ac8
| * Add .qmltypes files for built-in QML APIOswald Buddenhagen2015-12-075-0/+1876
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds two .qmltypes files: QtQml/plugins.qmltypes describes the components in the QtQml import, and builtins.qmltypes the enumerations in the implicit "Qt" namespace that does not require an import. builtins.qmltypes is automatically picked up by Qt Creator for each Qt version, while plugins.qmltypes will only be parsed if the import is used. Done-with: Kai Koehne <kai.koehne@theqtcompany.com> Done-with: Marco Benelli <marco.benelli@theqtcompany.com> Change-Id: Ia2b1739172c827b945d118b41b647c0a15f3419d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Utilize the resources when building statically.Andy Shaw2015-12-0210-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | This is needed so that the qmldir file is picked up correctly when using a static build of the plugins in the application as this gets taken care of automatically by qmake. The Q_INIT_RESOURCES line itself is only needed statically because no resource file is needed for dynamic libraries so it is protected with the QT_STATIC define. Task-number: QTBUG-35754 Change-Id: I9059e10c0846548f365fe4f95dd9c6100eeb43cd Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-211-1/+2
|\| | | | | | | Change-Id: I3567f741394f912d4312460e85555b6c39b61cb4
| * Shortcut: make both nativeText and portableText availableJ-P Nurmi2015-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | They have different use cases. One is for display purposes, whereas the other is suitable for storing to settings etc. [ChangeLog][QtQuick] Added Shortcut.nativeText and portableText properties to read back the key sequence as a string Change-Id: I5575925ae08ccc9fa8933afc053651b0f3813181 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-0312-1787/+1157
|\| | | | | | | | | | | | | Conflicts: tools/qmlprofiler/qmlprofilerclient.cpp Change-Id: I1de8832fefd0e45fea16ca072b6c7ae44fa376d4
| * Update plugins.qmltypes for QtQuick importKai Koehne2015-10-232-1757/+325
| | | | | | | | | | Change-Id: I943eef590a759f4cf8d546ce153d8d259d36e762 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Update plugins.qmltypesKai Koehne2015-10-2310-30/+832
| | | | | | | | | | | | | | | | Update all plugins.qmltypes except for QtQuick2. Change-Id: If79b82fa54d159171f45a1bd2e9432c76b3c5686 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-146-2/+46
|\| | | | | | | Change-Id: I11ea57222ba5aa683b7bfd7735fbc1d2cf86e875
| * Libraries: Fix single-character string literals.Friedemann Kleint2015-10-132-2/+2
| | | | | | | | | | | | | | Use character literals where applicable. Change-Id: I294fc4cb5cbbd23df9735ba2b398118f37cbe08a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-064-0/+44
| | | | | | | | | | | | Task-number: QTBUG-48594 Change-Id: Ifc207938de7f0c8995fc712df92665f222612647 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Add caseSensitive property to FolderListModelJoni Poikelin2015-10-125-3/+44
|/ | | | | | | | Allows controlling case sensitivity of nameFilters Task-number: QTBUG-45566 Change-Id: Iab3bdd4cbaee59e16fafb9d153f51b35b22a822a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Move remaining objects to new constructor syntaxLars Knoll2015-09-221-7/+6
| | | | | | | Also disable the old way of constructing objects. Change-Id: Ib4e69087cd563ae1481da116d6caf97876239798 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Cleanup usage of ExecutionEngine::currentContextLars Knoll2015-09-151-3/+1
| | | | | Change-Id: Ic79d6da162375928ec25871cd0341daeab6483d2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Change TestEvent key default event routing behaviorFilippo Cucchetto2015-08-161-0/+9
| | | | | | | | | | | | | | | The current behavior of the TestEvent is to send all the key events to the test window. For this reason is not possible routing events to custom windows created inside the test suite. The new behavior is to send the key events to the current focused window [Change][QuickTest][TestCase] Changed default routing behavior for key events in TestCase. The key events are sent to the window with active focus Change-Id: I6ff3113eb9f1cbc25f6cfd2dd7bfdff178ee6ac3 Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Font matching by font stylenameAllan Sandfeld Jensen2015-08-101-0/+1
| | | | | | | | | | | Some fonts may have styles that does not directly match to QFont properties. To support those QFontDatabase supports matching by style name. This patch exposes that to QML. Change-Id: I9896f2e3d9f6b56fb51f5694b018b456bcd05ed6 Task-number: QTBUG-30851 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Use by-ref in foreach when T is large or non-trivialSérgio Martins2015-07-181-1/+1
| | | | | Change-Id: I79271fdc3fa064e362dfaa64ff11d8a4c6b7e8c3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Port from Q_ENUMS to new macro Q_ENUM.Friedemann Kleint2015-06-191-1/+1
| | | | | | | | | | | Remove Q_ENUMS in favor of the new Q_ENUM macro which provides registration as meta enum and a debug stream operator. QQuickXmlListModel::Status is left unmodified as porting it creates a link error in tst_qquickxmllistmodel. Change-Id: Id5e6192c9f85e7c94332508fbd91873ddda31e1a Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Add 28 QList::reserve() callsSérgio Martins2015-06-081-0/+1
| | | | | Change-Id: Id4820ac458f48b10f2bf457144767efdef9e2c07 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-041-0/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4engine_p.h src/quick/items/qquickitemsmodule.cpp src/quick/items/qquicktext.cpp src/quick/util/qquickpixmapcache.cpp tests/auto/quick/qquickwindow/tst_qquickwindow.cpp Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
| * WinRT: fix warningsMaurice Kalinowski2015-05-191-0/+2
| | | | | | | | | | | | Change-Id: If11db499d743cbe79959145ecfcbcfec896a6845 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-04-283-12/+11
|\| | | | | | | | | | | | | Conflicts: tests/auto/quick/qquicktext/tst_qquicktext.cpp Change-Id: I075e742da8396a268d97d3ab34bcd9e0c0cf001f
| * [labs.settings] Minor optimizationKonstantin Ritt2015-04-231-9/+8
| | | | | | | | | | | | | | Prefer clear() over subsequent erase() and remove duplicated check. Change-Id: Ibc70c665972e2f972763e7a0088263815792a997 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * QtQml.Models: bump up the import version number to 2.2J-P Nurmi2015-04-222-3/+3
| | | | | | | | | | | | | | The latest version is 2.2 since 4ca9be5. Change-Id: I19014c26301a67f2ce2ef93d7bab124a65337b59 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* | Move exceptionValue and globalObject from the Engine onto the JS stackLars Knoll2015-04-241-3/+3
| | | | | | | | | | | | | | | | | | We'll need to move all GC'ed objects currently stored in ExecutionEngine onto the JS stack for easier management in a new garbage collection scheme. This is the start of that change. Change-Id: Ib3ad8e846875dade8a807ea79f063173d40e4aad Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Get rid of qv4value_inl_p.h and replace it by qv4typedvalue_p.hLars Knoll2015-04-241-1/+1
| | | | | | | | | | | | | | | | This is a cleaner separation and further reduces include dependencies in the definitions of our basic data structured. Change-Id: I18aa86cdea0c0dfbc16075d4d617af97e638811e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devSimon Hausmann2015-04-231-0/+540
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-221-0/+540
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlbinding.cpp src/qml/jsruntime/qv4arraybuffer.cpp src/qml/jsruntime/qv4functionobject.cpp Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 02:10:06 +0000