| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
The Loader item takes the qml/qmlItem functionality from Item and
moves it to a specialized subclass.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qabstractitemmodel.cpp
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qmetaobject.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
1) fromScriptValue() needs to call qvariant_cast() on the data, in
order to be symmetric with toScriptValue().
2) use the overload of newFunction() that takes a prototype object,
so that the prototype.constructor and constructor.prototype
relationship is set up correctly; otherwise the instanceof operator
won't work.
|
| |\ \ \
| | |/ /
| | | /
| | |/
| |/| |
Conflicts:
src/gui/widgets/qlinecontrol_p.h
|
| | |
| | |
| | |
| | | |
Reviewed-by: Harald Fernengel
|
|/ / |
|
| | |
|
| |
| |
| |
| |
| | |
Fixed all examples and demos to work after the
changes to Flipable and Rotation3D.
|
|\ \
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/widgets/qlineedit.cpp
|
| | |
| | |
| | |
| | | |
too "advanced".
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
After discussions with product management, it was considered best that
this example be removed until it can be improved. There are some bugs
an irregularities that should be cleaned up, and the theme should be
made less violent.
Reviewed-by: Volker Hilsheimer
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since QMdiArea provides this already via the standard keys, then we
don't want to add it ourselves otherwise it triggers an ambigious
shortcut on the platforms which already has CTRL+F4.
Task-number: 161999
Reviewed-by: Kavindra Palaraja
|
| |/
|/|
| |
| |
| | |
Add a colorGroup property and remove palette properties from the
root context.
|
|\ \
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
| |\ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
kinetic-declarativeui
Conflicts:
configure
configure.exe
src/gui/kernel/qaction.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This removes the need for a "root state" in the machine; or rather,
the machine _is_ the root state.
User code can now pass in a QStateMachine directly to the QState
constructor, instead of machine->rootState().
This also means we could get rid of the "proxying" from the machine
to the root state for things like properties (initialState et al),
finished() signal and auto-reparenting of states (the ChildAdded
event hack).
A fun little side-effect of this change is that it's now possible
to embed state machines within state machines. We can't think of
a good use case yet where you would rather embed a stand-alone
state machine (with its own event processing etc.) rather than
having just a regular nested state, but it's neat and it works.
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| | | |
| | | |
| | | |
| | | |
| | | | |
The editor was a just a detail to make the animations and shouldn't be
included in the example.
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
src/3rdparty/webkit/WebCore/page/DOMWindow.idl
src/corelib/io/qdiriterator.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
tests/auto/qxmlquery/tst_qxmlquery.cpp
tools/linguist/lconvert/main.cpp
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The example TrafficInfo did not compile on GCC 3.3 due to a bug in the
parser of GCC.
Task-number: 258208
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: trustme
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 884
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
bar where TabletPC users can also see them.
Fixes: task 216859
Rev-by: TrustMe
|
| | | | | |
|
| | | |\ \ |
|
| | | |\ \ \ |
|
| | | |\ \ \ \ |
|
| | | |\ \ \ \ \ |
|
| | | |\ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This was done by Tobias Koenig, as part of an internship at Trolltech/Qt
Software, started at Wed Oct 1 18:32:43 2008 +0200, and the last commit being
part of this commit dating Tue Feb 24 11:03:36 2009 +0100. This is work
consisting of about 650 commits squashed into one, where the first commit was
61b280386c1905a15690fdd917dcbc8eb09b6283, in the repository before Qt's history
cut.
|
| |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Adjust examples and demos accordingly.
As per QT-558
|
|/ / / / / / / / |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
qmlbindablevalue had been renamed and no-one updated this file.
|
|\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|