| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Reviewed-By: Peter Hartmann
(cherry picked from commit e6d6d3830e86202d4f32cd5695f37d4568710562)
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 05e956d5c7d5c39bee332972ce54fea71c15d24b)
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 4e4a800574a28a441858f95021d9092aa3001491)
|
|
|
|
|
|
|
|
| |
This reverts commit 19d63f4d932ae16d0e1c69892681ecd1fabeb44c.
Conflicts:
doc/src/qt4-intro.qdoc
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit d46b4208147ec01aba19c703f21954f068b4dc06)
|
|
|
|
|
|
|
|
| |
The name of the other examples are lowercase. The XML file of Qt Demo
reference a lowercase name.
Reviewed-by: Olivier Goffart
(cherry picked from commit 34044853d4315309920a481a585f96ba7b3fb140)
|
|
|
|
|
|
|
| |
See QTBUG-5532.
Reviewed-by: Jedrzej Nowacki
(cherry picked from commit 9f5dea393da4428685f1a1fd26b0e27f90dca340)
|
|
|
|
|
| |
Reviewed-by: Bradley T. Hughes
(cherry picked from commit bf01b2fada207ee171224386771445487054d42b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 1b14c3d33dea0fe4814f2749c49cf916ca13e012)
Conflicts:
examples/effects/customshader/blureffect.cpp
examples/effects/customshader/blureffect.h
examples/effects/customshader/blurpicker.cpp
examples/effects/customshader/blurpicker.h
examples/effects/customshader/customshadereffect.cpp
examples/effects/customshader/customshadereffect.h
examples/effects/customshader/main.cpp
|
|
|
|
|
|
| |
Task-number: QTBUG-5528
Reviewed-by: Gabriel
(cherry picked from commit f7a030d62ef9fc7725716951b87ec52f6a0d4c2e)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
... like all the other examples.
Reviewed-by: Gabriel
Task-number: QTBUG-5533
(cherry picked from commit dbdebbc68e42fb7d3f114f0765e2bf75a3fe19c0)
|
|
|
|
|
| |
Reviewed-by: Sarah Smith
(cherry picked from commit b2d5f886b36b4f4d317024db7cfd6668e2895cd4)
|
|
|
|
|
| |
Reviewed-by: Samuel
(cherry picked from commit e35d08343032ca366541de2a892f36dfc266b0da)
|
|
|
|
| |
(cherry picked from commit f79ecb7db2f26078541de6c31661fba76e12c9c0)
|
|
|
|
|
|
| |
Task-number: QTBUG-5640
Reviewed-by: Leo
(cherry picked from commit 6d4acbe94c71f7c0049cd08944855c23a716bee3)
|
|
|
|
|
|
|
| |
Its using QFontMetrics::width now.
Reviewed-by: thartman
(cherry picked from commit 4e37815e7e3c68ff561ead147cb06898a2db9c75)
|
|
|
|
|
| |
Reviewed-by: thartman
(cherry picked from commit a9576bacae07eb2b8465191a3e537a5659145914)
|
|
|
|
|
|
|
|
| |
Remember the scale factor so it won't reset each time a new touch sequence
starts.
Reviewed-by: Bradley T. Hughes
(cherry picked from commit 791c4035c28257e5a8426e6519866546faaf5286)
|
|
|
|
|
|
|
| |
QDesktopServices::openUrl expects a proper url, not just a filename.
Reviewed-by: Jedrzej Nowacki
(cherry picked from commit 64946cdc9a5e934132f5c21cbd85e4c21bb5e161)
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Get rid of QGraphicsEffectSource from the public API, instead add
convenience functions in QGraphicsEffect. This way we commit to less
API, and are free to introduce a customizable QGraphicsEffectSource
in a future release.
* Move PixmapPadMode into QGraphicsEffect and tweak the names of the
enum values.
* Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility.
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() ->
QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void
start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is actually only a workaround of what seems to be a QtWebKit bug.
See QTBUG-4649.
Reviewed-by: Jedrzej Nowacki
|
| |\ \ |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QRegExp::numCaptures() is marked as obsolete.
Replaced all usage in Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| |/ / / |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
dist/changes-4.6.0
|
| | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |\ \
| | | | |/ |
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also added symbianpkgrules.pri include to some examples
Reviewed-by: Janne Koskinen
|
| | |\ \ \ \ |
|
| | | | |_|/
| | | |/| |
| | | | | |
| | | | | | |
Reviewed-by: Sarah Smith
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When the gesture finishes it might not necessery set the ScaleFactorChanged
flag.
Also fixed the touch-event based pinch gesture.
Reviewed-by: trustme
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We don't actually need to fill the backgroup in the example as it will be done
by Qt.
And when double-clicked we need to reset the scale factor properly.
Reviewed-by: trustme
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Bradley T. Hughes
|
| | |\ \ \ \
| | | |/ / / |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Make the math correct.
Plus, update the imagegesture example.
Rev-By: denis
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: sroedal
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
morpheuz-fixes
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This was a design that was not possible before with the other
layouts. To do this, the developer would need to hardcode all the
positions and resize would not work.
Besides the fact that we use "pixmap widgets" no it's not totally
usefull widgets, it shows how anchors can help developers an designers
with to create applications with new layouts.
Signed-off-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| |_|/ / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| |\ \ \ \ \
| | |/ / / /
| |/| | / /
| | | |/ /
| | |/| |
| | | | | |
Conflicts:
dist/changes-4.6.0
src/gui/kernel/qevent.h
|