| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Update changelog
Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a translucent widge in multi-screen environment
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
translucent widge in multi-screen environment
Merge-request: 865
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (174 commits)
Fixed spelling.
Fixed many spelling errors.
Fix warning introduced by last commit on hiding of the 'd' member
Fix access to uninitialised memory in case of new throwing
Remove accidentially committed .qmlproject.user file, ignore this filetype
Corrected build fail for autotests
QComboBox popup is shown in incorrect location with bottom CBA
Fix Flipable docs
Fall back to Qt for loading images with DICAPS_COLORKEY.
Implement QWidget::metric PdmNumColors for QWS
Adding ::scroll capabilities to live pixmaps.
Major refactoring: creating a new QPixmapData subclass for live textures.
QS60Style: The QComboBox/QSpinBox text color is not according to theme
Using TLS to store QThreadData on Symbian
In meego, support Format_RGB32 too for eglShared images.
Remove unnecessary rounding
Functions that are externally defined to QtOpenGL needs to be imported.
Make sure d->ranges does not have invalid ranges before processing it.
Added include for missing file for Symbian3
Support for clipboard between Qt and Symbian applications
...
|
| |\ \ |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fixed many spelling errors.
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
trys -> tries
|
| |\ \ \ \
| | |/ / / |
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Demo Spectrum wav data size is not calculated correctly
Revert "Don't define highp/mediump/lowp if desktop GL has them"
Rename .pro file to match directory name.
Doc: Fixed qdoc warning.
Add header guards to audio example headers.
|
| | | |\ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/corelib/tools/qcryptographichash.cpp
src/opengl/qgl_p.h
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Demo Spectrum wav data size is not calculated correctly
|
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- Grab length of audio data from Data chunk size
- Read from the device no greater than the audio Data chunk size
Task-number: QTBUG-13779
Reviewed-by: Andrew den Exter
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Rename .pro file to match directory name.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: none
Reviewed-by: Trust Me
|
| | | |\ \ \
| | | | |/ /
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Don't define highp/mediump/lowp if desktop GL has them"
|
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd.
The GL_ARB_ES2_compatibility extension does not mention the lowp,
mediump or highp keywords.
Task-number: QTBUG-14384
Reviewed-by: Samuel
Reviewed-by: Prasanth
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Add header guards to audio example headers.
|
| | | | |\ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Add header guards to audio example headers.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-13413
Reviewed-by: Andrew den Exter
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Fixed qdoc warning.
|
| | | | |/ /
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: hjk
|
| |\ \ \ \ \
|/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (167 commits)
Fix warning introduced by last commit on hiding of the 'd' member
Fix access to uninitialised memory in case of new throwing
Remove accidentially committed .qmlproject.user file, ignore this filetype
Corrected build fail for autotests
QComboBox popup is shown in incorrect location with bottom CBA
Fix Flipable docs
Fall back to Qt for loading images with DICAPS_COLORKEY.
Implement QWidget::metric PdmNumColors for QWS
Adding ::scroll capabilities to live pixmaps.
Major refactoring: creating a new QPixmapData subclass for live textures.
QS60Style: The QComboBox/QSpinBox text color is not according to theme
Using TLS to store QThreadData on Symbian
In meego, support Format_RGB32 too for eglShared images.
Remove unnecessary rounding
Functions that are externally defined to QtOpenGL needs to be imported.
Make sure d->ranges does not have invalid ranges before processing it.
Added include for missing file for Symbian3
Support for clipboard between Qt and Symbian applications
Flickable 'moving' parameter stays at true when setting contentY.
Fix network request completion crashing on a canceled pixmap request
...
|
| |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
demos/declarative/snake/snake.qml
qmake/generators/symbian/symbiancommon.cpp
src/network/access/qnetworkaccessmanager.cpp
src/s60installs/s60installs.pro
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix warning introduced by last commit on hiding of the 'd' member
Fix access to uninitialised memory in case of new throwing
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
qsharedpointer_impl.h: In constructor 'QtSharedPointer::ExternalRefCount<T>::ExternalRefCount(T*, Deleter)':
qsharedpointer_impl.h:385: warning: declaration of 'd' shadows a member of 'this'
|
| | | |\ \ \ \
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix access to uninitialised memory in case of new throwing
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix access to uninitialised memory in case of new throwing
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Testing will come later with a full test for exception issues
Task-number: QTBUG-14637
Reviewed-by: Olivier Goffart
|
| | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Corrected build fail for autotests
QComboBox popup is shown in incorrect location with bottom CBA
QS60Style: The QComboBox/QSpinBox text color is not according to theme
Using TLS to store QThreadData on Symbian
Functions that are externally defined to QtOpenGL needs to be imported.
Added include for missing file for Symbian3
Support for clipboard between Qt and Symbian applications
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Corrected build fail for autotests
QComboBox popup is shown in incorrect location with bottom CBA
QS60Style: The QComboBox/QSpinBox text color is not according to theme
Using TLS to store QThreadData on Symbian
Functions that are externally defined to QtOpenGL needs to be imported.
Added include for missing file for Symbian3
Support for clipboard between Qt and Symbian applications
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Autotests compiled only for Symbian, this is now corrected.
Task-number: QT-2085
Reviewed-by: Janne Koskinen
Merge-request: 870
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
| | | | |\ \ \ \ \ |
|
| | | | | |\ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: The QComboBox/QSpinBox text color is not according to theme
Using TLS to store QThreadData on Symbian
Functions that are externally defined to QtOpenGL needs to be imported.
Added include for missing file for Symbian3
Support for clipboard between Qt and Symbian applications
|
| | | | | | |\ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: The QComboBox/QSpinBox text color is not according to theme
Using TLS to store QThreadData on Symbian
Functions that are externally defined to QtOpenGL needs to be imported.
Added include for missing file for Symbian3
Support for clipboard between Qt and Symbian applications
|
| | | | | |_|/ / / / /
| | | | |/| | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
If native side uses "bottom softkeys" with landscape orientation,
QComboBox's popup should be shown above softkeys and centered.
Currently it is shown above softkeys and on right border.
Task-number: QT-4174
Reviewed-by: mread
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Theme text colors are incorrect for spinboxes and comboboxes, they
should have same theme colors as lineedit has, as they are using same
graphic for "editor" sub-control in them.
Task-number: QT-4176
Reviewed-by: Miikka Heikkinen
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
TLS access on Symbian is significantly faster than using
pthread_getspecific. In the case of QThreadData, the data associated
with a thread, it makes sense to store and access the pointer in TLS
rather than using the pthread thread specific functions.
However, the pthread thread specific function have some destructor
functionality that Symbian TLS does not, so Symbian still uses the
pthread functions for setting the QThreadData to get the destruction
behaviour.
This change has wide ranging performance benefits for QML execution.
With improvements shown on a number of the declarative benchmarks.
Frame drawing times on test apps are also showing some improvement.
The qthread* autotests have been run on Symbian^3 and Ubuntu 10.10
Task-number: QT-4089
Reviewed-by: Shane Kearns
|
| | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
This is needed for RVCT4
Reviewed-by: Jason Barron
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Symbian3 has KClipboardUidTypePlainText defined in different file to
previous Symbian versions. The missing file is now included.
Task-number: QT-2085
Reviewed-by: Janne Koskinen
Merge-request: 870
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Clipboard now supports copying text between Qt and Symbian applications.
Text is always copied to QClipboard and to Symbian clipboard. If
QClipboard is empty, Symbian clipboard is checked and text is pasted
from there. Corresponding test cases added.
Task-number: QT-2085
Reviewed-by: Janne Koskinen
Merge-request: 870
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
| | |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | |/| | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove accidentially committed .qmlproject.user file, ignore this filetype
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Reviewed-By: Thomas Hartmann
|
| | |\ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / / /
| | |/| | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fall back to Qt for loading images with DICAPS_COLORKEY.
Implement QWidget::metric PdmNumColors for QWS
Adding ::scroll capabilities to live pixmaps.
Major refactoring: creating a new QPixmapData subclass for live textures.
|
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / /
| | | |/| | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fall back to Qt for loading images with DICAPS_COLORKEY.
Implement QWidget::metric PdmNumColors for QWS
Adding ::scroll capabilities to live pixmaps.
Major refactoring: creating a new QPixmapData subclass for live textures.
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Merge-request: 844
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
This change is necessary for http://acid3.acidtests.org/#top to pass.
Merge-request: 845
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Merge-request: 2494
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | |_|_|/ / / /
| | | | |/| | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Moving code from qmeegopixmapdata there.
Merge-request: 2494
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|