| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/graphicsview/graphicsview.pri
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
tests/auto/auto.pro
|
| |
| |
| |
| | |
Reviewed-by: Kent Hansen
|
| | |
|
| |
| |
| |
| | |
__qt_sender__ is evil. Gah.
|
| |
| |
| |
| |
| |
| |
| | |
Also improved an example a bit to optionally support TapAndHold
gesture with plain mouse events.
Reviewed-by: trustme
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The framecapture is based on GraphicsDojo/WebCapture
and shows how to use WebKit toolkit to capture a web
page and save its internal frames in different image
files using the new property QWebFrame::clipRenderToViewPort.
Merge-request: 1103
Reviewed-by: Ariya Hidayat <ariya.hidayat@nokia.com>
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Moved the gesture implementation to the imageviewer example as it cannot be
fully implemented in a crossplatform way - for example on Windows tap and hold
is a system gesture that is transparent to the application.
Reviewed-by: trustme
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/tools/qsharedpointer.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/dialogs/qcolordialog.cpp
src/gui/painting/qwindowsurface_raster.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qsharedpointer/externaltests.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reason: Example tries to get media from QList with an index out of
bounds. Nothing to do with Phonon.
Task-number: 253307
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The constructors that take a list of target states produce
hard-to-read code, and they're rarely useful in practice since
99% of transitions take a single target state; so it's better
to enforce that setTarget{State,States}() be used instead.
|
| | | |
|
| | |
| | |
| | |
| | | |
RevBy: denis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Harald Fernengel
|
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects
Conflicts:
src/gui/graphicsview/qgraphicseffect.cpp
src/gui/graphicsview/qgraphicseffect_p.h
|
| | | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-graphicseffect
|
| | | | | |
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.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.
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We need a convenient way of getting the pixmap representation of the
source.
|
| |_|/ /
|/| | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This makes it possible to basically implement support for graphics effects
on pretty much everything, e.g. QWidget. We currently only support
effects on QGraphicsItem, but there's more to come :-)
|
|/ / / |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/graphicsview/graphicsview.pri
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene.h
src/gui/graphicsview/qgraphicsview.cpp
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Should have done this a while ago. Use setWindowFilePath
to get proxy icons on mac and simplify window
title handling on the other platforms. The only
downside is that we do have to specify the
application name to get the exact same behavior.
But on the other hand, QSettings handlig is a bit
better.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This example only worked on desktop Windows and Windows mobile.
Windows CE uses the same GUID for the Internet Explorer ActiveX control
like desktop Windows.
Task-number: 255111
Reviewed-by: thartman
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- .ts file -> TS file
- .qm file -> QM file
- .ui file -> UI file
+ a handfull of typos I stumbled over
Merge-request: 802
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \ \
| | |/ / |
|