aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* remove app bundle config for macCharles Yin2011-08-081-2/+4
| | | | | | | Change-Id: I3b526dc556f714b5df712699f64b6bdc51971554 Reviewed-on: http://codereview.qt.nokia.com/2717 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-08-024-7/+2
| | | | | | | | | | | | | | | | This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Reviewed-by: Martin Jones Reviewed-by: Michael Brasser (cherry picked from commit 5517cc588c39814530b8bfd957821f55be42acf2) Change-Id: Iacfc5a9b2ca0c2610288cf86f190b4a9950cacd1 Reviewed-on: http://codereview.qt.nokia.com/2436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't enable qmlscene compability mode for commented out imports.Andrew den Exter2011-08-021-2/+2
| | | | | | | | | | | Valid import statements should be at the start of a line, maybe preceded by some white space. Task-number: QTBUG-20649 Change-Id: I1944bce0d30e680ebdb0798f5ae4e8c91a057a13 Reviewed-on: http://codereview.qt.nokia.com/2423 Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-291-1/+1
| | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Cleanup QMLViewer properly when exiting via File->Quit.Michael Brasser2011-07-261-0/+1
| | | | | | | | Task-number: QTBUG-14972 Change-Id: I9b8738fe0ae94a1bbed7427f137a6ab5c7a8ff86 Reviewed-on: http://codereview.qt.nokia.com/2154 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* qmlviewer resizes the root object multiple times.Martin Jones2011-07-262-1/+13
| | | | | | | | | | | | | | In SizeRootObjectToView mode on initial load the view was set to root object size, then the sceneResized() slot would resize back, then we would finally reset back to the correct value in statusChanged(true). Now react directly to the initial size being set. Change-Id: Ib6977cf7bad3fe79b9ac80bb6d916fb0f57c5f5e Fixes: QTBUG-16499 Reviewed-on: http://codereview.qt.nokia.com/2148 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove traces of webkitAlan Alpert2011-07-201-16/+0
| | | | | | | | | | | Removes the entire wince section for qmlviewer.pro, as wince is not yet supported for qt5 and its unclear what damage removing the webkit part would have done to it. Change-Id: Ib0c721856bb7a28c3238e85c8cc93b43e6e63368 Reviewed-on: http://codereview.qt.nokia.com/1267 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't use QT_BUILD_TREE anymoreMarius Storm-Olsen2011-07-201-1/+1
| | | | | | | | It's only valid in QtBase now, and even there one should not use it. Change-Id: Ie3dae869b6523f6e2ef727771ae98e9b3f4678c3 Reviewed-on: http://codereview.qt.nokia.com/1838 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmldump: Fix creation of objects from QDeclarativeTypes.Christian Kamm2011-07-201-14/+23
| | | | | | | | | | | | | | Previously, the import statement was not necessarily set up correctly for the type we wanted to instantiate. We simply use QDeclarativeType::create now and thus can skip finding the right import. Mirrors qtcreator/f326bd067d455e979b5d83195e19581a9e2fd494 Mirrors qt4.8/bdbc3ff0a32bb37a32dc4825413e60f9d75e5007 Change-Id: Ic9e652b341854941c0e6a51f49f23dfaae4f87d7 Reviewed-on: http://codereview.qt.nokia.com/1648 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* qmlplugindump: Place executable in QT_BUILD_TREE/bin.Christian Kamm2011-07-121-1/+1
| | | | | | Change-Id: I751e8186aeaa2b87046cbe50c690cb0a312f71c5 Reviewed-on: http://codereview.qt.nokia.com/1306 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-126-13/+11
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-085-85/+85
| | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* qmlplugindump: Improve error message for misbehaving plugin components.Christian Kamm2011-06-301-2/+8
| | | | | | | | | | | | Mirrors 6244008dcb43dde15dea3becbbec07d941b4759c in Qt Creator/2.3. (cherry picked from commit a39e975465a5dc0548891ccd93c4ff04165b60cd) Change-Id: I995eebe065ecf8b4f185d61987240f39ad11b57f Reviewed-on: http://codereview.qt.nokia.com/871 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* qmlplugindump: Change to QtQuick 2.0 import.Christian Kamm2011-06-291-1/+1
| | | | | | | | To be future-proof should QtQuick 1.0 ever go away. Change-Id: I9bf46bc9f60f5ff61deb60fa2ffa90ea89c9c8d5 Reviewed-on: http://codereview.qt.nokia.com/899 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* qmlplugindump: Fix dumping with -path on Mac.Christian Kamm2011-06-291-2/+10
| | | | | | | | | | | | | | | | | | If the current working directory was a direct parent of the qmldir path the exported modules had the path as the module URI on macs. Also changes the QtQuick export back to 1.0 to make it work with Qt 4.7.3. The version of that import statement does not actually matter as long as it's valid. Mirrors a change in Qt Creator: http://codereview.qt.nokia.com/896 (cherry picked from commit d7ab0007d4b051f3cf12f01157b8b78d2fddf7c8) Change-Id: Ib8caa8eda7f237b10e82df3afd560c118427aa8f Reviewed-on: http://codereview.qt.nokia.com/897 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* qmldump: Fix export comparison.Christian Kamm2011-06-281-1/+1
| | | | | | | | | | | | | Compare the full uri/name, not just the uri. Also QDeclarativeType::module was not available in 4.7.3. Mirrors http://codereview.qt.nokia.com/759 (cherry picked from commit a0bd8d2dc68fdf993821b5eb881769448b34dffd) Change-Id: Ib66ec79b929bd29e3aa27a1b70e5a5c1ec2d51e5 Reviewed-on: http://codereview.qt.nokia.com/762 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-stagingAaron Kennedy2011-06-241-0/+6
|\ | | | | | | | | Conflicts: src/declarative/items/qsgtextnode.cpp
| * Disable vsync animations by defaultGunnar Sletta2011-06-101-0/+6
| | | | | | | | Change-Id: Ia614915ddb96f5c51e9883885479f1269ab361ed
* | qmlplugindump: For extended types, remove exports of the base object.Christian Kamm2011-06-231-20/+27
| | | | | | | | | | Reviewed-by: Kai Koehne (cherry picked from commit 21af9f0be1dd0d9be6c3767074fdfbd54e3b8372)
* | qmlplugindump: Build debug version if possible.Christian Kamm2011-06-231-0/+17
| | | | | | | | | | Done-with: owolff (cherry picked from commit 19b666195e293a71ef918f4a7f91d7f8be5f69bc)
* | qmlplugindump: Add -v option.Christian Kamm2011-06-211-23/+40
| | | | | | | | | | Reviewed-by: Kai Koehne (cherry picked from commit 9b09ef514bb6c4c926440e3fbf19d7255f97a12f)
* | qmlplugindump: Fix emitted tooling version.Christian Kamm2011-06-211-2/+2
|/ | | | | | | Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1. Reviewed-by: Kai Koehne (cherry picked from commit 9f0fda822aec47da201ae79e6bc807294196a8a2)
* Merge branch 'qtquick2'Martin Jones2011-05-3117-130/+1734
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/flickr/common/Progress.qml demos/declarative/flickr/common/RssModel.qml demos/declarative/flickr/common/ScrollBar.qml demos/declarative/flickr/common/Slider.qml demos/declarative/flickr/mobile/Button.qml demos/declarative/flickr/mobile/GridDelegate.qml demos/declarative/flickr/mobile/ImageDetails.qml demos/declarative/flickr/mobile/ListDelegate.qml demos/declarative/flickr/mobile/TitleBar.qml demos/declarative/flickr/mobile/ToolBar.qml demos/declarative/webbrowser/content/Button.qml demos/declarative/webbrowser/content/FlickableWebView.qml demos/declarative/webbrowser/content/Header.qml demos/declarative/webbrowser/content/ScrollBar.qml demos/declarative/webbrowser/content/UrlInput.qml demos/declarative/webbrowser/webbrowser.qml doc/src/snippets/declarative/mousearea/mousearea-snippet.qml examples/declarative/modelviews/webview/newwindows/qml/alerts.html examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png examples/declarative/modelviews/webview/newwindows/qml/newwindows.html src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/qml/qdeclarativecompiledbindings.cpp src/declarative/qml/qdeclarativecompiledbindings_p.h src/declarative/qml/qdeclarativedom.cpp src/declarative/qml/qdeclarativedom_p.h src/declarative/qml/qdeclarativedom_p_p.h src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativetypeloader.cpp src/imports/particles/particles.cpp tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp Change-Id: I40df8a9403a58a6c03a0f1734f16a5cbed6c85ff
| * qmlplugindump: Bump QtQuick.tooling version to 1.1.Christian Kamm2011-05-301-1/+1
| | | | | | | | | | | | | | | | Mirrors a change to qmlplugindump in qtcreator/715cee76a9e46efb7f8245004aaa8a1c47b1618d Reviewed-by: Kai Koehne (cherry picked from commit 10f16bc55b9e5535bc3353260f97a32e18d70cf1)
| * qmlplugindump: Dump revision property.Christian Kamm2011-05-301-0/+9
| | | | | | | | | | | | | | | | Mirrors a change to qmldump in qt-creator/6e3274240077fc356a37d3de735b3b2da9654d2e Reviewed-by: Roberto Raggi (cherry picked from commit b0392d398e2f28682cdce6e85546d38a838440f7)
| * fix the qmltestrunner building errorsCharles Yin2011-05-301-3/+4
| | | | | | | | Change-Id: Ib544544615d8aa96d2e5af8c82766472e1ed4018
| * Work around remaining 'make check' failures.Martin Jones2011-05-271-1/+1
| | | | | | | | Change-Id: Ie4480d4f05f5d784eb277fa2be6e502da00524f8
| * qmltestrunner not installed by defaultCharles Yin2011-05-231-1/+1
| |
| * Integrate QtQuickTest into QtCharles Yin2011-05-203-0/+88
| | | | | | | | | | Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316 Task-number:QTBUG-16082
| * QmlViewer: Remove one call to enableDebuggingKai Koehne2011-05-101-2/+0
| | | | | | | | | | | | Merge f9b198987d2 resulted in two calls of the method. Reviewed-by: TrustMe
| * QmlViewer: Translate UIKai Koehne2011-05-107-126/+142
| | | | | | | | | | | | | | | | | | | | | | Install translators for the Qt & QmlViewer translations. also add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated strings. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14848 (cherry-picked from commit f33b31dcc1b8fd35501ab5b441a4529e2f8570f3)
| * added private headers to qmlsceneGunnar Sletta2011-05-041-1/+1
| |
| * added private headers to qmlplugindump.proGunnar Sletta2011-05-041-1/+1
| |
| * Merge branch 'master' into qtquick2Gunnar Sletta2011-05-041-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/imports/particles/particles.pro
| * | Removed distfieldgen tool.Yoann Lopes2011-04-293-275/+1
| | | | | | | | | | | | Not needed anymore.
| * | qmlplugindump: Fix --path usage with drive letters on Windows.Christian Kamm2011-04-281-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can't import by such a path, we instead use a "." import and set the uri of the component to the correct path. Mirrors a change to qmldump in qt-creator/0c8b4e38fab1862e3427aac7e7db68623bc7f174 Reviewed-by: Thomas Hartmann
| * | Merged master into qtquick2.axis2011-04-271-1/+1
| |\ \
| * | | Initial import from qtquick2.Qt by Nokia2011-04-2712-4/+1769
| | | | | | | | | | | | | | | | | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* | | | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-05-2418-306/+306
| |_|/ |/| | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Use private headersMarius Storm-Olsen2011-05-021-1/+1
| |/ |/|
* | Moved to using a feature profile instead of direct inclusion.axis2011-04-271-1/+1
|/
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2742-0/+6305
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 14:48:09 +0000