summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-570/+0
| | | | QDeclarativeXXX.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-241-0/+1
|\ | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
| * Merge remote branch 'origin/master'Thiago Macieira2010-02-231-24/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp
| * \ Merge remote branch 'origin/master'Thiago Macieira2010-02-201-205/+188
| |\ \ | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| * | | doc: Added "\since 4.7" to a bunch of declarative stuff.Martin Smith2010-02-191-0/+1
| | | |
* | | | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-231-26/+34
|\ \ \ \
| * | | | Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-231-26/+34
| | |_|/ | |/| | | | | | | | | | Task-number: QT-2538
* | | | Compile.Roberto Raggi2010-02-221-2/+0
| | | |
* | | | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-221-24/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h
| * | | Remove use of unexprted private classes.Martin Jones2010-02-221-24/+6
| | |/ | |/|
* | | Introduced the internal virtual method QmlView::setRootObject(object).Roberto Raggi2010-02-191-44/+52
|/ / | | | | | | Done-with: mae
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * Fix copyright year.Jason McDonald2010-02-161-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * doc: Fixed some qdoc errors.Martin Smith2010-02-161-0/+4
| |
* | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-181-201/+188
|/
* Remove QByteArray constructor from QmlComponent.Michael Brasser2010-01-131-2/+4
| | | | | | | It was too easily confused with the QString constructor that had completely different semantics. Use setData() instead. Task-number: QTBUG-6590
* fix includesOswald Buddenhagen2009-12-031-20/+21
| | | | | | | | | | | | - include headers from own directory with "" - include headers from own project without private/ - sort includes from most specific to most generic - make headers self-contained - some whitespace unification no attempt was made at making the qt includes consistent regarding the use of module names and forwarding headers. no attempt was made at sorting includes.
* Undo most of 913dd563064e8047fe738fc9c79135adfb928977Warwick Allison2009-12-021-5/+5
| | | | It seems we're going to have to so a syncqt/configure in Qt modules.
* Remove include styles that rely on configure.Warwick Allison2009-12-011-5/+5
| | | | May help modularization (syncqt and configure are Qt-specific).
* Qt.quit() added to qml.Tapani Mikola2009-11-301-0/+1
|
* QmlView doc.Michael Brasser2009-11-231-0/+1
|
* QmlView doc.Michael Brasser2009-11-231-0/+3
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-11-131-2/+2
|\ | | | | | | into kinetic-declarativeui
| * Do not use "QtDeclarative/XXX" style includes in declarative module code,Warwick Allison2009-11-121-2/+2
| | | | | | | | as it breaks reinstalling the module against existing Qt.
* | Cleanup.Michael Brasser2009-11-131-33/+5
|/
* CleanupAaron Kennedy2009-10-301-0/+1
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-301-16/+16
|\ | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/debugger/qmldebug.cpp src/declarative/fx/qmlgraphicsimagebase_p.h src/declarative/util/qmlanimation.h src/declarative/util/qmlstate.h src/declarative/util/qmltimer.cpp
| * fix headersWarwick Allison2009-10-291-16/+16
| |
* | Make private headers _pAaron Kennedy2009-10-301-4/+4
| |
* | Rename qfx files to qmlgraphics filesAaron Kennedy2009-10-301-1/+1
| |
* | Rename QFx classes to QmlGraphicsAaron Kennedy2009-10-301-11/+11
|/
* Doc.Michael Brasser2009-10-281-1/+1
|
* Fix "initial" size for remote content.Warwick Allison2009-10-261-1/+11
|
* Add url() for setUrl().Warwick Allison2009-10-081-0/+10
|
* Make compile since QmlValuePropertySource is no longer a Qobject.Bea Lam2009-10-021-1/+5
|
* Set sceneRect to size of root item instead of size of view.Christian Kamm2009-09-301-1/+1
| | | | | | | | This changes nothing when contentResizable is set and allows scroll bars to be used when it's false and the view size is smaller than the root item's size. Reviewed-by: owolff
* Prevent qmlviewer from confusing people when root items are small.Alan Alpert2009-09-241-0/+2
| | | | Task-number: QT-711
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-09-221-1/+1
| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
* Renaming: QFxView -> QmlViewYann Bodson2009-09-221-0/+579
generated by cgit v0.12 at 2025-01-14 08:13:03 (GMT)