| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp | ||||
| | * | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-23 | 1 | -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 Macieira | 2010-02-20 | 1 | -205/+188 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc | ||||
| | * | | | doc: Added "\since 4.7" to a bunch of declarative stuff. | Martin Smith | 2010-02-19 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge remote branch 'origin/master' into qtruntime | Roberto Raggi | 2010-02-23 | 1 | -26/+34 |
| |\ \ \ \ | |||||
| | * | | | | Remove QmlView::execute(). QmlView::setSource() does it all now. | Martin Jones | 2010-02-23 | 1 | -26/+34 |
| | | |_|/ | |/| | | | | | | | | | | Task-number: QT-2538 | ||||
| * | | | | Compile. | Roberto Raggi | 2010-02-22 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Merge remote branch 'origin/master' into qtruntime | Roberto Raggi | 2010-02-22 | 1 | -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 Jones | 2010-02-22 | 1 | -24/+6 |
| | | |/ | |/| | |||||
| * | | | Introduced the internal virtual method QmlView::setRootObject(object). | Roberto Raggi | 2010-02-19 | 1 | -44/+52 |
| |/ / | | | | | | | Done-with: mae | ||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-18 | 1 | -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 McDonald | 2010-02-16 | 1 | -1/+1 |
| | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 1 | -0/+4 |
| | | | |||||
| * | | QmlView API review. See QmlChanges.txt for details. | Martin Jones | 2010-02-18 | 1 | -201/+188 |
| |/ | |||||
| * | Remove QByteArray constructor from QmlComponent. | Michael Brasser | 2010-01-13 | 1 | -2/+4 |
| | | | | | | | | It was too easily confused with the QString constructor that had completely different semantics. Use setData() instead. Task-number: QTBUG-6590 | ||||
| * | fix includes | Oswald Buddenhagen | 2009-12-03 | 1 | -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 913dd563064e8047fe738fc9c79135adfb928977 | Warwick Allison | 2009-12-02 | 1 | -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 Allison | 2009-12-01 | 1 | -5/+5 |
| | | | | | May help modularization (syncqt and configure are Qt-specific). | ||||
| * | Qt.quit() added to qml. | Tapani Mikola | 2009-11-30 | 1 | -0/+1 |
| | | |||||
| * | QmlView doc. | Michael Brasser | 2009-11-23 | 1 | -0/+1 |
| | | |||||
| * | QmlView doc. | Michael Brasser | 2009-11-23 | 1 | -0/+3 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-11-13 | 1 | -2/+2 |
| |\ | | | | | | | into kinetic-declarativeui | ||||
| | * | Do not use "QtDeclarative/XXX" style includes in declarative module code, | Warwick Allison | 2009-11-12 | 1 | -2/+2 |
| | | | | | | | | | as it breaks reinstalling the module against existing Qt. | ||||
| * | | Cleanup. | Michael Brasser | 2009-11-13 | 1 | -33/+5 |
| |/ | |||||
| * | Cleanup | Aaron Kennedy | 2009-10-30 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-30 | 1 | -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 headers | Warwick Allison | 2009-10-29 | 1 | -16/+16 |
| | | | |||||
| * | | Make private headers _p | Aaron Kennedy | 2009-10-30 | 1 | -4/+4 |
| | | | |||||
| * | | Rename qfx files to qmlgraphics files | Aaron Kennedy | 2009-10-30 | 1 | -1/+1 |
| | | | |||||
| * | | Rename QFx classes to QmlGraphics | Aaron Kennedy | 2009-10-30 | 1 | -11/+11 |
| |/ | |||||
| * | Doc. | Michael Brasser | 2009-10-28 | 1 | -1/+1 |
| | | |||||
| * | Fix "initial" size for remote content. | Warwick Allison | 2009-10-26 | 1 | -1/+11 |
| | | |||||
| * | Add url() for setUrl(). | Warwick Allison | 2009-10-08 | 1 | -0/+10 |
| | | |||||
| * | Make compile since QmlValuePropertySource is no longer a Qobject. | Bea Lam | 2009-10-02 | 1 | -1/+5 |
| | | |||||
| * | Set sceneRect to size of root item instead of size of view. | Christian Kamm | 2009-09-30 | 1 | -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 Alpert | 2009-09-24 | 1 | -0/+2 |
| | | | | | Task-number: QT-711 | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-09-22 | 1 | -1/+1 |
| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Renaming: QFxView -> QmlView | Yann Bodson | 2009-09-22 | 1 | -0/+579 |
 |
index : Qt.git | |
| Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed. |
| summaryrefslogtreecommitdiffstats |