| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
src/corelib/animation/qabstractanimation.cpp
|
| |\ |
|
| | |\
| | | |
| | | |
| | | | |
4.6-staging2
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Softkeys example didn't fit on the screen in landscape mode due to
the widget minimum size enforcement done by Qt. Changed the layout
of the example from QVBoxLayout to QGridlayout to make better use of
the available space. Also shortened button texts.
Task-number: QTBUG-6126
Reviewed-by: Janne Anttila
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QCoreApplication::applicationFilePath() in emulator returns path to
Z drive. Use QDesktopServices instead which always returns the writable
drive.
Task-number: QTBUG-6117
Reviewed-by: Miikka Heikkinen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
every MotionNotify event.
Merge-request: 2210
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|\ \ \ \
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-6306
|
| |/ / / / |
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
into kinetic-declarativeui
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into kinetic-declarativeui
Conflicts:
examples/declarative/loader/qmlfolderlistmodel.h
|
| | | | | | | |
|
| |_|/ / / /
|/| | | | | |
|
|\ \ \ \ \ \
| |_|/ / / /
|/| | / / /
| | |/ / /
| |/| | | |
kinetic-declarativeui
|
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
... with several '&'.
Task-number: QTBUG-5667
Reviewed-by: Gabriel
|
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The broadcast receiver should share the port number. In most cases users
won't run the example on a network, but only on one machine. In the case
it simply should work too.
According to our documentation the fix is platform specific, it will
work only on Linux.
Reviewed-by: Peter Hartmann
|
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
Forward declarations outside namespace scope will
fail in this case.
Reviewed-by: brad
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-By: Thierry
|
| |\ \ \
| | |/ /
| |/| |
| | | | |
into 4.6
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 2142
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 2142
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
4.6-staging2
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ICON keyword can be used without UID, since .mif filename
is generated based on target instead of UID3 nowadays
Task-number: QTBUG-4677
Reviewed-by: Miikka Heikkinen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0.
It can be reverted now since mifconv invoking is changed to use
relative paths instead of absolute one.
Task-number: QTBUG-4745
Reviewed-by: TrustMe
|
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fixes commit 9a0f7a1ef
Reviewed-by: Olivier
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The name of the other examples are lowercase. The XML file of Qt Demo
reference a lowercase name.
Reviewed-by: Olivier Goffart
|
| | |_|/ /
| |/| | |
| | | | |
| | | | | |
Reviewed-by: Bradley T. Hughes
|
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-By: Peter Hartmann
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure.exe
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
See QTBUG-5532.
Reviewed-by: Jedrzej Nowacki
|
| |\ \ \ \ \
| | |_|/ / /
| |/| | / /
| | | |/ /
| | |/| | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Commit 3f109fd85cbdc49dc3ef1c14066073079f4e34bf made
QGraphicsShaderEffect private API, however the example showing how to
use it was kept. This patch just removes that example.
Reviewed-by: Samuel
|
| | | | |
| | | | |
| | | | |
| | | | | |
Over src/ tools/ examples/ and demos/
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-5528
Reviewed-by: Gabriel
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | | |
4.6-staging2
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
1) Use QFormLayout instead of QGridLayout
2) Remove Symbian specific size hack
3) Give button box a parent, so that it's buttons get
properly added as the dialog's softkeys.
4) Add submitButton with a positive button role
Task-number: QTBUG-5685
Reviewed-by: Jason Barron
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The current implementation would not show Softkeys as
long as we show a widget via showFullScreen. Therefore,
on Symbian we will for now use showMaximized
Reviewed-By: Jason Barron
|
|\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | |
|