summaryrefslogtreecommitdiff
path: root/tools/qmlviewer/qmlruntime.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into animation-refactorwip/animation-refactoranimation-refactorMichael Brasser2012-01-251-1/+1
|\ | | | | | | | | | | | | Conflicts: tests/auto/declarative/declarative.pro Change-Id: Ie339be2989fac553d351f3077869f1847367b504
| * Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | | | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* | Merge branch 'master' into animation-refactorMichael Brasser2012-01-161-2/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/quick/util/qdeclarativetimer.cpp tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp Change-Id: I981b0d01c71035f6611682e742f4330d0ef7891b
| * Fix build break in qmlviewer.Xizhi Zhu (Steven)2012-01-141-0/+1
| | | | | | | | | | | | | | It's introduced by commit 14b929e9c448f2cc74fa047aaf8af283b81fbaf9 in QtBase. Change-Id: Iacb5350b5f42a09b7419bf491ac9620a406422e6 Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
| * Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | | | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Merge branch 'master' into animation-refactorCharles Yin2011-11-141-220/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: tools/qmlviewer/qdeclarativetester.cpp tools/qmlviewer/qmlruntime.cpp Change-Id: I48f0eb02df27e4b524f45927939b4c257452b0aa
| * Remove Q_WS_*, symbian and maemo code in QtDeclarativeDamian Jansen2011-10-261-221/+3
| | | | | | | | | | Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* | Merge branch 'master' into animation-refactorCharles Yin2011-10-211-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/debugger/qdeclarativedebughelper.cpp src/declarative/items/qsgcanvas.cpp src/declarative/particles/qsgparticlesystem.cpp src/declarative/particles/qsgparticlesystem_p.h src/declarative/scenegraph/qsgcontext_p.h src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativeanimation_p.h src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativesmoothedanimation.cpp src/declarative/util/qdeclarativesmoothedanimation_p_p.h tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro Change-Id: I74c51cb6f7b6fb2f96b8f107c4a6f7468462cd50
| * Compile after changes to QtBaseLars Knoll2011-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | qmime.h got removed in QtBase, compile again after that change. Change-Id: I3e9a0454a4528db1b96d901e93ef763ba15d1a1e Reviewed-on: http://codereview.qt-project.org/5795 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Fix compilation of qmlviewerKent Hansen2011-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | "qmlruntime.cpp:123: error: invalid use of incomplete type" 'const struct QMimeData'" Change-Id: I427fee401e9fa7cd658c3d01e7530720141e4fa0 Reviewed-on: http://codereview.qt-project.org/5786 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | remove private classesCharles Yin2011-09-271-4/+4
| | | | | | | | | | | | Change-Id: Ibb4569e5861ee4da29b0c3c9b6d3f826cb3450f8 Reviewed-on: http://codereview.qt-project.org/5579 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* | remove QObject from all animation classesCharles Yin2011-09-261-3/+2
| | | | | | | | | | | | Change-Id: If118bcc4d82a1f6d2d2373bd0fb52df0ad994e60 Reviewed-on: http://codereview.qt-project.org/5443 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* | rename QUnifiedTimer to QUnifiedTimer2Charles Yin2011-09-231-5/+5
|/ | | | | | Change-Id: Ide5d46541dcfadcdb86c3adcb1d8b71b97c07ff8 Reviewed-on: http://codereview.qt-project.org/5430 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* partial build fix of qtquick1 autotestsMatthew Cattell2011-09-091-2/+2
| | | | | | Change-Id: Ic2106ec80e1e5402f4f9bf71cc4cf23ec4657046 Reviewed-on: http://codereview.qt-project.org/4546 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Compile with refactorGunnar Sletta2011-08-011-2/+2
| | | | | | Change-Id: I41119370bd4823dcdfe5d4e2521d18b8d6ba8be3 Reviewed-on: http://codereview.qt.nokia.com/2417 Reviewed-by: Jørgen Lind <jorgen.lind@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-261-1/+12
| | | | | | | | | | | | | | 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>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-1/+1
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'qtquick2'Martin Jones2011-05-311-54/+56
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * QmlViewer: Translate UIKai Koehne2011-05-101-54/+55
| | | | | | | | | | | | | | | | | | | | | | 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)
| * Initial import from qtquick2.Qt by Nokia2011-04-271-0/+1
| | | | | | | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-05-241-17/+17
|/ | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+1552
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
View Lorry Controller Status