aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* 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>
* | 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>
* | Tools: Fix single-character string literals.Friedemann Kleint2015-10-139-26/+31
| | | | | | | | | | | | | | Use character literals where applicable. Change-Id: I55679dcc13c4c79567712c0dfaaabc2b84fee010 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Make QML composite types inherit attached propertiesJ-P Nurmi2015-10-091-10/+11
| | | | | | | | | | | | | | | | Change-Id: Ic06af4805da987dd08e361f2668e7a1788d3eefe Task-number: QTBUG-43581 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | qmlplugindump: Drop '.exe' suffix in commentKai Koehne2015-09-231-1/+1
| | | | | | | | | | | | | | | | This generates just noise in the diffs. Change-Id: I09d1dbc6d8255a9cf5055abf96eb06ca78a80a94 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | qmlscene: Make it possible to pass non-local file URLs.Friedemann Kleint2015-09-221-16/+34
| | | | | | | | | | | | | | | | | | Change the argument parsing to use QUrl::fromUserInput() defaulting to local files. Do version check only for local files. Wait until loading is complete. Change-Id: I0261958d7cf2e67fd23407c03d89486703bebd52 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Convert FunctionObjects to new allocation syntaxLars Knoll2015-09-221-2/+2
| | | | | | | | | | Change-Id: I269c20abdc7f9eb0d71a2d2d485d622b65405762 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Inline property data into the objectLars Knoll2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Append the part of the objects property data that is known ad instantiation time to the object itself and by that avoid creating a separate MemberData. Saves some memory and should speed up object creation. Currently implemented only for Object and ArrayObject. Change-Id: I7693bf2f3a28fb718522398ebb94ac115e021fa4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | qml/qmlscene: Add command line option -no-scaling for Qt::AA_NoHighDpiScaling.Friedemann Kleint2015-09-072-0/+6
| | | | | | | | | | | | Task-number: QTBUG-46615 Change-Id: Idcea92d58c1532d956ad6cb16036646c231bb0ac Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Simon Hausmann2015-09-021-0/+8
|\| | | | | | | Change-Id: Ibc7a47f7ce6d15dff79fdc59f8ded297d1b8d50d
| * Warn if a composite type is not ready and continue.Marco Benelli2015-09-011-0/+8
| | | | | | | | | | Change-Id: Ib28f484188466831e4c64aee0e36a27dd4842b06 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-211-2/+2
|\| | | | | | | | | | | | | Conflicts: tools/qml/main.cpp Change-Id: I6d521b21be85d91ebb96c28e2c64186f02d94842
| * qml: Don't build OpenGL support if OpenGL is not available in Qt.Kai Koehne2015-08-191-5/+5
| | | | | | | | | | | | | | This is an amended backport of change 668ccf18d in dev. Change-Id: I168a4d5a55c34592599a557bef941ce1629c8178 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Ulf Hermann2015-08-182-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qv4debugservice.cpp src/qml/jsruntime/qv4value_inl_p.h src/qml/jsruntime/qv4value_p.h src/qml/memory/qv4mm.cpp src/qml/memory/qv4mm_p.h src/qml/qml/qqmlnotifier_p.h src/qml/qml/qqmlproperty.cpp src/quick/items/qquickflickable.cpp src/quick/items/qquicktextedit.cpp tests/auto/quick/qquickwindow/BLACKLIST The extra changes in qqmlbinding.cpp are ported from changes to qqmlproperty.cpp that occurred in parallel with writeBinding() being moved to qqmlbinding.cpp. Change-Id: I16d1920abf448c29a01822256f52153651a56356
| * qmlprofiler: Add missing #include <limits>.Friedemann Kleint2015-07-282-0/+4
| | | | | | | | | | | | | | Fixes the build with VS 2008 (Desktop). Change-Id: I8c9682526754586ea6f597f540a4d5b42363f052 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | qml: Don't build OpenGL support if OpenGL is not available in Qt.Robin Burchell2015-08-171-3/+3
| | | | | | | | | | Change-Id: I66c841778eb0ae662c3951a26665c83e233851b5 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Allow specification of loadable debug services via command lineUlf Hermann2015-08-131-1/+2
| | | | | | | | | | | | | | | | | | We don't want to load the debugger when profiling and vice versa. This makes it easier to prevent unwanted services from getting loaded. Task-number: QTBUG-47623 Change-Id: I28893b6218110274a6d30b27805d89dbb443add3 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | Remove unused QQmlPoolFrank Meerkoetter2015-07-311-1/+0
| | | | | | | | | | | | | | This code is no longer in use. Change-Id: If0cb009ac6622ed36cba5886d6685d3f242c3c87 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | qmlprofiler: Use QQmlProfilerDefinitions for accessing definitionsUlf Hermann2015-07-235-131/+144
| | | | | | | | | | Change-Id: I6def7dd8a0ce0db22ad4829029d8510f5869c813 Reviewed-by: Simon Hausmann <simon.hausmann@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>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-303-35/+161
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qml/qml/qqmlengine.cpp src/quick/items/qquickitemsmodule.cpp tools/qml/main.cpp Change-Id: Ida8daf6b4d7e675385f2f5514c446e52dedaf136
| * Enable high-dpi mode for qml.app on OS X.Morten Johan Sørvig2015-06-161-0/+2
| | | | | | | | | | | | | | Add missing "NSPrincipalClass" key. Change-Id: If7d02470ecee9f85731626f26f2381d434db9367 Reviewed-by: Jens Bache-Wiig <jensbw@gmail.com>
| * qml: Output information about build and GL renderer in verbose mode.Friedemann Kleint2015-06-151-15/+57
| | | | | | | | | | | | | | | | | | Make static contain() a member of LoadWatcher() and connect to QQuickWindow::onOpenGlContextCreated(). Print information similar to qtdiag. Change-Id: I0bc6bc43418e4392c6b5e2643d4f7899ff4f4f8b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * qml: Add options to control the GL renderer.Friedemann Kleint2015-06-041-0/+10
| | | | | | | | | | | | Task-number: QTBUG-46030 Change-Id: I5af5a0ef267444d85e8da6df196229ad8199c00f Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * qmlscene: Add option --verbose to obtain diagnostic output.Friedemann Kleint2015-06-041-2/+63
| | | | | | | | | | | | | | | | | | | | | | Print the build information and connect to QQuickWindow::openglContextCreated() to print information on the GL driver (similar to qtdiag). Set a window title indicating render type and Qt version. Task-number: QTBUG-46030 Change-Id: Ib4376126bf9c63f4cab8cb530ff1da66394b634b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * qmlscene: Add options to control the GL renderer.Friedemann Kleint2015-06-041-18/+29
| | | | | | | | | | | | | | | | | | | | | | Replace boolean option controlling context sharing by a vector of QCoreApplication attributes (bearing in mind that for example High DPI changes might add more attributes) and add the GL switching attributes. Task-number: QTBUG-46030 Change-Id: I934dd8910b7b50ec96ae9e00823649c9df6a00ef Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Fix inefficient usages of qDeleteAll()Sérgio Martins2015-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | No reason to iterate through all items to create a temporary QList we don't need. Change-Id: I3c5388f026ded0290afb9dd35fc7934011c4998d Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | qmlprofiler: Remove some dead codeUlf Hermann2015-06-152-7/+1
| | | | | | | | | | Change-Id: If1f542bc73d5af259ea3c0a5da40786f8d6f3dbf Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Allow specification of features to recordUlf Hermann2015-06-094-2/+120
| | | | | | | | | | | | Task-number: QTBUG-43066 Change-Id: I963a5a483f961dd150f00de3d96c723c8b62edb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Record input eventsUlf Hermann2015-06-095-6/+43
| | | | | | | | | | Change-Id: Ib6413d97638b192377d7dbeb19ed0c2f733a06a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add 28 QList::reserve() callsSérgio Martins2015-06-082-2/+7
| | | | | | | | | | Change-Id: Id4820ac458f48b10f2bf457144767efdef9e2c07 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | qmlprofiler: Output data after application quits in non-interactive modeUlf Hermann2015-06-073-1/+12
| | | | | | | | | | Change-Id: I38abed0d5af3bcc7be5fa9e21bde14be40a3ce1d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Redirect app stdout to qmlprofiler stderrUlf Hermann2015-06-071-1/+1
| | | | | | | | | | | | | | | | This seems to be a common technique for tools that wrap application execution and potentially have their own output. Change-Id: I4ca1bc5861d5b915b4ca07aec08ad06c8c73c8d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Improve options for trace outputUlf Hermann2015-06-064-50/+211
| | | | | | | | | | | | | | | | | | | | | | | | * Remove the auto-generation of file names. * Accept file names as parameters or from interactive commands * Output to stdout by default for better scripting and quick preview * Decouple output from clearing of data so that you can write the same data multiple times. Task-number: QTBUG-43066 Change-Id: Ia4cc3701cbac7c6f8948b11307130a5d6a2ff44c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Only accept commands if we ask for themUlf Hermann2015-06-066-41/+20
| | | | | | | | | | | | | | | | This way we can shut down the input thread after the last command and we cannot get commands before we can process them. Change-Id: Ie1583a338da9c9df0e07c9e09ce185857c5ea66d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-041-5/+1
|\| | | | | | | | | | | | | | | | | | | | | 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
| * qmllint: Fix parsing js files with .import directivesSérgio Martins2015-05-091-5/+1
| | | | | | | | | | | | | | | | | | For .pragmas we removed them explicitly but the correct fix is to not use "qmlMode" when setting code in the lexer. Change-Id: I6ffc0ca9e7ebab09fbf91e647d292ff0a3a1fd7d Task-number: QTBUG-45916 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | qmlprofiler: Allow aggregation of multiple traces into one file.Ulf Hermann2015-05-211-4/+6
| | | | | | | | | | Change-Id: Ifc9f9adafa3178e68212fb97914a6f4cae9a4c83 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: In interactive mode, don't quit if application quitsUlf Hermann2015-05-211-7/+7
| | | | | | | | | | | | | | We might want to inspect or save the pending data in some special way. Change-Id: I235b1f948ad4a9ddd100332991243231119bcf08 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Remove useless 'maximumTime' member.Ulf Hermann2015-05-211-11/+0
| | | | | | | | | | Change-Id: Icdb35e0763694312cfb4166df0f537e1845116e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Add non-interactive mode and make it the default.Ulf Hermann2015-05-213-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | If you just run a test application through the profiler without any further parameters, you want it to record the data the application generates and then terminate itself. [ChangeLog][QtQml][Behavior Change] Make qmlprofiler command line interface better suited for scripting. Task-number: QTBUG-43066 Change-Id: I831e714b9c7b4b984b6450ad5c78ba4fdae6b8f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 08:24:55 +0000