| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|
|
|
| |
Resolves scope collision between label property and label id
|
|\
| |
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into test
Conflicts:
demos/declarative/samegame/content/samegame.js
tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\
| | | |
| | | |
| | | | |
kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
mifconv can't always handle absolute paths to the .svg specified, so for
now we don't use absolute paths, and fix it later.
Task-number: QTBUG-4693
Reviewed-by: Shane Kearns
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also, add same trick for PPC
Reviewed-by: MortenS
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Simon Hausmann
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: alexis
|
| | | | |
|
| |\ \ \
| | |/ /
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | |
|
| | |\ \
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | |
|
| | |/ / |
|
| |/ / |
|
| |\ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | |
|
| |/ / |
|
| | | |
|
| | |
| | |
| | |
| | | |
Also add toString() method to qobjects
|
|/ / |
|
|\ \
| |/
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure
|
| |
| |
| |
| |
| | |
Reviewed-by: Denis Dzyubenko
Reviewed-by: Pierre Rossi
|
| |
| |
| |
| |
| | |
Reviewed-by: Denis Dzyubenko
Reviewed-by: Pierre Rossi
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add multitouch to the position of the path, and enable multitouch on
the controls of the demo.
Reviewed-by: Denis Dzyubenko
Reviewed-by: Pierre Rossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add multitouch feature to the HoverPoints and the ArthurWidget.
Multitouch is enabled by default for widgets using HoverPoints. The
ArthurWidget propagate the TouchEvents in order to have them handled by
a parent if a parent accept the touch events.
Reviewed-by: Denis Dzyubenko
Reviewed-by: Pierre Rossi
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
demos/mediaplayer/mediaplayer.pro
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added a line to the symbianpkgrules.pri files which includes an ICON
if the TARGET.UID3 is defined. We should fix the application_icon.prf to
handle ICON without UID3 situations more gracefully, but for now I
reordered existing UID3s to be specified before the symbianpkgrules.pri
includes.
Reviewed-by: Aleksandar Babic
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Note that fluidlauncher, because of desktopservices, installs the same mp3
to the same location.
|
| | | |
|
| | | |
|
| | | |
|
| |/
| |
| |
| |
| | |
Task-number: QTBUG-4665
Reviewed-by: Gareth Stockwell
|
| |
| |
| |
| |
| |
| |
| |
| | |
To improve screen real-estate utilization in small screen devices,
added -small-screen command line argument to the Context2d application.
Task-number: QTBUG-3296
Reviewed-by: Janne Koskinen
|
|\ \
| |/
| |
| |
| | |
Conflicts:
configure.exe
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by:TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Now QStateMachine can be a child of a QState but here in sub-attaq
the code was not design for that so the code breaks.
Task-number:QT-665
Task-number:QT-914
Reviewed-by:TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | | |
It seems that for 3.1 we need to explicitly link with insock.dll as well
Reviewed-by: Aleksandar Babic
|
| | |
| | |
| | |
| | |
| | | |
Task-number:QT-739
Reviewed-by:TrustMe
|
| |/ |
|
| |\ |
|
| | | |
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some recent changes had made Fluidlauncher unresponsive to keyboard
input. It appears none of the Fluidlauncher widgets got keyboard
focus by default, so set the focus explicitly to proper widget.
Task-number: QT-2214
Reviewed-by: Alessandro Portale
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit ea6b181df68a18044a06063ab33dc6eb35b2aba1.
We revert it because although it's useful for us developers when debugging,
it's intended for customers, to demonstrate how to use Qt code.
Conflicts:
demos/mediaplayer/mediaplayer.cpp
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
demos/embedded/fluidlauncher/config_s60/config.xml
demos/embedded/fluidlauncher/fluidlauncher.pro
src/corelib/io/io.pri
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qwidget_s60.cpp
src/s60installs/qt_libs.pro
|