| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
QDeclarativeXXX.
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
QTBUG-8267. Remove templating from QmlTimeLineEvent class (and rename
it to QmlTimeLineCallback to more represent what it is).
|
|\ \
| |/
| |
| |
| | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | | |
construction.
Task-number: QT-2798
|
| |/
|/| |
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
| |
Also fixes
-Scrolling backwards when model.count != 0 mod pathItemCount
-A minor typo in a comment
Task-number: QTBUG-6865
Reviewed-by: Martin Jones
|
| |
|
| |
|
| |
|
|
|
|
| |
Explictly mention that root items in delegates need a size.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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.
|
|
|
|
| |
It seems we're going to have to so a syncqt/configure in Qt modules.
|
|
|
|
| |
May help modularization (syncqt and configure are Qt-specific).
|
| |
|
|\
| |
| |
| | |
into kinetic-declarativeui
|
| | |
|
|/ |
|
|
|
|
|
|
| |
QML_DEFINE_TYPE etc. now define just the initial support version, with
support in all future versions being thus implied.
QTBUG-5421
|
| |
|
|
|