| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
The patch originally contained all changed done to MMF Phonon, but this
commit contains the changes only Gareth did.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/3rdparty/phonon/phonon/factory.cpp
src/s60installs/qt_libs.pro
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/plugins/plugins.pro
src/s60installs/qt.iby
|
| | | | | |
|
| |_|_|/
|/| | |
| | | |
| | | | |
QDeclarativeXXX.
|
| | | | |
|
| |_|/
|/| | |
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
doc/src/classes/qnamespace.qdoc
examples/examples.pro
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qobject.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qstandardgestures.h
src/gui/kernel/qwidget.cpp
|
| | | |
|
| / |
|
| |
| |
| |
| |
| |
| | |
The 'else' block is not the correct place to add the s60 subdir because
this will also build the plugin for other non-unix platforms which is
not correct. It should be built on symbian.
|
| | |
|
|/
|
|
|
|
|
| |
Ensure that we build the plugins we need and also clean up the file
a bit to remove the symbian specific blocks that aren't needed. Also
we no longer need a separate .iby file for deploying the VG graphics
system since it is now nicely integrated into Qt.
|
|
|