| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Use system palette and icons.
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/kernel/qmetaobject.cpp
tools/qdoc3/generator.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- .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
|
|\ \
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | | |
Also add clock example to demonstrate.
|
| | | | |
|
| |/ /
|/| | |
|
| | |
| | |
| | |
| | | |
Having to use QUrl::fromLocalFile() is crummy. Add appropriate overloads the QmlComponent, and resolve relative paths against a "base url" set on the QmlEngine.
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Wasn't actually loading the object's context properly, with regard to
url resolution.
|
| |\ \ \
| | |/ /
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Renamed evalQml to be consistent with us, not javascript.
Fixed bug where createComponent never had the right path.
createQmlObject (evalQml) now has a parent as a argument.
It also still has a bug where that parent doesnt get set properly,
although it is used as the creation context also.
|
| |/ /
|/| | |
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \
| | |/ /
| |/| /
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
configure.exe
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent_p.h
tools/qdoc3/codemarker.cpp
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/generator.cpp
|
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
After an API review round, we agreed that it makes sense for the
TouchBegin event to default to accepted if the widget has subscribed
to receive touch events.
|
| | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Add QTouchEvent::TouchPoint::area() and implement support for it on Windows
|