aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-251-14/+22
|\ | | | | | | | | | | | | Conflicts: tools/qmlimportscanner/main.cpp Change-Id: I01e17581f6691a03f83788773364d0cf96319514
| * qmlimportscanner: Output the relative path of a pluginFriedemann Kleint2016-12-201-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | Change 3c5e438890db63ecde98c84d221f87a3af52e1bf enabling using the target path version of a parent module made it harder to determine the deployment target path from the module name. Output the relative path in addition to remove the need to do that in deployment tools. Task-number: QTBUG-57494 Task-number: QTBUG-52556 Change-Id: Ib76f40f19b530f9351205df9109f2fef6191979d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-145-21/+24
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp src/qml/qml/qqmlimport.cpp src/quick/items/context2d/qquickcontext2dtexture_p.h tools/qmleasing/splineeditor.h Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5
| * qmlplugindump: avoid warningsMarco Benelli2016-12-081-4/+7
| | | | | | | | | | | | | | | | Wrap all global variable in an anonymous namespace in order to avoid compiler warnings on the uninizialized ones. Change-Id: Ifabb790d2d76b6056d706580b9e4c0f12f5119f0 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * Get rid of most QT_NO_FOO usagesLars Knoll2016-11-294-17/+17
| | | | | | | | | | | | | | | | Instead use QT_CONFIG(foo). This change actually detected a few mis-spelled macros and invalid usages. Change-Id: I06ac327098dd1a458e6bc379d637b8e2dac52f85 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-142-57/+6
|\| | | | | | | Change-Id: I905dcd29377bf1b2e0ee086823b54277d18e78dd
| * Cleanup of builtin JS helpers for qmljsSimon Hausmann2016-11-261-55/+2
| | | | | | | | | | | | | | | | | | | | Replace the hand-written gc and print functions with the print and gc functions also used in Qml and QJSEngine. And while we're at it, this also adds the console object. Change-Id: Ia3a0ff24936b7ed5149cb689838b987f9178131e Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * qmlimportscanner: Output application name in generic error messagesFriedemann Kleint2016-11-241-2/+4
| | | | | | | | | | | | | | | | This makes it easier to spot issues in build logs. Amends change a23bcdf91971510b79c541fdff4a9467ead08751. Change-Id: I68e440c2ce79504fb5f5fa08392a91d39e631e25 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | headers: Add missing override and remove redundant virtualAlexander Volkov2016-12-073-21/+21
| | | | | | | | | | | | Change-Id: Ifa816ebcd79372afca42dbd0dc0ecde006bb688a Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-238-1/+14
|\| | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4object_p.h Change-Id: Iff4d3aba7710a999b8befdc493cbe959e1ce02f9
| * qmlimportscanner: When passed an invalid file/directory it should cause an errorAndy Shaw2016-11-101-1/+6
| | | | | | | | | | | | | | | | Task-number: QTBUG-56617 Change-Id: I82eb9c07fd6350b2a63f80e62af4c0adf52656c7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Set Qt version on toolsFriedemann Kleint2016-11-098-0/+8
| | | | | | | | | | Change-Id: I21d77b2eba7107528fc00db0cf5d87f8347b63be Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-031-7/+38
|\| | | | | | | | | | | | | Conflicts: tools/qmljs/qmljs.cpp Change-Id: Ifa9e74bdb780eaff22fbc9ba1c514d0078a3fb29
| * Add the ability to explicitly enable the code cache in qmljsSimon Hausmann2016-10-231-7/+38
| | | | | | | | | | | | | | | | | | | | | | This also requires mapping the label pointers in the byte code back to the instruction enum. Fortunately this reverse mapping is only needed in the qmljs case. Normally in the QML engine we persist the byte-code to disk before linking the compilation unit to the engine (where we map the enum to goto labels). Change-Id: If0b79288274bb1031161841b63a85f164502aaec Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-182-5/+14
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4variantobject.cpp src/qml/types/qquickworkerscript.cpp src/quick/scenegraph/util/qsgdefaultpainternode_p.h tools/qmljs/qmljs.cpp Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59
| * Turn the no-network support into a configurable featureLars Knoll2016-10-101-1/+2
| | | | | | | | | | | | Change-Id: Ic70f60c124fe166b37fbe9b853735be3c5e0d46d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Make the Moth interpreter configurableLars Knoll2016-10-101-0/+8
| | | | | | | | | | | | Change-Id: I2b784820c4e39a7932f81bfee9ce78e01a2e96b5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * QML: Make Heap::Object and all subclasses trivialErik Verbruggen2016-10-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | GCC6 might dead-store-eliminate out our secret write to Base::mmdata, because it expects all memory content to be "undefined" before constructor calls. Clang might take the same approach if the constructor of Heap::Object is removed. By making these structs trivial, it also makes them memcpy-able. Change-Id: I055b2ad28311b997fbe059849ebda4d5894eaa9b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-1/+1
|\| | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4isel_moth_p.h Change-Id: I8e86a649d1ef8ad27dc66cc8c290093b2faabc69
| * qmlplugindump: update QtQuick references to 2.8Marco Benelli2016-09-121-1/+1
| | | | | | | | | | Change-Id: I2d418d50c6300e107795dd4ebdd95c78cb1b2175 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | tools: use const (and const APIs) moreAnton Kudryavtsev2016-08-226-28/+28
| | | | | | | | | | | | | | For CoW types, prefer const methods to avoid needless detach()ing. Change-Id: If9018391c001eba3b4b2061d06c4caa8136811ab Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | tools: replace 'foreach' with 'range for'Anton Kudryavtsev2016-08-224-16/+26
|/ | | | | | | | Catch rvalues to prevent detach()'ing. Change-Id: I7be159a405c994429c0eee10805bfe96fcf4c806 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* tools: replace 'foreach' with 'range for'Anton Kudryavtsev2016-08-2010-53/+53
| | | | | | | | | Mark some local variables or parameters as const to prevent detach()'ing. Use qAsConst where is not possible mark as const. Change-Id: I0a777c3bd855abd3bb1ad0907152360cf4a1050e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Adjust decarative after qtConfig changes in qtbaseLars Knoll2016-08-191-1/+1
| | | | | | | | | Most of the changes are optional, but cleanup our QT_CONFIG usage. Change-Id: I5253d53f72f6fb03c2cfedae1e17d94f424a6bbb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* qmlimportscanner: fix MSVC buildAnton Kudryavtsev2016-08-181-32/+40
| | | | | | | | | | | | | | MSVC does not like QStringLiteral in operator[]. And the follow-up patch, which replaces 'foreach' with 'range for' triggers this MSVC bug. So this prequel patch resolves 2 issues: 1. fix MSVC build - the main issue. 2. de-duplicate QStringLiteral data (.rodata) - as drive-by issue. Change-Id: Ic6607edf324e9330d2b8dccd34561abb90f79cf1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* qmlimportscanner: use QStringLiteral more judiciouslyAnton Kudryavtsev2016-08-181-2/+2
| | | | | | | Replace it with QL1S or with QL1C in QStringBuilder expressions Change-Id: I894c546d2d010a713cc476d60b7966e77df996af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-171-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qqmltypecompiler.cpp src/qml/compiler/qv4isel_moth.cpp src/qml/compiler/qv4ssa_p.h src/qml/qml/qqmlobjectcreator.cpp Change-Id: I8bb7fe773d657f908f20ee5e72c2b9bd643f6260
| * qmlplugindump: fix regexp for plugins.qmltypesJ-P Nurmi2016-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | The latest plugins.qmltypes files contain whitespace after "dependencies:". Furthermore, just for the sake of correctness, escape dots in the QtQuick.tooling module import URI and version. Change-Id: I54fa288bc530f7852747c75b4d656e789d519cf2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* | Do not override QT_QPA_PLATFORM env variablesAndreas Cord-Landwehr2016-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | The QGuiApplication documentation explicitly says that QT_QPA_PLATFORM can be used to specify the QPA for every QGuiApplication. Unconditionally overriding this value within the application is a unexpected behavior. Task-number: QTBUG-54789 Change-Id: Ia7a61a0f2921ef8ec27fe630e8d307d20ba1eb37 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | tools: use QStringRef moreAnton Kudryavtsev2016-08-124-14/+12
| | | | | | | | | | | | Change-Id: I4fccbfb2b965daf3a31846d1d51d39eb74ad944d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | SplineEditor: replace QList with QVectorAnton Kudryavtsev2016-08-111-3/+4
| | | | | | | | | | | | | | | | | | There are only appending operations, and QList is optimized for types with sizeof(void*), so storing qreal or QPointF in QList is inefficient. Change-Id: Ic2f216fa81549bfb8790c6ff58dd6053c776c297 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Qt object: Add exit(int)Cavit Sina Dogru2016-08-092-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | This is similar to the Qt.quit() function but also specifies the return code that the event loop will return. [ChangeLog][QtQml] Added exit(int retCode) method to the Qt global object. An application can call Qt.exit to specify a return code of the engine. Task-number: QTBUG-54360 Change-Id: Iaa319e6dc4d6b99dc3a5c01845e87b936fd2cab0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Remove dead codeSimon Hausmann2016-08-092-370/+0
| | | | | | | | | | | | | | We don't use C++ exceptions anymore :) Change-Id: Iedab648ec7ab6ee490dbe992d32d6a0017f26a41 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-08-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickshadereffect.cpp 5.7 had a bug-fix in code dev has replaced wholesale. src/quick/items/qquickwindow.cpp src/quick/items/qquickwindow_p.h One side changed a method's signature; the other side renamed a method declared adjacent to it and changed some code using it, moving some from the public class to its private partner. tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp One side added a blank line before a comment the other re-wrote. Kept the re-write, killed the stray blank. .qmake.conf Ignore 5.7's change to MODULE_VERSION. src/qml/compiler/qqmltypecompiler.cpp src/qml/compiler/qqmlpropertyvalidator.cpp 5.7 changed code in the former that dev moved to the latter. Reflect 5.7's changes there, adapted to dev's form. src/qml/qml/qqmlobjectcreator.cpp One side added new QVariant types; the other changed how it handled each type of QVariant (without git seeing any conflict); adapted the new stanzas to work the same as the transformed ones. tests/manual/v4/test262 dev had a broken sha1 for it; so used 5.7's 9741ac4655808ac46c127e3d1d8ba3d27ada618e Change-Id: I1fbe2255b97d6ef405cdd1d0cea7fab8dc351d6f
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp tests/auto/quick/qquickitem/tst_qquickitem.cpp Change-Id: If261f8eea84dfa5944bb55de999d1f70aba528fd
| | * Fix build on macOS with ICC: -sectcreate is a linker optionThiago Macieira2016-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Apparently Clang understands it and passes to the linker. ICC doesn't, so we have to use the -Wl option. Change-Id: Ibad13c8c3c8d7596aca965c4f6e96c1e82b3cef5 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Tooling: Convert connects to Qt5 styleUlf Hermann2016-07-285-28/+30
| | | | | | | | | | | | | | | Change-Id: I6746b777f73d047f5cf610bfca9b320ac1e13676 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Don't set QT_QML_DEBUG_NO_WARNING on -no-qml-debugUlf Hermann2016-07-262-2/+3
| | | | | | | | | | | | | | | | | | | | | It won't work anyway. Change-Id: I2bc8f6b1b72cf30f0314ad551838db4f04c11297 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-301-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick/items/context2d/qquickcanvasitem.cpp src/quickwidgets/qquickwidget.cpp tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp Change-Id: Idf279cb88e0df2a383489af5b6afdf04d04ae611
| * | qmlplugindump: Avoid warnings about missing createPlatformOpenGLContextKai Koehne2016-06-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced in 541eb6b704b53a6e88. There's no point in setting AA_ShareOpenGLContexts for the minimal plugin. Change-Id: Ibcc65ede41acf5a8cf22eacef4b94c20048a354a Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* | | V4: Pass scope around as parameters inside the runtime.Erik Verbruggen2016-06-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of many (or all) runtime functions consist of first creating a QV4::Scope, which saves and restores the JS stack pointer. It also prevents tail-calls because of that restoring behavior. In many cases it suffices to do that at the entry-point of the runtime. The return value of a JS function call is now also stored in the scope. Previously, all return values were stored in a ScopedValue, got loaded on return, and immediately stored in another ScopedValue in the caller. This resulted in a lot of stores, where now there is only one store needed, and no extra ScopedValue for every function. Change-Id: I13d80fc0ce72c5702ef1536d41d12f710c5914fa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-131-8/+23
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp Change-Id: I26d6435a29cac3840bb567ade5149c2562a94bf9
| * | qmlplugindump: add a command line option.Marco Benelli2016-05-251-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the option -noforceqtquick that prevent the inclusion of the QtQuick dependency in the resulting qmltypes file. Including the QtQuick dependency interfere with the generation of some qmltypes, such that the one of QtQuick itself. Change-Id: I63a44632b8dbabdd1ffecf16da050a9429e557da Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into HEADLaszlo Agocs2016-05-241-0/+1
|\| | | | | | | | | | | Change-Id: If91e0e28d004f1db978dcab393f189743bb69cd5
| * | qmlplugindump: Allow dumping of WebEngine pluginsKai Koehne2016-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | WebEngineView requires a shared opengl context. The plugin checks for this when initializing. Change-Id: I686b9c22be95f7ef16ea68ea49b8f9aee47789ae Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/scenegraphngLaszlo Agocs2016-05-243-16/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickopenglshadereffectnode.cpp src/quick/items/qquickshadereffect.cpp src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h src/quick/scenegraph/qsgdefaultglyphnode_p.h Change-Id: I3d6874b4e4231a89d2836c04fe8e7f2ef2d698c4
| * | Fix qmlimportscanner to find Qt Quick Controls 2 stylesJ-P Nurmi2016-05-021-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The styles are installed to eg. qml/QtQuick/Controls.2/Material. That is, the version is in the parent module. See 3c5e438 for more details. Change-Id: Id5083c7934071666dd5e11511f16dea07d3104bf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | QML: Fix qmlplugindump Info.plistErik Verbruggen2016-04-281-3/+3
| | | | | | | | | | | | | | | | | | Change-Id: I32d874c65251214f1f754f8caf443298944897e0 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Marco Benelli <marco.benelli@qt.io>
| * | qmlplugindump: skip "private" directories.Marco Benelli2016-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlplugindump used to skip directories called "Private". It seems that some directory called "private" are added, notably the one in QtGraphicalEffects. Such directories cause qmlplugindump to fail, so the name check is now case-insensitive. Change-Id: Ie564db7bf96d6596d5cd674adc125a9bcdcba7bb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | | Remove opengldummyLaszlo Agocs2016-05-0914-6698/+0
| | | | | | | | | | | | | | | Change-Id: I3538a6a4dfb05b3d6cd35e864619ec7a00a3a3c2 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 23:01:30 +0000