| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Rewritten the api almost from scratch, making it simplier and more
flexible at the same time.
The current implementation will not have complex gseturemanager class
inside Qt, but the QGesture base class, which represents both a
gesture recognizer and a gesture itself with a set of properties. A
set of common gestures that can use used in third-party applications
(and in Qt itself internally) is supposed to be found in
qstandardgestures.h, and a base class for user-defined gestures is in
qgesture.h
Gesture implementation for Pan on Windows7 has also been added as a
reference implementation for platform gestures.
|
| | |
| | |
| | |
| | | |
The other files here don't, so I see no reason why these should
|
| | |
| | |
| | |
| | | |
Also slightly updated a demo
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Need to call syncState() to let the paint engine set depth clipping
state parameters back to their OpenGL defaults.
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
| | |
| | |
| | |
| | | |
Reviewed-by: Andreas Aardal Hanssen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Commercial license headers belong in source packages only. The repo
must have the pre-release license headers.
Reviewed-by: Trust Me
|
| |\ \ |
|
| | | | |
|
| |/ /
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
We don't want to pull in too much if we can avoid it.
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qapplication_x11.cpp
|
| | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
examples
Reviewed-By: TrustMe
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-By: TrustMe
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Some touch devices don't recycle touch id's, so for longer sequences we could easily see
ids that become larger than the color list size. Make sure we constrain the index we use.
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/qnamespace.qdoc
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicsscene.cpp
|
| | | |
| | | |
| | | |
| | | | |
Task-number: 255114
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
added a new example to show how to enable touch for an existing widget (QDial in this case), and that
the mouse event emulation of QWidget does the Right Thing (tm)
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
src/gui/graphicsview/qgraphicsscene_p.h
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Local includes should use the double-quote form of #include rather than
the angle-bracket form.
Reviewed-by: Trust Me
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the API for these 2 classes is identical, the implementation is almost
identical, they share the same data structures, so bite the bullet and
merge them.
this means we go back to using screenPos() instead of globalPos()
again
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
rects instead
these are more useful, as already shown in the fingerpaint example
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene_p.h
|
| |\ \ \ \ |
|
| | | | | | |
|
| |\ \ \ \ \ |
|
| | | | | | | |
|