| 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
|
| |
| |
| |
| |
| |
| |
| |
| | |
As a value type QmlListProperty doesn't consume any memory in the object.
It also has a companion QmlListReference class that is part of the public
API for C++ developers to interact with that also manages memory issues
that existed with previous solutions (if the containing QObject was
destroyed it left a dangling pointer).
|
|\ \
| |/
| |
| |
| | |
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
|
| | |
| | |
| | |
| | |
| | | |
The context's id values must be deleted after the compiled bindings as they
may access the id values during shutdown.
|
| |/
|/| |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/ |
|
|
|
|
| |
Remove some unnecessary methods from the QmlMetaType class
|
|
|
|
| |
QTBUG-7957
|
| |
|
| |
|
| |
|
|
|
|
| |
QTBUG-5690
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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).
|
| |
|
|
|
|
| |
as it breaks reinstalling the module against existing Qt.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
QmlExpression should not print errors itself. This is the responsibility
of the caller.
|
|
|
|
|
| |
As the scope object is no longer added to the defaultObjects list
it makes sense that the root object remain constant at position 0
|
| |
|
| |
|
|
|
|
|
|
| |
ids and methods shadow properties. The reasoning is that the user
explicitly declared these names, whereas they might not even know a
property by that name exists.
|
| |
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
|
| | |
|
| |
| |
| |
| |
| | |
This allows us to delay the QML load until external script files have
been loaded from the network, and to correctly scope these scripts.
|
| | |
|
| | |
|
| | |
|
|/ |
|
|
|
|
|
|
|
| |
QUrl resolves empty to base, which is not desirable. Preserve emptiness
of QUrl.
Handle use of empty QUrl with WebView (WebKit doesn't handle empty URLs
well either).
|
|
|
|
| |
Make QML docs fit in with the new Qt style. Fix numerous qdoc errors.
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |
| |
| |
| | |
Preparation for merge of QtScript's JSC backend.
|
|/
|
|
|
|
| |
The imports of the component containing the reference to the
attached property are used to resolve typenames, rather than
assuming "Qt" namespace.
|
|
|
|
|
|
|
|
|
| |
By splitting the interface through which the system interacts with bindings
away from a specific implementation, we can introduce highly specialized
implementations for specific optimizations.
This commit also includes a sample optimization for object properties being
assigned directly from a local id.
|
| |
|
|
|
|
|
|
| |
While the QSet<> wasn't that expensive, the QmlContext only tracks the
expressions to stop programmers doing something "stupid" so any overhead is
unacceptable. This does give a measurable improvement.
|
| |
|