aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/dev' into wip/scenegraphngLaszlo Agocs2016-04-1325-1/+1473
|\| | | | | | | | | | | Change-Id: If33197b616de3476811f0161d4ecd8e7d004756c
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-0825-1/+1473
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add benchmarks to the "make benchmark" targets that are known to workSimon Hausmann2016-03-171-2/+1
| | | | | | | | | | | | | | | | | | | | | The qjsengine benchmark is one exception that is omitted because it crashes currently. Change-Id: Ic93344dc864d0d6427d85faa12a2753126be808e Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * qmltime: Remove deprecation define.Robin Burchell2016-03-151-2/+0
| | | | | | | | | | | | | | | | | | | | | Not needed, qmltime uses no deprecated stuff. Change-Id: I349993b4974857d947ea014bedfc544aaf7c682c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Move qmltime out of benchmarks directory.Robin Burchell2016-03-1525-1/+1591
| | | | | | | | | | | | | | | | | | | | | This is a tool, not a benchmark. Change-Id: Ie6b4452a1235923e1663a8a525ddad8408d21545 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Enable building Qt Quick module with QT_NO_OPENGL definedAndy Nichols2016-03-222-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the Qt Quick module depends on either the OpenGL or OpenGLES headers being available at build time. Since we are adding support for adaptations that do not depend on OpenGL, it should be possible to build Qt Quick in environments that do not have OpenGL development headers. This does present many challenges though because in some cases GL types, and classes that require OpenGL are part of the public APIs. However since these classes were never available when QT_NO_OPENGL was defined, it should be possible to redefine the function signatures under this scenario, since it's not possible to break binary compatibility if there never were any binaries to break compatibility with. One of the bigger changes that was necessary to facilitate this change is creating interfaces out of QSGContext and QSGRenderContext. Here the default behavior was usage of OpenGL directly, even though subclasses could override all OpenGL usage. Making them interfaces should bring QSGContext and QSGRenderContext more in line with the other classes present in the adaptation layer. Change-Id: Iaa54dc0f6cfd18d2da1d059548abf509bd71f200 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | 2DRenderer: Change license to LGPLv3 or GPL2+ or CommercialAndy Nichols2016-03-092-18/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was previously GPL3 or Commercial only when it was in a standalone module. This should give the 2D renderer code the same license as the rest of QtDeclarative. Change-Id: Ia4e283b9ea7da76445b1db7c9707099d0fd5d05c Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | Merge remote-tracking branch 'qtdeclarative-2drender/dev' into qtdeclarativeAndy Nichols2016-03-0814-0/+6662
|\ \ \ | |/ / |/| | | | | | | | | | | This integrates the Qt Quick 2D Renderer into the qtdeclarative module Change-Id: I3080b3ca0194794e2145b240526f5a693418543b
| * | Move OpenGL/EGL headers into 3rdparty folderAndy Nichols2015-11-2412-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These headers are actually 3rd party code since they come directly from the Khronos Group. This fixes issues with the license checker as well. Documentation and build script are updated to reflect the change in the header location. Change-Id: I1e513d7be580dcc3ea987d7fd0a5049fd7255d4e Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
| * | Update headers to pass license check testAndy Nichols2015-11-242-24/+26
| | | | | | | | | | | | | | | Change-Id: I48623789ed483a9f8efe17fe398400ed29c87f3f Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
| * | Add OpenGL dummy libraries to projectAndy Nichols2014-09-0214-0/+6660
| / | | | | | | | | | | | | | | | | | | Qt still depends on OpenGL even if we dont plan on using it. The OpenGL dummy library provides the OpenGL and EGL headers and sharded objects necessary to build Qt with OpenGL ES2 support. Change-Id: I588f819b108834486a14769a8c1740e86a14bc24 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-125-11/+158
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979
| * QuickTest, QmlImportScanner: replace QStringLiteral with QLatin1StringAnton Kudryavtsev2016-02-101-8/+8
| | | | | | | | | | | | | | ... in string comparisons. It's more efficient. Change-Id: Ia157618cf870870f24c4a2962a385962da819275 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * qmlplugindump: option to merge qmltypes.Marco Benelli2016-02-024-3/+150
| | | | | | | | | | | | | | | | | | | | | | | | QtCreator does not handle dependencies between Qml types defined in different qmltypes files. Sometimes manual editing of qmltypes file is needed to let QtCreator find the missing type information. With the new -merge option it is possible to merge a qmltypes file to the output of qmlplugindump. Dependencies are correctly merged but components are simply added, so they could cause conflict. Change-Id: I6569339e4f05d37ea63fa2173983b4d595ae0ad6 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-291-13/+18
|\| | | | | | | Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e
| * qmlimportscanner: do not use local predicates.Marco Benelli2016-01-281-13/+18
| | | | | | | | | | | | | | | | Some (?) pre C++11 compilers are not able to resolve template arguments for std::find_if when the predicates are local to the function. Change-Id: I1e5c4adc3409bd32081ddedff158ab9dcc2eaa9a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/devSimon Hausmann2016-01-221-2/+9
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-221-2/+9
| |\| | | | | | | | | | Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
| | * qmlplugindump: avoid generating conflicting types.Marco Benelli2016-01-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlplugindump used to import QtQuick, therefore skipping all QtQuick types when dumping. Now that it imports only Qt, it is no longer the case, and all QtQuick types would be dumped in the module's qmltypes file. It can be avoided by specifyng 'QtQuick' as dependency in qmldir file or in a json file passed as -dependencies option. It seems however that people are not used to that, so in order to restore the old behavior, the QtQuick dependency is automatically added when the dependency list is empty. Change-Id: I5fb2e57893607a877d284767b3fd09159b45ff42 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| | * QmlPluginDump: use QFileInfo::exist(f) instead ofAnton Kudryavtsev2016-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | ... QFileInfo(f).exists(). It's faster. Change-Id: Id9dd30f5532ed73c487caffcaad3860a6475e832 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Don't build qmldebug or qmlprofiler on -no-qml-debugUlf Hermann2016-01-221-1/+3
|/ / | | | | | | | | | | | | | | qmlprofiler depends on qmldebug and won't work with that version of Qt anyway. Change-Id: I86a180671b8d7c84e9ab05ff1cef4e6a5ea4f7f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-01-2031-527/+372
| | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Tools: fix expensive iteration over QHash::keys()Anton Kudryavtsev2016-01-152-7/+10
| | | | | | | | | | Change-Id: I902bafdbc2ddfceeacfc9ef274513a2b0a23aed7 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | QtDeclarative: use prefix ++/-- for iterator typesAnton Kudryavtsev2016-01-091-2/+2
| | | | | | | | | | | | | | | | ... because it's useful for non-primitive types. These were the only two remaining instances in QtDeclarative. Change-Id: I52eba66313e953762d87313ccbd7ee0be9039be1 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-181-0/+8
|\| | | | | | | | | | | | | Conflicts: tests/auto/quick/qquicklistview/tst_qquicklistview.cpp Change-Id: I9588a3e2c7d590e031dd4c66905a79f0d74d3ac8
| * qmlplugindump: Don't try to import Qt.test.qtestrootAlbert Astals Cid2015-12-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | Qt.test.qtestroot is only provided by quick_test_main so if we find any plugin that tries to inherit from TestCase.qml qmlplugindump will fail trying to import this unexistant import Change-Id: Idee881fa641267a17594dd3c92e929ca3473f3df Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-073-15/+47
|\| | | | | | | Change-Id: Ica75a71062d0613e415f2433c5c22c2e251b37cd
| * QmlJs: separate dumping of Qt built-ins and QtQml.Marco Benelli2015-11-271-3/+37
| | | | | | | | | | | | | | | | | | | | builtins.qmltypes used to contain also definitions that belong to QtQml. This patch makes qmlplugindump dump only Qt built-ins when called with the '-builtin' option, and makes dumping of QtQml work correctly. Change-Id: I123b9cae6f2557cf281f857df51fae095cbc25cc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Revert "qmlscene/qml tools: Temporarily disable High DPI options."Friedemann Kleint2015-11-262-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | Re-enable the options after the attributes have their final names. Add options for enabling scaling. This reverts commit 051684f125bbc31bd882c4cd313c3482bcd145a0. Task-number: QTBUG-46615 Task-number: QTBUG-48379 Change-Id: If862061c688f9febff3b9511a4f19649b07d2011 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-212-15/+30
|\| | | | | | | Change-Id: I3567f741394f912d4312460e85555b6c39b61cb4
| * qmlimportscanner: Improve command line help.Friedemann Kleint2015-11-161-6/+13
| | | | | | | | | | | | | | | | | | Output example line containing the Qt import path ready for copy & paste. Task-number: QTBUG-48424 Change-Id: I44d0793ade4322d376ed2b72e5c3935b19ba2c7d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Proper handling of composite types with different versions.Marco Benelli2015-11-031-9/+17
| | | | | | | | | | Change-Id: I967da2eb1867f218d47faf8a589d1773e6f57fc7 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Extend QDebugMessageServiceUlf Hermann2015-11-171-1/+5
| | | | | | | | | | | | | | | | Add category and timestamp, and allow synchronizing the timestamps with QQmlProfilerService. Change-Id: I8dc67e43e1087e231167fc4cfdfb5f659e00c5b2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | QmlDebug: Restructure QPacket and QPacketProtocolUlf Hermann2015-11-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot use the same data stream version for the client and server versions of QPacket and QPacketProtocol should not deal with QPackets but with simple byte arrays because the underlying QDataStream is hard to copy. The new QQmlDebugPacket picks its data stream version from QQmlDebugConnector now, which adjusts it when connecting. As there can only ever be one QQmlDebugConnector, we can keep the version static. The clients need to query the connection for the correct version. We may connect to several different servers sequentially or we may have a server running while using a client, and we don't want to confuse the versions between those. With this in place, all remaining occurrences of QDataStream are replaced with QPacket or QQmlDebugPacket. Change-Id: I3f6ba73fcbfad5e8df917c5feb9308116738a614 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | QmlProfiler: Remove "Source code not available"Ulf Hermann2015-11-051-3/+1
| | | | | | | | | | | | | | | | | | A missing tag is much better to express that piece of information. The original message would have to be parsed in order to figure out that it's actually not source code. Change-Id: I3cc7cad26c4fad84f5d1aa63c59a84523109dd2e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-033-4/+12
|\| | | | | | | | | | | | | Conflicts: tools/qmlprofiler/qmlprofilerclient.cpp Change-Id: I1de8832fefd0e45fea16ca072b6c7ae44fa376d4
| * qmlscene/qml tools: Temporarily disable High DPI options.Friedemann Kleint2015-11-022-0/+8
| | | | | | | | | | | | | | | | To be re-enabled once the attribute names are final. Task-number: QTBUG-46615 Change-Id: Id463167ab102e3c2f3af4fe39675853eae3bb851 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * Remove uses of QT_POINTER_SIZE, replacing with proper constructsThiago Macieira2015-10-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | Where the size of void* was really wanted, use sizeof(void*). There's only one use of QT_POINTER_SIZE in qtdeclarative now, in fdegen/ main.cpp selecting the ELF size constants. It's easier to keep it like that than to use C++ selecting constructs. The tool isn't built anyway. Change-Id: I1d0f78915b5942aab07cffff140fa0f99ce7d7d4 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-261-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qml/qml.pro tools/qmlprofiler/qmlprofilerclient.cpp Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4
| | * qmlprofiler: Use server's datastream version for communicationUlf Hermann2015-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | As qmlprofiler doesn't support datastream version negotiation we have to use the data stream version the server uses by default: QT_4_7. Change-Id: I0fa89f82f0f6c651e8e377bd578f8d7ae61045ab Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Move QML profiler client to qmldebugUlf Hermann2015-10-307-326/+168
| | | | | | | | | | | | | | | Change-Id: I506909b68be6cbad631d1645673c2d38460aed33 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | QmlProfiler: Collect useful input eventsUlf Hermann2015-10-305-16/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | Just "Key" or "Mouse" as only attributes of input events are not very useful. This change adds some additional information and also collects input events from QQuickWindow. Change-Id: I062bbffeef3fa87776bc8be33f2321edf793faa2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | qmlprofiler: Use local socket connection by defaultUlf Hermann2015-10-302-14/+31
| | | | | | | | | | | | | | | | | | | | | This is faster and more reliable. Change-Id: I2eef4c7ffa99daf68d0f7a53a959f4fc788666c5 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Move QQmlDebugClient into separate static libraryUlf Hermann2015-10-306-534/+13
| | | | | | | | | | | | | | | Change-Id: Ib3daf9da2cf6798bd022cfcf54d11e565c9cb4ca Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | QmlProfiler: Remove binding typesUlf Hermann2015-10-281-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is only one type of binding left and as all clients check atEnd() before trying to get the bindingType from the stream we can just remove all of this. Change-Id: I4d50ef4a691630b521292cb622ef539b3494a970 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | QmlProfiler: Fix lookup of type stringsUlf Hermann2015-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | sizeof(QString) == sizeof(char *), but only incidentally. Change-Id: I1d39825746f5c6a74b540be7f254afbf0fb375d0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into origin/devUlf Hermann2015-10-222-35/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.h src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h src/qml/debugger/qqmldebugserviceinterfaces.cpp src/qml/jsruntime/qv4debugging_p.h Change-Id: I82a4ce1bcd4579181df886558f55ad2b328d1682
| * | qmlscene: Split argument parsing.Friedemann Kleint2015-10-191-31/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loop over argv to filter out the arguments that need to be set before Q[Gui]Application creation and use QCoreApplication::arguments() for the remaining arguments. This prevents Qt's arguments (-geometry/-platform...) from interfering with the URL argument check. Change-Id: I2a88478534179b79578f7fb979a6b264a4fae44d Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * | Skip designer-related directories while scanning imports.Marco Benelli2015-10-191-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtcreator's qmldesigner plugin contains some directories that are not reacheable during the import scan, resulting in qmlplugindump complaing for missing dependencies. Since these components are not needed, let the scanner just ignore them. Change-Id: Icdf7c9e841cf5bcc1e737a0fc75a63b1e02f87f9 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Use QStringRef in a bunch of places.wip/dbusSérgio Martins2015-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Done automatically with clazy static analyzer. Change-Id: Ia0cf8fa24331ab102a3c3c30c2aa92ef1ba772e2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 16:14:17 +0000