| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't use QAtomicInt in statics because they are non-POD.
|
| | |
| |
| |
| | |
Reviewed-By: Olivier Goffart
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Qt app draws background incorrectly when animated wallpaper is used
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In Symbian^3 OS supports animated wallpapers. Unfortunately animation
is drawn to separate surface underneath the application surface. To
avoid fiddling with system surfaces, Qt apps indicate to the
OS that application does not support animated wallpaper and thus,
system draws a "regular" wallpaper for the application.
This feature is supported only in Sym^3.
Task-number: QT-3148
Reviewed-by: Shane Kearns
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QTBUG-5955: Qt fails to build on alpha architecture
|
| |/ /
| |
| |
| |
| |
| |
| |
| | |
- add alpha platform support based on JavaScriptCore from src/3rdparty/webkit copy.
- fix invalid type conversions on alpha architecture.
Merge-request: 640
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a race condition with QtDBus blocking for replies.
QtDBus: Debug message update
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If an auxiliary thread tried to block on waiting for a reply, and at
the same time the main thread handled the reply, there's room for a
race condition. So ensure only one thread is stopped at
dbus_pending_call_block().
The other thread(s) will be waiting on the QWaitCondition.
It's not a race condition for the main thread to process (and finish
processing) the reply while the auxiliary thread hasn't even started
to wait. The code will ensure that the reply is properly seen.
Task-Id: https://projects.maemo.org/bugzilla/show_bug.cgi?id=155306
Reviewed-By: Trust Me
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed DEPLOYMENT from demos/spectrum/spectrum.pro
Install source for spectrum demo
Fixed path for copying launcher script for spectrum demo
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
DEPLOYMENT was added to demos/spectrum/spectrum.pro as a workaround
for QTBUG-5312, in order to allow 'make sis' to be executed from
the demos/spectrum directory. While this workaround is OK for SBSv2,
it causes a build failure when using SBSv1.
Task-number: QTBUG-10833
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10880
Reviewed-by: Thomas Zander
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10879
Reviewed-by: Thomas Zander
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed an assert in QMenu
Call eglTerminate() when the last QEglContext is destroyed to free mem.
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed an assert in QMenu
Call eglTerminate() when the last QEglContext is destroyed to free mem.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The code was changed and changed the behaviour. This is
basically a kind of revert.
Reviewed-By: gabi
Task-Number: QTBUG-10735
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We never called eglTerminate() to free memory allocated by
eglInitialize() since it was a fixed allocation that would be used
for the lifetime of an application. The new behavior is to call
eglTerminate() when the last EGL context in the app is destroyed.
Task-number: QT-3383
Reviewed-by: Rhys Weatherley
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My 4.6.3 changes.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )
tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
( ecee9d7244ce4f7e7acf723bcef535532780db5f )
Changes in WebKit/qt since the last update:
* [Qt] Nested overflow div does not scroll https://bugs.webkit.org/show_bug.cgi?id=38641
* [Qt] Non animated gifs are animated in QtWebKit https://bugs.webkit.org/show_bug.cgi?id=35955
* [Qt] startAnimation() is not needed to preceede nativeImageForCurrentFrame() https://bugs.webkit.org/show_bug.cgi?id=37844
* Animated GIF images does not animate 10x as expected by default. https://bugs.webkit.org/show_bug.cgi?id=36818
Plus updated/fixed def files
|
| | |/ / |
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Backport multitouch bug fixes to 4.6
Removed double EINTR loop from nativeWrite and nativeRead.
Fixed qsslkey test deployment for Symbian and fixed compiler warnings.
Fixing the race condition in event dispatcher implementation on
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
commit 24b811e53b30546279346ab7b16799be119ab8c4 on 4.7 includes bug
fixes which are needed for 4.6 as well.
1. TouchEnd event was missing
2. pressure in touchpoints was set to 0.0 for non pressure sensitive
touch screens, it should be set to 1.0 for consistency with existing
Qt ports (e.g. mac).
Task-number: QTBUG-10885
Reviewed-by: Bradley T. Hughes
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qt_safe_write and and qt_safe_read already contain EINTR_LOOP.
It seems that this loop has been added to code due to
merge/clean-up errors in commits:
4aafbd6222e7aeafd59a4a4356ba8c53b2bfa1d1
f0a8feed9e9b4de10df76faa350201edaef98f1d
Reviewed-by: Aleksandar Sasha Babic
Reviewed-by: Markus Goetz
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Aleksandar Sasha Babic
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Symbian platform
New socket related requests are comming into QSelectThread by
interrupting the select call by writing to pipe.
One of the criteria is that m_mutex (from QSelectThread) could be
locked, meaninig that QSelectThread is in m_waitCond.wait() call.
However, the m_mutex can be locked by other contenders trying to
post new requests in burst. This would trigger writing to pipe in
false situations, making QSelectThread to hang in waitCond as
no wakeAll will come until some next request (in future) kicks in.
Task-number: QT-3358
Reviewed-by: Janne Anttila
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
changes-4.6.3 updated
|
| | | | |
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing the compile issue.
Fixing the compile issue.
|
| | | |
| | |
| | |
| | |
| | | |
Private headers have to be included in consistent and proper way:
not like "name_p.h" or "../name_p.h" but <private/name_p.h>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We have to explicitely specify the include path to the MW headers
for Symbian. The compiler always gets confused if the private headers
get in the way.
Reviewed-by: TrustMe
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Typo.
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Removed nearest test from qaudiodeviceinfo unit test.
QAudioDeviceInfo::nearestFormat() consistent across all platforms
The documentation for processedUSecs() is ambiguous
|
| | |\ \ \ \ |
|
| | | |\ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioDeviceInfo::nearestFormat() consistent across all platforms
The documentation for processedUSecs() is ambiguous
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioDeviceInfo::nearestFormat() consistent across all platforms
The documentation for processedUSecs() is ambiguous
|
| | | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioDeviceInfo::nearestFormat() consistent across all platforms
The documentation for processedUSecs() is ambiguous
|
| | | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioDeviceInfo::nearestFormat() consistent across all platforms
The documentation for processedUSecs() is ambiguous
|
| |\ \ \ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | / / /
| | |_|_|_|/ / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My 4.6.3 changes.
Added my 4.6.3 changes.
My 4.6.3 changes.
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| |\ \ \ \ \ \ \ \
| |/ / / / / / /
| | | / / / / /
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add my 4.6.3 changes
|
| |/ / / / / / |
|
| |\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix WebKit version dependency in pkg files
Add support for including module specific .pri files as part of qt.prf handling
My changelog entries for 4.6.3
Add my changes to the 4.6.3 changes log
my changelog for 4.6.3
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Default to the Qt major/minor/patch version for WebKit, but use them
only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is
read by qt.prf
Task-number: QTBUG-10847
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-10847
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: trustme
|
| | | | | | | |
|
